From nobody Tue Dec 2 00:03:27 2025 Received: from mail-ot1-f51.google.com (mail-ot1-f51.google.com [209.85.210.51]) (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 0910A283FE5 for ; Tue, 25 Nov 2025 10:19:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764065997; cv=none; b=el2HX8nMlMg3w9ljbS/bk3840pYjk94+B2e4Lwi0hSennkJlsfmqSM7Yo98e1y+Uj+RpendQ7W3k8uFxRK1ybE2RYgNlAqsl3NiT3tz0hMWgi2dPGTEasGPWBONbQOuIYGamphVqpSOssIzgbepKkDzcECaA6hlvb808u7R1U/c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764065997; c=relaxed/simple; bh=3RiXWowk55zr2p2eq73rkAXHd/aJ3SITLXEDdD0tOSg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=D1oz3O3FcRI2aqu4AtEA3LL0oix3MPg0Ni0pYCeUF2KTlvveuSL8HGe1D1/zphhiLz3ItrhnQY+ijL5kVY15igalbxmW1OJ44rF+nnBDosaynN2DHPFLMSKC04KGptRTVmoGJwo0dha2VeMl54C4J+eqlkReCxVE58oA55r1OzU= 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.51 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-f51.google.com with SMTP id 46e09a7af769-7c6d3676455so1555053a34.2 for ; Tue, 25 Nov 2025 02:19:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764065995; x=1764670795; 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=c+Zhhyc2V4qfWtECl+wYUVLsRnhgxQqkr3SEOLVVqz8=; b=rw0fdy3wUk8LnhYoydCg+R7Am/lfLj58oUNHLorD7e/fgn9H4Qd3achbWeI/JSAc10 9Y2FUBGhq/F8IveuYR1bXCncpTaJjJaN1CryTmFB1UhBWqgmJ/A4XnXYaCKOjPuizssq 4FLdHZEcIl3XnVzeWmo2nc6r4ZCZRP/z2F5lqQYNynE+3/vEzMBaYfs9+rNNeaAw2rfn EPqVNQ5IS7sI+xiwRRtytzqfOXu7s2ZakSnP83c32EPYfTyZbWUuaSejGbHROST8KyAM 30INyDi6vCGWO3NNppw+ZQ0e4ZrijiXLMZGuDbzhGIsWmU8wSg2my/DJ7/WuVvNg19m3 xufg== X-Forwarded-Encrypted: i=1; AJvYcCW+XURQxfqJW0vQMNM/tmaGvFeohV+tfhXTTzKY9Gok+tZ+2Glx2S9VDyyxvu0iGEH+nQHdxza70uhBj8E=@vger.kernel.org X-Gm-Message-State: AOJu0YxSbT3EogxJAxSsmYfhooSO3Z1bPawHiqOCzH8cNsPiWQjd8880 JizO1LQclRRBjL/dMLUZ9j4BkRKaXHrsIQKi5xnkS+XjFcGrH75C9wOy X-Gm-Gg: ASbGncsQjqFzy7rSTn97BPqYEYOjr+35PfhOnSaZ5pjYPR8RsvjZCWHbQtg2PRB34RT VktfoyAn4o8e2/FBEVgm50kHGgmX1nGesMOZRSzMD8RICBGyq2nnJZt3XNcKQ7HltPKntr3Cmvb 7g7rs86PJJxLMSJuzAx2/S6DpboSu/eBnPB3dmPy7yCm71AlM3FXuyJw4FpVtMf+JJcJESBJzbo RPv4OKw08N0TtTVlTzczpziNSjdWPt2wwESmba15tOnfJTdZeSsSfqopMCRfSRPv50c9DEyG2O+ ZQXBPNJs9DULkJjzHsJmAOIleZdOdOJu1uvQJru8CaQ2as+wJcHm1H9HjAdM89c23LCxrFRDY4+ caB5thdoPt0ffYs/FdGYkuYUUEL0XjLmAcGSib3L/0A8OR7qTUfZOaWURmcbcrz2CZK0PAX2reE BiOGBN3P9/MLO4hS+yg+a0UwtC X-Google-Smtp-Source: AGHT+IHY2sraLYhAXeIuXGFaHS2dicYqNJk8AZF0BKKSEQfRkb5QPHQDH0CLxRmEirGOyUOizH91eg== X-Received: by 2002:a05:6830:440c:b0:79f:19f:7f2 with SMTP id 46e09a7af769-7c798e1b962mr6667023a34.0.1764065994932; Tue, 25 Nov 2025 02:19:54 -0800 (PST) Received: from localhost ([2a03:2880:10ff:74::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7c78d3e3bc6sm6100636a34.16.2025.11.25.02.19.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Nov 2025 02:19:54 -0800 (PST) From: Breno Leitao Date: Tue, 25 Nov 2025 02:19:44 -0800 Subject: [PATCH net-next v2 1/8] i40e: 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-1-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=2154; i=leitao@debian.org; h=from:subject:message-id; bh=3RiXWowk55zr2p2eq73rkAXHd/aJ3SITLXEDdD0tOSg=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpJYLIAU6lJ+/Blj33Z6a3CA8B1/dBpOFhEJRoL qFHON0zu1aJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSWCyAAKCRA1o5Of/Hh3 bSgLEACwtbnfZB0O1PkzazJaBBXouuvxXqVM7xOm2fXUKPsgJT3WrEVMxBermV1OM7rbH4n8CW2 YAsBC1adOB6X+3buIMPx8AdpoG7lqkair93iAUrkM7RuUUHb1bCRs7I1ZTq0KXCdNO3jiynsu8O IX5vkZF73kPvJnPDuhy0ep6cQ4ByZGztrQV5Xtvaq5DQSn3+cfJqig7CF8RS4d/Tr9D0d8tcCEw g03QABmoxvNHNnZDoyzKQ5oqVwxccxgKtcrRh5v8FjI6Yg9Ctu1t38NUQC0ulG37KF3mc2ejz8k f6SRBHD3Hz5jDYk8qntl7QDuRGs388eX2C8d82p/hWH7Ql3tKSDCS2yqHm/38l+C5RaOlWBTK9J wdXlc+fPfFuiEcLFFBgKuXmbN+P1nw6J0A+DOBvCdItlNBdCNkVL1eaxHD8dBnTdaPEDcsCj4FB bC7BKbzWkyMrsXvKuRtEh3ICic63p+YwmOlMnAKNOJnFJMcxHaYOdu2Mk4FemV3NesP6bX/gPiN drr1m++i7vpo2ndheAvSiI2qkUCg69O96mAYx88d8wNuLh+rZ2+SN7UsjnyXxe3okKKrYibe2/a CWagKluxznqFNbVLanMyH+4o8AiWESE7Ejp4bVOUCQMnSrmOUX3OtwlT+YlBxa2QFxx6QiRPdcY yykclTksMqRBg/g== 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 i40e with the new ethtool API for querying RX ring parameters. Signed-off-by: Breno Leitao Signed-off-by: Aleksandr Loktionov --- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/e= thernet/intel/i40e/i40e_ethtool.c index 86c72596617a..f2c2646ea298 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c +++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c @@ -3521,6 +3521,20 @@ static int i40e_get_ethtool_fdir_entry(struct i40e_p= f *pf, return 0; } =20 +/** + * i40e_get_rx_ring_count - get RX ring count + * @netdev: network interface device structure + * + * Return: number of RX rings. + **/ +static u32 i40e_get_rx_ring_count(struct net_device *netdev) +{ + struct i40e_netdev_priv *np =3D netdev_priv(netdev); + struct i40e_vsi *vsi =3D np->vsi; + + return vsi->rss_size; +} + /** * i40e_get_rxnfc - command to get RX flow classification rules * @netdev: network interface device structure @@ -3538,10 +3552,6 @@ static int i40e_get_rxnfc(struct net_device *netdev,= struct ethtool_rxnfc *cmd, int ret =3D -EOPNOTSUPP; =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D vsi->rss_size; - ret =3D 0; - break; case ETHTOOL_GRXCLSRLCNT: cmd->rule_cnt =3D pf->fdir_pf_active_filters; /* report total rule count */ @@ -5819,6 +5829,7 @@ static const struct ethtool_ops i40e_ethtool_ops =3D { .set_msglevel =3D i40e_set_msglevel, .get_rxnfc =3D i40e_get_rxnfc, .set_rxnfc =3D i40e_set_rxnfc, + .get_rx_ring_count =3D i40e_get_rx_ring_count, .self_test =3D i40e_diag_test, .get_strings =3D i40e_get_strings, .get_eee =3D i40e_get_eee, --=20 2.47.3 From nobody Tue Dec 2 00:03:27 2025 Received: from mail-oi1-f180.google.com (mail-oi1-f180.google.com [209.85.167.180]) (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 6E9632EFD81 for ; Tue, 25 Nov 2025 10:19:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764065999; cv=none; b=XL+7ZBaz/S+dnNkSGx7IHulX6ne2HwwyZRHKbvPbPVq6XQXwxAWeEZUfFzXAsJ283ntta043htCv7k2kxvBRej2JB+upOVwP2zzDQyLcIY03Vjb46iBVh4mL+Z2qwHmEQNaudshMnnHPZHRItIWCg55SyLtvy/3Jj+bgWVJP7Ak= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764065999; c=relaxed/simple; bh=3i7C7WKxlPKP4f0VTj5obFFhyx8DsVbLTl7zSEWQvvY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aL/9r4PzYL0nIPsZI83X4Sk8QmAwEzfME8JuVfKeDzxFaits/USFiqLbO1BB/p4/p06UmMyeWwNgvY/IP4OAaofY7pziFdBIqjQD3fha4+6MbMPUzAaP+KTl43lFSElNrXXwvGkWAj1kDt8r3XKQjabJ0OjPYi0w3xfALbdStuU= 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.167.180 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-oi1-f180.google.com with SMTP id 5614622812f47-450b5338459so2252981b6e.2 for ; Tue, 25 Nov 2025 02:19:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764065996; x=1764670796; 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=Ev1qL0vgRlnaty2XtQ6L8S4d7iM08dylTBEfHI0VuIk=; b=n89ZMvcYjgPlI70jN+ZOwAHRmjVRGSn57hHAyejURTAhNaBMIa1/2g7YpBftNX3j0i H+I7njPzrR7J0h6GxSG29qCokvA5c4A1/JM8zpPrpnC6M7YhKOL21i4nZrj5VdF/Lcis 11UsL5heCZsmkiA2zORVE1ugmIqGCVj2jaHamWtHaFi16QZLyjmVjlA/RXGCaVLTpgcc C5fTFpg7lmWidg7Sk2adpTUnumLvoyMrmatsHZPng2fxrLN1/Okrz6UeNYCa67oE8IXy liUuirK0/Dtdz5AzKpnc3+pa8ccvOoYNf1/UsuwUjFbEatCJlzJN7CjRTs6bO9TVAd3X 7nSA== X-Forwarded-Encrypted: i=1; AJvYcCVcaRJzMwJUqBgowCIUg0eZDyaMyoXimz3nBAcVt4gNOZFg0VgzNK7t8XjZGjxdlZpP297X00LU02lJ/VE=@vger.kernel.org X-Gm-Message-State: AOJu0Yyda7d0jDFvLP1572gRn6b306taebACdjkGyLLpDAY3kfrQDZno wGlFwZ9PPq+fNSi390bCDG4euaF2r6RmVqf3FJykIXnbrUlOnP1KzvKu X-Gm-Gg: ASbGncs9Y6dU/UrvOGbfNFzfbOaQajsgIzohQCuWQnbwIkk4ZMiof6TORimyhNuh4Zd 4rfSK1YsGqBBY5y5h+PjHQW8N3l0JUHN9m33MZ9RvbCmjIPg8zuJB8tqm1Nv27IuSZI7Mbsc1/C FHxJidDFTFXUSclsuiGBaZVLJ416nI69M9zaOWkowJoK5fBNDoQMFpDJKP7Sekkeg5JEDy7bdLp 810FQreXP/NT8i+joeZE+5FZE7Z1EW3U/t4Ab0h1eQp4r4hs7pGJQjjmi1BIEveYGLR71B7xco7 9SYgGYiP/HpsFjpTqPxnG4qqbCzqW8Kem9AG7QgyyMDnNnWRDHPMB6Yhfsci5q1vQ9ZfcvWUeYU lowwEmVOOQYzTITt/K3haINkKrizbA4vlHuJuJnrh28G8V81APnjeUfxiyvdzvsNkinkpE0VU4Y WILD8japR+CReQYA== X-Google-Smtp-Source: AGHT+IFBHj5AHiLPFSozWaRHBF9ntqn5K9eCGUcsuxG5NUpa2ycHn2Q/uRMEEg5Cb/MN6mcrbNf2fA== X-Received: by 2002:a05:6808:1919:b0:450:f3e4:eb05 with SMTP id 5614622812f47-45112d150ebmr6096325b6e.64.1764065996364; Tue, 25 Nov 2025 02:19:56 -0800 (PST) Received: from localhost ([2a03:2880:10ff:48::]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-65782a6c8f3sm4126405eaf.7.2025.11.25.02.19.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Nov 2025 02:19:55 -0800 (PST) From: Breno Leitao Date: Tue, 25 Nov 2025 02:19:45 -0800 Subject: [PATCH net-next v2 2/8] iavf: 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-2-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=2184; i=leitao@debian.org; h=from:subject:message-id; bh=3i7C7WKxlPKP4f0VTj5obFFhyx8DsVbLTl7zSEWQvvY=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpJYLIkIZHrCNVt2InqazbIwEgJO57onj7C+BuT j9j6CLnX9qJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSWCyAAKCRA1o5Of/Hh3 bQ+oD/9EbaUQfykt99NhcVKbXM6HAwxijuvKLLPjhCOVON+bxERVgo+//umDkG3hSFCTkg5qx9s zWpGsCNkJFxFCpcF0BmP9EAn0CAdnlBn75QxEi4/RlVYKecqEW7oB/cct4Q0wNcw8ilTKAw+Sxq ryvQTRMn8IBBclGQAg7a4EmITq/sTf13WO2HNjSombXZKD9byz4IgN9bnQoYj8dI+Pu40kVLs4f pC5zvi0GkvPGjiQQ+mIHatvzj0dZOFg8BVLzMgEGMNtQupydoWN4u5vy7gxZudjtIM7QAmUjUmu OILpoxNvPVbKWqTkqJf70V3AVhxP69z/pEabqn2C6msu3fsei0eIISS3DHu7ym3i8MRmhA7P2EB jLnsxemyENdeASWvtozEm4KIZIF8HQvpOhLatLDBn/wQ7SIfytJUTDhBit0boyZ8UjV4TKypsLW Cf7Gch06WdkhKMbt9Kbky9odcF+4A9I8pEY7aisLj/D+Ooi6Xb+zj2opl4FJu/MzPUdu3cO3LSB nzYW2W/nQVeLIAwZIOV7mH3P2u4pWsziNMoG0sjptWZ9AzBPwvdzgGGWDc51qzGZdBWuYZBhVLv WTN+D4rPBlSx99pGJuzOtav9Rwz+tjCnu9uWrPnlIKCZGrlxLDuKrFwZPPCPV4NyJWWAVWqlr/H 11mQ3GmGPFk/zbw== 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 iavf with the new ethtool API for querying RX ring parameters. Signed-off-by: Breno Leitao Signed-off-by: Aleksandr Loktionov --- drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c b/drivers/net/e= thernet/intel/iavf/iavf_ethtool.c index a3f8ced23266..2cc21289a707 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c +++ b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c @@ -1638,6 +1638,19 @@ static int iavf_set_rxnfc(struct net_device *netdev,= struct ethtool_rxnfc *cmd) return ret; } =20 +/** + * iavf_get_rx_ring_count - get RX ring count + * @netdev: network interface device structure + * + * Return: number of RX rings. + **/ +static u32 iavf_get_rx_ring_count(struct net_device *netdev) +{ + struct iavf_adapter *adapter =3D netdev_priv(netdev); + + return adapter->num_active_queues; +} + /** * iavf_get_rxnfc - command to get RX flow classification rules * @netdev: network interface device structure @@ -1653,10 +1666,6 @@ static int iavf_get_rxnfc(struct net_device *netdev,= struct ethtool_rxnfc *cmd, int ret =3D -EOPNOTSUPP; =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D adapter->num_active_queues; - ret =3D 0; - break; case ETHTOOL_GRXCLSRLCNT: if (!(adapter->flags & IAVF_FLAG_FDIR_ENABLED)) break; @@ -1866,6 +1875,7 @@ static const struct ethtool_ops iavf_ethtool_ops =3D { .set_per_queue_coalesce =3D iavf_set_per_queue_coalesce, .set_rxnfc =3D iavf_set_rxnfc, .get_rxnfc =3D iavf_get_rxnfc, + .get_rx_ring_count =3D iavf_get_rx_ring_count, .get_rxfh_indir_size =3D iavf_get_rxfh_indir_size, .get_rxfh =3D iavf_get_rxfh, .set_rxfh =3D iavf_set_rxfh, --=20 2.47.3 From nobody Tue Dec 2 00:03:27 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 From nobody Tue Dec 2 00:03:27 2025 Received: from mail-ot1-f51.google.com (mail-ot1-f51.google.com [209.85.210.51]) (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 9771E2F1FD0 for ; Tue, 25 Nov 2025 10:19:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764066001; cv=none; b=JN6iCh69duGYF/GRUU4FoYwVqojtSaLfRuWJadAuW7Uursql6z95XzLCvm8SdUItpfWUvUS67RzlHH1fOgfjG+3D0UrusWkFJ4CtX8p7dq/bicwDQFR41csM9LSFVHReIDe4sSFh9fs6oetu2CHdQCi7sNtdPF3Kfn2VBrhLDlU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764066001; c=relaxed/simple; bh=+mKqoVITB42hGcYSGhqJCuohMHY7kF/4b4nnE5SxPMY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Mz5du69fq6a0tZ7dmrbVVcTZJbE0IcNn0LJ1wcV+hAZYaKJVCoTUzE77zVeeT13IdJTa52wP4xT9clGISkgjs4CbTVPeCBf95xvNpsjzqMV0yoZ7bAGqHoz/9lfcX4ZuX8ZVObzjzUQhgJs+emNUG6zxnz+DQBHF5XZv2jP3BIk= 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.51 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-f51.google.com with SMTP id 46e09a7af769-7c6cc44ff62so3497182a34.3 for ; Tue, 25 Nov 2025 02:19:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764065999; x=1764670799; 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=F3UJKFUGkVvLB3wHG4oGvnme23SWc+gY7YZkrVaP7Sw=; b=v7ZEErQws6H6UDv08YRfcx2YiHYsHOItMdObSoA0N3uutssCfJxJIbxetocBYV1xI9 TWA96/zsdpteVgZBq1PZpiT84chtC97/yas3Nd3ip2t8tP6eMQLlSqVHA73JnWoVIJQh HwH6PKkBY7PVkVbspYrFNhnT6cC6/9/y0zpQU61T/1LlrSCzgwr+mc0+l+6mkwUepNi6 W2qvnQftINJLpKLqSx5PqpsuLwelSXRvBN2lWOTTuMoaJeVQBdBXJC9SpbnZF6QE3hju N/MwmmgEtWsAJ+PtydKsDswq7aDqBpvPgqUZWynRW5DlXZvRho9n7sZGs6JSRfWrhvpI c2yw== X-Forwarded-Encrypted: i=1; AJvYcCWKPfswVI/i3EYrbXn/Z/+fMBwSckm8tzZ3JuwRdxTRJQTkS1ctNXIgADdGcMniRqYq8rfalfFQrTQUK8I=@vger.kernel.org X-Gm-Message-State: AOJu0YwODGykuQyJuqKE1Iu9ZbhRSsFSX5cOUnfy0swCWABSf8ux3aC5 aaSG8qNkUWHlALL5du4dBXZ2atPlH7TQCBeqDh0U9iOnx0fliyrTBkSl X-Gm-Gg: ASbGnctGP+RftH1CKyDGcplbIV6xfAJ6V1Klx1ClT9P110L8FofDT7GE6Z+hOGm5ZvZ pOdbZTx4+5YafFHpTFjjEBDH5Yw4O6USW0q2SuCkzWZwBob49ooumYp6zRSMDEIdo55I1K3NeH7 9h/pPePx5I70lDXp/q3hIlE7mXkYlpF23UnXCb9Hx6iU/OQxrJYjGLJys6d/Lku8BFOjKSh6ENW Y/zeD2ulH8NVuiOVgn/jaF8o87KJs6DvpeZPOUyLXvUoq/SLQfTR3P+Ij1w53bKMLO4z/q2l4lv c8fzt65jmeuM1AzJbUrgvIA/R9j/Ae06IO7GRIiMKuV4Hy7LlikVywdatBKgEBNF23WubyJxsg+ jj4Dkw1f+c7FuIzRS/+rpdXfoXnPUSWX+bjUYCJeRL24GSJaWASRuU6JqNHWRJNaM+aidT4D/4Q 1pXUYWfrlA/IIVVA== X-Google-Smtp-Source: AGHT+IGuLIuKJ9TdTjmy0inbvUt0VBwN2voCUtXNkx0exipVNDA/fm8mJbXcCwAq/N0Z7Pyhn9HWTg== X-Received: by 2002:a05:6830:2b09:b0:7c7:4bb:dc06 with SMTP id 46e09a7af769-7c7c3c66650mr1144804a34.0.1764065998716; Tue, 25 Nov 2025 02:19:58 -0800 (PST) Received: from localhost ([2a03:2880:10ff:43::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7c78d346d84sm6126885a34.13.2025.11.25.02.19.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Nov 2025 02:19:58 -0800 (PST) From: Breno Leitao Date: Tue, 25 Nov 2025 02:19:47 -0800 Subject: [PATCH net-next v2 4/8] idpf: 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-4-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=2441; i=leitao@debian.org; h=from:subject:message-id; bh=+mKqoVITB42hGcYSGhqJCuohMHY7kF/4b4nnE5SxPMY=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpJYLIa66miHkyrbzAg+8nGLilethXxs3tVSlYv eK4pwAyJOCJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSWCyAAKCRA1o5Of/Hh3 bS8ZD/kBb4tdz4tRd09xMak7gTq+zCpME4Wj5VOfKeVLSiV6t4bWaxIqHC3/L0ojLy5UUR6gwMq r4kXBHYP+uLQS1zUpwCiJ8jkulST7Ti8qkIJAm4OgiGEBf8DY9Fef3VaguLTY8987d1a9G+0qla EBar+X+C0cFsNcxFndfmEnN7qAZ1wbVxTTEHltsPvqkxGglHUYkRyFDeFjYyTAqGOCkwEzzPqLC 0E9x4NAbFLUGunFF3l5fxHm3mDo0VLxrCuZecOkXes9WVuzN8xa4h6/omKU4pTMvXHX1s4PUhcE y/foMyfQvUa/t78CnujY4J/G70DTrqrd1hWKgvwfYWWolY4GZumZIu0n3QnNp3Pqe+x149xm5W0 qpLPRD7++g5a/sPUBqXvNiD43ZGCob5mhEOmFA9ap4soGFMJfZrOTrzpQPc/Jf3w2u5JcjlZGKS HzRx/geY7KmiDKl4n4Tnck6eDSsmHxb1fatr0kKtVWdW4LkVd/L9j3pl5hcIuV9Na7rHc3tuYrc qDTRECaw9NsdH5Pia8lKFj2J5hqbx2P98OHaA4BIFMjbfiC5IOuk92Dz+uhn7qkMNGeQUrWmh0L O+zZdvhez49HSxnvPCebgOHOFac+lSzKgladEOswJAIF4KZpr/T/sMwAt3SJbRSJF6ZCdgZEpX3 XEQCfGXkiX8vYJg== 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 idpf with the new ethtool API for querying RX ring parameters. I was not totally convinced I needed to have the lock, but, I decided to be on the safe side and get the exact same behaviour it was before. Signed-off-by: Breno Leitao Signed-off-by: Aleksandr Loktionov --- drivers/net/ethernet/intel/idpf/idpf_ethtool.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/idpf/idpf_ethtool.c b/drivers/net/e= thernet/intel/idpf/idpf_ethtool.c index a5a1eec9ade8..5dd82b1349c5 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_ethtool.c +++ b/drivers/net/ethernet/intel/idpf/idpf_ethtool.c @@ -5,6 +5,25 @@ #include "idpf_ptp.h" #include "idpf_virtchnl.h" =20 +/** + * idpf_get_rx_ring_count - get RX ring count + * @netdev: network interface device structure + * + * Return: number of RX rings. + */ +static u32 idpf_get_rx_ring_count(struct net_device *netdev) +{ + struct idpf_vport *vport; + u32 num_rxq; + + idpf_vport_ctrl_lock(netdev); + vport =3D idpf_netdev_to_vport(netdev); + num_rxq =3D vport->num_rxq; + idpf_vport_ctrl_unlock(netdev); + + return num_rxq; +} + /** * idpf_get_rxnfc - command to get RX flow classification rules * @netdev: network interface device structure @@ -28,9 +47,6 @@ static int idpf_get_rxnfc(struct net_device *netdev, stru= ct ethtool_rxnfc *cmd, user_config =3D &np->adapter->vport_config[np->vport_idx]->user_config; =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D vport->num_rxq; - break; case ETHTOOL_GRXCLSRLCNT: cmd->rule_cnt =3D user_config->num_fsteer_fltrs; cmd->data =3D idpf_fsteer_max_rules(vport); @@ -1757,6 +1773,7 @@ static const struct ethtool_ops idpf_ethtool_ops =3D { .get_channels =3D idpf_get_channels, .get_rxnfc =3D idpf_get_rxnfc, .set_rxnfc =3D idpf_set_rxnfc, + .get_rx_ring_count =3D idpf_get_rx_ring_count, .get_rxfh_key_size =3D idpf_get_rxfh_key_size, .get_rxfh_indir_size =3D idpf_get_rxfh_indir_size, .get_rxfh =3D idpf_get_rxfh, --=20 2.47.3 From nobody Tue Dec 2 00:03:27 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 From nobody Tue Dec 2 00:03:27 2025 Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) (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 40D432F1FD1 for ; Tue, 25 Nov 2025 10:20:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764066004; cv=none; b=mf5lr5hH5ZiOognCPsgk2o3f2GifYAam6kDZPxJ1gb6KH51js03FS/lrged4T9QeJEo8XcZsJEzqRwc86J8qHqCvONSPbWoIU/HF04hrFQZX4/cTcEfwSa+xlfYY7Jh3nrecNhYlRUiYDCv5FQnS2BztJtDnpwSKdTgRGkkBS40= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764066004; c=relaxed/simple; bh=Q0AZpTNUFttrJLNx9FvORT21hZNYuuTH+qlH8H7VieA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nMNgtcLUM7CmdaU7HrDcH3Df5WDUxa3y/bv4dzPlQwmmXaczvyqykA0oeVI24zdgs0abejnKeUW/XmCNECYfpTKDMgKx+/PfhlW6btbM5eMimE7ab9xTRdDww5dduSe2VfjgrxScoiyDeo+xV5ilj/Ce32PffiCZpB+xbo7r/sY= 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.50 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-f50.google.com with SMTP id 46e09a7af769-7c765f41346so2084782a34.3 for ; Tue, 25 Nov 2025 02:20:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764066001; x=1764670801; 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=8Yu7gPJkUQ7vuyCmZzm/NNLqbPOpqaQrxUJ4JkhHxnk=; b=bvpQkpb7d6B2wcaeU8FI+9ycDz1PCgfnwyVaP0Xa2/MhMc4oQLEUtkGFYR1cP5LMo6 pAv2+bjramMCgvbH4jtCVniEQ/67bGTXNJ2ni2/Oz63z1QX1Rzt/FlEDKj4koV2eAxyV VRanMqR+s8HuzhEhHLPoJvzeFDxYjo6IFoXS77DOkIuDyQhMTF7kT6p+I46y4aHs7G5R TJIcb1TnSJEKLqhqLIcH2v3uUU2/HCEf4UeLVch+PqNRXz3IigXxkTeV1NIzsG770xQv 29OwsnB+wYfSRNkNSbe6WuFSZCbfssTh5HBeWqjKy/SnSNdxJK7BU/FYH8FbBX5lo69V vY5g== X-Forwarded-Encrypted: i=1; AJvYcCVxF+5vJPpn9/aAInY6N2Z8VQt4mnkQEPFXIAX7GUQp9ncqiQueR0/5GLA3s8H3juvjfkHxto5c7J/mFb8=@vger.kernel.org X-Gm-Message-State: AOJu0YySpy57D0fX2PsVACPw1XW+GDKwo+1+848TmY47Ft0zPzF8m2DH PHfh+kkalShc4rgR4sRiEj7rg+1EHN5r361ZpPT5a6mrFtUm9skRxA7i X-Gm-Gg: ASbGncvpKupc+Je9ntrJcSju154hNOpSWX7EM6aeGPcjzwaFB9V0c74MqbQ8n5hinPN DfBaELWawrmfwEZxSnlRVRJJidFF7L172DAvf1EkjyvFsALLcVPG+Nm/n7jo28yHqbvOUKwPdst diq8GW07i4FP8oIUXI0Ey5wSb/KMHtl0tHSnGrbSMV7sB5cFlpQbsnOHUWv4adXpjB5EvcvpffQ ZX6D0lYNZPomk/gVF/iIA105+exMLmYWXwznAnktf2IMaU1sJl7iZrMdEFbwDulYcKjp8AS+IkY H8p2Fsc1sLQzY2vrzZ7eC8cGuMhPrCLZoD/brD4u3qlauHWw5zRFQF9EiQ2Kk5TepMpzaF4S4Qr l8MbTvsO4PJl2Sv3tDej+EKJqBWBjT6HlNIyXqAm5UWobzSEYTugTy9LU2VyU2DdCd7zqoGQnwZ 1Pa2SfF9EwkCvWaQ== X-Google-Smtp-Source: AGHT+IFYidAJStx/3yLbtUGaORWltJ3sPJCt+ub5ZDeRVPCOV25y2qZl0pgExiFfidEWvGeNPQgc7Q== X-Received: by 2002:a05:6830:a90:b0:7c7:1c77:f107 with SMTP id 46e09a7af769-7c798cc684dmr8246144a34.34.1764066001247; Tue, 25 Nov 2025 02:20:01 -0800 (PST) Received: from localhost ([2a03:2880:10ff:5b::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7c78d400b2fsm6117096a34.22.2025.11.25.02.20.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Nov 2025 02:20:00 -0800 (PST) From: Breno Leitao Date: Tue, 25 Nov 2025 02:19:49 -0800 Subject: [PATCH net-next v2 6/8] igc: 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-6-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=1918; i=leitao@debian.org; h=from:subject:message-id; bh=Q0AZpTNUFttrJLNx9FvORT21hZNYuuTH+qlH8H7VieA=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpJYLIRfG2UeA7ILtyLTVPFkpMX69FPiKLhzY5p DWiH7FBcluJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSWCyAAKCRA1o5Of/Hh3 bSZhD/0emHaiSZYsdU/B4gJdVA27ND+ZjOBWi7ZzZhXpt8NirHhjrt/kqoyxYR1506PQIgx/jU6 oUVL46lADAMbXim0ui+0FungfV0L2yXRUjnLeFppXmp8FYKQsPjXECqKklesgdCEIgMqQQA/11C 6MKn367INNE2kOXJh0gFA7vFNaCGPy7PLjJl8tYwMCNwSGPnVzLxRkHFs1GEpfrbXyyvRE13hu6 23Ggl111gePbkwJAknUfY7f69TKJRX0dn/gh1WJK2nLoJ1yJfq8GMan2LQ9DO4e3VWTdmbjrskn 5UVh0ISbounYP5X6ubpGJ6REPB8GbSv1smiqZXajN8YOYlRCMWHccfoIoxhGwo7MLCT3o1Nnc4A hvYIoFjn7Ai3TmE/25WDGgDIyB76QbmawwUflu12uk2CEXHJG4TVox6YuO6OSNVB56rLFpMTRJs /8NsrYNcrwIoSFVPuAq4xlR3UBn4MXWTgwNAusTs9cR6D8wVR7YuMAWTIhNISTw1y0yJvTZEwNX KEYUx3JddG/X+SjcSrf92w99XvLHsi50gAQ2lQZEQChr5FujdTussekfS+sXd6DKcO1g2K8eWHT UWaI0+z0rGeXJMEkgl+Jc65mQL3J0ph9iO07RaFv2LR69kfcW15lnZK6pW4yOKnpwCI6I5UNPJk dKfM//WFoI/ROig== 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 igc with the new ethtool API for querying RX ring parameters. Signed-off-by: Breno Leitao Signed-off-by: Aleksandr Loktionov --- drivers/net/ethernet/intel/igc/igc_ethtool.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/eth= ernet/intel/igc/igc_ethtool.c index bb783042d1af..e94c1922b97a 100644 --- a/drivers/net/ethernet/intel/igc/igc_ethtool.c +++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c @@ -1091,15 +1091,19 @@ static int igc_ethtool_get_rxfh_fields(struct net_d= evice *dev, return 0; } =20 +static u32 igc_ethtool_get_rx_ring_count(struct net_device *dev) +{ + struct igc_adapter *adapter =3D netdev_priv(dev); + + return adapter->num_rx_queues; +} + static int igc_ethtool_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd, u32 *rule_locs) { struct igc_adapter *adapter =3D netdev_priv(dev); =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D adapter->num_rx_queues; - return 0; case ETHTOOL_GRXCLSRLCNT: cmd->rule_cnt =3D adapter->nfc_rule_count; return 0; @@ -2170,6 +2174,7 @@ static const struct ethtool_ops igc_ethtool_ops =3D { .set_coalesce =3D igc_ethtool_set_coalesce, .get_rxnfc =3D igc_ethtool_get_rxnfc, .set_rxnfc =3D igc_ethtool_set_rxnfc, + .get_rx_ring_count =3D igc_ethtool_get_rx_ring_count, .get_rxfh_indir_size =3D igc_ethtool_get_rxfh_indir_size, .get_rxfh =3D igc_ethtool_get_rxfh, .set_rxfh =3D igc_ethtool_set_rxfh, --=20 2.47.3 From nobody Tue Dec 2 00:03:27 2025 Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) (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 B1ACE2F9C37 for ; Tue, 25 Nov 2025 10:20:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764066005; cv=none; b=PebAwFUhFi3UPFPQ0+zZ2y3KldfDQLmmr9fcVC4R5Idlv/KVcr2bkOLJJX7v/ckijJjcanfy3lKKlkYlFoOKbZHZI2YcMfK/vNQ6V0Qm13Q5ipKfajnoX/0Pba5r3IkMw9vezrsO76lXBKfmUO9Optnpsg4nwcVUns/nezKTBa8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764066005; c=relaxed/simple; bh=OkmNiQ6YYv3uc0G7OY7lyiSTVze+U7ucr00ng0VO9JY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Mhe/oN8nAVrOJBiSlaIj4TwmV22fDL6UHPGumhNdV+Vh3KRUzlEvDg28XlPzxAgOGBLRoANbsF6QBwITvFD1cbuK1UWNVc2E9/UZkv3n57mtIDZs3oZgVepGTRJmN0Whk5FTIX4/GQZ8VTK6/45Skbn0RoWyPmmd5cga/iBuovo= 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.167.175 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-oi1-f175.google.com with SMTP id 5614622812f47-4511744b411so1725737b6e.3 for ; Tue, 25 Nov 2025 02:20:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764066003; x=1764670803; 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=PU9hyC9362jDv5FXyh0OOcazyjJD28LuH+4Fj57jjN0=; b=bemPBEP28Y0BCHNdzEbJ1nqRkLlx8RsBfH0QUcxgFfeFT1QgVVE9/z9a6z2ZoewWhU Fwfxc83Rw2w8FxhA/s05lb9VlRnbljSdd++NxEuJLFFCRXfa134y5l0kNk5QJBtlOIHG UvCQVlXfcAxb/vgrfDKatl8kISY5AT10+As7s6s6tRB5gKakB3KhmTTIuPsQs2v/DiY+ NJzZ4JPsrJkhADo5gF4DhtPM+1qlzdHOJMlu+OUeBk6reM2MyZ0vxl+BCPpP7wULAuA3 viv3rJsuSzfbVIf5hyOLuxY9igAulHjoEi4Mlt3ca5ZCG2ssUi7b7Quoj7hFRWLQrLiM Dc5w== X-Forwarded-Encrypted: i=1; AJvYcCXwBMKJddiLMLtXKE+Qcb5dDUZlK+J28es5Wid+Xi9jGtYM9V6ZEfXnmMNKUZm8SuwYuKX/3UZGNB2oIKk=@vger.kernel.org X-Gm-Message-State: AOJu0YxsGMS6XZUfKfLwPE7x+kYv43FAPcfMYa/fiOm+dX86iFHv5rud 4XePyXQi1Jb4XM7dnMab1IYsMz9a3Z5KQ7kJenMsIhdoBgOocEJ/H6dl X-Gm-Gg: ASbGncvmwSGbl3isWN9hjpGFExUdl6iZMPuIt0p55He6505FEsn7qv3+Sk10ZeOUw35 Lnhc/IFwEE/Ngk2uVAa7tN+hZPRIzvC8GBfk0+nh8Eq0CzUD1HQ8XfDgWWGmAcI7+avD16wFZTM HmCryLsF6ZS2qldV3hOtVS+qp9ZLrPsnGCoshsLgvGHcy6oHYxxH9Sazw2BhzHlvdbb+us0DTRP QhwbfKKvrFfHeA/f2Ld45EjU7tWl9a+SuPnnv5YMZ7dqXsvPgNBfDbVaf5LMfmdMan/DYJS72Jv 7Wmx4BWT8DvOXhk4eLq2LBdfrm0CPxJTUrPObvb7ec7M7Wl/e5DyuuvuZkcbqvCJwMXz8KEMxdr RKry4bzqG5vNPBFckenzx8d6FCE2tzrGkPJMFgeNw9T+TUbR3iFYzt8LiDqlt0a3MzslJXYBDD4 zKZkKsLlS9C4Pz X-Google-Smtp-Source: AGHT+IHthk47k/0+mFB4/rU+D8HcVb5Zhji+7aaqntTqAXc55L/5R9rvQ4fRXAMNxSE4hloiSbB5jQ== X-Received: by 2002:a05:6808:2227:b0:43f:5c61:448d with SMTP id 5614622812f47-4514e60108emr894047b6e.9.1764066002689; Tue, 25 Nov 2025 02:20:02 -0800 (PST) Received: from localhost ([2a03:2880:10ff:4::]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-65782a38456sm4189883eaf.3.2025.11.25.02.20.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Nov 2025 02:20:02 -0800 (PST) From: Breno Leitao Date: Tue, 25 Nov 2025 02:19:50 -0800 Subject: [PATCH net-next v2 7/8] ixgbevf: 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-7-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=2009; i=leitao@debian.org; h=from:subject:message-id; bh=OkmNiQ6YYv3uc0G7OY7lyiSTVze+U7ucr00ng0VO9JY=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpJYLIUkKS6lrxmxJ+rShJYVwYFd7lG986d7poy OhlH+xcpDKJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSWCyAAKCRA1o5Of/Hh3 bQ9VD/sGdvKkjtI6Tc77NNcYNT6lJ/PYEYfiEz4K+4k+XKrA09ddP/hGGQMqNPBbXkKnsvhUgz7 uzvBCrI24UvzI8yJ32aCGYndKQQ0yfnoG6357aIi++DDz3EiViD4S2j75kDFLBTHzJwN4sS0F9a BffhCmk/eUc8vv8DdGcSYjKldgJwYEkl5D++Xz0OC1HDdYTYuTCx/AvSRm1hkBKH2Z80JWL/M5d a9e6NbDKjJYiQZIS5opkVPN3Ank3bT8KYjz3iyHoBVObVyXhydZ4r8cOzgcj3vBTABKa7BPA358 qinhzpWXB7BJZt5NIrRradIPWk8iRMhwpyLiH5Iyb/31ZMJ1cC1EHCiXNwsaslS4Dt+PDMf/sHU Dbfqhzi7XxOP3tQoBDSnYuc7kZ2nj1JHYQ1ds2j+YQ+dYL8TDvii+GB1htOd7ayeEA1rI1EBDup V7jyPhuaIGCfoya61WeVI5YJmtZieJF6zk6U8okXvNhutZlS19rrlQAyV5gozOGCWHeZCkH8X7n 3+ErTSefDVJBSu2xTHUXQzpLsVOnmBHfknyZidg6wyQVM3ViyPOELt3KvYwXuPpFu+6s/At8kf+ hduzrQB5WAXjFtsgzsKWlONlhCyezQWqVjMo/AiM2rMSRQhSwFkjAoZXQ6L4PM+yt1X/ixEprqk q0kyk+sG9bre7Hw== 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 ixgbevf with the new ethtool API for querying RX ring parameters. Signed-off-by: Breno Leitao Signed-off-by: Aleksandr Loktionov --- drivers/net/ethernet/intel/ixgbevf/ethtool.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbevf/ethtool.c b/drivers/net/eth= ernet/intel/ixgbevf/ethtool.c index bebad564188e..537a60d5276f 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ethtool.c +++ b/drivers/net/ethernet/intel/ixgbevf/ethtool.c @@ -867,19 +867,11 @@ static int ixgbevf_set_coalesce(struct net_device *ne= tdev, return 0; } =20 -static int ixgbevf_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc = *info, - u32 *rules __always_unused) +static u32 ixgbevf_get_rx_ring_count(struct net_device *dev) { struct ixgbevf_adapter *adapter =3D netdev_priv(dev); =20 - switch (info->cmd) { - case ETHTOOL_GRXRINGS: - info->data =3D adapter->num_rx_queues; - return 0; - default: - hw_dbg(&adapter->hw, "Command parameters not supported\n"); - return -EOPNOTSUPP; - } + return adapter->num_rx_queues; } =20 static u32 ixgbevf_get_rxfh_indir_size(struct net_device *netdev) @@ -987,7 +979,7 @@ static const struct ethtool_ops ixgbevf_ethtool_ops =3D= { .get_ethtool_stats =3D ixgbevf_get_ethtool_stats, .get_coalesce =3D ixgbevf_get_coalesce, .set_coalesce =3D ixgbevf_set_coalesce, - .get_rxnfc =3D ixgbevf_get_rxnfc, + .get_rx_ring_count =3D ixgbevf_get_rx_ring_count, .get_rxfh_indir_size =3D ixgbevf_get_rxfh_indir_size, .get_rxfh_key_size =3D ixgbevf_get_rxfh_key_size, .get_rxfh =3D ixgbevf_get_rxfh, --=20 2.47.3 From nobody Tue Dec 2 00:03:27 2025 Received: from mail-oo1-f42.google.com (mail-oo1-f42.google.com [209.85.161.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 DC2C02FE061 for ; Tue, 25 Nov 2025 10:20:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764066006; cv=none; b=lvjmc4HQs/wDDFt5TgMP0XAXjs5krIPlqmC2wSooJ0DpLAtzRLgKsfaQADTFL6joBUo6c4rmXe0/dhC6sIWceLv0N/I9i2rgoC83GcGX4yZcIVNmOrW8dDb4vjnRoHxzXE8pCWUh10FGL9rn8EPrYg4ysQPBQhi0nifA3zWfV54= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764066006; c=relaxed/simple; bh=dXV72bqndpkkvzq9o6QtXIzE69babSsUr1zwRzXjy7A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PB3+Thnh3FbVXXyxR4aIYoSWKDpN0oNVvVKGy4NDuajGzM18xwl0NuvYYEk6qerFUk79zmVDSVkEqeyrMwCkcgG7nBPBWIRfjx74lf3Cp/eHSDCHA/FE6XbQYUjGwBFkwN8eTmlb31yoTVjzdygkbP1MQxeJKKLr4Kl+dR4040A= 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.161.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-oo1-f42.google.com with SMTP id 006d021491bc7-6574ace76dbso2137312eaf.3 for ; Tue, 25 Nov 2025 02:20:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764066004; x=1764670804; 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=Tvbta4fVdZn9vAqQBg3FZCIOEShaAvkwCR4RcvEMvMU=; b=LKXcma53cPUFkkfDLqG/n5xAKG6rPG2aEhwmt20ltTeOfRBisi3nruThq4mSpU0b0e gr00YUkApUh740Izxq34q9bAxxQXWV915rakOzcH1nsFdbSIj4pFL2hUHK2JUiFNiwSt RzGXHbqIHSxbterI85NHKpjYyHGyvsbIYo8o2aZ527Ew5GhrkMjpVlf8w5bclgTLdCkw rrV1LLs4ANeKWTKlsiOcLziV2/Yw8M158hZMBwfPDnYGSbRQCsKO/gHfbvPtPFZN6vcp LlyG08n7J0Z5IgV+NKR/CVSAUM1vmFgkDdqOxEFY0pHUVWSdzLpZSQnMMEt2fS9xwfXM tbRA== X-Forwarded-Encrypted: i=1; AJvYcCVxOIxAr3gqqCcjnebjmXvcrXucEtEXMCapamCq1zX2YR5RqduOPX4P4tTx4bxC2sByEvPmd+G1B1IbERw=@vger.kernel.org X-Gm-Message-State: AOJu0YyOYrOOjdrvyNqfZi8p1Kjz3+CLWZwY/JTOHPkK21DkvsU9GIkF KRZrtWTIDaFJDZUIEikARxo8Q1jGFPlEylKwOBLrBvb6SQ2sIQyVXO0Z X-Gm-Gg: ASbGncvI30rtAWpkqYZU3aYfhe2Wp/TR3K0nmnjMN3PZg67Rgz913U8VF3gxmJ1exXL bNECFS/O6ZY1VUN5J8gestWG7aTuBykns5ZcDru+uZ38Aw1nPbyMLRLTQb96xE7WVPNObGjEXUW 1xH/j2lPiQ3ZzowtqtOze1kpkg4x3/0f4W6PFW1c12oYnEtwfqhAFgP+dftO1r3RbTrq9aloK4t lzKS68UQCxtAIo7h4LqiehwPmzfne2WpSv2plvF7WCypPWEBTQILsyuPQ2gMmH+7/ZKfVKc5dRU LiuB7ialLWz9YhruT+2W7MGpjmdL0eZbUuezKxxqI7WkD2EX8t5CPaXYNAXsgnpaNHhpOKjAT0B mzVm57KB3xoXsgQDB507SCmiMGCnCJGaUvTjJeBdhIBqYHhdKMvaj86OyKkY9liBbYlpIUdhAXD qobHCQ/2/JDG4iXX+ymCGS X-Google-Smtp-Source: AGHT+IG0n0J7rKRKrTWwDRtn+YiwdUe/ykWABXHXC6gNlvNKhYZ7bef0l5IiHuvPmD0px4kFdMhhrg== X-Received: by 2002:a05:6830:2b0c:b0:7c7:6da2:6d6d with SMTP id 46e09a7af769-7c798c4acb9mr8363612a34.5.1764066003793; Tue, 25 Nov 2025 02:20:03 -0800 (PST) Received: from localhost ([2a03:2880:10ff::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7c78d4280ddsm6145336a34.29.2025.11.25.02.20.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Nov 2025 02:20:03 -0800 (PST) From: Breno Leitao Date: Tue, 25 Nov 2025 02:19:51 -0800 Subject: [PATCH net-next v2 8/8] fm10k: 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-8-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=1964; i=leitao@debian.org; h=from:subject:message-id; bh=dXV72bqndpkkvzq9o6QtXIzE69babSsUr1zwRzXjy7A=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpJYLIAMYpRybdfkoBMBylttuJo/I+zxk10WasV OHTbp/453GJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSWCyAAKCRA1o5Of/Hh3 beq9D/sGrH7k8zyr42hndTHDhiu3C+5sa8ejE3PTLKXfz8VGFpSwkznKO3f7QGhI+fhLBP0aPN1 FO/fj0bnQA55HE3/gO6mdw+Y6Y4LFlL41U3T6Z5pLty6QrgbpOKeRTVoXA7NJeNiGB1Mgyaa+O4 2nqjhJsF93MHNuBOONOtiq1Hjz4QrbMqPLacFotgrEobYEqjR+HWYIIlrpaHcifg6Pf4J2Y6B4W UPV63dTdvs68k037miseUbQSqRfLa+RanPmZUby4C1TOWqfJCIjoP/XF59uWtuIhGat39Ri83oD sZLxizdb5iEVehz827agbw5CDq8i2E/xOveVYBGZNDNJxkgg3Dp7GFOu4dUoYJx1FqwGDSqtp+7 T6QaUEiDadl57/vHgGTjTBLtsNRDgKfkpqeOVPAnxrILZ5mSVDiW/iFzFVT3Fik1TdvB11Cc4+X 1U8w5+ISyAJx6jQ8Y7mO3fh10d0boHc+1EMJjY7reRm2cNvZ193tW46EaeDd72gmvUr0WYql0V+ qMztuITVslcHA0JkDqJGoZ5ULWLF33SRDwjh/WtCnbjMlICzk5Qs4tWJ6GCj1N8cgrhJdYgRrAq n1oHTCrplBgL07N+ldMZpwJdZC24gl3MB2Q/jWiww8Sg64qRJA6oya4FYHqLfFH0nGQq31EMb+m x7CGTmvx2hs3cfw== 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 fm10k with the new ethtool API for querying RX ring parameters. Signed-off-by: Breno Leitao Signed-off-by: Aleksandr Loktionov --- drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net= /ethernet/intel/fm10k/fm10k_ethtool.c index bf2029144c1d..76e42abca965 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c @@ -734,22 +734,11 @@ static int fm10k_get_rssh_fields(struct net_device *d= ev, return 0; } =20 -static int fm10k_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *c= md, - u32 __always_unused *rule_locs) +static u32 fm10k_get_rx_ring_count(struct net_device *dev) { struct fm10k_intfc *interface =3D netdev_priv(dev); - int ret =3D -EOPNOTSUPP; =20 - switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D interface->num_rx_queues; - ret =3D 0; - break; - default: - break; - } - - return ret; + return interface->num_rx_queues; } =20 static int fm10k_set_rssh_fields(struct net_device *dev, @@ -1160,7 +1149,7 @@ static const struct ethtool_ops fm10k_ethtool_ops =3D= { .set_ringparam =3D fm10k_set_ringparam, .get_coalesce =3D fm10k_get_coalesce, .set_coalesce =3D fm10k_set_coalesce, - .get_rxnfc =3D fm10k_get_rxnfc, + .get_rx_ring_count =3D fm10k_get_rx_ring_count, .get_regs =3D fm10k_get_regs, .get_regs_len =3D fm10k_get_regs_len, .self_test =3D fm10k_self_test, --=20 2.47.3