From nobody Tue Dec 2 00:25:37 2025 Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com [209.85.210.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 AC9592F28F6 for ; Tue, 25 Nov 2025 10:20:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764066002; cv=none; b=ob7RnSiqpMhyDseuplb7pohDMq10mPj8S6c0JTBkI7z9ct9OQQSQLIRTeaQN77dULGn/Te5uZtizjNB0VzE5DD1bsu/0adk0q4Jxs/PbY2eHfMC1fKUnVPswzZ0uPcC4kk2lTrdDsyjRmOJ0M7JtdjgUtSQ3t0nucycavrjQg/M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764066002; c=relaxed/simple; bh=hVEX4eVAfWJb5W2oFiVN1kQa1CjAK6kJPi2V6F44wTs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kWKL3CNsXHBr6iE7Pq8tqeQWxkFLcPfM2HT99DB7OQzQxFzmw1f46k7HCNMuDJAPVpP9W+CeCmPsVfL3RwWNr57NF5Rurc5h5evW9/fnBEaxXsqPsjWSkT1zYOXqGG8IQ/gQKEi7Wod6Lgm/mqOUDBrdQTxAfxuFMEAQGk9FzxI= 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.210.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-ot1-f48.google.com with SMTP id 46e09a7af769-7c704bdd57aso2377675a34.3 for ; Tue, 25 Nov 2025 02:20:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764066000; x=1764670800; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=h8v9/WTizrePyr3QJeAH1/2LNaWTwWj5f0e5cWpR0qY=; b=wiSdIZPsnVLYFqgr8mZi+9PDBGeBkBgyDCq5QS5NzZuFZUeVxmtQ8bl7qZalXLeMSa CP0QC3zkuQJPmFiZA66YUYipthWWUHgCT5ezbZ7CdEU3Lr/z65cxeIxn0kyDDvXn5Q1v ogAhBKNyVhnRgumgrbM0BjwikGrI1llXxlfe2mujnrsBn+axea0dCkixFO+eL8kOaYcs SA0n5HOC15NfGTw7i56m6Kuyy70clckg3xIhVO1JKu5u0cMRu/X7KVHa8nOIBnYTjwfM U+ZU7ZPGuOUDQwRQHPSIltXP3hxC36Dps++JtThFgXJFXnxpkst1Ck4JWBrEMb1n50po FVUw== X-Forwarded-Encrypted: i=1; AJvYcCVIJkTwWfRmJstxtMFwSaH9MnCdKbY2Y6DrSAhep7VUcJSXg2rB3b6TFzTIGQ7VXhhSM1rXayZiajfvU1s=@vger.kernel.org X-Gm-Message-State: AOJu0Yx6pFEIEGdc4toIWH3AJiGCL5+MN5scidhg9NgTPYRIJ2o8zGdZ oKNzOdBgSsuSCwh2WyTblKuyz90ov/iPiew8jiZ5FQhkY5eaZC6SqopU X-Gm-Gg: ASbGncsChyyA7WRhM6Fe06KTNrNK2BxMuIuXATFdRyb9MvtDbN/9CD+mREH5qr1wO1z P6yrWValplGU3dNTVa8FBH0aCjtjIVXfCXZ44C+UpSaTFCC4e40TtnCGqUTQBxK2/ZKkhFUSYAn Y1EABl3S2/CHMl8cF9hbBRqM2jOvviA5OVqx2rsqW+Kfe/dwIuKTRnLf+vUaBKXFwJ68C9BeRfq /BBPnh/R1zL2q7t0I2rNUnVJnM04A4z/XRXuhjdx7mnrTI1u3PPotQ0dRANtn6fTiPZbJ72nQUy J21M4wynhyBJ2+mExaeEwwN1CvtBRmdpWajV9RHYIjtvxEW745Gl5PQH1sDETLMIRkIReAg6u2Y UeAxtouRNMweun7Cu152BMqpwT1qp0iKxDNGvWuMnI8pZmoIPzV7WG/R1HF5b+Qf3sfttl584qv cLkmF2gpqWTODJ X-Google-Smtp-Source: AGHT+IE6t71uMK8vJhUZf3a/GMa3fQepPfD+FiI5B3hDu2dvBBm1hjM9xvNb0LamgEBtLV3ur2SqXw== X-Received: by 2002:a05:6830:719d:b0:7c7:62d0:b462 with SMTP id 46e09a7af769-7c7c42b680emr1199371a34.6.1764065999790; Tue, 25 Nov 2025 02:19:59 -0800 (PST) Received: from localhost ([2a03:2880:10ff:5::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7c78d3e2b43sm6139322a34.19.2025.11.25.02.19.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Nov 2025 02:19:59 -0800 (PST) From: Breno Leitao Date: Tue, 25 Nov 2025 02:19:48 -0800 Subject: [PATCH net-next v2 5/8] igb: extract GRXRINGS from .get_rxnfc 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: <20251125-gxring_intel-v2-5-f55cd022d28b@debian.org> References: <20251125-gxring_intel-v2-0-f55cd022d28b@debian.org> In-Reply-To: <20251125-gxring_intel-v2-0-f55cd022d28b@debian.org> To: aleksander.lobakin@intel.com, Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com, Breno Leitao , Aleksandr Loktionov X-Mailer: b4 0.15-dev-a6db3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1909; i=leitao@debian.org; h=from:subject:message-id; bh=hVEX4eVAfWJb5W2oFiVN1kQa1CjAK6kJPi2V6F44wTs=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpJYLI5QoXS9+mJwT5CIZcE4OlmgbGwG/2mdjWe 58PXeytql2JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSWCyAAKCRA1o5Of/Hh3 bdCiEACSgNVB4KN8Azh7hBw6ckkRbrThhhx63ZWDCp6/YNvXnsbqJv6nKQbUfQXQ0jWDda46H/I XrH/JxD3zH5O4vH64EbO7Y57egV7sgm7WgFNu21smSBNN3ccunDTmlUJqIcFCwZ29uv0++TMx0E Lb9fXt3hHjuwu6Ovvc/7aSuycpBQzCdLLlOToTQp8UXzxgKQFT3L6MMQDXt3Tyb21QrzsWmpI7Z sEiZq8i/9XJc7maUllQDm20RtvIUkwRarwPwsbdaYF5flWor9JjupY9G0AbcACExt+zq5IntXIp T+/+F2SNaXz2PIBf2rRoMsc8fFyv129QxIS7Ht8hzvju8Sqv/rVF/JQ1mA1OfLaXkDL97UfmB7x o0DZjOLwKoAg5V2ZlwbSmUJiIyv8x3SfrDU4HjIdm1Z+qhC6thsjk5gN03RHWTQ/IZaRzIFCv30 G+iw20MZ6VQD+wku+OUqer1c//4H3HPSNC/KHx3VEiAk3u3wuw3UUt3itze90/EMF/bs6IZo3Y2 w0u7dND+a0OW+4cF2F/dt+gaB0wzP5Sq5bIKgxtVHe5MtBU6f3IgcoDyQIbq3OqDmxeBPffFtl1 j1ywp2RdAjRBR+A2PEZCVK4DKJydD8Mq4SyLygWR62gfFefyPLa5uDXmSnahWXIGYYa0I0+x9X8 6NHpyZBi8i9YOuA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Commit 84eaf4359c36 ("net: ethtool: add get_rx_ring_count callback to optimize RX ring queries") added specific support for GRXRINGS callback, simplifying .get_rxnfc. Remove the handling of GRXRINGS in .get_rxnfc() by moving it to the new .get_rx_ring_count(). This simplifies the RX ring count retrieval and aligns igb with the new ethtool API for querying RX ring parameters. Signed-off-by: Breno Leitao Signed-off-by: Aleksandr Loktionov --- drivers/net/ethernet/intel/igb/igb_ethtool.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/eth= ernet/intel/igb/igb_ethtool.c index 10e2445e0ded..b507576b28b2 100644 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c @@ -2541,6 +2541,13 @@ static int igb_get_rxfh_fields(struct net_device *de= v, return 0; } =20 +static u32 igb_get_rx_ring_count(struct net_device *dev) +{ + struct igb_adapter *adapter =3D netdev_priv(dev); + + return adapter->num_rx_queues; +} + static int igb_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd, u32 *rule_locs) { @@ -2548,10 +2555,6 @@ static int igb_get_rxnfc(struct net_device *dev, str= uct ethtool_rxnfc *cmd, int ret =3D -EOPNOTSUPP; =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D adapter->num_rx_queues; - ret =3D 0; - break; case ETHTOOL_GRXCLSRLCNT: cmd->rule_cnt =3D adapter->nfc_filter_count; ret =3D 0; @@ -3473,6 +3476,7 @@ static const struct ethtool_ops igb_ethtool_ops =3D { .get_ts_info =3D igb_get_ts_info, .get_rxnfc =3D igb_get_rxnfc, .set_rxnfc =3D igb_set_rxnfc, + .get_rx_ring_count =3D igb_get_rx_ring_count, .get_eee =3D igb_get_eee, .set_eee =3D igb_set_eee, .get_module_info =3D igb_get_module_info, --=20 2.47.3