[v5,1/3] ethdev: decouple flow types and RSS offload types
diff mbox series

Message ID 1569637743-174186-2-git-send-email-simei.su@intel.com
State Superseded, archived
Delegated to: Ferruh Yigit
Headers show
Series
  • extend RSS offload types
Related show

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-dpdk_compile_ovs success Compile Testing PASS
ci/iol-dpdk_compile success Compile Testing PASS
ci/iol-dpdk_compile_spdk success Compile Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/Intel-compilation success Compilation OK
ci/iol-mellanox-Performance success Performance Testing PASS

Commit Message

Simei Su Sept. 28, 2019, 2:29 a.m. UTC
This patch decouples RTE_ETH_FLOW_* and ETH_RSS_*. Both serves
different purposes. The former defines flow types. The later
defines RSS offload types.

Signed-off-by: Simei Su <simei.su@intel.com>
---
 lib/librte_ethdev/rte_ethdev.h | 49 ++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

Comments

Ori Kam Sept. 28, 2019, 4:23 p.m. UTC | #1
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Simei Su
> Sent: Saturday, September 28, 2019 5:29 AM
> To: qi.z.zhang@intel.com; jingjing.wu@intel.com; xiaolong.ye@intel.com
> Cc: dev@dpdk.org; simei.su@intel.com
> Subject: [dpdk-dev] [PATCH v5 1/3] ethdev: decouple flow types and RSS offload
> types
> 
> This patch decouples RTE_ETH_FLOW_* and ETH_RSS_*. Both serves
> different purposes. The former defines flow types. The later
> defines RSS offload types.
> 
> Signed-off-by: Simei Su <simei.su@intel.com>
> ---

Acked-by: Ori Kam <orika@mellanox.com>
Thanks,
Ori

>  lib/librte_ethdev/rte_ethdev.h | 49 ++++++++++++++++++++----------------------
>  1 file changed, 23 insertions(+), 26 deletions(-)
> 
> diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
> index d987178..1605467 100644
> --- a/lib/librte_ethdev/rte_ethdev.h
> +++ b/lib/librte_ethdev/rte_ethdev.h
> @@ -453,7 +453,6 @@ struct rte_eth_rss_conf {
>   * possible, and exclusively. For example, if a packet is identified as
>   * 'RTE_ETH_FLOW_NONFRAG_IPV4_TCP', it will not be any of other flow
> types,
>   * though it is an actual IPV4 packet.
> - * Note that the flow types are used to define RSS offload types.
>   */
>  #define RTE_ETH_FLOW_UNKNOWN             0
>  #define RTE_ETH_FLOW_RAW                 1
> @@ -482,31 +481,29 @@ struct rte_eth_rss_conf {
>  #define RTE_ETH_FLOW_MAX                23
> 
>  /*
> - * The RSS offload types are defined based on flow types.
> - * Different NIC hardware may support different RSS offload
> - * types. The supported flow types or RSS offload types can be queried by
> - * rte_eth_dev_info_get().
> - */
> -#define ETH_RSS_IPV4               (1ULL << RTE_ETH_FLOW_IPV4)
> -#define ETH_RSS_FRAG_IPV4          (1ULL << RTE_ETH_FLOW_FRAG_IPV4)
> -#define ETH_RSS_NONFRAG_IPV4_TCP   (1ULL <<
> RTE_ETH_FLOW_NONFRAG_IPV4_TCP)
> -#define ETH_RSS_NONFRAG_IPV4_UDP   (1ULL <<
> RTE_ETH_FLOW_NONFRAG_IPV4_UDP)
> -#define ETH_RSS_NONFRAG_IPV4_SCTP  (1ULL <<
> RTE_ETH_FLOW_NONFRAG_IPV4_SCTP)
> -#define ETH_RSS_NONFRAG_IPV4_OTHER (1ULL <<
> RTE_ETH_FLOW_NONFRAG_IPV4_OTHER)
> -#define ETH_RSS_IPV6               (1ULL << RTE_ETH_FLOW_IPV6)
> -#define ETH_RSS_FRAG_IPV6          (1ULL << RTE_ETH_FLOW_FRAG_IPV6)
> -#define ETH_RSS_NONFRAG_IPV6_TCP   (1ULL <<
> RTE_ETH_FLOW_NONFRAG_IPV6_TCP)
> -#define ETH_RSS_NONFRAG_IPV6_UDP   (1ULL <<
> RTE_ETH_FLOW_NONFRAG_IPV6_UDP)
> -#define ETH_RSS_NONFRAG_IPV6_SCTP  (1ULL <<
> RTE_ETH_FLOW_NONFRAG_IPV6_SCTP)
> -#define ETH_RSS_NONFRAG_IPV6_OTHER (1ULL <<
> RTE_ETH_FLOW_NONFRAG_IPV6_OTHER)
> -#define ETH_RSS_L2_PAYLOAD         (1ULL << RTE_ETH_FLOW_L2_PAYLOAD)
> -#define ETH_RSS_IPV6_EX            (1ULL << RTE_ETH_FLOW_IPV6_EX)
> -#define ETH_RSS_IPV6_TCP_EX        (1ULL << RTE_ETH_FLOW_IPV6_TCP_EX)
> -#define ETH_RSS_IPV6_UDP_EX        (1ULL << RTE_ETH_FLOW_IPV6_UDP_EX)
> -#define ETH_RSS_PORT               (1ULL << RTE_ETH_FLOW_PORT)
> -#define ETH_RSS_VXLAN              (1ULL << RTE_ETH_FLOW_VXLAN)
> -#define ETH_RSS_GENEVE             (1ULL << RTE_ETH_FLOW_GENEVE)
> -#define ETH_RSS_NVGRE              (1ULL << RTE_ETH_FLOW_NVGRE)
> + * Below macros are defined for RSS offload types, they can be used to
> + * fill rte_eth_rss_conf.rss_hf or rte_flow_action_rss.types.
> + */
> +#define ETH_RSS_IPV4               (1ULL << 2)
> +#define ETH_RSS_FRAG_IPV4          (1ULL << 3)
> +#define ETH_RSS_NONFRAG_IPV4_TCP   (1ULL << 4)
> +#define ETH_RSS_NONFRAG_IPV4_UDP   (1ULL << 5)
> +#define ETH_RSS_NONFRAG_IPV4_SCTP  (1ULL << 6)
> +#define ETH_RSS_NONFRAG_IPV4_OTHER (1ULL << 7)
> +#define ETH_RSS_IPV6               (1ULL << 8)
> +#define ETH_RSS_FRAG_IPV6          (1ULL << 9)
> +#define ETH_RSS_NONFRAG_IPV6_TCP   (1ULL << 10)
> +#define ETH_RSS_NONFRAG_IPV6_UDP   (1ULL << 11)
> +#define ETH_RSS_NONFRAG_IPV6_SCTP  (1ULL << 12)
> +#define ETH_RSS_NONFRAG_IPV6_OTHER (1ULL << 13)
> +#define ETH_RSS_L2_PAYLOAD         (1ULL << 14)
> +#define ETH_RSS_IPV6_EX            (1ULL << 15)
> +#define ETH_RSS_IPV6_TCP_EX        (1ULL << 16)
> +#define ETH_RSS_IPV6_UDP_EX        (1ULL << 17)
> +#define ETH_RSS_PORT               (1ULL << 18)
> +#define ETH_RSS_VXLAN              (1ULL << 19)
> +#define ETH_RSS_GENEVE             (1ULL << 20)
> +#define ETH_RSS_NVGRE              (1ULL << 21)
> 
>  #define ETH_RSS_IP ( \
>  	ETH_RSS_IPV4 | \
> --
> 1.8.3.1

Patch
diff mbox series

diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
index d987178..1605467 100644
--- a/lib/librte_ethdev/rte_ethdev.h
+++ b/lib/librte_ethdev/rte_ethdev.h
@@ -453,7 +453,6 @@  struct rte_eth_rss_conf {
  * possible, and exclusively. For example, if a packet is identified as
  * 'RTE_ETH_FLOW_NONFRAG_IPV4_TCP', it will not be any of other flow types,
  * though it is an actual IPV4 packet.
- * Note that the flow types are used to define RSS offload types.
  */
 #define RTE_ETH_FLOW_UNKNOWN             0
 #define RTE_ETH_FLOW_RAW                 1
@@ -482,31 +481,29 @@  struct rte_eth_rss_conf {
 #define RTE_ETH_FLOW_MAX                23
 
 /*
- * The RSS offload types are defined based on flow types.
- * Different NIC hardware may support different RSS offload
- * types. The supported flow types or RSS offload types can be queried by
- * rte_eth_dev_info_get().
- */
-#define ETH_RSS_IPV4               (1ULL << RTE_ETH_FLOW_IPV4)
-#define ETH_RSS_FRAG_IPV4          (1ULL << RTE_ETH_FLOW_FRAG_IPV4)
-#define ETH_RSS_NONFRAG_IPV4_TCP   (1ULL << RTE_ETH_FLOW_NONFRAG_IPV4_TCP)
-#define ETH_RSS_NONFRAG_IPV4_UDP   (1ULL << RTE_ETH_FLOW_NONFRAG_IPV4_UDP)
-#define ETH_RSS_NONFRAG_IPV4_SCTP  (1ULL << RTE_ETH_FLOW_NONFRAG_IPV4_SCTP)
-#define ETH_RSS_NONFRAG_IPV4_OTHER (1ULL << RTE_ETH_FLOW_NONFRAG_IPV4_OTHER)
-#define ETH_RSS_IPV6               (1ULL << RTE_ETH_FLOW_IPV6)
-#define ETH_RSS_FRAG_IPV6          (1ULL << RTE_ETH_FLOW_FRAG_IPV6)
-#define ETH_RSS_NONFRAG_IPV6_TCP   (1ULL << RTE_ETH_FLOW_NONFRAG_IPV6_TCP)
-#define ETH_RSS_NONFRAG_IPV6_UDP   (1ULL << RTE_ETH_FLOW_NONFRAG_IPV6_UDP)
-#define ETH_RSS_NONFRAG_IPV6_SCTP  (1ULL << RTE_ETH_FLOW_NONFRAG_IPV6_SCTP)
-#define ETH_RSS_NONFRAG_IPV6_OTHER (1ULL << RTE_ETH_FLOW_NONFRAG_IPV6_OTHER)
-#define ETH_RSS_L2_PAYLOAD         (1ULL << RTE_ETH_FLOW_L2_PAYLOAD)
-#define ETH_RSS_IPV6_EX            (1ULL << RTE_ETH_FLOW_IPV6_EX)
-#define ETH_RSS_IPV6_TCP_EX        (1ULL << RTE_ETH_FLOW_IPV6_TCP_EX)
-#define ETH_RSS_IPV6_UDP_EX        (1ULL << RTE_ETH_FLOW_IPV6_UDP_EX)
-#define ETH_RSS_PORT               (1ULL << RTE_ETH_FLOW_PORT)
-#define ETH_RSS_VXLAN              (1ULL << RTE_ETH_FLOW_VXLAN)
-#define ETH_RSS_GENEVE             (1ULL << RTE_ETH_FLOW_GENEVE)
-#define ETH_RSS_NVGRE              (1ULL << RTE_ETH_FLOW_NVGRE)
+ * Below macros are defined for RSS offload types, they can be used to
+ * fill rte_eth_rss_conf.rss_hf or rte_flow_action_rss.types.
+ */
+#define ETH_RSS_IPV4               (1ULL << 2)
+#define ETH_RSS_FRAG_IPV4          (1ULL << 3)
+#define ETH_RSS_NONFRAG_IPV4_TCP   (1ULL << 4)
+#define ETH_RSS_NONFRAG_IPV4_UDP   (1ULL << 5)
+#define ETH_RSS_NONFRAG_IPV4_SCTP  (1ULL << 6)
+#define ETH_RSS_NONFRAG_IPV4_OTHER (1ULL << 7)
+#define ETH_RSS_IPV6               (1ULL << 8)
+#define ETH_RSS_FRAG_IPV6          (1ULL << 9)
+#define ETH_RSS_NONFRAG_IPV6_TCP   (1ULL << 10)
+#define ETH_RSS_NONFRAG_IPV6_UDP   (1ULL << 11)
+#define ETH_RSS_NONFRAG_IPV6_SCTP  (1ULL << 12)
+#define ETH_RSS_NONFRAG_IPV6_OTHER (1ULL << 13)
+#define ETH_RSS_L2_PAYLOAD         (1ULL << 14)
+#define ETH_RSS_IPV6_EX            (1ULL << 15)
+#define ETH_RSS_IPV6_TCP_EX        (1ULL << 16)
+#define ETH_RSS_IPV6_UDP_EX        (1ULL << 17)
+#define ETH_RSS_PORT               (1ULL << 18)
+#define ETH_RSS_VXLAN              (1ULL << 19)
+#define ETH_RSS_GENEVE             (1ULL << 20)
+#define ETH_RSS_NVGRE              (1ULL << 21)
 
 #define ETH_RSS_IP ( \
 	ETH_RSS_IPV4 | \