From patchwork Tue Aug 18 10:31:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kiran Kumar Kokkilagadda X-Patchwork-Id: 75613 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3B856A034C; Tue, 18 Aug 2020 12:32:30 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 130791C023; Tue, 18 Aug 2020 12:32:29 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id E4FD32B91 for ; Tue, 18 Aug 2020 12:32:27 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 07IAVeJc014504; Tue, 18 Aug 2020 03:32:21 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=z8JEbcGk5bclC9sQwrFfJ4EAbgDUmZrhP6izbSWS7z0=; b=YQB9vIvANvWp/A/9EwpxS0kARZVRxIlf5aNSKyWCOfRwk9EbSWDnq7ks0v7/kg8y6RY3 pPxOWmDzaPuIaNAGRXZSwL9N+x7r54fY4Cr94+4HNHhvVKkf/tiYdGu2N6q/m7m/m3OW CiB/Jz6eJ2V4dHmXtJ7w6Y0iROmbMAKyHKPirBrv1dK0bnt4L6XBhC4X670kEBN6pah0 x/oJ6OjWfuU5blNIdjZQx+eIEh/xlL4kQCIHy9UIuKq2EaQY+092fB7Yo56xReePDvdv 4/WPFR0cDqU6uuTjKCQ0Pb8EVNv3lRxW90m/wKCleRz0jw9aBuPm63pQxb8b6JLKMdYK 1Q== Received: from sc-exch04.marvell.com ([199.233.58.184]) by mx0a-0016f401.pphosted.com with ESMTP id 3304fhj219-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 18 Aug 2020 03:32:21 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 18 Aug 2020 03:32:21 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 18 Aug 2020 03:32:19 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 18 Aug 2020 03:32:19 -0700 Received: from localhost.localdomain (unknown [10.28.34.15]) by maili.marvell.com (Postfix) with ESMTP id 5EF183F703F; Tue, 18 Aug 2020 03:32:08 -0700 (PDT) From: To: Wenzhuo Lu , Beilei Xing , Bernard Iremonger , Thomas Monjalon , Ferruh Yigit , "Andrew Rybchenko" CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Kiran Kumar K Date: Tue, 18 Aug 2020 16:01:44 +0530 Message-ID: <20200818103145.2192371-1-kirankumark@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200818072143.2189928-1-kirankumark@marvell.com> References: <20200818072143.2189928-1-kirankumark@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-08-18_06:2020-08-18, 2020-08-18 signatures=0 Subject: [dpdk-dev] [PATCH v4 1/2] ethdev: add level support for RSS offload types 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" From: Kiran Kumar K This patch reserves 2 bits as input selection to select Inner and outer layers for RSS computation. It is combined with existing ETH_RSS_* to choose Inner or outer layers for L2, L3 and L4. This functionality already exists in rte_flow through level parameter in RSS action configuration rte_flow_action_rss. Signed-off-by: Kiran Kumar K --- app/test-pmd/parameters.c | 6 ++++++ lib/librte_ethdev/rte_ethdev.h | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index 7cb0e3d6e..5f669ff24 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -632,6 +632,8 @@ launch_args_parse(int argc, char** argv) { "forward-mode", 1, 0, 0 }, { "rss-ip", 0, 0, 0 }, { "rss-udp", 0, 0, 0 }, + { "rss-outer", 0, 0, 0 }, + { "rss-inner-outer", 0, 0, 0 }, { "rxq", 1, 0, 0 }, { "txq", 1, 0, 0 }, { "rxd", 1, 0, 0 }, @@ -1051,6 +1053,10 @@ launch_args_parse(int argc, char** argv) rss_hf = ETH_RSS_IP; if (!strcmp(lgopts[opt_idx].name, "rss-udp")) rss_hf = ETH_RSS_UDP; + if (!strcmp(lgopts[opt_idx].name, "rss-outer")) + rss_hf |= ETH_RSS_LEVEL_OUTER; + if (!strcmp(lgopts[opt_idx].name, "rss-inner-outer")) + rss_hf |= ETH_RSS_LEVEL_INNER_OUTER; if (!strcmp(lgopts[opt_idx].name, "rxq")) { n = atoi(optarg); if (n >= 0 && check_nb_rxq((queueid_t)n) == 0) diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h index d29930fd8..28184cc85 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -552,6 +552,33 @@ struct rte_eth_rss_conf { #define RTE_ETH_RSS_L3_PRE64 (1ULL << 53) #define RTE_ETH_RSS_L3_PRE96 (1ULL << 52) +/* + * We use the following macros to combine with the above layers to choose + * inner and outer layers or both for RSS computation. + * Note: Default is 0: inner layers, 1: outer layers, 2: both + * bit 50 and 51 are reserved for this. + */ + +/** + * Level 0, It basically stands for the innermost encapsulation level RSS + * can be performed on according to PMD and device capabilities. + */ +#define ETH_RSS_LEVEL_INNER (0ULL << 50) +/** + * Level 1, It basically stands for the outermost encapsulation level RSS + * can be performed on according to PMD and device capabilities. + */ +#define ETH_RSS_LEVEL_OUTER (1ULL << 50) +/** + * Level 2, It basically stands for the both inner and outermost + * encapsulation level RSS can be performed on according to PMD and + * device capabilities. + */ +#define ETH_RSS_LEVEL_INNER_OUTER (2ULL << 50) +#define ETH_RSS_LEVEL_MASK (3ULL << 50) + +#define ETH_RSS_LEVEL(rss_hf) ((rss_hf & ETH_RSS_LEVEL_MASK) >> 50) + /** * For input set change of hash filter, if SRC_ONLY and DST_ONLY of * the same level are used simultaneously, it is the same case as From patchwork Tue Aug 18 10:31:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kiran Kumar Kokkilagadda X-Patchwork-Id: 75614 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id AB05DA034C; Tue, 18 Aug 2020 12:32:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7FF5A1C065; Tue, 18 Aug 2020 12:32:41 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 5AFAC2B91 for ; Tue, 18 Aug 2020 12:32:39 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 07IAVjkC014537; Tue, 18 Aug 2020 03:32:33 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=byFkSfQKgXCZJ8XleC9kYxfAGW6WezC1+rwAgN/C/nU=; b=G7/qq+LTM0/jZ/yv3yRkZTfLPBTyBL2I35gE3A9WIDu5Sc1NUG33fVq0NCoZHH6IJ57r bl0PD+pgD6DW5W93EKfynXQxS3xmNJz8dnlgKI1KfAc8lzY72MvZxzKkyffjyD9gyoT6 r54ANti5aQMsTCnPyOfI+wt9hnZ6WfeiAtDbDKGAH4dcsOk5keWVdLrmKQD/nO64KHCy u4rrix6RCPK6oCe/QSUTpv0Jw5IVwvBNnVPDRKfIdbb1oQr+Jv0HaQv+whEobN2oH/a1 TqEsJjmdhgX8VzOCn5Mc+d+F4yFPRO1z7POGmnR5X+N1s+g4+Xl7xXmqcStCTFOdJedl 9A== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0a-0016f401.pphosted.com with ESMTP id 3304fhj21y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 18 Aug 2020 03:32:32 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 18 Aug 2020 03:32:32 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 18 Aug 2020 03:32:30 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 18 Aug 2020 03:32:30 -0700 Received: from localhost.localdomain (unknown [10.28.34.15]) by maili.marvell.com (Postfix) with ESMTP id 15D133F704A; Tue, 18 Aug 2020 03:32:19 -0700 (PDT) From: To: Jerin Jacob , Nithin Dabilpuram , Kiran Kumar K CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Date: Tue, 18 Aug 2020 16:01:45 +0530 Message-ID: <20200818103145.2192371-2-kirankumark@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200818103145.2192371-1-kirankumark@marvell.com> References: <20200818072143.2189928-1-kirankumark@marvell.com> <20200818103145.2192371-1-kirankumark@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-08-18_06:2020-08-18, 2020-08-18 signatures=0 Subject: [dpdk-dev] [PATCH v4 2/2] net/octeontx2: add rss hash level support 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" From: Kiran Kumar K Add support to choose rss hash level from ethdev rss config. Signed-off-by: Kiran Kumar K --- V4 Changes: * Replace ETH_RSS_LEVEL_OUTER | ETH_RSS_LEVEL_INNER_OUTER with ETH_RSS_LEVEL_MASK drivers/net/octeontx2/otx2_ethdev.h | 2 +- drivers/net/octeontx2/otx2_rss.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) -- 2.25.1 diff --git a/drivers/net/octeontx2/otx2_ethdev.h b/drivers/net/octeontx2/otx2_ethdev.h index e9efe52bb..a11411239 100644 --- a/drivers/net/octeontx2/otx2_ethdev.h +++ b/drivers/net/octeontx2/otx2_ethdev.h @@ -119,7 +119,7 @@ #define NIX_RSS_OFFLOAD (ETH_RSS_PORT | ETH_RSS_IP | ETH_RSS_UDP |\ ETH_RSS_TCP | ETH_RSS_SCTP | \ ETH_RSS_TUNNEL | ETH_RSS_L2_PAYLOAD | \ - NIX_RSS_L3_L4_SRC_DST) + NIX_RSS_L3_L4_SRC_DST | ETH_RSS_LEVEL_MASK) #define NIX_TX_OFFLOAD_CAPA ( \ DEV_TX_OFFLOAD_MBUF_FAST_FREE | \ diff --git a/drivers/net/octeontx2/otx2_rss.c b/drivers/net/octeontx2/otx2_rss.c index d859937e6..194f4e8af 100644 --- a/drivers/net/octeontx2/otx2_rss.c +++ b/drivers/net/octeontx2/otx2_rss.c @@ -323,6 +323,7 @@ otx2_nix_rss_hash_update(struct rte_eth_dev *eth_dev, struct rte_eth_rss_conf *rss_conf) { struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev); + uint8_t rss_hash_level; uint32_t flowkey_cfg; uint8_t alg_idx; int rc; @@ -339,7 +340,9 @@ otx2_nix_rss_hash_update(struct rte_eth_dev *eth_dev, otx2_nix_rss_set_key(dev, rss_conf->rss_key, (uint32_t)rss_conf->rss_key_len); - flowkey_cfg = otx2_rss_ethdev_to_nix(dev, rss_conf->rss_hf, 0); + rss_hash_level = ETH_RSS_LEVEL(rss_conf->rss_hf); + flowkey_cfg = + otx2_rss_ethdev_to_nix(dev, rss_conf->rss_hf, rss_hash_level); rc = otx2_rss_set_hf(dev, flowkey_cfg, &alg_idx, NIX_DEFAULT_RSS_CTX_GROUP, @@ -375,6 +378,7 @@ otx2_nix_rss_config(struct rte_eth_dev *eth_dev) { struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev); uint32_t idx, qcnt = eth_dev->data->nb_rx_queues; + uint8_t rss_hash_level; uint32_t flowkey_cfg; uint64_t rss_hf; uint8_t alg_idx; @@ -399,7 +403,8 @@ otx2_nix_rss_config(struct rte_eth_dev *eth_dev) } rss_hf = eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf; - flowkey_cfg = otx2_rss_ethdev_to_nix(dev, rss_hf, 0); + rss_hash_level = ETH_RSS_LEVEL(rss_hf); + flowkey_cfg = otx2_rss_ethdev_to_nix(dev, rss_hf, rss_hash_level); rc = otx2_rss_set_hf(dev, flowkey_cfg, &alg_idx, NIX_DEFAULT_RSS_CTX_GROUP,