From nobody Tue Dec 2 00:46:53 2025 Received: from mail-oa1-f53.google.com (mail-oa1-f53.google.com [209.85.160.53]) (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 2B21431A07F for ; Mon, 24 Nov 2025 18:19:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764008356; cv=none; b=BH0CjMLFNPh5g5u2omDHiqt1vSWIebiynIjz0/5b78liS5GrdiRUl/81Hn2ghoPPGNxMBcXx1WOVIkPg8K4Sg6Z1894/Brhi89lZrbM0h9DnDwlCQHExpZqeHXcoL5vI/AiT4KI3RTiRbQcrBhOWv7Bwqz7e7vjX5K05MvitVlw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764008356; c=relaxed/simple; bh=+491Or4K+VhrXnrrDRxg/WQ8CB07m+mcC02v5a0qyfc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WeaGvsuSKcRh4JEbKKDZAUG5dyDAzDcW0Hp8EeoqURuIth0JiwBy0e0hrWaHwMGUgZ6lSkjcL0XTs9Ml1p3mC8u1iaw20XRn0SZvjG1HoMfzwptIvan62pOUvPJbHwvRO1ZQiayDHCw78gmbQI47JaK6+dBc/mMPxcRXnQzj3Q8= 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.160.53 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-oa1-f53.google.com with SMTP id 586e51a60fabf-3e8317b1262so5243936fac.3 for ; Mon, 24 Nov 2025 10:19:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764008354; x=1764613154; 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=fx59kZobOiLlkjIJkhyrAD4JK62swHthcfDZB+hD/ag=; b=ROyxJh4CwYUHUFYgB/CdkxgXlN++kQp2vAcqt298BfLgFK+D7YbE+NPS0WdDmdMDq0 VFXf2vcfS1zBnOO7GXz2LfT1rkdjUGPest/V5YNmlh3aR28fYXvwyQ7gGJmg4DekILjc m+NpcAK7m0MbHWQBvK9kbc6gVBj9KC70xKILu6mOwrg7ZWledZcdi0EJirxFjVVRD9OR acxbDVsHAVuvfgns4kP9Qw2206d5oDJtYgC0Yh5T20xQqAHG5i+ifVkGHp/VBUSSB5Qt 7+0TovJhYkg0r1mvczGeqrf/lQ0GMz8nJlGbG+JOoKfqItQd09osPhEDJm6cqTPnaHms TRMQ== X-Forwarded-Encrypted: i=1; AJvYcCVol6vU0KmylgKXBVXxljjXb18zHPCL2BA6D55ScHiRnwhnDcahqKsnTf7Jth6AAKljk2XSAhDC+opL3u4=@vger.kernel.org X-Gm-Message-State: AOJu0Yw8MV6HXltpQKtdy6pGdVYBBxsUj7Q3B3v0gyncgm1uTh/MOEIR j8ENN+FBw41oUDkNiZ3rvc6qfZZ/mpSLu8Osce0KK+Cjcn05LPstv5gB X-Gm-Gg: ASbGncvT/+F0z0xzAKTkStPfRsnTdctyKqxYbj1JVwXFa45S/HuZV8Hqx3dh39qj5na 0tDFzbTXJ/lZ/LF7P2kfkPiiGfctDIJPSndt+wY1czBE6QNZ6EJgcx7t6FkLfNN/gM2g1HwaQjO mMz8LjJqQn2TOjhAl0vkvnBHLUvCdC5+qTYi5PFrr/ZPkF9ML7FYTWz0Mlv1lurJd5zf3eLsA9A n0WIziAYf5CgI3rq7pTADZl+bGVPGovW+V38gMULc+oWvh3BPKlRtwcNQ3InownYIFZmaD7T2+Z kNW5rBj3f9ybmmf1NekuDzBAPveOf//HqRQdCsuT2Nm+p1BblJKA8Q7BiA4XoQo/jM6xMrJxQvL qfuXkBqfyDxk0UeS22lzw6StI+EbbL14h9IasF3X6TuwPW0oF8/IsFkpgmXnjdzYU1qzKwyIMC5 V9k7EcNzVEgVrdcYJ3DaiS6Jk= X-Google-Smtp-Source: AGHT+IEwktVlSteATKeuEe8h/9QjcpnuzOQ2EefOvhCo3grua4HzWEU7FL3f7+OF8FxvOlsqkr/Ozg== X-Received: by 2002:a05:6808:6d85:b0:450:c09:92aa with SMTP id 5614622812f47-451159c8719mr4723518b6e.12.1764008354294; Mon, 24 Nov 2025 10:19:14 -0800 (PST) Received: from localhost ([2a03:2880:10ff:7::]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-65782831ed6sm3739360eaf.0.2025.11.24.10.19.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 10:19:13 -0800 (PST) From: Breno Leitao Date: Mon, 24 Nov 2025 10:19:07 -0800 Subject: [PATCH net-next 3/8] ice: 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: <20251124-gxring_intel-v1-3-89be18d2a744@debian.org> References: <20251124-gxring_intel-v1-0-89be18d2a744@debian.org> In-Reply-To: <20251124-gxring_intel-v1-0-89be18d2a744@debian.org> To: aleksander.lobakin@intel.com, Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: michal.swiatkowski@linux.intel.com, michal.kubiak@intel.com, maciej.fijalkowski@intel.com, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com, Breno Leitao X-Mailer: b4 0.15-dev-a6db3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2097; i=leitao@debian.org; h=from:subject:message-id; bh=+491Or4K+VhrXnrrDRxg/WQ8CB07m+mcC02v5a0qyfc=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpJKGdlls4uF2OD5ZflG+F0iwa41aeAgQ4Ihuwn hGFDZDhfa+JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSShnQAKCRA1o5Of/Hh3 bb0ZEACJSTnwfdl5b4X6VciykMnuVqqwIXsWYeW0iyZYWA9qWLshkLMVysv0F6xh78Fa+xLzn7H AmrmhIacyMhiNi2INrkHO2iGdkP9/KbDFMCg1Pheai7btan8XjGK8+DSdrE2zabVLtikuc38322 4muERaehJd1zzkYBhkWXRlruHYk4EvVFi9EYNsaeKi1mVaHdOLaXIWtW4jpKvHdowexCoGw8xkE N6bOLRzAE8qIi0B0p1ojfNKOikTbFFYlNBTurzKhGdMZb7ZgECg0tr9POBJvFwyorAiTF3lQ8hq AqoywzO1XZ7UvngnxRVrvpzxyJfU+a0AmUZHZaf2cEVLpNpms9mW6PmAdUYmee97ZwySLpRlMBc dbrxZEHwuB/Zie+8hy1teQ7vqb+w8c7H1bmqiFBw9gJI2HTtncCHJXJX5yPMe4hYmccwvm6VERg hs+c8ong69DQniXIgykU+jXCmT6iuD5LzqvkkuCq/dQgnWu/51pYcWr8oiHTnHNaKLkkBlfHmSa EnB8iDRFWjq23HhYBFbCQ2zSjZ5gvmqi3eq5szqZB4VDtg0XDcpGDerMz4Sm3wP0OREancJ9R2B HTfzJy35UWSwPFwyX01b8xXawoFKvDSSKuXf3ibTtaoaF7G6UtOzBBMClWonAanHisiUArwbxgx K1QAoeOOOkg3fPw== 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 ice with the new ethtool API for querying RX ring parameters. Signed-off-by: Breno Leitao --- drivers/net/ethernet/intel/ice/ice_ethtool.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/eth= ernet/intel/ice/ice_ethtool.c index a1d9abee97e5..adb6e10ccb1b 100644 --- a/drivers/net/ethernet/intel/ice/ice_ethtool.c +++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c @@ -3083,6 +3083,20 @@ static int ice_set_rxnfc(struct net_device *netdev, = struct ethtool_rxnfc *cmd) return -EOPNOTSUPP; } =20 +/** + * ice_get_rx_ring_count - get RX ring count + * @netdev: network interface device structure + * + * Returns the number of RX rings. + */ +static u32 ice_get_rx_ring_count(struct net_device *netdev) +{ + struct ice_netdev_priv *np =3D netdev_priv(netdev); + struct ice_vsi *vsi =3D np->vsi; + + return vsi->rss_size; +} + /** * ice_get_rxnfc - command to get Rx flow classification rules * @netdev: network interface device structure @@ -3103,10 +3117,6 @@ ice_get_rxnfc(struct net_device *netdev, struct etht= ool_rxnfc *cmd, hw =3D &vsi->back->hw; =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D vsi->rss_size; - ret =3D 0; - break; case ETHTOOL_GRXCLSRLCNT: cmd->rule_cnt =3D hw->fdir_active_fltr; /* report total rule count */ @@ -4853,6 +4863,7 @@ static const struct ethtool_ops ice_ethtool_ops =3D { .get_sset_count =3D ice_get_sset_count, .get_rxnfc =3D ice_get_rxnfc, .set_rxnfc =3D ice_set_rxnfc, + .get_rx_ring_count =3D ice_get_rx_ring_count, .get_ringparam =3D ice_get_ringparam, .set_ringparam =3D ice_set_ringparam, .nway_reset =3D ice_nway_reset, --=20 2.47.3