From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
	by inbox.dpdk.org (Postfix) with ESMTP id F303CA04AF;
	Wed, 19 Aug 2020 08:05:10 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
	by dpdk.org (Postfix) with ESMTP id A42831C00D;
	Wed, 19 Aug 2020 08:05:09 +0200 (CEST)
Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com
 [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 355E61C002
 for <dev@dpdk.org>; Wed, 19 Aug 2020 08:05:08 +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
 07J5uWYf019716; Tue, 18 Aug 2020 23:05:04 -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=s318+zc2NdxT1uudPGDkVIaKfVuvJK8oMQtZ5T+s3IQ=;
 b=KL/bNCDK1zbkAZgnBue1T7VbfAq94ViLYP0LHJdqL1zX4FARTPgnwNI0ouF7jTIcUmZN
 NVjuTEwvTgDuXZiP45wcg6rqoObLBFBNELeo4twt1tAx5ZpdP9+S6Mgi8G+Q3MzopMDU
 k5+X9FGkq5zPGV9/jJFPGegLMSdWoBpe1H4F/+SSCuuWhdpshb+QgH7QisEpJw/S6348
 /jtMWw4aA+tw9VvNYQQAZHxULO3+6gdRzmrqE734m5edwiFEjQ74Y3KnuJlJjCi4RrKV
 6v4lDfAXx81645GNp7mjl+mLxjhgVUlhl+Ddd/VbgED7MJjdMITVHtfHX4H3ouY1X0jl dw== 
Received: from sc-exch02.marvell.com ([199.233.58.182])
 by mx0a-0016f401.pphosted.com with ESMTP id 3304fhpe3n-1
 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);
 Tue, 18 Aug 2020 23:05:04 -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 23:05:03 -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 23:05:03 -0700
Received: from localhost.localdomain (unknown [10.28.34.15])
 by maili.marvell.com (Postfix) with ESMTP id 0C00E3F703F;
 Tue, 18 Aug 2020 23:04:51 -0700 (PDT)
From: <kirankumark@marvell.com>
To: Wenzhuo Lu <wenzhuo.lu@intel.com>, Beilei Xing <beilei.xing@intel.com>,
 Bernard Iremonger <bernard.iremonger@intel.com>, Thomas Monjalon
 <thomas@monjalon.net>, Ferruh Yigit <ferruh.yigit@intel.com>, "Andrew
 Rybchenko" <arybchenko@solarflare.com>
CC: <dev@dpdk.org>, <jerinj@marvell.com>, <orika@mellanox.com>,
 <xuanziyang2@huawei.com>, <cloud.wangxiaoyun@huawei.com>,
 <zhouguoyang@huawei.com>, <rosen.xu@intel.com>, <jia.guo@intel.com>,
 <rmody@marvell.com>, <shshaikh@marvell.com>, <ndabilpuram@marvell.com>,
 <qiming.yang@intel.com>, <qi.z.zhang@intel.com>,
 <keith.wiles@intel.com>, <hemant.agrawal@nxp.com>,
 <sachin.saxena@nxp.com>, <wei.zhao1@intel.com>, <johndale@cisco.com>,
 <hyonkim@cisco.com>, <chas3@att.com>, <matan@mellanox.com>,
 <shahafs@mellanox.com>, <viacheslavo@mellanox.com>,
 <rahul.lakkireddy@chelsio.com>, <grive@u256.net>, <lironh@marvell.com>,
 <jingjing.wu@intel.com>, <xavier.huwei@huawei.com>,
 <humin29@huawei.com>, <yisen.zhuang@huawei.com>,
 <ajit.khaparde@broadcom.com>, <somnath.kotur@broadcom.com>,
 <jasvinder.singh@intel.com>, <cristian.dumitrescu@intel.com>,
 Kiran Kumar K <kirankumark@marvell.com>
Date: Wed, 19 Aug 2020 11:34:45 +0530
Message-ID: <20200819060446.2264111-1-kirankumark@marvell.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20200818103145.2192371-1-kirankumark@marvell.com>
References: <20200818103145.2192371-1-kirankumark@marvell.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687
 definitions=2020-08-19_04:2020-08-18,
 2020-08-19 signatures=0
Subject: [dpdk-dev] [PATCH v5 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 <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

From: Kiran Kumar K <kirankumark@marvell.com>

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 <kirankumark@marvell.com>
---
V5 Changes:
* Added support to set rss level type from port config in testpmd

 app/test-pmd/cmdline.c         | 11 ++++++++++-
 app/test-pmd/parameters.c      |  6 ++++++
 lib/librte_ethdev/rte_ethdev.h | 27 +++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 0a6ed85f3..4eafee8c8 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -2334,7 +2334,16 @@ cmd_config_rss_parsed(void *parsed_result,
 		rss_conf.rss_hf = ETH_RSS_GTPU;
 	else if (!strcmp(res->value, "none"))
 		rss_conf.rss_hf = 0;
-	else if (!strcmp(res->value, "default"))
+	else if (!strcmp(res->value, "level-inner")) {
+		rss_hf &= (~ETH_RSS_LEVEL_MASK);
+		rss_conf.rss_hf = (rss_hf | ETH_RSS_LEVEL_INNER);
+	} else if (!strcmp(res->value, "level-outer")) {
+		rss_hf &= (~ETH_RSS_LEVEL_MASK);
+		rss_conf.rss_hf = (rss_hf | ETH_RSS_LEVEL_OUTER);
+	} else if (!strcmp(res->value, "level-inner-outer")) {
+		rss_hf &= (~ETH_RSS_LEVEL_MASK);
+		rss_conf.rss_hf = (rss_hf | ETH_RSS_LEVEL_INNER_OUTER);
+	} else if (!strcmp(res->value, "default"))
 		use_default = 1;
 	else if (isdigit(res->value[0]) && atoi(res->value) > 0 &&
 						atoi(res->value) < 64)
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
--
2.25.1