From: Tariq Toukan <ttoukan.linux@gmail.com>
To: Joe Damato <jdamato@fastly.com>,
netdev@vger.kernel.org, saeedm@nvidia.com, ecree@solarflare.com,
andrew@lunn.ch, kuba@kernel.org, davem@davemloft.net,
leon@kernel.org, pabeni@redhat.com, arnd@arndb.de
Cc: linux-kernel@vger.kernel.org, Tariq Toukan <tariqt@nvidia.com>
Subject: Re: [net-next v2 2/2] net/mlx5: Fix flowhash key set/get for custom RSS
Date: Wed, 26 Jul 2023 11:36:11 +0300 [thread overview]
Message-ID: <e9fb9cc0-6e6f-ee78-8e7d-b4a1af38d5c2@gmail.com> (raw)
In-Reply-To: <20230725205655.310165-3-jdamato@fastly.com>
On 25/07/2023 23:56, Joe Damato wrote:
> mlx5 flow hash field retrieval and set only worked on the default
> RSS context as of commit f01cc58c18d6 ("net/mlx5e: Support multiple RSS
> contexts"), not custom RSS contexts.
>
> For example, before this patch attempting to retrieve the flow hash fields
> for RSS context 1 fails:
>
> $ sudo ethtool -u eth1 rx-flow-hash tcp4 context 1
> Cannot get RX network flow hashing options: Invalid argument
>
> This patch fixes getting and setting the flow hash fields for contexts
> other than the default context.
>
> Getting the flow hash fields for RSS context 1:
>
> $ sudo ethtool -u eth1 rx-flow-hash tcp4 context 1
> For RSS context 1:
> TCP over IPV4 flows use these fields for computing Hash flow key:
> IP DA
>
> Now, setting the flash hash fields to a custom value:
>
> $ sudo ethtool -U eth1 rx-flow-hash tcp4 sdfn context 1
>
> And retrieving them again:
>
> $ sudo ethtool -u eth1 rx-flow-hash tcp4 context 1
> For RSS context 1:
> TCP over IPV4 flows use these fields for computing Hash flow key:
> IP SA
> IP DA
> L4 bytes 0 & 1 [TCP/UDP src port]
> L4 bytes 2 & 3 [TCP/UDP dst port]
>
> Signed-off-by: Joe Damato <jdamato@fastly.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Thanks for your patch.
> ---
> .../ethernet/mellanox/mlx5/core/en/rx_res.c | 25 +++++++++++---
> .../ethernet/mellanox/mlx5/core/en/rx_res.h | 7 ++--
> .../mellanox/mlx5/core/en_fs_ethtool.c | 33 ++++++++++++++-----
> 3 files changed, 48 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c
> index e1095bc36543..56e6b8c7501f 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c
> @@ -218,17 +218,32 @@ int mlx5e_rx_res_rss_set_rxfh(struct mlx5e_rx_res *res, u32 rss_idx,
> return mlx5e_rss_set_rxfh(rss, indir, key, hfunc, res->rss_rqns, res->rss_nch);
> }
>
> -u8 mlx5e_rx_res_rss_get_hash_fields(struct mlx5e_rx_res *res, enum mlx5_traffic_types tt)
> +int mlx5e_rx_res_rss_get_hash_fields(struct mlx5e_rx_res *res, u32 rss_idx,
> + enum mlx5_traffic_types tt)
> {
> - struct mlx5e_rss *rss = res->rss[0];
> + struct mlx5e_rss *rss;
> +
> + if (rss_idx >= MLX5E_MAX_NUM_RSS)
> + return -EINVAL;
> +
> + rss = res->rss[rss_idx];
> + if (!rss)
> + return -ENOENT;
>
> return mlx5e_rss_get_hash_fields(rss, tt);
> }
>
> -int mlx5e_rx_res_rss_set_hash_fields(struct mlx5e_rx_res *res, enum mlx5_traffic_types tt,
> - u8 rx_hash_fields)
> +int mlx5e_rx_res_rss_set_hash_fields(struct mlx5e_rx_res *res, u32 rss_idx,
> + enum mlx5_traffic_types tt, u8 rx_hash_fields)
> {
> - struct mlx5e_rss *rss = res->rss[0];
> + struct mlx5e_rss *rss;
> +
> + if (rss_idx >= MLX5E_MAX_NUM_RSS)
> + return -EINVAL;
> +
> + rss = res->rss[rss_idx];
> + if (!rss)
> + return -ENOENT;
>
> return mlx5e_rss_set_hash_fields(rss, tt, rx_hash_fields);
> }
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h
> index 5d5f64fab60f..580fe8bc3cd2 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h
> @@ -48,9 +48,10 @@ int mlx5e_rx_res_rss_get_rxfh(struct mlx5e_rx_res *res, u32 rss_idx,
> int mlx5e_rx_res_rss_set_rxfh(struct mlx5e_rx_res *res, u32 rss_idx,
> const u32 *indir, const u8 *key, const u8 *hfunc);
>
> -u8 mlx5e_rx_res_rss_get_hash_fields(struct mlx5e_rx_res *res, enum mlx5_traffic_types tt);
> -int mlx5e_rx_res_rss_set_hash_fields(struct mlx5e_rx_res *res, enum mlx5_traffic_types tt,
> - u8 rx_hash_fields);
> +int mlx5e_rx_res_rss_get_hash_fields(struct mlx5e_rx_res *res, u32 rss_idx,
> + enum mlx5_traffic_types tt);
> +int mlx5e_rx_res_rss_set_hash_fields(struct mlx5e_rx_res *res, u32 rss_idx,
> + enum mlx5_traffic_types tt, u8 rx_hash_fields);
> int mlx5e_rx_res_packet_merge_set_param(struct mlx5e_rx_res *res,
> struct mlx5e_packet_merge_param *pkt_merge_param);
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c
> index aac32e505c14..aed599db9d84 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c
> @@ -900,10 +900,16 @@ static int mlx5e_set_rss_hash_opt(struct mlx5e_priv *priv,
> struct ethtool_rxnfc *nfc)
> {
> u8 rx_hash_field = 0;
> + u32 flow_type = 0;
> + u32 rss_idx = 0;
> int err;
> int tt;
>
> - tt = flow_type_to_traffic_type(nfc->flow_type);
> + if (nfc->flow_type & FLOW_RSS)
> + rss_idx = nfc->rss_context;
> +
> + flow_type = flow_type_mask(nfc->flow_type);
> + tt = flow_type_to_traffic_type(flow_type);
> if (tt < 0)
> return tt;
>
> @@ -911,10 +917,10 @@ static int mlx5e_set_rss_hash_opt(struct mlx5e_priv *priv,
> * on src IP, dest IP, TCP/UDP src port and TCP/UDP dest
> * port.
> */
> - if (nfc->flow_type != TCP_V4_FLOW &&
> - nfc->flow_type != TCP_V6_FLOW &&
> - nfc->flow_type != UDP_V4_FLOW &&
> - nfc->flow_type != UDP_V6_FLOW)
> + if (flow_type != TCP_V4_FLOW &&
> + flow_type != TCP_V6_FLOW &&
> + flow_type != UDP_V4_FLOW &&
> + flow_type != UDP_V6_FLOW)
> return -EOPNOTSUPP;
>
> if (nfc->data & ~(RXH_IP_SRC | RXH_IP_DST |
> @@ -931,7 +937,7 @@ static int mlx5e_set_rss_hash_opt(struct mlx5e_priv *priv,
> rx_hash_field |= MLX5_HASH_FIELD_SEL_L4_DPORT;
>
> mutex_lock(&priv->state_lock);
> - err = mlx5e_rx_res_rss_set_hash_fields(priv->rx_res, tt, rx_hash_field);
> + err = mlx5e_rx_res_rss_set_hash_fields(priv->rx_res, rss_idx, tt, rx_hash_field);
> mutex_unlock(&priv->state_lock);
>
> return err;
> @@ -940,14 +946,23 @@ static int mlx5e_set_rss_hash_opt(struct mlx5e_priv *priv,
> static int mlx5e_get_rss_hash_opt(struct mlx5e_priv *priv,
> struct ethtool_rxnfc *nfc)
> {
> - u32 hash_field = 0;
> + int hash_field = 0;
> + u32 flow_type = 0;
> + u32 rss_idx = 0;
> int tt;
>
> - tt = flow_type_to_traffic_type(nfc->flow_type);
> + if (nfc->flow_type & FLOW_RSS)
> + rss_idx = nfc->rss_context;
> +
> + flow_type = flow_type_mask(nfc->flow_type);
> + tt = flow_type_to_traffic_type(flow_type);
> if (tt < 0)
> return tt;
>
> - hash_field = mlx5e_rx_res_rss_get_hash_fields(priv->rx_res, tt);
> + hash_field = mlx5e_rx_res_rss_get_hash_fields(priv->rx_res, rss_idx, tt);
> + if (hash_field < 0)
> + return hash_field;
> +
> nfc->data = 0;
>
> if (hash_field & MLX5_HASH_FIELD_SEL_SRC_IP)
next prev parent reply other threads:[~2023-07-26 8:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-25 20:56 [net-next v2 0/2] rxfh with custom RSS fixes Joe Damato
2023-07-25 20:56 ` [net-next v2 1/2] net: ethtool: Unify ETHTOOL_{G,S}RXFH rxnfc copy Joe Damato
2023-07-25 20:56 ` [net-next v2 2/2] net/mlx5: Fix flowhash key set/get for custom RSS Joe Damato
2023-07-26 8:36 ` Tariq Toukan [this message]
2023-07-28 9:00 ` [net-next v2 0/2] rxfh with custom RSS fixes patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e9fb9cc0-6e6f-ee78-8e7d-b4a1af38d5c2@gmail.com \
--to=ttoukan.linux@gmail.com \
--cc=andrew@lunn.ch \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=ecree@solarflare.com \
--cc=jdamato@fastly.com \
--cc=kuba@kernel.org \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=saeedm@nvidia.com \
--cc=tariqt@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome