diff mbox

[dpdk-dev,v4,2/2] net/mlx4: advertise supported RSS hash functions

Message ID 1526225995-31378-2-git-send-email-ophirmu@mellanox.com (mailing list archive)
State Superseded, archived
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Ophir Munk May 13, 2018, 3:39 p.m. UTC 
  Advertise mlx4 supported RSS functions as part of dev_infos_get
callback.
Previous to this commit RSS support was reported as none. Since the
introduction of [1] it is required that all RSS configurations will be
verified.

[1] commit 8863a1fbfc66 ("ethdev: add supported hash function check")

Signed-off-by: Ophir Munk <ophirmu@mellanox.com>
---
 drivers/net/mlx4/mlx4_ethdev.c | 12 ++++++-----
 drivers/net/mlx4/mlx4_flow.c   | 45 ++++++++++++++++++++++++++++++++++++++++++
 drivers/net/mlx4/mlx4_flow.h   | 35 ++++++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+), 5 deletions(-)

Comments

Thomas Monjalon May 13, 2018, 4:12 p.m. UTC | #1 
13/05/2018 17:39, Ophir Munk:
>  	info->speed_capa =
> -			ETH_LINK_SPEED_1G |
> -			ETH_LINK_SPEED_10G |
> -			ETH_LINK_SPEED_20G |
> -			ETH_LINK_SPEED_40G |
> -			ETH_LINK_SPEED_56G;
> +		ETH_LINK_SPEED_1G |
> +		ETH_LINK_SPEED_10G |
> +		ETH_LINK_SPEED_20G |
> +		ETH_LINK_SPEED_40G |
> +		ETH_LINK_SPEED_56G;

Not sure why you re-indent.
For info, line continuation in control statements must be done with 2 tabs:
	http://dpdk.org/doc/guides/contributing/coding_style.html#general
In this case, it is not a control statement, so I guess 1 or 2 tabs
can be accepted.
Ophir Munk May 13, 2018, 4:13 p.m. UTC | #2 
Shahaf asked for it in his review

> -----Original Message-----
> From: Thomas Monjalon [mailto:thomas@monjalon.net]
> Sent: Sunday, May 13, 2018 7:13 PM
> To: Ophir Munk <ophirmu@mellanox.com>
> Cc: dev@dpdk.org; Adrien Mazarguil <adrien.mazarguil@6wind.com>; Olga
> Shern <olgas@mellanox.com>; Shahaf Shuler <shahafs@mellanox.com>
> Subject: Re: [PATCH v4 2/2] net/mlx4: advertise supported RSS hash
> functions
> 
> 13/05/2018 17:39, Ophir Munk:
> >  	info->speed_capa =
> > -			ETH_LINK_SPEED_1G |
> > -			ETH_LINK_SPEED_10G |
> > -			ETH_LINK_SPEED_20G |
> > -			ETH_LINK_SPEED_40G |
> > -			ETH_LINK_SPEED_56G;
> > +		ETH_LINK_SPEED_1G |
> > +		ETH_LINK_SPEED_10G |
> > +		ETH_LINK_SPEED_20G |
> > +		ETH_LINK_SPEED_40G |
> > +		ETH_LINK_SPEED_56G;
> 
> Not sure why you re-indent.
> For info, line continuation in control statements must be done with 2 tabs:
> 	https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F
> %2Fdpdk.org%2Fdoc%2Fguides%2Fcontributing%2Fcoding_style.html%23ge
> neral&data=02%7C01%7Cophirmu%40mellanox.com%7C521136e06b61475a
> 99c308d5b8ec58fa%7Ca652971c7d2e4d9ba6a4d149256f461b%7C0%7C0%7
> C636618247609249241&sdata=GkEBudFg9ukUbGM9Wi%2F84vT%2FQRv3qX
> KuT%2BiFN0ziVjc%3D&reserved=0
> In this case, it is not a control statement, so I guess 1 or 2 tabs can be
> accepted.
>
Ophir Munk May 13, 2018, 4:23 p.m. UTC | #3 
Anyway will update in v5 to be sent now

> -----Original Message-----
> From: Ophir Munk
> Sent: Sunday, May 13, 2018 7:14 PM
> To: Thomas Monjalon <thomas@monjalon.net>
> Cc: dev@dpdk.org; Adrien Mazarguil <adrien.mazarguil@6wind.com>; Olga
> Shern <olgas@mellanox.com>; Shahaf Shuler <shahafs@mellanox.com>
> Subject: RE: [PATCH v4 2/2] net/mlx4: advertise supported RSS hash
> functions
> 
> Shahaf asked for it in his review
> 
> > -----Original Message-----
> > From: Thomas Monjalon [mailto:thomas@monjalon.net]
> > Sent: Sunday, May 13, 2018 7:13 PM
> > To: Ophir Munk <ophirmu@mellanox.com>
> > Cc: dev@dpdk.org; Adrien Mazarguil <adrien.mazarguil@6wind.com>; Olga
> > Shern <olgas@mellanox.com>; Shahaf Shuler <shahafs@mellanox.com>
> > Subject: Re: [PATCH v4 2/2] net/mlx4: advertise supported RSS hash
> > functions
> >
> > 13/05/2018 17:39, Ophir Munk:
> > >  	info->speed_capa =
> > > -			ETH_LINK_SPEED_1G |
> > > -			ETH_LINK_SPEED_10G |
> > > -			ETH_LINK_SPEED_20G |
> > > -			ETH_LINK_SPEED_40G |
> > > -			ETH_LINK_SPEED_56G;
> > > +		ETH_LINK_SPEED_1G |
> > > +		ETH_LINK_SPEED_10G |
> > > +		ETH_LINK_SPEED_20G |
> > > +		ETH_LINK_SPEED_40G |
> > > +		ETH_LINK_SPEED_56G;
> >
> > Not sure why you re-indent.
> > For info, line continuation in control statements must be done with 2 tabs:
> > 	https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F
> >
> %2Fdpdk.org%2Fdoc%2Fguides%2Fcontributing%2Fcoding_style.html%23ge
> >
> neral&data=02%7C01%7Cophirmu%40mellanox.com%7C521136e06b61475a
> >
> 99c308d5b8ec58fa%7Ca652971c7d2e4d9ba6a4d149256f461b%7C0%7C0%7
> >
> C636618247609249241&sdata=GkEBudFg9ukUbGM9Wi%2F84vT%2FQRv3qX
> > KuT%2BiFN0ziVjc%3D&reserved=0
> > In this case, it is not a control statement, so I guess 1 or 2 tabs
> > can be accepted.
> >
diff mbox

Patch

diff --git a/drivers/net/mlx4/mlx4_ethdev.c b/drivers/net/mlx4/mlx4_ethdev.c
index 9a76670..ef559a3 100644
--- a/drivers/net/mlx4/mlx4_ethdev.c
+++ b/drivers/net/mlx4/mlx4_ethdev.c
@@ -582,11 +582,13 @@  mlx4_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
 		info->if_index = if_nametoindex(ifname);
 	info->hash_key_size = MLX4_RSS_HASH_KEY_SIZE;
 	info->speed_capa =
-			ETH_LINK_SPEED_1G |
-			ETH_LINK_SPEED_10G |
-			ETH_LINK_SPEED_20G |
-			ETH_LINK_SPEED_40G |
-			ETH_LINK_SPEED_56G;
+		ETH_LINK_SPEED_1G |
+		ETH_LINK_SPEED_10G |
+		ETH_LINK_SPEED_20G |
+		ETH_LINK_SPEED_40G |
+		ETH_LINK_SPEED_56G;
+	info->flow_type_rss_offloads =
+		mlx4_ibv_to_rss_types(priv->hw_rss_sup);
 }
 
 /**
diff --git a/drivers/net/mlx4/mlx4_flow.c b/drivers/net/mlx4/mlx4_flow.c
index f117e2e..b234623 100644
--- a/drivers/net/mlx4/mlx4_flow.c
+++ b/drivers/net/mlx4/mlx4_flow.c
@@ -139,6 +139,51 @@  mlx4_conv_rss_types(struct priv *priv, uint64_t types)
 }
 
 /**
+ * Convert verbs RSS types to their DPDK equivalents.
+ *
+ * This function returns a group of RSS DPDK types given their equivalent group
+ * of verbs types.
+ * For example both source IPv4 and destination IPv4 verbs types are converted
+ * into their equivalent RSS group types. If each of these verbs types existed
+ * exclusively - no conversion would take place.
+ *
+ * @param types
+ *   RSS hash types in verbs format.
+ *
+ * @return
+ *   DPDK RSS hash fields supported by mlx4.
+ */
+uint64_t
+mlx4_ibv_to_rss_types(uint64_t types)
+{
+	enum { IPV4, IPV6, IPV4_TCP, IPV6_TCP, IPV4_UDP, IPV6_UDP};
+
+	static const uint64_t in[] = {
+		[IPV4] = IPV4_IBV_HF,
+		[IPV6] = IPV6_IBV_HF,
+		[IPV4_TCP] = IPV4_IBV_HF | TCP_IBV_HF,
+		[IPV6_TCP] = IPV6_IBV_HF | TCP_IBV_HF,
+		[IPV4_UDP] = IPV4_IBV_HF | UDP_IBV_HF,
+		[IPV6_UDP] = IPV6_IBV_HF | UDP_IBV_HF,
+	};
+	static const uint64_t out[RTE_DIM(in)] = {
+		[IPV4] = IPV4_RSS_HF,
+		[IPV6] = IPV6_RSS_HF,
+		[IPV4_TCP] = IPV4_RSS_HF | IPV4_TCP_RSS_HF,
+		[IPV6_TCP] = IPV6_RSS_HF | IPV6_TCP_RSS_HF,
+		[IPV4_UDP] = IPV4_RSS_HF | IPV4_UDP_RSS_HF,
+		[IPV6_UDP] = IPV6_RSS_HF | IPV6_UDP_RSS_HF,
+	};
+	uint64_t conv = 0;
+	unsigned int i;
+
+	for (i = 0; i != RTE_DIM(in); ++i)
+		if ((types & in[i]) == in[i])
+			conv |= out[i];
+	return conv;
+}
+
+/**
  * Merge Ethernet pattern item into flow rule handle.
  *
  * Additional mlx4-specific constraints on supported fields:
diff --git a/drivers/net/mlx4/mlx4_flow.h b/drivers/net/mlx4/mlx4_flow.h
index 2c8dff3..e47982c 100644
--- a/drivers/net/mlx4/mlx4_flow.h
+++ b/drivers/net/mlx4/mlx4_flow.h
@@ -30,6 +30,40 @@ 
 /** Meta pattern item used to distinguish internal rules. */
 #define MLX4_FLOW_ITEM_TYPE_INTERNAL ((enum rte_flow_item_type)-1)
 
+/** IBV supported RSS hash functions combinations */
+#define IPV4_IBV_HF ( \
+	IBV_RX_HASH_SRC_IPV4 | \
+	IBV_RX_HASH_DST_IPV4)
+#define IPV6_IBV_HF ( \
+	IBV_RX_HASH_SRC_IPV6 | \
+	IBV_RX_HASH_DST_IPV6)
+#define TCP_IBV_HF ( \
+	IBV_RX_HASH_SRC_PORT_TCP | \
+	IBV_RX_HASH_DST_PORT_TCP)
+#define UDP_IBV_HF (IBV_RX_HASH_SRC_PORT_UDP | \
+	IBV_RX_HASH_DST_PORT_UDP)
+
+/** Supported RSS hash functions combinations */
+#define IPV4_RSS_HF ( \
+	ETH_RSS_IPV4 | \
+	ETH_RSS_FRAG_IPV4 | \
+	ETH_RSS_NONFRAG_IPV4_OTHER)
+#define IPV6_RSS_HF ( \
+	ETH_RSS_IPV6 | \
+	ETH_RSS_FRAG_IPV6 | \
+	ETH_RSS_NONFRAG_IPV6_OTHER | \
+	ETH_RSS_IPV6_EX)
+#define IPV4_TCP_RSS_HF ( \
+	ETH_RSS_NONFRAG_IPV4_TCP)
+#define IPV6_TCP_RSS_HF ( \
+	ETH_RSS_NONFRAG_IPV6_TCP | \
+	ETH_RSS_IPV6_TCP_EX)
+#define IPV4_UDP_RSS_HF ( \
+	ETH_RSS_NONFRAG_IPV4_UDP)
+#define IPV6_UDP_RSS_HF ( \
+	ETH_RSS_NONFRAG_IPV6_UDP | \
+	ETH_RSS_IPV6_UDP_EX)
+
 /** PMD-specific (mlx4) definition of a flow rule handle. */
 struct rte_flow {
 	LIST_ENTRY(rte_flow) next; /**< Pointer to the next flow structure. */
@@ -49,6 +83,7 @@  struct rte_flow {
 /* mlx4_flow.c */
 
 uint64_t mlx4_conv_rss_types(struct priv *priv, uint64_t rss_hf);
+uint64_t mlx4_ibv_to_rss_types(uint64_t ibv_rss_types);
 int mlx4_flow_sync(struct priv *priv, struct rte_flow_error *error);
 void mlx4_flow_clean(struct priv *priv);
 int mlx4_filter_ctrl(struct rte_eth_dev *dev,