From: Jijiang Liu <jijiang.liu@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v2 1/2] lib/lpm:fix an issue of condition check in delete_depth_small()
Date: Fri, 30 Oct 2015 21:14:38 +0800 [thread overview]
Message-ID: <1446210879-14242-2-git-send-email-jijiang.liu@intel.com> (raw)
In-Reply-To: <1446210879-14242-1-git-send-email-jijiang.liu@intel.com>
Fixes an issue of check logic in delete_depth_small function.
For a tbl24 entry, the 'ext_entry' field indicates whether we need to use tbl8_gindex to read the next_hop from a tbl8 entry, or whether it can be read directly from this entry.
If a route is deleted, the prefix of previous route is used to override the deleted route.
When checking the depth of the previous route the conditional checks both the ext_entry and the depth, but the "else" leg fails to take account that the condition could fail for one of two possible reasons, leading to an incorrect flow when 'ext_entry == 0' is true , but 'lpm->tbl24[i].depth > depth' is false. The fix here is to add a condition check to the else leg so that it only executes when ext_entry is set.
Signed-off-by: NaNa <nana.nn@alibaba-inc.com>
---
lib/librte_lpm/rte_lpm.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/librte_lpm/rte_lpm.c b/lib/librte_lpm/rte_lpm.c
index 163ba3c..57ec2f0 100644
--- a/lib/librte_lpm/rte_lpm.c
+++ b/lib/librte_lpm/rte_lpm.c
@@ -734,8 +734,7 @@ delete_depth_small(struct rte_lpm *lpm, uint32_t ip_masked,
if (lpm->tbl24[i].ext_entry == 0 &&
lpm->tbl24[i].depth <= depth ) {
lpm->tbl24[i].valid = INVALID;
- }
- else {
+ } else if (lpm->tbl24[i].ext_entry == 1) {
/*
* If TBL24 entry is extended, then there has
* to be a rule with depth >= 25 in the
@@ -780,8 +779,7 @@ delete_depth_small(struct rte_lpm *lpm, uint32_t ip_masked,
if (lpm->tbl24[i].ext_entry == 0 &&
lpm->tbl24[i].depth <= depth ) {
lpm->tbl24[i] = new_tbl24_entry;
- }
- else {
+ } else if (lpm->tbl24[i].ext_entry == 1) {
/*
* If TBL24 entry is extended, then there has
* to be a rule with depth >= 25 in the
--
1.7.7.6
next prev parent reply other threads:[~2015-10-30 13:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-30 13:14 [dpdk-dev] [PATCH v2 0/2] Fix two issues in lpm Jijiang Liu
2015-10-30 13:14 ` Jijiang Liu [this message]
2015-10-30 14:13 ` [dpdk-dev] [PATCH v2 1/2] lib/lpm:fix an issue of condition check in delete_depth_small() Bruce Richardson
2015-10-30 13:14 ` [dpdk-dev] [PATCH v2 2/2] lib/lpm:fix an initialization issue of valid_group in the delete_depth_small() Jijiang Liu
2015-10-30 14:22 ` Bruce Richardson
2015-10-30 14:24 ` Bruce Richardson
2015-10-30 14:31 ` Thomas Monjalon
2015-10-30 14:56 ` Richardson, Bruce
2015-11-02 8:05 ` Liu, Jijiang
2015-11-01 18:43 ` [dpdk-dev] [PATCH v2 0/2] Fix two issues in lpm Thomas Monjalon
2015-11-02 8:09 ` Liu, Jijiang
2015-11-02 8:25 ` Thomas Monjalon
2015-11-02 8:34 ` Liu, Jijiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1446210879-14242-2-git-send-email-jijiang.liu@intel.com \
--to=jijiang.liu@intel.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).