From nobody Tue Dec 2 00:25:39 2025 Received: from mail-oa1-f54.google.com (mail-oa1-f54.google.com [209.85.160.54]) (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 8FBA9231836 for ; Tue, 25 Nov 2025 10:19:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764066000; cv=none; b=QmR6VyJSxtIknQpl/DZ2MYT8BMoF9fYaWeLOTbgU59D9jetzw9szrO//OSrjStqmeXBmA/JozAXnHrpBcafbtn7zsfvYHwwscaPHnwLinZAPq1Wx0TDv0scu2rr/51gdfjZiLeMboyTiMY9cQuonYr/GkOiR/j1Io/oBV/eohHk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764066000; c=relaxed/simple; bh=xnhB3QD/pUGnQrTJXaBFG/oDYpB/BeGm+/VZM80nzu4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=F7NiC/2b88i9sVnkpqyVgJNqC969oPQMn5aejN4Vbp1Fj97qTyHSNFfLNIodjwsR3sLzB8Df9P0ULsVd2dx+ZuZ+c25BzZDEHP1BKFP7mT3nBEHFavG8pp/jYCZ9WxFZS3lzdhgLpzf4RNpK6TSa7+fqJfAQh4vBnmyKIV3J+2w= 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.54 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-f54.google.com with SMTP id 586e51a60fabf-3e0f19a38d0so3396039fac.0 for ; Tue, 25 Nov 2025 02:19:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764065998; x=1764670798; 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=3ul0k1GgM/c5rCraOnK8Dvxg0D7FDaM0Ol4h54SDXmY=; b=glDMJZR3iZUOSbFjEGiyInZxm7LbffSxoRiLKG9pBSGnW2uOPfQAganpNafQhELOYY Ztu0HTQnYzDUzl9gpcC4O4pFuEjG3awp9GzpOj7zLujlCYQhk87iOfeBLvExkiEtoXlQ nygMoAE/1KyTA8Mh4KtxO7McCMOFvpm2S7JDCgXa9L45meUjBCxaLuE+a+TqaeriwdN6 nJT8M6oNNcgEhlEuk34SAwCiLXt3c9U8Ui97NwYHfq06F14f+GcyjA2UrcM0hFh9aHek Naaw7mmS7C0p0UYXvFB1J4nPxK77+412zRvVk77mZAP3WI8hKSsqw8Rd7LKNL9/T+zwj 41vQ== X-Forwarded-Encrypted: i=1; AJvYcCUjcZXS6XTatyR2W7sPVLCQyDnKLiGYG1y06jSj1sOIt127nBWTXniDzugVzWW1sQ62H5kJdQ7NA3J4sHE=@vger.kernel.org X-Gm-Message-State: AOJu0YxCxMssOSOBg+mEa7TcIRKeOaDPTv+qC7J+wYf5/tES+VrfF+iH EfWp7W7dAopeYxUvGoYggGxkKwPbmHSyp6Ciwi5ElfAH4qILg2wCd6cG X-Gm-Gg: ASbGncu7YUWxoNyT+mcBM5qRyb0hXayic4cshMmDwTLXQRCEyXTUwMFrPuAM0NgApZW WDpJgCURFcmZR2+xW8PvmHmSGj8eJSwkcE6uQlW6I7GkR13reBdLbLCg+d5ve5AyAqEOpfB4kIV NEnhgP9awYmzB4MNh8sMqECbvWrjmKKNf18hXyRoOdOHdtYdPDuE3yk136X1+JYiPa7mmYILojx eziuM5k8s33mCpejuOP6/3Y+wuPW5IYDf6G7+tJixvP+2xe0/5BRS5LNRO073GoMvau3rHrHkV3 AZTh5IoaKqQobBu5YvUfWERSjSgkziD/ttLhk18HBN7i+vbSoffDUy2EhsbzgsejKIBV79aCXQs z9mOqvO0DNqTEjcv/1DnBu7gjW7uVkGqFJTGXkx/688R8/XftKu0QG71Gi3soBw0Q7oBXPc/kUG +kJmwxWd4fbVQg4o5UPoUIFqQ= X-Google-Smtp-Source: AGHT+IFtyiOuX8iw1pCACYNN8QG3Yfj2mFNz7FsdX3NPuCOLpPFhjIhc24EJOKd6na0bNrNHM798PA== X-Received: by 2002:a05:6870:70a4:b0:3e8:973e:e011 with SMTP id 586e51a60fabf-3ed1ffd81b2mr1082088fac.47.1764065997707; Tue, 25 Nov 2025 02:19:57 -0800 (PST) Received: from localhost ([2a03:2880:10ff:6::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-3ec9dc8e103sm7393177fac.19.2025.11.25.02.19.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Nov 2025 02:19:57 -0800 (PST) From: Breno Leitao Date: Tue, 25 Nov 2025 02:19:46 -0800 Subject: [PATCH net-next v2 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: <20251125-gxring_intel-v2-3-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=2161; i=leitao@debian.org; h=from:subject:message-id; bh=xnhB3QD/pUGnQrTJXaBFG/oDYpB/BeGm+/VZM80nzu4=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpJYLIarQOjd6mqF5tJPKnLM4/NSSLPVvrfC+mv DN4vMU/f9GJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSWCyAAKCRA1o5Of/Hh3 bV1TD/oDDTNgkychPS/hc0OyTMeB+NP0a4nHhkbxqBQkDc9MC7hz8QGJNE8ZGTmo8wAZFarpJjK XGSGxwl6f7QnLSx9FbyvhDanDz8boT5Hqptb0ONXknk5cFIl4lSJ3T8oGNdya40mc5oD8fPWkzh aGrSBZFkl1FyBnJkDflgBYfYwzuoC0kiGZ1rfQqLhVAW1V82npC4c7OS2RCDcJ7gvyb5FDBKKyv 582a6QflL/QwzFjOBgqfFrGzXrkm4tTn0qL2jfkc7/BQX1I7ryUjbbczdk8M1tOCU7Sp7+cbCvg HsK4nIp2SVtC91B34qC0eCFF0Pqcp6TYpRAxAVqS58/nzpmka5xWIyrsfzM5t3Xh/nNzOXlyOP+ Z0ybXcOGTW6fANvuzAO2SkRYgWRzUr7BQI8bbza63e5tiUXJByTp/U7bjOyEtXUk4jSs82c0e2M Nktj/eY7KlYtAERe6988DtUeSk+uK+qE+FocpeDTfuwWt8OR6qdCjUXCN0K+wtEa86E/922Pq0O iXVqN5XfxyRdAiKKgr8BT2SL99pN6Li1cCa9r+u/ML25RhrNmCtchsE7uul07C+Dt+VDl44VHy1 zDJVOc5jEROWD2MglOOYxLjY453J0yIQjB/cZ5BHUQdqpdimYaQZ4aZIK9WhCYJxFhHl2c1zvCr eUFn/QhPrDrhX3w== 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 Signed-off-by: Aleksandr Loktionov --- 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..969d4f8f9c02 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 + * + * Return: 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