From nobody Wed Sep 10 05:41:30 2025 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1E95A313269; Fri, 5 Sep 2025 17:07:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757092058; cv=none; b=R9sRejOxCcd2nWBvlpZ1zBDAtLznXgw8zoPTKIv1c7YpokZZerjLMKymzaBi42Kx3hSzzb/UxvHAxOyEH25nbVpbkhLFOU5y8fiS+wWNaRAY791YPhgFT0E8j6t/0FEKYduTJ+K4QzCth9dcGdqxxkek9k9BK3z0/iG2LIkSOro= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757092058; c=relaxed/simple; bh=LCDHUbohxTHgzzdULwcsi+67Tz4B7J+HXNyStYI9NJM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jU151JupprhF44j1DMD7uEJiAbBJAVCkYMOgEng7okzf4Dvp1xvSZvt8tkmDQPnM31n1vwLRdBLMuJl0+VbOUImZI3TfjDc9VmdjsYXOc3XU5lhBzkyciIJvOSZdvFn5Xdw6Qljn8NWxfCowmgBEP6Z8yYW4trang8uULfh7YNc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-b0475ce7f41so452415366b.1; Fri, 05 Sep 2025 10:07:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757092053; x=1757696853; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XjFEyEGuqdVSCAOxsi8hLG5VAzYgCXVIet3Kae4PlkA=; b=BIFd5W1NjWJis7GB+LiusMfRNmT5RC3/IbFuyDo75ym7AySHebhuYPKW343iAMAtQe CaFg0bqiszqZ5tvcpURMAmWZ7szsPgkiFfMJIEaf2CZ2q8HGEZQuiMQ8CL1hdkojiflt cdKqJfF6LDtrts+tfF98Bu0d8pNOEGUWS6K9LXS3qkQiVkkSLg/2TE2DK5v7dAuObmsw 45KiNpT6F3dS7eQ4nVd9mMAZRfzxKeIZrhcYM6sFP+G+1/Q8b7D06PRTMKhLH1qbA4zZ 9y7Jqm+EPOykA9F3vdIlDzQvLzuZuWmPqPcJT6txYaw2F+hO7N+0BEAI6/NBa2qz2oWE aADg== X-Forwarded-Encrypted: i=1; AJvYcCVU5iCvItaML0bn21bzZKZU7zrk3j3NUlDX25eFdRYWYbzOUaqaHFbGwmq14lTEjIahhRtpJd61u42QwGg=@vger.kernel.org X-Gm-Message-State: AOJu0Yx9xKwAFWUqwsbCmmIPRCNT238RnSUTPxtWcrSOY+dW+dWGzuCg 1IoBf9G4ZESj6fI9PfVj/rtz6jcEphTT8Q/j25ByLBIR0eKqopNMgAkY X-Gm-Gg: ASbGncu6b/ZBl72Zhydo6sw15gaVU4PyZWAt9wI0W4H+HTpOzHz7Hh+QONqKFw35fLu sOLCc8K2xZrduTs8O3GMGEh5FS94Blhoo8rLZLJf/4LsrI57S6j/3nWFc2lkV9ivQeUqEfr1hqk s6igcaHpTJHc3u/c0dzZ3mcZ9fISv5QYaWcqgF2p7FyFC54flLVRIk+lV3V+kjfH/WuXxF7p+6A LIBgG9vKuf37jsna1jfvnsFhfa/jWKRXToXg/y6fCSjsVISzq8FN3L2D1HBrc0HWQRxfC7KfSEe sK2C4sZ/bgfEkrU63IxLL0KOhX8rF3Hunb34MaZmqRHKTX8epssR2siZVb2Iq3AdGrQTGiTBdOO 3U+h8RyJp6c5t X-Google-Smtp-Source: AGHT+IEtHKvrBZ1ElRKdXcbXiLKbzc+xq3O81Tx45cgrsAppwtCpGohC/I6pqK1UuZeX5Mbk4RqQvQ== X-Received: by 2002:a17:906:e0d1:b0:b03:d5ca:b16 with SMTP id a640c23a62f3a-b03d5d9531cmr1967196466b.23.1757092053304; Fri, 05 Sep 2025 10:07:33 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:8::]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-61cfc1c77d0sm17028439a12.11.2025.09.05.10.07.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Sep 2025 10:07:32 -0700 (PDT) From: Breno Leitao Date: Fri, 05 Sep 2025 10:07:20 -0700 Subject: [PATCH RFC net-next 1/7] net: ethtool: pass the num of RX rings directly to ethtool_copy_validate_indir Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250905-gxrings-v1-1-984fc471f28f@debian.org> References: <20250905-gxrings-v1-0-984fc471f28f@debian.org> In-Reply-To: <20250905-gxrings-v1-0-984fc471f28f@debian.org> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , kuba@kernel.org, Simon Horman , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux.dev, Breno Leitao , jdamato@fastly.com, kernel-team@meta.com X-Mailer: b4 0.15-dev-dd21f X-Developer-Signature: v=1; a=openpgp-sha256; l=1815; i=leitao@debian.org; h=from:subject:message-id; bh=LCDHUbohxTHgzzdULwcsi+67Tz4B7J+HXNyStYI9NJM=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBouxjRF1LnGP+c+KeilYAqoifWv9nTDL85rRXV+ FU+TohJLyiJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaLsY0QAKCRA1o5Of/Hh3 bYpRD/9Ks9DGMXwbRHetypyA0qlJPI+4Gq4Z19bsOMjk5f3rAybjEM10Km1XZ/OCXicFTz6SrxB XUkEf3yphmPyK7uz3Szfm9mif4zELXBPRjxhsWd5A6SoTna+KOPmSSGh3szbsRy1MdqUaub5pJQ /bYGkSP2g9PPsj0ccxvbOrqnf3u2IdkMmWr4q+7MIcPG+kWZx80S7ilTeFYX2beezGuKHphj94S +ZRmkX9lLIe5yncfw3dZJFoFeCn2MhfYYlV6Z1aFR4nCrWIHEaNjCmPDofDVlo9+1NCpAZHiDZA NOodn1CTbkLLikpgpVxfqX5xrUKkrKM0/tScrLjwkUGdhSCqLzqsezpHuEV0MwQzYvHpU3ea379 /1vwOFqJBgoyeek5m6uGYT/1O2iHWDLFSy70WYoBwYnX+bw9YC6VCqQQs9FZBLFfLC2iccfSTmk oMOgWWYru63R2CO9gr2FR15mlw5W4P9xf7U3np790CQDj5bCRldPWtX0JTLoL04P07AICICDxa+ y8RdB1QTT6ISmO4e8LpxtHbbO5EUjtATzIphHptGqFqXakskMUtUqhJvBDM+dHkWaGXr81xo2qu uXrAK+oF79crda5wqGUXEk/Et1ESIS2scZs4klqCKJ9jO1PnGL2z63c/Q3/YjAODbndYgo9dMBK rO0H6hvrps1tY9Q== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Modify ethtool_copy_validate_indir() and callers to validate indirection table entries against the number of RX rings as an integer instead of accessing rx_rings->data. This will be useful in the future, given that struct ethtool_rxnfc might not exist for native GRXRINGS call. Signed-off-by: Breno Leitao Suggested-by: Jakub Kicinski --- net/ethtool/ioctl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index 0b2a4d0573b38..15627afa4424f 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -1246,8 +1246,8 @@ static noinline_for_stack int ethtool_get_rxnfc(struc= t net_device *dev, } =20 static int ethtool_copy_validate_indir(u32 *indir, void __user *useraddr, - struct ethtool_rxnfc *rx_rings, - u32 size) + int num_rx_rings, + u32 size) { int i; =20 @@ -1256,7 +1256,7 @@ static int ethtool_copy_validate_indir(u32 *indir, vo= id __user *useraddr, =20 /* Validate ring indices */ for (i =3D 0; i < size; i++) - if (indir[i] >=3D rx_rings->data) + if (indir[i] >=3D num_rx_rings) return -EINVAL; =20 return 0; @@ -1366,7 +1366,7 @@ static noinline_for_stack int ethtool_set_rxfh_indir(= struct net_device *dev, } else { ret =3D ethtool_copy_validate_indir(rxfh_dev.indir, useraddr + ringidx_offset, - &rx_rings, + rx_rings.data, rxfh_dev.indir_size); if (ret) goto out; @@ -1587,7 +1587,7 @@ static noinline_for_stack int ethtool_set_rxfh(struct= net_device *dev, rxfh_dev.indir_size =3D dev_indir_size; ret =3D ethtool_copy_validate_indir(rxfh_dev.indir, useraddr + rss_cfg_offset, - &rx_rings, + rx_rings.data, rxfh.indir_size); if (ret) goto out_free; --=20 2.47.3 From nobody Wed Sep 10 05:41:30 2025 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D9A54313266; Fri, 5 Sep 2025 17:07:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757092059; cv=none; b=Wt9zb3YcEJglYk1/U6qLf1QYB9d0LFgitEDPC95ukqvim0NAl9Ea9lWWJCrFoZ/nGYhDm9vWNxZxJXXp1b9snfqP1TjHW1NJZErBCY6fLagmLcoO+IYnDbciSeu+WCIbC9tqoTOYh4Q3vYMoT0+wz3egXawCPbcJbAP4KvgUOis= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757092059; c=relaxed/simple; bh=4qXNf5FPKeqB6oI1PmmIoli/4B/k2fYlPhoDMAj4Ltg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IhXXnhlQDtgeP+8d0VXh2it+/PQaSxthY9vUVkO52EHpa1pV8HNvDV11/DW2/4yZOC0n/03yeZefyGhkBQl7KAb8eiWbL77jX9yNcTOZFXOLFrKOzGoFBJHMXe7/wxP+vNIj/fEH8Rs0lbggNQ8diB/FwAV7+gdxBV+XckotzxU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.208.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-620724883e6so3474040a12.2; Fri, 05 Sep 2025 10:07:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757092055; x=1757696855; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AEyyDJEjHIGcptoyVMY30XDmajElEFVLCjxYGTHfuEc=; b=k+n08vbh1YrfFW8qfW47mjS/9DRyrTtpMkOH2HeWIpYAUgx0wn0V5ZW9qpEHbhACp8 G1Q3vc7GHc1wUBnSyLFF6h+Xdb9RIeBPeZND0HmzWJPrVWcmkioOdIZT/5LyPLMOnmso ABWUaThOaRY7kQ22lLj04ywJ0Pw2Li30JFnEiKgPwIqw2LR6RepZCg0eWOgRBrdV45U3 AXz5Ja1kHOkgWUCeFttiwkmvmEd5eOodrlGxeK3rlQwY9G4ijP6NQfMfCWBrnpkazRSB D4ANWohPnqdFiV6UT+ThNX7xsIyQKeQoT5IOq8A7G9qToQNvtHPTbJVucngMADboB682 FZMA== X-Forwarded-Encrypted: i=1; AJvYcCUhKaBK50ed3ADnrCzRqyfMxfrZJQHdO3ba4hmzojf5Kr0meQWENlvo7+sToN6GUsrdvmBX597mLDQp9Y8=@vger.kernel.org X-Gm-Message-State: AOJu0YzXsxdkefOTv/j+NW4DKkje9kAqy4uCO3lPDV8HvUq4qDTtyvXZ Fc0vuPesIMPZdRAIQuHyrh8x2N0wB2wzHzOH1VLVcSBK1/thSB4WCJOZ X-Gm-Gg: ASbGnctzMlNvy3PiMbLqC+hkqkVlFBUW7NfUOJI7gmilVXtGBzRs0QfSemgF/EejeIx pYMN5pfJFFN/yQYinPvdEuVkrtF7XPfQENhAhugflio26pMqhGyB1Op4jeggnmN9wWMTttpEFgc XeEa+oktjLJN65GDpZFzFIjUtTA75Bt52p9xWSxj0Vcm7hP0GnZyv6yD3uaO5inGfC2wGztEzN1 r24dI5oxJwoNT5c80uRpPGQ6dzOZoh0deFx/gBq695+1uIrJPOqwPLqFdDO3j5KGnfMalQ1xFTy xmWxLy3SLEDfd7sXPzi9T13uk63i9U3mLIyUWrzqnu0E/fRIZqHXH8qmcZAZ4QM6YR13YwARvCP hTemkDuly5yU0R6mD5Gkea+A3 X-Google-Smtp-Source: AGHT+IEfg3Ct5Mwvv/lnPzUvVsJLfBdreHP7EuqgYVEHTA4nIMOW1OT1Dw0Z1/X63bSyShxKFNfYyQ== X-Received: by 2002:a05:6402:27cf:b0:621:b7ba:ef76 with SMTP id 4fb4d7f45d1cf-621b7baf1e6mr2475893a12.35.1757092054856; Fri, 05 Sep 2025 10:07:34 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:74::]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6222f293a31sm886343a12.12.2025.09.05.10.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Sep 2025 10:07:34 -0700 (PDT) From: Breno Leitao Date: Fri, 05 Sep 2025 10:07:21 -0700 Subject: [PATCH RFC net-next 2/7] net: ethtool: add support for ETHTOOL_GRXRINGS ioctl Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250905-gxrings-v1-2-984fc471f28f@debian.org> References: <20250905-gxrings-v1-0-984fc471f28f@debian.org> In-Reply-To: <20250905-gxrings-v1-0-984fc471f28f@debian.org> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , kuba@kernel.org, Simon Horman , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux.dev, Breno Leitao , jdamato@fastly.com, kernel-team@meta.com X-Mailer: b4 0.15-dev-dd21f X-Developer-Signature: v=1; a=openpgp-sha256; l=2335; i=leitao@debian.org; h=from:subject:message-id; bh=4qXNf5FPKeqB6oI1PmmIoli/4B/k2fYlPhoDMAj4Ltg=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBouxjS9fofHaCc9nPoMTZDSSfsSJmJMtCJ1GvnA Qxd2Y9yuW6JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaLsY0gAKCRA1o5Of/Hh3 bZ7JEACoFMQE8XAyYs6lke3RKQquerpOPAyHsrhSfB3GwhSYDs+BRRZUODdEplnKuiKkLhf44VF Gv7mDEXzTZhUj3LnQ8tt/W7iTdm5P7uxVO847UtQZzxH1JnGmC9q+FlatzaHVYsYH6VzZviOdwj DJPTsJMOWg+V+gdJbhy6HVA14hs6T4xjse/vCNwV3MkTrCUvgHpQVXMGiB6LO2OGucUxPa7uUVx NkPAttShJ1EY4cq9n/y9AZN0nD+qLjqSEQThMl60TB/DJp/UnHJjDCVEGHWEDijAL8bFWjL8kCo 4p8Qe0oN70ugTH3RTbdrGWpufzpztiYVj28aeffFRthLd+SqkRqGE3+Ki/w0fBu9kwqzl6slOnh qXBcRIGTOIQiVVlj8veRM4Pqw2t+GcTpjoPFjnpLbRp2R2c0xSpCkRqTmIMy9ZElWSCt4+owhJe JxH35AzY2iXkasbwLTnme9Vq2gGrqhigoanPB+6n3lHN7n7yvqW4TE1A6hOHpYuICKHatfuj2ld QjS6Jjn+sWjBtAKZVS7UFuHhmYxZkHGmYSEXM2XmWznL5/0g6cuYlAHAmoaJh5XFY8KoDyTg1hx vXVWDFwnz5dFCTp5yCjLu34zAwOUVKWbX288i7y9Zoc6AEtkYy8p0R5r69lQNV4wkCa+cPXUWi9 0qPczFDz0KJMCHw== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D This patch adds handling for the ETHTOOL_GRXRINGS ioctl command in the ethtool ioctl dispatcher. It introduces a new helper function ethtool_get_rxrings() that calls the driver's get_rxnfc() callback with appropriate parameters to retrieve the number of RX rings supported by the device. By explicitly handling ETHTOOL_GRXRINGS, userspace queries through ethtool can now obtain RX ring information in a structured manner. In this patch, ethtool_get_rxrings() is a simply copy of ethtool_get_rxnfc(). Signed-off-by: Breno Leitao Suggested-by: Jakub Kicinski --- net/ethtool/ioctl.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index 15627afa4424f..4214ab33c3c81 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -1208,6 +1208,44 @@ static noinline_for_stack int ethtool_set_rxnfc(stru= ct net_device *dev, return 0; } =20 +static noinline_for_stack int ethtool_get_rxrings(struct net_device *dev, + u32 cmd, + void __user *useraddr) +{ + struct ethtool_rxnfc info; + size_t info_size =3D sizeof(info); + const struct ethtool_ops *ops =3D dev->ethtool_ops; + int ret; + void *rule_buf =3D NULL; + + if (!ops->get_rxnfc) + return -EOPNOTSUPP; + + ret =3D ethtool_rxnfc_copy_struct(cmd, &info, &info_size, useraddr); + if (ret) + return ret; + + if (info.cmd =3D=3D ETHTOOL_GRXCLSRLALL) { + if (info.rule_cnt > 0) { + if (info.rule_cnt <=3D KMALLOC_MAX_SIZE / sizeof(u32)) + rule_buf =3D kcalloc(info.rule_cnt, sizeof(u32), + GFP_USER); + if (!rule_buf) + return -ENOMEM; + } + } + + ret =3D ops->get_rxnfc(dev, &info, rule_buf); + if (ret < 0) + goto err_out; + + ret =3D ethtool_rxnfc_copy_to_user(useraddr, &info, info_size, rule_buf); +err_out: + kfree(rule_buf); + + return ret; +} + static noinline_for_stack int ethtool_get_rxnfc(struct net_device *dev, u32 cmd, void __user *useraddr) { @@ -3377,6 +3415,8 @@ __dev_ethtool(struct net *net, struct ifreq *ifr, voi= d __user *useraddr, rc =3D ethtool_set_rxfh_fields(dev, ethcmd, useraddr); break; case ETHTOOL_GRXRINGS: + rc =3D ethtool_get_rxrings(dev, ethcmd, useraddr); + break; case ETHTOOL_GRXCLSRLCNT: case ETHTOOL_GRXCLSRULE: case ETHTOOL_GRXCLSRLALL: --=20 2.47.3 From nobody Wed Sep 10 05:41:30 2025 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5B19B313277; Fri, 5 Sep 2025 17:07:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757092063; cv=none; b=YaB/bO1WDe+ycK6kmgP0ctZ8wneEj0w43NWyQp+Csp5+ppvRAbC2ivP5OxgP1g/69ZUtDDCWTIPTgTvM1kwC9HVdtGocrAogcPLXp8i67DHb49O46gOGMTh7dAFebeDDo20MCSZJIwGeR6RsQjzs9FjCIh+GpXYG3eIHLSo4Aug= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757092063; c=relaxed/simple; bh=CeqI/CPfLt91GzhZXuIdCi7ZkDtyIbGKbbgMl5Idh5w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cUY2lkzIDCwEq1gXbupdF0kjcdKRMyM84lI7VmWz7jD/cf21Xyl63WLwfBwfp9x0QsC63fgMV31G+mbD6/25bUsRhsO47fh+0o1/QOp0P9yKyTq3DBJx04OZ+tdfp+8OZ+tBDqMG5NPXy5/TfqXGfn9+xSvzYuAHZKxwdhHMQ/Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-b0454d63802so399134366b.2; Fri, 05 Sep 2025 10:07:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757092057; x=1757696857; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zxdlD9Z0X49cP7JCYN5rg4ONGmDsa0/rUnEhDLiPlaE=; b=JD7flmG2f8J3hzNznwoezwGNrFryq2noax/yMeT1Vn5VJhqcSE5CmCQ88xFs32lHcQ 48RULhx5Utzruud4UdovZM1Q6uTWHRUGmuPyFnDMhb5jwIUaYbq9AMxoS09+xGOxlVop iHUe+8YMz9tHAGM/0fCXyh7kcGGnhsFuiYIkKbLQfFGIbuEM+2CtgaoRBHTK1FaSpXA5 qK5k7a1xnG9AxYszih0ttkQ0v2oMUd0pPQJB9EgR/Y5QQGoOeif7BGHZ6ka61mAm3eeW 4bbGdvAPOH8qGS7Eh5eolFM7mYr+K/KJ86sP2XF6Tgx8J9NUUVGdb8aKmtge52kq05rq zv0g== X-Forwarded-Encrypted: i=1; AJvYcCW7o2YZqKfTBQ0rG4hvYBk53xp8N9iW1WT7SHd9chjrWlKRHrXh7/DOubEMxr4zl7NchIam/1O74+hDmEA=@vger.kernel.org X-Gm-Message-State: AOJu0YyMVCwUUV2+RbFpXqOf9gavI9nzQCLwvuGMrW8bc8Ov5jFGxy3I Ki2kVYvR+1kUdaFvNx99XQA1j8sMsHDQ8xmawv9Y5p+MKVFOOv8H0BBq X-Gm-Gg: ASbGncvarsChCcV+WYGsy4o0gZOEpjtf0mjXkr/oNSdbjeo5q5Z+PNoTkqHY1r70KxJ zb13sPQfJb00pg+w2HUPvoj/XbC/5KJUdMllhmqUEnfb4q9a8WsTpwCKR6uhSLLhnT1FYPp+3vc pwaGt56O6eV39GO5UertZs4U7jD1t4pTM23M3wCsavHnAWs0U/iYGKbl3mCsVggKzuNNcvRI3oQ IfFGRDzi914DhKSv3vs0e3wpr1TTeZ1MOLNkYXKJNcmEX/dO7Uptce9U0ffw8DQbeFaj0Vtlh7Q 3jVb8Lm2i712UOqFniM0CAJUyuyNtgrp8gt5VksVa52FJK0CImZFygr4Ep4K7KbwYalYUFvAeOH wy2pGvLtYuwkXUg== X-Google-Smtp-Source: AGHT+IFyGzIlqDsGhq19oUFnJmq6/ZpxkKdMi1XxXMB1n+8oNFxl2efi4d+YlV018cOAZxqPq1U0XA== X-Received: by 2002:a17:907:7f8f:b0:b04:2b21:a4a4 with SMTP id a640c23a62f3a-b042b21a975mr2071162566b.63.1757092056558; Fri, 05 Sep 2025 10:07:36 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:70::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b041cef6b4dsm1381805066b.65.2025.09.05.10.07.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Sep 2025 10:07:35 -0700 (PDT) From: Breno Leitao Date: Fri, 05 Sep 2025 10:07:22 -0700 Subject: [PATCH RFC net-next 3/7] net: ethtool: remove the duplicated handling from ethtool_get_rxrings Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250905-gxrings-v1-3-984fc471f28f@debian.org> References: <20250905-gxrings-v1-0-984fc471f28f@debian.org> In-Reply-To: <20250905-gxrings-v1-0-984fc471f28f@debian.org> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , kuba@kernel.org, Simon Horman , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux.dev, Breno Leitao , jdamato@fastly.com, kernel-team@meta.com X-Mailer: b4 0.15-dev-dd21f X-Developer-Signature: v=1; a=openpgp-sha256; l=1540; i=leitao@debian.org; h=from:subject:message-id; bh=CeqI/CPfLt91GzhZXuIdCi7ZkDtyIbGKbbgMl5Idh5w=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBouxjSvnaJuRjHtK0yeKEGoQ4A5NW22cVpy1kmQ lCxuucJjouJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaLsY0gAKCRA1o5Of/Hh3 bYBwD/9suGdhma341NDgQsMOw2iyLW54YRcwxFm8uq68CLVHFgiKdKCqCHlRGr1gK0jwK3lIrJm BLo15fZ3x3KMt3j7FwIBzcoo1oGK4agXImKRhsbR602Oqj0/sAHXrgf6hiwuUi5l7zYtEXycRAi UR22vJRHd2+LZet0/hIYqTjdymCAIMvH5w35eoQpd0KASO1Z9tPXjI1XUBfMDPJIeTQQazqKzr+ 1Ie5PCtoRiIBNc+MFNg3TMRQqnvbikxYIESqx6Jlpo0cc+nTL30K4gT8Yd0N/hV1tjJBr/X3OSl V3Kj2HUkQoReL/3u2EO0MwEhJmQhANLIt6OX3yqi3Vg1Q20ZXyb5K+JLQ1aq9DpUD5TKENXSFKc TFaANTXxAECp7v8LZby5FAIKPfW1ByA+gcXPt439MXVqnCY3o4qUsnwrir7ZvMPz2NjtgcOLnJ1 K2sHa2Fc9BS8yZjwpz6JvhcSWlD9HZj2rRk2WeZnTm9JLypP7Ui1xP6/MJ9j9QxM5inNLH0R94o QxxbpIVtUKyx8KPneCBWx6SG33u8IjJ/wKuYhC8hvypO8XO8BQBuyjYm4uH7KQISm/7JI3sateN /+JWJIfUTyNeu1Q49stFie7cyQvZ/85vttbMfIYRny/rakd0ZPEXrxpTCWrc0YjL0B7l72r4gxT pDS++R1eO/SKfaQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D ethtool_get_rxrings() was a copy of ethtool_get_rxnfc(). Clean the code that will never be executed for GRXRINGS specifically. Signed-off-by: Breno Leitao Suggested-by: Jakub Kicinski --- net/ethtool/ioctl.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index 4214ab33c3c81..1a9ad47f60313 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -1216,7 +1216,6 @@ static noinline_for_stack int ethtool_get_rxrings(str= uct net_device *dev, size_t info_size =3D sizeof(info); const struct ethtool_ops *ops =3D dev->ethtool_ops; int ret; - void *rule_buf =3D NULL; =20 if (!ops->get_rxnfc) return -EOPNOTSUPP; @@ -1225,25 +1224,11 @@ static noinline_for_stack int ethtool_get_rxrings(s= truct net_device *dev, if (ret) return ret; =20 - if (info.cmd =3D=3D ETHTOOL_GRXCLSRLALL) { - if (info.rule_cnt > 0) { - if (info.rule_cnt <=3D KMALLOC_MAX_SIZE / sizeof(u32)) - rule_buf =3D kcalloc(info.rule_cnt, sizeof(u32), - GFP_USER); - if (!rule_buf) - return -ENOMEM; - } - } - - ret =3D ops->get_rxnfc(dev, &info, rule_buf); + ret =3D ops->get_rxnfc(dev, &info, NULL); if (ret < 0) - goto err_out; - - ret =3D ethtool_rxnfc_copy_to_user(useraddr, &info, info_size, rule_buf); -err_out: - kfree(rule_buf); + return ret; =20 - return ret; + return ethtool_rxnfc_copy_to_user(useraddr, &info, info_size, NULL); } =20 static noinline_for_stack int ethtool_get_rxnfc(struct net_device *dev, --=20 2.47.3 From nobody Wed Sep 10 05:41:30 2025 Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 46BC6345743; Fri, 5 Sep 2025 17:07:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757092063; cv=none; b=bYiOW8XHBIh1ecpX7nzUxksbLr0w7kjsGpvi9jrCopnNxwfXweFh30mgafxMDp7bGIi6NsbI2yXEs0y7XwlFex0jNdTYLse9o9+b7JGTzUot+IhlPKjFtP2HVtZEX3b0gtiLVtBVpyBYalbWYCCbsJd/ht4D69FKMp8T3CJt9eM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757092063; c=relaxed/simple; bh=KVKSsW2WTK2b+YQKfMYkRtMIvYs5cvK6cLAuCNRNWUQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Q73bmMh6cUbKY93ZfxakQSC4+8C1rrpBNujkXrRYyzJFhtlU6ckG5Xi2KwBSDyswRHcUuN81GFdk+qyV5Ddg8ck6gAsL3XLwTAG8xs6mfxzgRK6CnzWn2BESUpSzloufNRIGE6Y3Iw4Or2X7ylJsW2p/hUUJzLDuVTbzr+6Hj2Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.208.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-6229f5ed47fso509550a12.1; Fri, 05 Sep 2025 10:07:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757092058; x=1757696858; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hkb3H3Hru4QFaSuS9oEviTp7IMbrnpNMLSXnPYRrEKg=; b=lVBeRSLnE3nPoo2W9x6/6pKa9kIndWonesWWmjmAyb5gK+gNOP+u+DnzemTpOJL5QN sm7I+Vellsrav2ohBTZ8BqSmf8nhAnkRhJMzEZt2JmJo7oxkqAWkt3lNsoCL6+ZqphPL fQK9GGSMZv/xR+Vz/Mof6zmYVZeawGOzCtUQYYa0N5/buSJM1n9ixTB0Henh2fuma97Z 6BTYGFb7sapcakTjn3ZP98EEhxfe6ljDzogkbOgQuv13e3zApSFdPWS8p59LCU6897+r fR5F8169Fd4VSjGHaZm72h7EqEgHMwL2MzmLyU/ztuM235VXRj2kcmnWmRQC+vz5nD0v 2MJw== X-Forwarded-Encrypted: i=1; AJvYcCUevN2bdeA47Fxjt1n9AKVzsF650sTpnyIxAZaeAoUtSno1PVGt/Oo8RVEanynqMVWEuXXi/UtSoPA9+EE=@vger.kernel.org X-Gm-Message-State: AOJu0Yz2G23JUPhHfS6q+abzPY8JOmDfxOM4qZX+CuqZkOGPda54LoD2 YgF3Xl47PbWHsgRMN+kTfdnyMtnM7q/Y+RF83enXj1YH24coFoRFBw5/ X-Gm-Gg: ASbGnctaZrjZBgmPbWSxKn/Fr8GuVGKpBUcC/IYyEKD0325FFZvdpVbOC36RT9FQoQ6 kkSueHAGhpp7+wRxtV1HTIulLuGoOMl19G8SDWKsqNT04oLvO/UXj29N/j1EHzcINeLxuYGAlmW I2j04qeFcjMiVkUkNS9fAXulhMEKuBtPetM9pyIV5hm/DYnXG6q0cwcM84ywqcr6wSe596RAByC w6LlNa2HQrPt//dtgZLAwmHvnxprKLqV2gZH+kLySKhrDqSUKtQOQvymjhCdxceYP2cDLGXU0WK JpwIRAjSuE+8hIqJjmi7tHvhI/HvEN7dsiIbo7vOlXbRSZ8CfnYJn+4ggudPKEGEB+ZToOPh5Ff P2roJyezCBa9KcA== X-Google-Smtp-Source: AGHT+IEW7PqC2/WUxYBi8+JOOLG0n7mbB0JHYUl3TfKSgMK9s6BabZvv4Lbp1/uO2+dfsZQbPoQRyg== X-Received: by 2002:a05:6402:1e8a:b0:61c:7160:73b2 with SMTP id 4fb4d7f45d1cf-61d26ed35bbmr21799723a12.36.1757092058336; Fri, 05 Sep 2025 10:07:38 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:70::]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-61cfc52ae40sm16609830a12.44.2025.09.05.10.07.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Sep 2025 10:07:37 -0700 (PDT) From: Breno Leitao Date: Fri, 05 Sep 2025 10:07:23 -0700 Subject: [PATCH RFC net-next 4/7] net: ethtool: add get_rxrings callback to optimize RX ring queries Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250905-gxrings-v1-4-984fc471f28f@debian.org> References: <20250905-gxrings-v1-0-984fc471f28f@debian.org> In-Reply-To: <20250905-gxrings-v1-0-984fc471f28f@debian.org> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , kuba@kernel.org, Simon Horman , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux.dev, Breno Leitao , jdamato@fastly.com, kernel-team@meta.com X-Mailer: b4 0.15-dev-dd21f X-Developer-Signature: v=1; a=openpgp-sha256; l=2397; i=leitao@debian.org; h=from:subject:message-id; bh=KVKSsW2WTK2b+YQKfMYkRtMIvYs5cvK6cLAuCNRNWUQ=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBouxjS/M4wmNx9IaSekB2GdCq/oA1QNr1HRj7vF jpaMHABPYeJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaLsY0gAKCRA1o5Of/Hh3 bUo+D/wLtkI785qZ2WWIoHuckAJX+CwjwJiXB/E06jkg4U4q0K73svWKLBE5q77MDyLxZvlGKlz JIhUufDnHn3zg2rqZ+LxSTDE97wzmanDF6Jv7NYOqA5Q1tly2R9hyrWXFzvF+UPVPCHYNikNAJ2 BQ7MKQE5nywYwNy51ChhT7SjELqA6Nj0qASCaoDLTT/ETjGyezrKKzN3bEMjRv8A4tyiJRIQxYF /a7/NQ2T+ImmCScmTsO+y8yr19n0kFJFOBN8M9fXPt0NAyNyhQCYJo0Hn7ifOEa66ahPuKxQlXv ATp1V4utt1u/1VdWZwmEKVAPlmfDXHQ83Njr1kZn+r/6Ek/MFJxXxjhh4/RSxu2Ty6SxxDRCoWR bUsYzUgZtQcvDd1mMD8cjdNeEa7cM/3oPImRwOUanFZDKAWL+F+Xz9tX6rsFdSoz8d+y+pekpYg 9OMe/pvWYYEQ41Ym5Hh9Rq6b4JhnATH7OYDkuOyNGDuAb25Xq13PEf99J7L2EaTh5LPzHmigz22 6Towg7bus7eOF+XwAXfjc4eB+dIi/HQt8Sw90njgY69vySsDKE8uRPTularT2vVeyV5/O78Ilde UcXS2kO6lcpEiMOV0vCZPL6cANjSoXxXQeJdy4TIbrLrn+eFDGA1m/BQBkGkNOecUPZtxML4yci 0f2wXpuznziJEEw== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Add a new optional get_rxrings callback in ethtool_ops to allow drivers to provide the number of RX rings directly without going through the full get_rxnfc flow classification interface. Modify ethtool_get_rxrings() to use get_rxrings() if available, falling back to get_rxnfc() otherwise. Signed-off-by: Breno Leitao Suggested-by: Jakub Kicinski --- include/linux/ethtool.h | 1 + net/ethtool/ioctl.c | 25 +++++++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index de5bd76a400ca..4f6da35a77eb1 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -1141,6 +1141,7 @@ struct ethtool_ops { struct ethtool_ringparam *, struct kernel_ethtool_ringparam *, struct netlink_ext_ack *); + int (*get_rxrings)(struct net_device *dev); void (*get_pause_stats)(struct net_device *dev, struct ethtool_pause_stats *pause_stats); void (*get_pauseparam)(struct net_device *, diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index 1a9ad47f60313..2f3dbef9eb712 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -1208,6 +1208,22 @@ static noinline_for_stack int ethtool_set_rxnfc(stru= ct net_device *dev, return 0; } =20 +static int get_num_rxrings(struct net_device *dev) +{ + const struct ethtool_ops *ops =3D dev->ethtool_ops; + struct ethtool_rxnfc rx_rings; + int ret; + + if (ops->get_rxrings) + return ops->get_rxrings(dev); + + ret =3D ops->get_rxnfc(dev, &rx_rings, NULL); + if (ret < 0) + return ret; + + return rx_rings.data; +} + static noinline_for_stack int ethtool_get_rxrings(struct net_device *dev, u32 cmd, void __user *useraddr) @@ -1217,16 +1233,17 @@ static noinline_for_stack int ethtool_get_rxrings(s= truct net_device *dev, const struct ethtool_ops *ops =3D dev->ethtool_ops; int ret; =20 - if (!ops->get_rxnfc) + if (!ops->get_rxnfc && !ops->get_rxrings) return -EOPNOTSUPP; =20 ret =3D ethtool_rxnfc_copy_struct(cmd, &info, &info_size, useraddr); if (ret) return ret; =20 - ret =3D ops->get_rxnfc(dev, &info, NULL); - if (ret < 0) - return ret; + if (WARN_ON_ONCE(info.cmd !=3D ETHTOOL_GRXRINGS)) + return -EOPNOTSUPP; + + info.data =3D get_num_rxrings(dev); =20 return ethtool_rxnfc_copy_to_user(useraddr, &info, info_size, NULL); } --=20 2.47.3 From nobody Wed Sep 10 05:41:30 2025 Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9AF54313287; Fri, 5 Sep 2025 17:07:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757092063; cv=none; b=VhFqJtigIYILN6cgQq0ob1UEEgplKh2dUtZSzhumyol9WJOG8DIuaRre8+6DPLcXzAUWnV29YFpl/7YwEQzsyVFZWFeHR7h1OsmUWjVAYb20dSKt2IHCmbcPu+Pdc6GnwxxbFWxc1Dcv/KPnc4CXByTR/VD9C/nd70EajlIp+F4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757092063; c=relaxed/simple; bh=EVX3rLFghruPiq1XL2IrD4i1q86cWmPVrWJL5Cu3vjE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fRc6hETZZlbqpWj+CxSM2YNKkO5TyGftXbC8ggV7iEpaN3UFoZA3vMThlvHycnHEMw1VSBSxYIc5nwLSabCxm8pDeFIX0aYNpZb6+GV2yH2ek1EpVHIG1oPF6nSK71eSiCe0jHZ3AsahRrNxb10J18liP344qrK+HmXndb1UgVo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.208.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-61cebce2f78so2514231a12.1; Fri, 05 Sep 2025 10:07:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757092060; x=1757696860; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=enK2RLL3LGNwUswiRLlXEekGpfyfpNr8qEb0IuggtGA=; b=BHoqdsdUAn3QEHCXcghMA4gyLBHdsSarzZShxjBM9DIFsF01DoRAHcHbcA3rltlBaF uih4X/+Ib5N0X7cjXg8gOkLrdD79fPDFBpQAMjO/0Dw/s6px6VpeVUFSNR3Y8OG6M4Na Cjw0KNfXbLzCPPi4Hu4f3r6RJ7RZyELFuVk8LZdKG++HDJr9kndQcflLfw9y0eNSA9nS myh+S8SltRDuOEyMpb5Wgi0j7ReQbc+6gl4QxZn4vxXbcxu+l9ef28xmyferTSidXUb8 qzz6YaNOY+nRT/dqHpqPT7o9rkSZ78si91HJJEcE8uWyulqb9M8SJ8SQHNLx2wZdMxfe 1aew== X-Forwarded-Encrypted: i=1; AJvYcCVqnG4kOQTkI0jSmaUACw+Teq2cg7HFtEZdD8Fm9nIDFF8ICr5eq10qsy7G7J497z0J3MxAbJs47JxnuFo=@vger.kernel.org X-Gm-Message-State: AOJu0YyHp6rMNNWjCwrjVkYkOfq82VlKxOsTJd9pkcFNBkTZxlM32Lia GfzpFslBHeHjeISl9NolnSwMWwaS2ODrMRFID0h6oo4qK5M0EGcEr8iu X-Gm-Gg: ASbGncsDl6WnUxmSCw2sRJ+qpAb/n7Vx6B2a9SKqVzY6is1t5lu3AgYzbmZzuZ4Y+5l /TL/wOiiWljLNlktOMyZwb6KHMX/xWgkdta1ltnCmXE64kU1V7IJGOtQxvo4mSNUBKDz3IDe1XH tdm+gAKXPT38wbUd7PpENcXdAXhy6ADIdij6wwt1VPbOwzsMf++Wpac8mjcpw25LMlh1J2FZWhX zlU79C0ICv5qlDO7UXU7UgMBiyKqY4j4Blxx0kHLajcUTrNO9xuv4H1aFzyiYW2zn6S40kR6+Gc +d0kkinmf7ewQhOUAMb01Djf+8DPPqwGYaUWvCJ7ddio0tTvjuJ+8w3ajWceVFZ/dF+F+KXOzip Om+qpbLib1cN4sCd43CLb5KXffCLGayOH5K0= X-Google-Smtp-Source: AGHT+IHxxIKU/QIpfoYKZ0n3uAme+aXwYNKL+iOjBsrL24sOi0np0inqG53vPvgoepOoAiJuoI8BRw== X-Received: by 2002:a05:6402:5252:b0:61d:12df:75c7 with SMTP id 4fb4d7f45d1cf-61d26ec99d9mr22274475a12.35.1757092059851; Fri, 05 Sep 2025 10:07:39 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:74::]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-61cfc52a886sm16601824a12.43.2025.09.05.10.07.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Sep 2025 10:07:39 -0700 (PDT) From: Breno Leitao Date: Fri, 05 Sep 2025 10:07:24 -0700 Subject: [PATCH RFC net-next 5/7] net: ethtool: update set_rxfh to use get_num_rxrings helper Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250905-gxrings-v1-5-984fc471f28f@debian.org> References: <20250905-gxrings-v1-0-984fc471f28f@debian.org> In-Reply-To: <20250905-gxrings-v1-0-984fc471f28f@debian.org> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , kuba@kernel.org, Simon Horman , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux.dev, Breno Leitao , jdamato@fastly.com, kernel-team@meta.com X-Mailer: b4 0.15-dev-dd21f X-Developer-Signature: v=1; a=openpgp-sha256; l=2167; i=leitao@debian.org; h=from:subject:message-id; bh=EVX3rLFghruPiq1XL2IrD4i1q86cWmPVrWJL5Cu3vjE=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBouxjSc+6vRRhaibZiaSOjhLELTodvncDUilHJ+ FBe2U6tnUGJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaLsY0gAKCRA1o5Of/Hh3 be+1EACroSZI1BBv4XxZsn+FEIpg9NWuRhLmEM1e75InHiQYW+gHjqX+hAqa/8ayxNwa8prtAjW BInXgZrEm1VBgbtx5CLPh1lfSSOJZ85EFuKMVPu2CoY3W0fjSnT8BhiKDJIPcr+dPUl1nYVUFsD g1c+2/gYi+cjq82DlhRdy4ysG/RpLO5gLXmKJZmDneabzwGUgOGthxaL+n29AIBfrbj3ybUyAHC Fmkl255MxdhnTMe+aoWmamrPYHW0ILAHCFG2edAO3JzeT5FCKhrXt1JoevR4xu/1q7Tj8YbdYyb abSIqG4/70pcVKl73ltckBxA7hgNi1GgjclzuovapA+poxho+Yd3OclQmkBEsjAvPbAu3o/HBnL HonGtzOswXL48fvFl0XhPfeCvf5ESHM3extCHKwDZ8z7/dL3qssyQQrmO10fyhNmUCW9Lv+f8At D8I3D1ETHAVGwJjd39ulNFk3g0pAfBTfEb57MhvUa4peTiHcug0vqNcR3NnjQWDlODgVAXXTyH+ j2LqeS1bGpHb8loywJGhLaXjFtRtvIiT2XzpObeTymL/Qk/R5JHQcARJ+L0vRZjqMpZIOnYRvkl jaG3lE9rhWsQ8yKgXhN9Ck2UjZiT78vssED1QCuDZh6i4lBiPx8+r1ij6sfAP2RfKO/GolTthp8 r/zvaMlgWVcf2yA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Modify ethtool_set_rxfh() to use the new get_num_rxrings() helper function for retrieving the number of RX rings instead of directly calling get_rxnfc with ETHTOOL_GRXRINGS. This way, we can leverage the new helper if it is available in ethtool_ops. Signed-off-by: Breno Leitao Suggested-by: Jakub Kicinski --- net/ethtool/ioctl.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index 2f3dbef9eb712..daab20b392f7b 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -1548,9 +1548,9 @@ static noinline_for_stack int ethtool_set_rxfh(struct= net_device *dev, struct ethtool_rxfh_param rxfh_dev =3D {}; struct ethtool_rxfh_context *ctx =3D NULL; struct netlink_ext_ack *extack =3D NULL; - struct ethtool_rxnfc rx_rings; struct ethtool_rxfh rxfh; bool create =3D false; + int num_rx_rings; u8 *rss_config; int ntf =3D 0; int ret; @@ -1611,10 +1611,11 @@ static noinline_for_stack int ethtool_set_rxfh(stru= ct net_device *dev, if (!rss_config) return -ENOMEM; =20 - rx_rings.cmd =3D ETHTOOL_GRXRINGS; - ret =3D ops->get_rxnfc(dev, &rx_rings, NULL); - if (ret) + num_rx_rings =3D get_num_rxrings(dev); + if (num_rx_rings < 0) { + ret =3D num_rx_rings; goto out_free; + } =20 /* rxfh.indir_size =3D=3D 0 means reset the indir table to default (master * context) or delete the context (other RSS contexts). @@ -1627,7 +1628,7 @@ static noinline_for_stack int ethtool_set_rxfh(struct= net_device *dev, rxfh_dev.indir_size =3D dev_indir_size; ret =3D ethtool_copy_validate_indir(rxfh_dev.indir, useraddr + rss_cfg_offset, - rx_rings.data, + num_rx_rings, rxfh.indir_size); if (ret) goto out_free; @@ -1639,7 +1640,8 @@ static noinline_for_stack int ethtool_set_rxfh(struct= net_device *dev, rxfh_dev.indir_size =3D dev_indir_size; indir =3D rxfh_dev.indir; for (i =3D 0; i < dev_indir_size; i++) - indir[i] =3D ethtool_rxfh_indir_default(i, rx_rings.data); + indir[i] =3D + ethtool_rxfh_indir_default(i, num_rx_rings); } else { rxfh_dev.rss_delete =3D true; } --=20 2.47.3 From nobody Wed Sep 10 05:41:30 2025 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40D8A35CEA6; Fri, 5 Sep 2025 17:07:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757092065; cv=none; b=FHY0qdN/J55NzJTRhx8n+x8Mb2IL9xexlRI8ita+g681YdQnwV6aK0jDMUMBiopRk1/s61EmMDO81Yhew255BNaPQj4DAITIzfo0tR4c/GSti+vAXGY17KoIKkcXRPaTla9009wesVPHyeZsYH+C8i3MHlOvEuPHZtjzO2ysT1Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757092065; c=relaxed/simple; bh=sroc+RppV1M6H+TIsJKRX7fAwebQ6S9cC3k5ypJgaso=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ud1llj9HTgK06QSNJJVX8EjXibqjBzuMHmQg2wzjMwvt4l0mXdylULqJHZ6snQYc3tUSyhcyhstAxq0sE03MA0f3poDxkLYIlASpwd5+QtkUf4Jz+v3fZn/G4JrdEY+maaBQr1KHlPft1hupKviZX3InfXi8ZCayvi2cgDKOy2E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-b0454d63802so399152666b.2; Fri, 05 Sep 2025 10:07:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757092061; x=1757696861; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WB27QbpegxH/pdun83Mbz494V3PtsHtvy0S+yeujRvY=; b=CmjNP5r4eG4sfHICvAa4dWwO8BbOuaExEPoJfFgLrTU5w37vcFgU1rsPGXqk78/HRJ BD3uUXuPppUHwkbSKAWozVEjoK/C4oinNQmxKQGB4B85VQ10dtSXMYVNnmaC/Abi/RGi PiSVr99uuqBdzegMxOtCH2CHvihu9cz0YlIlurO5DpISApzxC7Rr2KOm2hni5mFAD1Um QsGLXWEXouE8eZAKddB2cRXoW07bUhZv8kshaCXMLTgqPltVdiMnUU0f5g8EA5IJIUC3 a3J9Mou9IWHDe5fwr4J1UgVyNj5QZ2iNPG3du6t/ehgsu4dF5xB3uJhjQvWTo662jPDI x2JA== X-Forwarded-Encrypted: i=1; AJvYcCWJdZE/CZU9mvG5LYjxzsy70tp0E3/WtD3ALRVBBjwzb90w739MZSPNuTV4xRpI+/PjuFfoh6JFGP+qfac=@vger.kernel.org X-Gm-Message-State: AOJu0Yy64FxIJG5StBbUi9+aKR/obj9hheCMwIkgDk9Dnlq09V+vGgEA ROOsP22rvOPv4PrWI1bPqknMGTa8qq3z5s/lKhAjsgSka5jKc8vXgMHr X-Gm-Gg: ASbGncuXq7eyaJaJIxMaWSWSSPx3yo5npBlqnOl6VfwRsuBj/1TXVGrCwxYVptIvMGQ bm2Cd1VrAinMm9M1eEznJXMZ0t6nUVaZWZGIEyhZSeIMjrEchAYiH6YYw+cKnJw/JmSPiuWScNR mDhO5J59SXFMexKxdWcsaz7sYL+Lr8wxl6DCB272jwibAr2GpxKrrwpBIFoG5YR+iW43/kOIXVf htIGDwlUk8RSXdw7WsQOEQ2oyisxXb9t0GZvvhBa/SoIIMRd8SM1WtLpZnfQABgAYJ7JV4RToGN 6J8mHCqyj1t+4JG0GCwC0Dq5gqpV9KLEEPmgwtxyJ7F2+gsS7lii9oo9BAuF3iA28UX1buZw48+ HHW2W58JnYtlUNA== X-Google-Smtp-Source: AGHT+IEkBpUVtO8y7z6mSS/qOlXkeoTLptQaKSdIMGlkvuGLpdfe1FLEyTDL49ho2pOVXAdSfYopkA== X-Received: by 2002:a17:907:2d0e:b0:b04:708e:7348 with SMTP id a640c23a62f3a-b04708e75b4mr1064208866b.30.1757092061372; Fri, 05 Sep 2025 10:07:41 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:71::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b02152cc1b8sm1602638466b.36.2025.09.05.10.07.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Sep 2025 10:07:40 -0700 (PDT) From: Breno Leitao Date: Fri, 05 Sep 2025 10:07:25 -0700 Subject: [PATCH RFC net-next 6/7] net: ethtool: update set_rxfh_indir to use get_num_rxrings helper Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250905-gxrings-v1-6-984fc471f28f@debian.org> References: <20250905-gxrings-v1-0-984fc471f28f@debian.org> In-Reply-To: <20250905-gxrings-v1-0-984fc471f28f@debian.org> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , kuba@kernel.org, Simon Horman , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux.dev, Breno Leitao , jdamato@fastly.com, kernel-team@meta.com X-Mailer: b4 0.15-dev-dd21f X-Developer-Signature: v=1; a=openpgp-sha256; l=1775; i=leitao@debian.org; h=from:subject:message-id; bh=sroc+RppV1M6H+TIsJKRX7fAwebQ6S9cC3k5ypJgaso=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBouxjSKU6lgNhuZGo6wKBMO2msYpL2/Fa+SIRns 9e1AD7gvDiJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaLsY0gAKCRA1o5Of/Hh3 bew6D/9Pxn6a4MJUgaAelp2Jvwf39pM8Cp8W1AfGBj2lmIJbg+j4d7oNHtxRxq93vaGnnZK9gNb 1Qf2MAc4m2wx5er2xyEYEjvm3g6H3ntp0I2ZEbxzN6pDeGfHEKx1nRvKuw9DUqepUen04/T+BA5 XmciqjcDeOf9SBvjqnlMfnrNZo75xeKq5T9uyg3Zq3vZJ9/rz7UZm9v36iq1FzZxJ4DoTraBbLR g6Ln6iXJwQoxaa/1aHN17NzOAZ4opKuyXEJtpX8E+ssxnKOIn/w6ArSGP3YUjxu4FPoLZRBUc93 ibavi5cAVk5GR6GZfEDe8Yud2x/zstGRvDthHqLdLZH6D/h2MeyrY8Cggn48tqLFNmKacsuAmVC zZrxPZizGYlZkgi1aYhHjRXe7MJbMsuK73uX/OrhuYefH7BY+TqKpmaciFGd4UKCU4QXx84P37j 1wWrSISGeqqmS+978jiGO4mtIS+0qLafPE3dJPTOMIQzDc7gnXrPTMH+FJwOGvs9hfHG236Y5p2 jZsc0b8GoGeMdTx2x7ZMu185VKB/q5u+OnpCNN552wOUEDvsS1GTJ7XUxUx0JXNB5R+pSzlH6t/ ewPRoYQ0muxDpaMVFf8kjYW7E0cps9uFf1lVL4FdQnmT5BRzaMDhbinkqHRM9cbk2AGYkiEV9qR 3zKVJ/ClWzx732A== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Modify ethtool_set_rxfh() to use the new get_num_rxrings() helper function for retrieving the number of RX rings instead of directly calling get_rxnfc with ETHTOOL_GRXRINGS. This way, we can leverage the new helper if it is available in ethtool_ops. Signed-off-by: Breno Leitao Suggested-by: Jakub Kicinski --- net/ethtool/ioctl.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index daab20b392f7b..b8d85bba48329 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -1367,7 +1367,7 @@ static noinline_for_stack int ethtool_set_rxfh_indir(= struct net_device *dev, const struct ethtool_ops *ops =3D dev->ethtool_ops; struct ethtool_rxfh_param rxfh_dev =3D {}; struct netlink_ext_ack *extack =3D NULL; - struct ethtool_rxnfc rx_rings; + int num_rx_rings; u32 user_size, i; int ret; u32 ringidx_offset =3D offsetof(struct ethtool_rxfh_indir, ring_index[0]); @@ -1393,20 +1393,21 @@ static noinline_for_stack int ethtool_set_rxfh_indi= r(struct net_device *dev, if (!rxfh_dev.indir) return -ENOMEM; =20 - rx_rings.cmd =3D ETHTOOL_GRXRINGS; - ret =3D ops->get_rxnfc(dev, &rx_rings, NULL); - if (ret) + num_rx_rings =3D get_num_rxrings(dev); + if (num_rx_rings < 0) { + ret =3D num_rx_rings; goto out; + } =20 if (user_size =3D=3D 0) { u32 *indir =3D rxfh_dev.indir; =20 for (i =3D 0; i < rxfh_dev.indir_size; i++) - indir[i] =3D ethtool_rxfh_indir_default(i, rx_rings.data); + indir[i] =3D ethtool_rxfh_indir_default(i, num_rx_rings); } else { ret =3D ethtool_copy_validate_indir(rxfh_dev.indir, useraddr + ringidx_offset, - rx_rings.data, + num_rx_rings, rxfh_dev.indir_size); if (ret) goto out; --=20 2.47.3 From nobody Wed Sep 10 05:41:30 2025 Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9F40C374292; Fri, 5 Sep 2025 17:07:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757092067; cv=none; b=bzpL/7KmKDawLIUl7NSI+LYgo7sVNmQa4v5vMy0Pp1wmWR+WTDmZpPr1i9FXJtSc94MIw/A66xqlaKxOa2qoi+sPiQXz1uBKJvOc9sx9RtQAYskWghjdnzphHKxhgcZu4GDN4miB9MtdTMxB4wLbueyTK563MltucSuvnzYchzo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757092067; c=relaxed/simple; bh=3aXidoCnjwjLlFAFt83SYhSNY9u5/DbQjFuEPX/ClMk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qUhQziS7Hx7EI7TwfbOcaOlmM3bbNnppdLYZq4Xb5mU6YsgqHiIqa0y8I5U+Z62zZ0Z5/hdNKPpP68b5WVnIx1pmYC5D+nLrhath+/xO+m6LFuv1iXFG2BUN4mVCcUp+y7u4UAgYZtXuWor8A6HSZZk2P2qwdxPfA8tgUPs2mRM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.208.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-61a8c134533so4447944a12.3; Fri, 05 Sep 2025 10:07:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757092064; x=1757696864; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hPOh83BwsxUoqeI+xJ5O/OzWhrMRpIrMTjO1JPoh9E0=; b=WChw8X0QAyFyJXC/Vt1tlQe7ixA5IAS+HQbV7dyezOCmXN1nj6bJczjrN2QWXQWhy3 Tsqqra4jHcyCFAjxu+qZLdRPlX+rBLnXoMzewWB/aZIUdVA9VXcSjlnDZqinGT17GP2t XXsplGFYlXhDEKPadEgXLpThwQrc3Iw+zgettKiyIzvJUqVcCX91pNVi2/zVjQfRm8dW x7zUwiQdv6CEavLGKs3P27ZXxpTAXu1ttJrvCEdy5UGwzNLwmiXa1iXk1mhDuRR7A4+F zX8w9671RCwyYxS32io6TAcQXTvzzWTFuLGd+tgEOmbWtYPYvOlDJCzO2KvPmWdvKRwt kEvQ== X-Forwarded-Encrypted: i=1; AJvYcCVr36u2Z4bxGDYxkVp28crRoDfns6Mu2ozV08qGs9FuWWtNBV03bcx8K9XozNIBvBdJ0hq5V9ayInbd/KA=@vger.kernel.org X-Gm-Message-State: AOJu0YyfD7IDG+5kWclfOZ0VibJXo85MHuy3V7YR4huh0cxawmdiDRAM l/NhtJR+fwa+w/uTsTBmFwpWRfq+z9q5r/Xp9r/qttx2GVYuEy2Ni7df X-Gm-Gg: ASbGnctATNBFzM9yGdu6ChxVJ48lOyVtIiLg4lh//wixrenyGGm313CHu0Zw1b/8nNm 7WU8nODX5qXNugKsSgkq/W43Tq2WkvUcPNphE6QBWQ1cuTFWBrnRYp30TY8d8Yx+H0AGhqqJH3a gLipml80ERbIh5P8x6LU+CIUS+fiXIDWwT4yr6PZQ/8ZuQyH07XlmjmdKFZbKzvqA+miiI7N+wJ 7svu7sh/OXJIKB/RIMmbswoUT/FX9z5v0PKF9p7Tmygk2MlwpkuKBnvapMgYV4zP2lJPpmjOmuy 1O/R5zI4BB0uylTASzupJA8foUjq5YnQHtJx8wFne1u5mvUnK3RA/G12ChDrinVpLCZnlobr9Nk q3WR0mHnyIOJNmLquCJgu2972 X-Google-Smtp-Source: AGHT+IFHB/021clnQGQ9l2V/ebhPpnhyDNv4aANIU9IER24mAVYd7lakHWEK5C+0sF2ladD2UZSv7Q== X-Received: by 2002:a05:6402:210c:b0:61e:a5c8:e830 with SMTP id 4fb4d7f45d1cf-61ea5c8e868mr16151197a12.1.1757092063706; Fri, 05 Sep 2025 10:07:43 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:71::]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-61cfc1c77d0sm17028678a12.11.2025.09.05.10.07.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Sep 2025 10:07:43 -0700 (PDT) From: Breno Leitao Date: Fri, 05 Sep 2025 10:07:26 -0700 Subject: [PATCH RFC net-next 7/7] net: virtio_net: add get_rxrings ethtool callback for RX ring queries Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250905-gxrings-v1-7-984fc471f28f@debian.org> References: <20250905-gxrings-v1-0-984fc471f28f@debian.org> In-Reply-To: <20250905-gxrings-v1-0-984fc471f28f@debian.org> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , kuba@kernel.org, Simon Horman , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux.dev, Breno Leitao , jdamato@fastly.com, kernel-team@meta.com X-Mailer: b4 0.15-dev-dd21f X-Developer-Signature: v=1; a=openpgp-sha256; l=1593; i=leitao@debian.org; h=from:subject:message-id; bh=3aXidoCnjwjLlFAFt83SYhSNY9u5/DbQjFuEPX/ClMk=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBouxjSrAs1Sm+xxMdVGyejtHHGgv9lU+1AEZcr8 HRgIm5+yvKJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaLsY0gAKCRA1o5Of/Hh3 bSzdD/9VZrqjup5ByMvV1ARdrXaNOQAT0EzCwe6eGJSqbeLxU6C5ECSqaD2RYn6tKOwqGGwr0aK KNWlZc7acHG7tdwqHvzcctsE6HsC5bFDsVO7N4AdhNiZtz0b/U0FLDYas4mtVQyw68PRhffmMBX boWG8bfFtjAj4MvMwVbFlWNYsIbL/FNHgMx/7zj5pLzAWB4HFASzWEkpq2dgQdittZ05EpETn1u UMRVxB5cG7Gebm0jD0L86pan6rSQlaLr6VZDUN+zQkUsP9aO9YY99Zux7c+u16ZWaVS9AskwOze ce80xTgM9pgAz9S1WQyDCC0w1xLbw/zfZI2Y3xTUpD3oRC+QmRBzezdCnD3+6inNbf/QyNGqwpL 30d8WBTuEcCMXqKPYwmWgaEL30ljXdjT89l4Q4xyzMgGLc3WMBxLXUlFVq4AfW8JeSeIpITb/lj 9RX94ORn0vcc4wgenLBxht/1Y0JIRyWYr7JIz/CIfhlnbEl0VSaCNK0gFCMKf6u7DYpd29s5tZV l1WXHx3tdLMBIFtlbM2dAzS9eBBb8fbeh4QOju85Y4GOs5qozuuFsLZETAq1ZkJF1PdzeTWg+sP /1ig8EsSB8pIvbnuafh054c5DHfMc2I1IFr1eeVvrnu2Z3LzDJroipiBciPKHFPubblQW/PfxGa UOYSQ23i/cdj7GQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Replace the existing virtnet_get_rxnfc callback with a dedicated virtnet_get_rxrings implementation to provide the number of RX rings directly via the new ethtool_ops get_rxrings pointer. This simplifies the RX ring count retrieval and aligns virtio_net with the new ethtool API for querying RX ring parameters. Signed-off-by: Breno Leitao Suggested-by: Jakub Kicinski --- drivers/net/virtio_net.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 975bdc5dab84b..942ae55e8897d 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -5610,20 +5610,11 @@ static int virtnet_set_rxfh(struct net_device *dev, return 0; } =20 -static int virtnet_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc = *info, u32 *rule_locs) +static int virtnet_get_rxrings(struct net_device *dev) { struct virtnet_info *vi =3D netdev_priv(dev); - int rc =3D 0; =20 - switch (info->cmd) { - case ETHTOOL_GRXRINGS: - info->data =3D vi->curr_queue_pairs; - break; - default: - rc =3D -EOPNOTSUPP; - } - - return rc; + return vi->curr_queue_pairs; } =20 static const struct ethtool_ops virtnet_ethtool_ops =3D { @@ -5651,7 +5642,7 @@ static const struct ethtool_ops virtnet_ethtool_ops = =3D { .set_rxfh =3D virtnet_set_rxfh, .get_rxfh_fields =3D virtnet_get_hashflow, .set_rxfh_fields =3D virtnet_set_hashflow, - .get_rxnfc =3D virtnet_get_rxnfc, + .get_rxrings =3D virtnet_get_rxrings, }; =20 static void virtnet_get_queue_stats_rx(struct net_device *dev, int i, --=20 2.47.3