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 7FA1BA2EFC for ; Mon, 14 Oct 2019 15:36:37 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 766C81BF47; Mon, 14 Oct 2019 15:36:26 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 7DB3A1C0D8 for ; Mon, 14 Oct 2019 15:36:18 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 06:36:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,295,1566889200"; d="scan'208";a="220104888" Received: from npg-dpdk-cvl-simeisu-118d193.sh.intel.com ([10.67.110.183]) by fmsmga004.fm.intel.com with ESMTP; 14 Oct 2019 06:36:16 -0700 From: Simei Su To: qi.z.zhang@intel.com, xiaolong.ye@intel.com, ferruh.yigit@intel.com Cc: dev@dpdk.org, simei.su@intel.com Date: Mon, 14 Oct 2019 21:36:08 +0800 Message-Id: <1571060169-311974-3-git-send-email-simei.su@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1571060169-311974-1-git-send-email-simei.su@intel.com> References: <1570604240-97643-1-git-send-email-simei.su@intel.com> <1571060169-311974-1-git-send-email-simei.su@intel.com> Subject: [dpdk-dev] [PATCH v12 2/3] ethdev: extend 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" This patch reserves several bits as input set selection from the high end of the 64 bits. It is combined with exisiting ETH_RSS_* to represent RSS types. This patch also checks the simultaneous use of SRC_ONLY and DST_ONLY of the same level. Signed-off-by: Simei Su Reviewed-by: Qi Zhang Acked-by: Ori Kam --- lib/librte_ethdev/rte_ethdev.c | 5 +++++ lib/librte_ethdev/rte_ethdev.h | 25 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index 7caaa0b..69a3d71 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -1269,6 +1269,9 @@ struct rte_eth_dev * goto rollback; } + RTE_ETH_RSS_HF_REFINE(dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf, + dev_conf->rx_adv_conf.rss_conf.rss_hf); + /* Check that device supports requested rss hash functions. */ if ((dev_info.flow_type_rss_offloads | dev_conf->rx_adv_conf.rss_conf.rss_hf) != @@ -3112,6 +3115,8 @@ struct rte_eth_dev * if (ret != 0) return ret; + RTE_ETH_RSS_HF_REFINE(rss_conf->rss_hf, rss_conf->rss_hf); + dev = &rte_eth_devices[port_id]; if ((dev_info.flow_type_rss_offloads | rss_conf->rss_hf) != dev_info.flow_type_rss_offloads) { diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h index 40aa6a3..389a3e6 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -165,6 +165,17 @@ #define RTE_ETHDEV_LOG(level, ...) \ rte_log(RTE_LOG_ ## level, rte_eth_dev_logtype, "" __VA_ARGS__) +#define RTE_ETH_RSS_HF_REFINE(output, input) do { \ + if ((input & ETH_RSS_L3_SRC_ONLY) && \ + (input & ETH_RSS_L3_DST_ONLY)) \ + output = input & (~(ETH_RSS_L3_SRC_ONLY | \ + ETH_RSS_L3_DST_ONLY)); \ + if ((input & ETH_RSS_L4_SRC_ONLY) && \ + (input & ETH_RSS_L4_DST_ONLY)) \ + output = input & (~(ETH_RSS_L4_SRC_ONLY | \ + ETH_RSS_L4_DST_ONLY)); \ +} while (0) + struct rte_mbuf; /** @@ -507,6 +518,20 @@ struct rte_eth_rss_conf { #define ETH_RSS_NVGRE (1ULL << 21) #define ETH_RSS_GTPU (1ULL << 23) +/* + * We use the following macros to combine with above ETH_RSS_* for + * more specific input set selection. These bits are defined starting + * from the high end of the 64 bits. + * Note: If we use above ETH_RSS_* without SRC/DST_ONLY, it represents + * both SRC and DST are taken into account. If SRC_ONLY and DST_ONLY of + * the same level are used simultaneously, it is the same case as none of + * them are added. + */ +#define ETH_RSS_L3_SRC_ONLY (1ULL << 63) +#define ETH_RSS_L3_DST_ONLY (1ULL << 62) +#define ETH_RSS_L4_SRC_ONLY (1ULL << 61) +#define ETH_RSS_L4_DST_ONLY (1ULL << 60) + #define ETH_RSS_IP ( \ ETH_RSS_IPV4 | \ ETH_RSS_FRAG_IPV4 | \ -- 1.8.3.1