From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C4B8FA09FF; Thu, 24 Dec 2020 03:24:56 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9846BC9B6; Thu, 24 Dec 2020 03:24:54 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 596E5C9B4 for ; Thu, 24 Dec 2020 03:24:52 +0100 (CET) IronPort-SDR: Sww2n/VCjx28t/cAadgyCIkLpMniVys6ed2V5UQtziVlWznSQ2cwS5hV74msC2A9Sji4VO6ryG 9hN8T2VcRCug== X-IronPort-AV: E=McAfee;i="6000,8403,9844"; a="175323973" X-IronPort-AV: E=Sophos;i="5.78,443,1599548400"; d="scan'208";a="175323973" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Dec 2020 18:24:50 -0800 IronPort-SDR: 3SYQJDxDSIBGBFlCB8VfB0cE57/OtyxUdZI3/om+n/StKljgTc22PChzVhjqFopU4KlRptpIAi IxwdSj8/2Nhg== X-IronPort-AV: E=Sophos;i="5.78,443,1599548400"; d="scan'208";a="374207493" Received: from unknown (HELO intel-npg-odc-srv02.cd.intel.com) ([10.240.178.186]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Dec 2020 18:24:47 -0800 From: Murphy Yang To: dev@dpdk.org Cc: qiming.yang@intel.com, jia.guo@intel.com, qi.z.zhang@intel.com, stevex.yang@intel.com, jingjing.wu@intel.com, beilei.xing@intel.com, Murphy Yang Date: Thu, 24 Dec 2020 02:20:44 +0000 Message-Id: <20201224022044.84292-1-murphyx.yang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201223080346.79009-1-murphyx.yang@intel.com> References: <20201223080346.79009-1-murphyx.yang@intel.com> Subject: [dpdk-dev] [PATCH v5] net/iavf: fix invalid RSS combinations rule can be created X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Currently, when use 'flow' command to create a rule that combine with several RSS types, even the RSS type combination is invalid, it also be created successfully. Here list some invalid RSS combinations: - ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_TCP - ETH_RSS_IPV6 | ETH_RSS_NONFRAG_IPV6_TCP - ETH_RSS_GTPU | ETH_RSS_IPV4 - ETH_RSS_GTPU | ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_UDP - ETH_RSS_GTPU | ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_TCP - ETH_RSS_GTPU | ETH_RSS_IPV6 - ETH_RSS_GTPU | ETH_RSS_IPV6 | ETH_RSS_NONFRAG_IPV6_UDP - ETH_RSS_GTPU | ETH_RSS_IPV6 | ETH_RSS_NONFRAG_IPV6_TCP For 'ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_TCP' (same as IPV6), this pathch adds these combinations in 'invalid_rss_comb' array to do valid check, if the combination check failed, the rule will be created unsuccessful. For other 'ETH_RSS_GTPU' invalid combinations, this patch removes the 'ETH_RSS_GTPU' from the input set mask, if the combination is invalid, the 'rss_type' check will be failed, the rule will be created unsuccessful. Fixes: 91f27b2e39ab ("net/iavf: refactor RSS") Signed-off-by: Murphy Yang --- v5: - remove 'ETH_RSS_GTPU' from input set mask. v4: - use 'ETH_RSS_XXX' replace 'IAVF_RSS_TYPE_INNER_XXX' v3: - update the comments. v2: - add invalid RSS combinations. drivers/net/iavf/iavf_hash.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c index c4c73e6644..916d6c5dfa 100644 --- a/drivers/net/iavf/iavf_hash.c +++ b/drivers/net/iavf/iavf_hash.c @@ -341,19 +341,13 @@ struct virtchnl_proto_hdrs ipv6_udp_gtpc_tmplt = { #define IAVF_RSS_TYPE_INNER_IPV6_SCTP (ETH_RSS_IPV6 | \ ETH_RSS_NONFRAG_IPV6_SCTP) /* GTPU IPv4 */ -#define IAVF_RSS_TYPE_GTPU_IPV4 (IAVF_RSS_TYPE_INNER_IPV4 | \ - ETH_RSS_GTPU) -#define IAVF_RSS_TYPE_GTPU_IPV4_UDP (IAVF_RSS_TYPE_INNER_IPV4_UDP | \ - ETH_RSS_GTPU) -#define IAVF_RSS_TYPE_GTPU_IPV4_TCP (IAVF_RSS_TYPE_INNER_IPV4_TCP | \ - ETH_RSS_GTPU) +#define IAVF_RSS_TYPE_GTPU_IPV4 IAVF_RSS_TYPE_INNER_IPV4 +#define IAVF_RSS_TYPE_GTPU_IPV4_UDP IAVF_RSS_TYPE_INNER_IPV4_UDP +#define IAVF_RSS_TYPE_GTPU_IPV4_TCP IAVF_RSS_TYPE_INNER_IPV4_TCP /* GTPU IPv6 */ -#define IAVF_RSS_TYPE_GTPU_IPV6 (IAVF_RSS_TYPE_INNER_IPV6 | \ - ETH_RSS_GTPU) -#define IAVF_RSS_TYPE_GTPU_IPV6_UDP (IAVF_RSS_TYPE_INNER_IPV6_UDP | \ - ETH_RSS_GTPU) -#define IAVF_RSS_TYPE_GTPU_IPV6_TCP (IAVF_RSS_TYPE_INNER_IPV6_TCP | \ - ETH_RSS_GTPU) +#define IAVF_RSS_TYPE_GTPU_IPV6 IAVF_RSS_TYPE_INNER_IPV6 +#define IAVF_RSS_TYPE_GTPU_IPV6_UDP IAVF_RSS_TYPE_INNER_IPV6_UDP +#define IAVF_RSS_TYPE_GTPU_IPV6_TCP IAVF_RSS_TYPE_INNER_IPV6_TCP /* ESP, AH, L2TPV3 and PFCP */ #define IAVF_RSS_TYPE_IPV4_ESP (ETH_RSS_ESP | ETH_RSS_IPV4) #define IAVF_RSS_TYPE_IPV4_AH (ETH_RSS_AH | ETH_RSS_IPV4) @@ -806,7 +800,9 @@ static void iavf_refine_proto_hdrs(struct virtchnl_proto_hdrs *proto_hdrs, static uint64_t invalid_rss_comb[] = { ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_UDP, + ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_TCP, ETH_RSS_IPV6 | ETH_RSS_NONFRAG_IPV6_UDP, + ETH_RSS_IPV6 | ETH_RSS_NONFRAG_IPV6_TCP, RTE_ETH_RSS_L3_PRE32 | RTE_ETH_RSS_L3_PRE40 | RTE_ETH_RSS_L3_PRE48 | RTE_ETH_RSS_L3_PRE56 | RTE_ETH_RSS_L3_PRE96 -- 2.17.1