DPDK patches and discussions
 help / color / mirror / Atom feed
From: Wei Zhao <wei.zhao1@intel.com>
To: dev@dpdk.org
Cc: qi.z.zhang@intel.com, Wei Zhao <wei.zhao1@intel.com>
Subject: [dpdk-dev] [PATCH v3] net/i40e: fix issue for RSS flow API
Date: Fri, 26 Jan 2018 16:46:51 +0800	[thread overview]
Message-ID: <20180126084651.41865-1-wei.zhao1@intel.com> (raw)
In-Reply-To: <20180126030817.38021-1-wei.zhao1@intel.com>

This patch fix issue check from DPDK coverity issues.

Coverity issue: 257020, 257024, 257037
Fixes: ecad87d22383e ("net/i40e: move RSS to flow API")

Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>

---

v2:
-fix an error introduced in v1 patch.

v3:
-change coverity writing style for DPDK rule.
---
 drivers/net/i40e/i40e_ethdev.c | 2 +-
 drivers/net/i40e/i40e_flow.c   | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 5ea9f99..b0db458 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -11681,7 +11681,7 @@ i40e_config_rss_filter(struct i40e_pf *pf,
 							sizeof(uint32_t);
 	}
 
-	return i40e_hw_rss_hash_set(pf, &rss_conf);
+	i40e_hw_rss_hash_set(pf, &rss_conf);
 
 	rte_memcpy(rss_info,
 		conf, sizeof(struct i40e_rte_flow_rss_conf));
diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index cd9a9b6..2cb9c64 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -4201,6 +4201,7 @@ i40e_flow_parse_rss_action(struct rte_eth_dev *dev,
 	struct i40e_rte_flow_rss_conf *rss_info = &pf->rss_info;
 	uint16_t i, j, n, tmp;
 	uint32_t index = 0;
+	uint64_t hf_bit = 1;
 
 	NEXT_ITEM_OF_ACTION(act, actions, index);
 	rss = (const struct rte_flow_action_rss *)act->conf;
@@ -4219,7 +4220,7 @@ i40e_flow_parse_rss_action(struct rte_eth_dev *dev,
 
 	if (action_flag) {
 		for (n = 0; n < 64; n++) {
-			if (rss->rss_conf->rss_hf & (1 << n)) {
+			if (rss->rss_conf->rss_hf & (hf_bit << n)) {
 				conf_info->region[0].hw_flowtype[0] = n;
 				conf_info->region[0].flowtype_num = 1;
 				conf_info->queue_region_number = 1;
@@ -4313,9 +4314,11 @@ i40e_flow_parse_rss_action(struct rte_eth_dev *dev,
 		}
 
 		rss_config->queue_region_conf = TRUE;
-		return 0;
 	}
 
+	if (rss_config->queue_region_conf)
+		return 0;
+
 	if (!rss || !rss->num) {
 		rte_flow_error_set(error, EINVAL,
 				RTE_FLOW_ERROR_TYPE_ACTION,
-- 
2.9.3

  parent reply	other threads:[~2018-01-26  8:54 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-23  6:43 [dpdk-dev] [PATCH] net/i40e: fix issues " Wei Zhao
2018-01-25  3:59 ` Zhang, Qi Z
2018-01-25  5:40 ` Zhang, Qi Z
2018-01-26  3:17   ` Zhao1, Wei
2018-01-26  8:32     ` Zhang, Helin
2018-01-26  8:56       ` Zhao1, Wei
2018-01-25  6:12 ` Zhang, Qi Z
2018-01-25  6:22   ` Zhao1, Wei
2018-01-26  3:08 ` [dpdk-dev] [PATCH v2] net/i40e: fix issue " Wei Zhao
2018-01-26  7:32   ` Zhang, Qi Z
2018-01-26  8:43   ` [dpdk-dev] [PATCH v3] " Wei Zhao
2018-01-26  8:46   ` Wei Zhao [this message]
2018-01-30  2:46     ` Zhang, Helin

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=20180126084651.41865-1-wei.zhao1@intel.com \
    --to=wei.zhao1@intel.com \
    --cc=dev@dpdk.org \
    --cc=qi.z.zhang@intel.com \
    /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).