net/ice: correct RSS types check error
Checks
Commit Message
This patch corrects logic error for checking rss->types to match
pattern in RSS action parser.
Fixes: 5ad3db8d4bdd ("net/ice: enable advanced RSS")
Cc: stable@dpdk.org
Signed-off-by: Simei Su <simei.su@intel.com>
---
drivers/net/ice/ice_hash.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
Comments
> -----Original Message-----
> From: Su, Simei <simei.su@intel.com>
> Sent: Wednesday, October 30, 2019 10:50 AM
> To: Zhang, Qi Z <qi.z.zhang@intel.com>; Xing, Beilei <beilei.xing@intel.com>;
> Yang, Qiming <qiming.yang@intel.com>
> Cc: dev@dpdk.org; Ye, Xiaolong <xiaolong.ye@intel.com>; Su, Simei
> <simei.su@intel.com>; stable@dpdk.org
> Subject: [PATCH] net/ice: correct RSS types check error
>
> This patch corrects logic error for checking rss->types to match pattern in RSS
> action parser.
>
> Fixes: 5ad3db8d4bdd ("net/ice: enable advanced RSS")
> Cc: stable@dpdk.org
No need to cc stable, if fix on the current release.
>
> Signed-off-by: Simei Su <simei.su@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
On 10/30, Simei Su wrote:
>This patch corrects logic error for checking rss->types to match
>pattern in RSS action parser.
>
>Fixes: 5ad3db8d4bdd ("net/ice: enable advanced RSS")
>Cc: stable@dpdk.org
>
>Signed-off-by: Simei Su <simei.su@intel.com>
>---
> drivers/net/ice/ice_hash.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
>index f710b97..346d6cf 100644
>--- a/drivers/net/ice/ice_hash.c
>+++ b/drivers/net/ice/ice_hash.c
>@@ -315,13 +315,13 @@ struct ice_hash_match_type ice_hash_type_list[] = {
>
> /* Check if rss types match pattern. */
> if (rss->func != RTE_ETH_HASH_FUNCTION_SIMPLE_XOR) {
>- if (((rss_hf & ETH_RSS_IPV4) != m->eth_rss_hint) ||
>- ((rss_hf & ETH_RSS_NONFRAG_IPV4_UDP) != m->eth_rss_hint) ||
>- ((rss_hf & ETH_RSS_NONFRAG_IPV4_TCP) != m->eth_rss_hint) ||
>- ((rss_hf & ETH_RSS_NONFRAG_IPV4_SCTP) != m->eth_rss_hint) ||
>- ((rss_hf & ETH_RSS_IPV6) != m->eth_rss_hint) ||
>- ((rss_hf & ETH_RSS_NONFRAG_IPV6_UDP) != m->eth_rss_hint) ||
>- ((rss_hf & ETH_RSS_NONFRAG_IPV6_TCP) != m->eth_rss_hint) ||
>+ if (((rss_hf & ETH_RSS_IPV4) != m->eth_rss_hint) &&
>+ ((rss_hf & ETH_RSS_NONFRAG_IPV4_UDP) != m->eth_rss_hint) &&
>+ ((rss_hf & ETH_RSS_NONFRAG_IPV4_TCP) != m->eth_rss_hint) &&
>+ ((rss_hf & ETH_RSS_NONFRAG_IPV4_SCTP) != m->eth_rss_hint) &&
>+ ((rss_hf & ETH_RSS_IPV6) != m->eth_rss_hint) &&
>+ ((rss_hf & ETH_RSS_NONFRAG_IPV6_UDP) != m->eth_rss_hint) &&
>+ ((rss_hf & ETH_RSS_NONFRAG_IPV6_TCP) != m->eth_rss_hint) &&
> ((rss_hf & ETH_RSS_NONFRAG_IPV6_SCTP) != m->eth_rss_hint))
> return rte_flow_error_set(error,
> ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION,
>--
>1.8.3.1
>
Acked-by: Xiaolong Ye <xiaolong.ye@intel.com>
Applied to dpdk-next-net-intel. Thanks.
@@ -315,13 +315,13 @@ struct ice_hash_match_type ice_hash_type_list[] = {
/* Check if rss types match pattern. */
if (rss->func != RTE_ETH_HASH_FUNCTION_SIMPLE_XOR) {
- if (((rss_hf & ETH_RSS_IPV4) != m->eth_rss_hint) ||
- ((rss_hf & ETH_RSS_NONFRAG_IPV4_UDP) != m->eth_rss_hint) ||
- ((rss_hf & ETH_RSS_NONFRAG_IPV4_TCP) != m->eth_rss_hint) ||
- ((rss_hf & ETH_RSS_NONFRAG_IPV4_SCTP) != m->eth_rss_hint) ||
- ((rss_hf & ETH_RSS_IPV6) != m->eth_rss_hint) ||
- ((rss_hf & ETH_RSS_NONFRAG_IPV6_UDP) != m->eth_rss_hint) ||
- ((rss_hf & ETH_RSS_NONFRAG_IPV6_TCP) != m->eth_rss_hint) ||
+ if (((rss_hf & ETH_RSS_IPV4) != m->eth_rss_hint) &&
+ ((rss_hf & ETH_RSS_NONFRAG_IPV4_UDP) != m->eth_rss_hint) &&
+ ((rss_hf & ETH_RSS_NONFRAG_IPV4_TCP) != m->eth_rss_hint) &&
+ ((rss_hf & ETH_RSS_NONFRAG_IPV4_SCTP) != m->eth_rss_hint) &&
+ ((rss_hf & ETH_RSS_IPV6) != m->eth_rss_hint) &&
+ ((rss_hf & ETH_RSS_NONFRAG_IPV6_UDP) != m->eth_rss_hint) &&
+ ((rss_hf & ETH_RSS_NONFRAG_IPV6_TCP) != m->eth_rss_hint) &&
((rss_hf & ETH_RSS_NONFRAG_IPV6_SCTP) != m->eth_rss_hint))
return rte_flow_error_set(error,
ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION,