From nobody Sun Feb 8 04:12:58 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3FE9DEB64DD for ; Tue, 25 Jul 2023 20:57:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231338AbjGYU5Z (ORCPT ); Tue, 25 Jul 2023 16:57:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229689AbjGYU5V (ORCPT ); Tue, 25 Jul 2023 16:57:21 -0400 Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A5C499 for ; Tue, 25 Jul 2023 13:57:20 -0700 (PDT) Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2b701e1ca63so88871421fa.1 for ; Tue, 25 Jul 2023 13:57:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1690318639; x=1690923439; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XXkXZVLYtvpmMK+N6m7lUYctgnQ+ZBph0K+CANbOOz0=; b=hSCX5EM9dinUO3WkWP7I0k1PfipLkOgtZdOvM87v8MFPaxkvNAb+B+8gn5DO4jvKRJ ODRuasphOFkJh3jnCUKQWJXhbWXS01Rm7+psWuaxhlx1yhxan8eWCbk99GFu2hLaC+Gp /ZaJeRc8/8J3FLzolhC3fsvMNEbToGm1gJOXI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690318639; x=1690923439; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XXkXZVLYtvpmMK+N6m7lUYctgnQ+ZBph0K+CANbOOz0=; b=ZWJY1HZx18r+ETkLuFWfaTK0fE7vPNJQ2JQxvtAGZoA9GvePzzYejP5bkMDnrve15Q PjBgT08FbxzNe17Bh7P6OBKxD6XSjq0YbpuBIMqx0h30P8/dqaVsvwWDsJhKgnFaduzX sY4995JwZHkzHEHI7WvQA+kMn+KzIqTA1dYjaM+LegzvzPSHBkHmCcAj1d7NgG7sQfkh LY76QoA1W/gK4srkem0J03GYIP4MC3iFxfWXbMbLK+VnxS3PiWYqoh022vDRyv+VqyOI UnAcyHmJ3LunZ++TIGJ+WFSyUU6mJwzDh9WjbvgHsGSVckx4JbO3N69zPzrSPvvUzgGD wypw== X-Gm-Message-State: ABy/qLbORhJLhTV8obafAqZHRHQLRPfaXAtBnyrPn32cLwLdpru9r+hV wfpbOeg2mayo/142xY6JuQ5mQg== X-Google-Smtp-Source: APBJJlE3Ft6buDSZqyIJN5yJdaEdHrqE2co25eo255yV7fRf7kv2L3jsIhlAtyVXuAl5eGeZkOXJtQ== X-Received: by 2002:a2e:9047:0:b0:2b5:974f:385 with SMTP id n7-20020a2e9047000000b002b5974f0385mr9880351ljg.9.1690318638798; Tue, 25 Jul 2023 13:57:18 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id h19-20020a1709062dd300b0097073f1ed84sm8704186eji.4.2023.07.25.13.57.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 13:57:18 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org, saeedm@nvidia.com, tariqt@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, Joe Damato , Edward Cree Subject: [net-next v2 1/2] net: ethtool: Unify ETHTOOL_{G,S}RXFH rxnfc copy Date: Tue, 25 Jul 2023 20:56:54 +0000 Message-Id: <20230725205655.310165-2-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230725205655.310165-1-jdamato@fastly.com> References: <20230725205655.310165-1-jdamato@fastly.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" ETHTOOL_GRXFH correctly copies in the full struct ethtool_rxnfc when FLOW_RSS is set; ETHTOOL_SRXFH needs a similar code path to handle the FLOW_RSS case so that ethtool can set the flow hash for custom RSS contexts (if supported by the driver). The copy code from ETHTOOL_GRXFH has been pulled out in to a helper so that it can be called in both ETHTOOL_{G,S}RXFH code paths. Acked-by: Edward Cree Signed-off-by: Joe Damato --- net/ethtool/ioctl.c | 75 +++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index 4a51e0ec295c..7d40e7913e76 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -907,6 +907,38 @@ static int ethtool_rxnfc_copy_to_compat(void __user *u= seraddr, return 0; } =20 +static int ethtool_rxnfc_copy_struct(u32 cmd, struct ethtool_rxnfc *info, + size_t *info_size, void __user *useraddr) +{ + /* struct ethtool_rxnfc was originally defined for + * ETHTOOL_{G,S}RXFH with only the cmd, flow_type and data + * members. User-space might still be using that + * definition. + */ + if (cmd =3D=3D ETHTOOL_GRXFH || cmd =3D=3D ETHTOOL_SRXFH) + *info_size =3D (offsetof(struct ethtool_rxnfc, data) + + sizeof(info->data)); + + if (ethtool_rxnfc_copy_from_user(info, useraddr, *info_size)) + return -EFAULT; + + if ((cmd =3D=3D ETHTOOL_GRXFH || cmd =3D=3D ETHTOOL_SRXFH) && info->flow_= type & FLOW_RSS) { + *info_size =3D sizeof(*info); + if (ethtool_rxnfc_copy_from_user(info, useraddr, *info_size)) + return -EFAULT; + /* Since malicious users may modify the original data, + * we need to check whether FLOW_RSS is still requested. + */ + if (!(info->flow_type & FLOW_RSS)) + return -EINVAL; + } + + if (info->cmd !=3D cmd) + return -EINVAL; + + return 0; +} + static int ethtool_rxnfc_copy_to_user(void __user *useraddr, const struct ethtool_rxnfc *rxnfc, size_t size, const u32 *rule_buf) @@ -944,16 +976,9 @@ static noinline_for_stack int ethtool_set_rxnfc(struct= net_device *dev, if (!dev->ethtool_ops->set_rxnfc) return -EOPNOTSUPP; =20 - /* struct ethtool_rxnfc was originally defined for - * ETHTOOL_{G,S}RXFH with only the cmd, flow_type and data - * members. User-space might still be using that - * definition. */ - if (cmd =3D=3D ETHTOOL_SRXFH) - info_size =3D (offsetof(struct ethtool_rxnfc, data) + - sizeof(info.data)); - - if (ethtool_rxnfc_copy_from_user(&info, useraddr, info_size)) - return -EFAULT; + rc =3D ethtool_rxnfc_copy_struct(cmd, &info, &info_size, useraddr); + if (rc) + return rc; =20 rc =3D dev->ethtool_ops->set_rxnfc(dev, &info); if (rc) @@ -978,33 +1003,9 @@ static noinline_for_stack int ethtool_get_rxnfc(struc= t net_device *dev, if (!ops->get_rxnfc) return -EOPNOTSUPP; =20 - /* struct ethtool_rxnfc was originally defined for - * ETHTOOL_{G,S}RXFH with only the cmd, flow_type and data - * members. User-space might still be using that - * definition. */ - if (cmd =3D=3D ETHTOOL_GRXFH) - info_size =3D (offsetof(struct ethtool_rxnfc, data) + - sizeof(info.data)); - - if (ethtool_rxnfc_copy_from_user(&info, useraddr, info_size)) - return -EFAULT; - - /* If FLOW_RSS was requested then user-space must be using the - * new definition, as FLOW_RSS is newer. - */ - if (cmd =3D=3D ETHTOOL_GRXFH && info.flow_type & FLOW_RSS) { - info_size =3D sizeof(info); - if (ethtool_rxnfc_copy_from_user(&info, useraddr, info_size)) - return -EFAULT; - /* Since malicious users may modify the original data, - * we need to check whether FLOW_RSS is still requested. - */ - if (!(info.flow_type & FLOW_RSS)) - return -EINVAL; - } - - if (info.cmd !=3D cmd) - return -EINVAL; + ret =3D ethtool_rxnfc_copy_struct(cmd, &info, &info_size, useraddr); + if (ret) + return ret; =20 if (info.cmd =3D=3D ETHTOOL_GRXCLSRLALL) { if (info.rule_cnt > 0) { --=20 2.25.1 From nobody Sun Feb 8 04:12:58 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE3D5EB64DD for ; Tue, 25 Jul 2023 20:57:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231416AbjGYU5a (ORCPT ); Tue, 25 Jul 2023 16:57:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231262AbjGYU5Y (ORCPT ); Tue, 25 Jul 2023 16:57:24 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC4841988 for ; Tue, 25 Jul 2023 13:57:22 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-99364ae9596so1011903166b.1 for ; Tue, 25 Jul 2023 13:57:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1690318641; x=1690923441; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SZaam7kr0RM2wvFpQkpovBqoJNVqtgLNS4lSsOVsnM0=; b=lPILFNe6iyP6sPc9zZXqtkD+ivwxJMiLysrJkPdoYQMn9aUoUR2L+BdedOAO6wrWeb nJgu5Pj2uLdy0yE7AfOGoETN3LnBIfii7oJ812PRc6szN23P9cM0ECvKbe5nSu3cK6/E kv47ZNe0QTxjWrdDBUb824me6CcO++gY7Rh9Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690318641; x=1690923441; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SZaam7kr0RM2wvFpQkpovBqoJNVqtgLNS4lSsOVsnM0=; b=lRNmLwpudSoJEt22PmBAS0iguEAQ+GHNIYgm+9KfS0Nse6qJr/WnpBQvXUqmIkouG5 G8JdHy2IH/+20bvpPIhGYnYqztR+cKAnf2cgxMdQYa9AuJIyy/MLKLY5hXYIZDbiGuy+ ekWSf3OtYnPAyCzeOSwELBdkqUHiENFGI1TL9mHAwbYXAOx2Is+p8Ms6WvCCAZokTPjv 6YnyrlkZ15GQ09LUBw+YcSJ7UyFsospLTezDZgw9MBBIgMIislnXVdZJtmXB9gjbn5dn get5MwxpEIn+l5B77SkQFm7cMhKEJTxYYPpcD/Tu0MIE5MuEUNET2V3DXigWeCzZ6UKd BExg== X-Gm-Message-State: ABy/qLZmictdewNqUL/AcCFpZSC0V7qJ8b0I/kHHnFog5l3cAEmouyXw D41jlKgMDy5UCzvNeSal6r9Clg== X-Google-Smtp-Source: APBJJlGX7BZVD6CMaWSxooDiqPHBfJnW1g6PQRdV1WoMXcFPycQZ2h1NdKwXfYvEFDAjGCB44Qe4og== X-Received: by 2002:a17:907:2c4f:b0:982:870f:9e8f with SMTP id hf15-20020a1709072c4f00b00982870f9e8fmr225ejc.62.1690318641418; Tue, 25 Jul 2023 13:57:21 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id h19-20020a1709062dd300b0097073f1ed84sm8704186eji.4.2023.07.25.13.57.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 13:57:21 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org, saeedm@nvidia.com, tariqt@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, Joe Damato Subject: [net-next v2 2/2] net/mlx5: Fix flowhash key set/get for custom RSS Date: Tue, 25 Jul 2023 20:56:55 +0000 Message-Id: <20230725205655.310165-3-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230725205655.310165-1-jdamato@fastly.com> References: <20230725205655.310165-1-jdamato@fastly.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Tariq Toukan --- .../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 *re= s, u32 rss_idx, return mlx5e_rss_set_rxfh(rss, indir, key, hfunc, res->rss_rqns, res->rss= _nch); } =20 -u8 mlx5e_rx_res_rss_get_hash_fields(struct mlx5e_rx_res *res, enum mlx5_tr= affic_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 =3D res->rss[0]; + struct mlx5e_rss *rss; + + if (rss_idx >=3D MLX5E_MAX_NUM_RSS) + return -EINVAL; + + rss =3D res->rss[rss_idx]; + if (!rss) + return -ENOENT; =20 return mlx5e_rss_get_hash_fields(rss, tt); } =20 -int mlx5e_rx_res_rss_set_hash_fields(struct mlx5e_rx_res *res, enum mlx5_t= raffic_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 =3D res->rss[0]; + struct mlx5e_rss *rss; + + if (rss_idx >=3D MLX5E_MAX_NUM_RSS) + return -EINVAL; + + rss =3D res->rss[rss_idx]; + if (!rss) + return -ENOENT; =20 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); =20 -u8 mlx5e_rx_res_rss_get_hash_fields(struct mlx5e_rx_res *res, enum mlx5_tr= affic_types tt); -int mlx5e_rx_res_rss_set_hash_fields(struct mlx5e_rx_res *res, enum mlx5_t= raffic_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); =20 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c b/driv= ers/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 =3D 0; + u32 flow_type =3D 0; + u32 rss_idx =3D 0; int err; int tt; =20 - tt =3D flow_type_to_traffic_type(nfc->flow_type); + if (nfc->flow_type & FLOW_RSS) + rss_idx =3D nfc->rss_context; + + flow_type =3D flow_type_mask(nfc->flow_type); + tt =3D flow_type_to_traffic_type(flow_type); if (tt < 0) return tt; =20 @@ -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 !=3D TCP_V4_FLOW && - nfc->flow_type !=3D TCP_V6_FLOW && - nfc->flow_type !=3D UDP_V4_FLOW && - nfc->flow_type !=3D UDP_V6_FLOW) + if (flow_type !=3D TCP_V4_FLOW && + flow_type !=3D TCP_V6_FLOW && + flow_type !=3D UDP_V4_FLOW && + flow_type !=3D UDP_V6_FLOW) return -EOPNOTSUPP; =20 if (nfc->data & ~(RXH_IP_SRC | RXH_IP_DST | @@ -931,7 +937,7 @@ static int mlx5e_set_rss_hash_opt(struct mlx5e_priv *pr= iv, rx_hash_field |=3D MLX5_HASH_FIELD_SEL_L4_DPORT; =20 mutex_lock(&priv->state_lock); - err =3D mlx5e_rx_res_rss_set_hash_fields(priv->rx_res, tt, rx_hash_field); + err =3D mlx5e_rx_res_rss_set_hash_fields(priv->rx_res, rss_idx, tt, rx_ha= sh_field); mutex_unlock(&priv->state_lock); =20 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 =3D 0; + int hash_field =3D 0; + u32 flow_type =3D 0; + u32 rss_idx =3D 0; int tt; =20 - tt =3D flow_type_to_traffic_type(nfc->flow_type); + if (nfc->flow_type & FLOW_RSS) + rss_idx =3D nfc->rss_context; + + flow_type =3D flow_type_mask(nfc->flow_type); + tt =3D flow_type_to_traffic_type(flow_type); if (tt < 0) return tt; =20 - hash_field =3D mlx5e_rx_res_rss_get_hash_fields(priv->rx_res, tt); + hash_field =3D mlx5e_rx_res_rss_get_hash_fields(priv->rx_res, rss_idx, tt= ); + if (hash_field < 0) + return hash_field; + nfc->data =3D 0; =20 if (hash_field & MLX5_HASH_FIELD_SEL_SRC_IP) --=20 2.25.1