From 97b2217ae5bcdd90e9265790de388e7febeee3bd Mon Sep 17 00:00:00 2001 From: Ophir Munk Date: Mon, 14 May 2018 10:07:32 +0000 Subject: [PATCH 1/1] net/mlx4: advertise supported RSS hash functions 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 --- drivers/net/mlx4/mlx4_ethdev.c | 2 + drivers/net/mlx4/mlx4_flow.c | 80 ++++++++++++++++++++++++++++++++++ drivers/net/mlx4/mlx4_flow.h | 1 + 3 files changed, 83 insertions(+) diff --git a/drivers/net/mlx4/mlx4_ethdev.c b/drivers/net/mlx4/mlx4_ethdev.c index 9a76670d8e..0a9c2e2f57 100644 --- a/drivers/net/mlx4/mlx4_ethdev.c +++ b/drivers/net/mlx4/mlx4_ethdev.c @@ -587,6 +587,8 @@ mlx4_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) 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 26a92e95ff..202779f7d2 100644 --- a/drivers/net/mlx4/mlx4_flow.c +++ b/drivers/net/mlx4/mlx4_flow.c @@ -42,6 +42,41 @@ #include "mlx4_rxtx.h" #include "mlx4_utils.h" +/** IBV supported RSS hash functions combinations */ +#define MLX4_IBV_IPV4_HF ( \ + IBV_RX_HASH_SRC_IPV4 | \ + IBV_RX_HASH_DST_IPV4) +#define MLX4_IBV_IPV6_HF ( \ + IBV_RX_HASH_SRC_IPV6 | \ + IBV_RX_HASH_DST_IPV6) +#define MLX4_IBV_TCP_HF ( \ + IBV_RX_HASH_SRC_PORT_TCP | \ + IBV_RX_HASH_DST_PORT_TCP) +#define MLX4_IBV_UDP_HF ( \ + IBV_RX_HASH_SRC_PORT_UDP | \ + IBV_RX_HASH_DST_PORT_UDP) + +/** Supported RSS hash functions combinations */ +#define MLX4_RSS_IPV4_HF ( \ + ETH_RSS_IPV4 | \ + ETH_RSS_FRAG_IPV4 | \ + ETH_RSS_NONFRAG_IPV4_OTHER) +#define MLX4_RSS_IPV6_HF ( \ + ETH_RSS_IPV6 | \ + ETH_RSS_FRAG_IPV6 | \ + ETH_RSS_NONFRAG_IPV6_OTHER | \ + ETH_RSS_IPV6_EX) +#define MLX4_RSS_IPV4_TCP_HF ( \ + ETH_RSS_NONFRAG_IPV4_TCP) +#define MLX4_RSS_IPV6_TCP_HF ( \ + ETH_RSS_NONFRAG_IPV6_TCP | \ + ETH_RSS_IPV6_TCP_EX) +#define MLX4_RSS_IPV4_UDP_HF ( \ + ETH_RSS_NONFRAG_IPV4_UDP) +#define MLX4_RSS_IPV6_UDP_HF ( \ + ETH_RSS_NONFRAG_IPV6_UDP | \ + ETH_RSS_IPV6_UDP_EX) + /** Static initializer for a list of subsequent item types. */ #define NEXT_ITEM(...) \ (const enum rte_flow_item_type []){ \ @@ -138,6 +173,51 @@ mlx4_conv_rss_types(struct priv *priv, uint64_t types) return (uint64_t)-1; } +/** + * 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] = MLX4_IBV_IPV4_HF, + [IPV6] = MLX4_IBV_IPV6_HF, + [IPV4_TCP] = MLX4_IBV_IPV4_HF | MLX4_IBV_TCP_HF, + [IPV6_TCP] = MLX4_IBV_IPV6_HF | MLX4_IBV_TCP_HF, + [IPV4_UDP] = MLX4_IBV_IPV4_HF | MLX4_IBV_UDP_HF, + [IPV6_UDP] = MLX4_IBV_IPV6_HF | MLX4_IBV_UDP_HF, + }; + static const uint64_t out[RTE_DIM(in)] = { + [IPV4] = MLX4_RSS_IPV4_HF, + [IPV6] = MLX4_RSS_IPV6_HF, + [IPV4_TCP] = MLX4_RSS_IPV4_HF | MLX4_RSS_IPV4_TCP_HF, + [IPV6_TCP] = MLX4_RSS_IPV6_HF | MLX4_RSS_IPV6_TCP_HF, + [IPV4_UDP] = MLX4_RSS_IPV4_HF | MLX4_RSS_IPV4_UDP_HF, + [IPV6_UDP] = MLX4_RSS_IPV6_HF | MLX4_RSS_IPV6_UDP_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. * diff --git a/drivers/net/mlx4/mlx4_flow.h b/drivers/net/mlx4/mlx4_flow.h index 2c8dff3625..d1f1611eb8 100644 --- a/drivers/net/mlx4/mlx4_flow.h +++ b/drivers/net/mlx4/mlx4_flow.h @@ -49,6 +49,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, -- 2.20.1