From nobody Mon Feb 9 01:51:43 2026 Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6299E38170B; Thu, 22 Jan 2026 18:40:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769107259; cv=none; b=PMml0A+tv6HT9vfLuXShEFjMZ4jNyaSrCOWCT5t0Yfn5BOMYJRm1W1Egse3FPcbBXBS6TqfVIhYgggRkC8CkZi2+H24KEv7UaztWzsjGh/fnV35BG512SG3JWsG1LGJ0JiJ+ohKd69jI0uA2tWbIQshRDWlbfk9tjle3XfKm2IA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769107259; c=relaxed/simple; bh=bJbfYoi9ePT6GJvQe190QXenIvJlnJbG5gCYyHOYLyw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uW5qMuRdPp1VuqNrdG4wzbmHyoCvKPRK6LUWdegHLbPTEWiETwhrondFMin3Z01Gl0K+eaeIMeDhQcBCSrZjUGzD/HcQLEjQKM6TBUN2Hka/2nK7DJ3q74qXH+yK2IiscubKdCP3zRON1WcwR/M4FIQG1prqebgJFYV/PCg054M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=WodppWPD; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="WodppWPD" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description; bh=0dc9BpwHRAb/FF2L8Jh14J11cIizVUqlWjJq5crcpt8=; b=WodppWPDGvQoSvmTSV/LYo/1x1 oPYD2IuzgCuw4P69kDavqHdfvpctFPByvZtA234oczQckfVfcKJI3d+2gN+yUVXerCG/Z6UHOyxai Fw6jnDFEkyR64oosT3ZgUXdw9FYeBKbzmXATf6pXTb67luUmUdj4fBMJBvhrB+8T7V+ECI4Wya0mR /9lzHsXI69rzbQSFVESY9f3w3r+4qqFyLaZUuXcN9Mym0zXSLlTOjb8DvvmvQlIk+YQdVvMMfKvwy PMr3vw7QjIewDdxrXqkOO+Sz5kDyBsUw47APZHrJbYcIXcwHV69gzIYaBdFHT3x+JwGhaGx4mlnE8 fd9cPYkg==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1vizbt-00DE0H-1f; Thu, 22 Jan 2026 18:40:49 +0000 From: Breno Leitao Date: Thu, 22 Jan 2026 10:40:13 -0800 Subject: [PATCH net-next v2 1/9] net: benet: convert to use .get_rx_ring_count 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: <20260122-grxring_big_v4-v2-1-94dbe4dcaa10@debian.org> References: <20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org> In-Reply-To: <20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Igor Russkikh , Simon Horman , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Alexander Duyck , kernel-team@meta.com, Edward Cree , Brett Creeley Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, oss-drivers@corigine.com, linux-hyperv@vger.kernel.org, linux-net-drivers@amd.com, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=2883; i=leitao@debian.org; h=from:subject:message-id; bh=bJbfYoi9ePT6GJvQe190QXenIvJlnJbG5gCYyHOYLyw=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcm8k2+B4mcM/copQUAEtONk0z4PoFFju/fIp1 /wqToeN7ZaJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXJvJAAKCRA1o5Of/Hh3 bd/kEACG4XJSOpexSFU2ks+thmqBCYwrNy4E+RWz1hvm9+j1KaUGS4KMNmPZMa0l2IpFbRWzzSU EYZYQjLapSLNta3vKOlDK4BtOVDe6UFxJ5Qh1DgyMRquZ9RwPm4R9Pzkahl/xBywg3J2dLSNJy6 xchXSZqo7P5MlcA88oNElxEOGA7sp8YlOXYgxYFCjd8NlXXg8uO0Zk3n5VElkW5NNSfVUFpFl9g 2UYcV37k58ah+igyBLyuU06caavBJOjyhp9nCLj0vpmAuYZtgQBplvobd52hgM6uj/a/0XOEFd4 09wEzImFn79Rg/sC6Uc47LLsdjc64ynJzg3mYin9sRdwzHSkgW2oSjHCkYSuZFb3bfUb8eDnTrr KSUz5/S9q1EVS2Vt+hG1sm3AI3zmRBkTPT0RIw6sfi1BICUWun7cs51BlwwhcW1leaX8dtTHrDI dWHAo4lYAKx7iPMH/QxtHOzZOk/eV8If+RdfpHXYKfkDoarHnAkgJXmr7fhAF8CN9+3FY7z+6iN HIfqsWjbKl11/xKZArJO2CP2O1V5gQ1ZNXaRUNu+3zBL4O2W+Md4Pvm6GMu8+pgHifx5wy87Diq oX68R37KzFmytpFG1jyp3Kzkre8NjvWKsGbKh9hL/o4frmCkSN3f7jmNooYShtCFpm33hDR8tNl GJgX1GRHvteCskA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Use the newly introduced .get_rx_ring_count ethtool ops callback instead of handling ETHTOOL_GRXRINGS directly in .get_rxnfc(). Since ETHTOOL_GRXRINGS was the only command handled by be_get_rxnfc(), remove the function entirely. Since the be_multi_rxq() check in be_get_rxnfc() previously blocked RSS configuration on single-queue setups (via ethtool core validation), add an equivalent check to be_set_rxfh() to preserve this behavior, as suggested by Jakub. Signed-off-by: Breno Leitao Reviewed-by: Brett Creeley --- drivers/net/ethernet/emulex/benet/be_ethtool.c | 37 ++++++++++------------= ---- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/e= thernet/emulex/benet/be_ethtool.c index f55f1fd5d90fd..87dbbd5b7f4e6 100644 --- a/drivers/net/ethernet/emulex/benet/be_ethtool.c +++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c @@ -1073,6 +1073,13 @@ static void be_set_msg_level(struct net_device *netd= ev, u32 level) adapter->msg_enable =3D level; } =20 +static u32 be_get_rx_ring_count(struct net_device *netdev) +{ + struct be_adapter *adapter =3D netdev_priv(netdev); + + return adapter->num_rx_qs; +} + static int be_get_rxfh_fields(struct net_device *netdev, struct ethtool_rxfh_fields *cmd) { @@ -1117,28 +1124,6 @@ static int be_get_rxfh_fields(struct net_device *net= dev, return 0; } =20 -static int be_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *c= md, - u32 *rule_locs) -{ - struct be_adapter *adapter =3D netdev_priv(netdev); - - if (!be_multi_rxq(adapter)) { - dev_info(&adapter->pdev->dev, - "ethtool::get_rxnfc: RX flow hashing is disabled\n"); - return -EINVAL; - } - - switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D adapter->num_rx_qs; - break; - default: - return -EINVAL; - } - - return 0; -} - static int be_set_rxfh_fields(struct net_device *netdev, const struct ethtool_rxfh_fields *cmd, struct netlink_ext_ack *extack) @@ -1293,6 +1278,12 @@ static int be_set_rxfh(struct net_device *netdev, u8 *hkey =3D rxfh->key; u8 rsstable[RSS_INDIR_TABLE_LEN]; =20 + if (!be_multi_rxq(adapter)) { + dev_info(&adapter->pdev->dev, + "ethtool::set_rxfh: RX flow hashing is disabled\n"); + return -EINVAL; + } + /* We do not allow change in unsupported parameters */ if (rxfh->hfunc !=3D ETH_RSS_HASH_NO_CHANGE && rxfh->hfunc !=3D ETH_RSS_HASH_TOP) @@ -1441,7 +1432,7 @@ const struct ethtool_ops be_ethtool_ops =3D { .get_ethtool_stats =3D be_get_ethtool_stats, .flash_device =3D be_do_flash, .self_test =3D be_self_test, - .get_rxnfc =3D be_get_rxnfc, + .get_rx_ring_count =3D be_get_rx_ring_count, .get_rxfh_fields =3D be_get_rxfh_fields, .set_rxfh_fields =3D be_set_rxfh_fields, .get_rxfh_indir_size =3D be_get_rxfh_indir_size, --=20 2.47.3 From nobody Mon Feb 9 01:51:43 2026 Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3139B3859DD; Thu, 22 Jan 2026 18:40:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769107270; cv=none; b=Lb95kIDH+MaLM0KIJUvgAu25Mm0wj8iqHbgAm4sPV9KcvfIgPQ8RR7E7fAB9FF2yHG6cD4Rx8uYtnTMz7y5VuSeNm5t5yXUgt9Q4Pdxs0l/yQ7z1BanjJOSaMXiJhoLMHzSaFZIDExtR79dTmjwV6nKR+XVPOEmORhag3ZxiaEM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769107270; c=relaxed/simple; bh=mny2J00nrRs6M1IHRh0d8Q1nMB8VhbEIqBu99Df48CU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RNr/7w4XP8gIZ1gyEolHRy9CJCcv1eza3C9PyKASSBkU7OjBXZeQs19tlHmy14wg03QAmhI4aUg+bqJ0fZq5FGV+pD2wjbMLdyeFwL1CO3bv5bSS4ge6Zs3mINzUWO94DztCEYRskLj66lHqe0h/eJVDoPrSOSsHvtZS+T7Slho= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=NQP60CwH; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="NQP60CwH" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description; bh=Sij5cyFk6sASCRFzOWNEYLobCeVvd/jMN2k8ihm0wIw=; b=NQP60CwHXQo7aqzhha6anevK3c xbl7o/XC2guoaytEpqBe8NxVsfMyqUMyVOPoSjqh36nn13feMSvgOstmOeod88Yq8dktQquPp/LD6 HhjPOyzFGyDyqk8hpEhxxrrBRWCzuUZHNtnmQGUnCSr2aVJFMq0UnC3y+pKK0EcBMH3EgXvmHEYNf iITCPx93HZOKOXPNxidP5vMix/VGT6TF6ItQQEss93oG5Jliw3XuINwcWCG5Ve6dH3sI6YfIXhLTs KfDKWBqcDWHaKwRULAoQkIVHRuSyZu2TSwBOUtK8l9OA2juO1WUdUyds3Qr/ZJGC6+Z3Bu5mxxq68 JsEmpJcA==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1vizby-00DE0U-Ly; Thu, 22 Jan 2026 18:40:54 +0000 From: Breno Leitao Date: Thu, 22 Jan 2026 10:40:14 -0800 Subject: [PATCH net-next v2 2/9] net: atlantic: convert to use .get_rx_ring_count 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: <20260122-grxring_big_v4-v2-2-94dbe4dcaa10@debian.org> References: <20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org> In-Reply-To: <20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Igor Russkikh , Simon Horman , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Alexander Duyck , kernel-team@meta.com, Edward Cree , Brett Creeley Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, oss-drivers@corigine.com, linux-hyperv@vger.kernel.org, linux-net-drivers@amd.com, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=1782; i=leitao@debian.org; h=from:subject:message-id; bh=mny2J00nrRs6M1IHRh0d8Q1nMB8VhbEIqBu99Df48CU=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcm8kKGR/7/+R88bgdG1d1CAVDrvN1m4tU6wAx Lyad+buyleJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXJvJAAKCRA1o5Of/Hh3 beqCD/9Q3iypbU4jAhwYJL6ZzuBe69K/yo+wvzan9GYfmIsdEd1b2EschFEPOHviKA+jJy58HJ+ DztZwxXZdTM1TVvb/OjUoiMZ7pAMK6w80yomt0vWTPsxCfiI73fl2keHHiyKsPXen5z/MkKOYgw TI3o5bdY6QmxikeB88Kmy3LCoA7w8AbMxOJPlv2LsTZcX4RU9Ccai3FI72KcvLBtiRZ1TJDzWeW inKYyMkeXcA6yEytC/hGPQAW20PBnp/JKQ+6bqqOpc+U3tA04lb/VriZa81ZuPfMh7AgIjnAM+q Y4iFu4Q4UHXUZmDCDXgyWTC8F9pqWMnFIoWfiEo4YMimp7TaUbyz0qgBqcAQeyFFELoTSM3fXHa kpoLrfpkXlIQToNrCa8v4ZaMdm3b3cwFQ+OjSNrsPQXKa1t1+i/C4fcdQfdrpy4ipMrWZx+Otpq RKu1hBaIiHdhYJ3zcwcyCfM9PDHCSjeGRLSwo119yE+5ZNvMv0HZBjuwkrJnZtrayKhiyXSYQ/k vgi7YmjNGjdmggcn8eksYlLPPlFuZehdc0gtAeO5gzJjoUiZKCxDUdxNBtysq65WhEUSt3EYRu7 zOMYBn+M5OqpjF4oPlNQOkN6qLMlub5nfZXy97Us8KKzdko0CTG3+MI6oisn13YcM0rgsyhtBLc 3bZS1tBerJkNyUw== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Use the newly introduced .get_rx_ring_count ethtool ops callback instead of handling ETHTOOL_GRXRINGS directly in .get_rxnfc(). Signed-off-by: Breno Leitao Reviewed-by: Brett Creeley --- drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c b/drivers/= net/ethernet/aquantia/atlantic/aq_ethtool.c index 6fef47ba0a59b..a6e1826dd5d7e 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c @@ -500,20 +500,25 @@ static int aq_ethtool_set_rss(struct net_device *netd= ev, return err; } =20 +static u32 aq_ethtool_get_rx_ring_count(struct net_device *ndev) +{ + struct aq_nic_cfg_s *cfg; + struct aq_nic_s *aq_nic; + + aq_nic =3D netdev_priv(ndev); + cfg =3D aq_nic_get_cfg(aq_nic); + + return cfg->vecs; +} + static int aq_ethtool_get_rxnfc(struct net_device *ndev, struct ethtool_rxnfc *cmd, u32 *rule_locs) { struct aq_nic_s *aq_nic =3D netdev_priv(ndev); - struct aq_nic_cfg_s *cfg; int err =3D 0; =20 - cfg =3D aq_nic_get_cfg(aq_nic); - switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D cfg->vecs; - break; case ETHTOOL_GRXCLSRLCNT: cmd->rule_cnt =3D aq_get_rxnfc_count_all_rules(aq_nic); break; @@ -1072,6 +1077,7 @@ const struct ethtool_ops aq_ethtool_ops =3D { .set_rxfh =3D aq_ethtool_set_rss, .get_rxnfc =3D aq_ethtool_get_rxnfc, .set_rxnfc =3D aq_ethtool_set_rxnfc, + .get_rx_ring_count =3D aq_ethtool_get_rx_ring_count, .get_msglevel =3D aq_get_msg_level, .set_msglevel =3D aq_set_msg_level, .get_sset_count =3D aq_ethtool_get_sset_count, --=20 2.47.3 From nobody Mon Feb 9 01:51:43 2026 Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CFA08381713; Thu, 22 Jan 2026 18:41:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769107270; cv=none; b=ffOzYZxscC6zRfxQHPFr3Y9LdRuckXAlhp4OMLjMUc6+1l2Sk55nZjzQLSWkpQWn3XPYXJapvaZ98m83kdgpwb6FI5BYAI3LrtKwK2kRD1Uj0FL4NBcWfWQ6vf7ONm716u9pb/YrwKIaiR299RLC/ZNkk2K+1FMPKeNqBH7oIvw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769107270; c=relaxed/simple; bh=OKbGb+qTrd7mgSuZ+uguuxpL+ep+/TBEvmLlF+53LxA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lY10lmw86UvbGy6d0OqWTKkCXlv3xOcH86aGaLSNLqdT7lC5TP56HjPEj9TbdT3H1sQTdLX9h16nqmTJAV8ICIqH4+w8K+KTq0rxk1ub+CxcI54sV8r0AsKbyVIjulfrP/KtzWreCaEf/pxS2so0rTzct3aAqM9IEmsk4p4ar+Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=fkJE1Adb; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="fkJE1Adb" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description; bh=XD2UTz5oPmh8TXyMBvF/w2pVWzLX0Zi6SpoC7dDXlfY=; b=fkJE1AdbtL0hrCieGHVW4Dqi+f 7YTSSfELrVl9gxm2CMWzrToiXHdOjphia9ZzP6QCOpdUUy5o4nAVkAPGSP06lJ1PpDfYDPXEJb1Zo I2Y/lc42kAk/3/vmSNhmIASr51C0uwdd/IjmSjtqhuBchDpr/KH/XTxpSGplB97/l70W+1pppuJZb bxjPvZ7r/qCTygd9bDwbxWYSW5xjQSs9YPdM1WG0HkDG8sg8/Cx1PW8Wy2QZzMW3m7yF/hOQcvkk0 3ditwGsYst+1XKxila13YWGZM1wyEpA6++Zq8iySUQa1ndy+LfNDnoM/IsjpzIuMBQMfihjcExIWC 9bu2lNIQ==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1vizc4-00DE0l-FJ; Thu, 22 Jan 2026 18:41:00 +0000 From: Breno Leitao Date: Thu, 22 Jan 2026 10:40:15 -0800 Subject: [PATCH net-next v2 3/9] net: nfp: convert to use .get_rx_ring_count 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: <20260122-grxring_big_v4-v2-3-94dbe4dcaa10@debian.org> References: <20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org> In-Reply-To: <20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Igor Russkikh , Simon Horman , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Alexander Duyck , kernel-team@meta.com, Edward Cree , Brett Creeley Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, oss-drivers@corigine.com, linux-hyperv@vger.kernel.org, linux-net-drivers@amd.com, Breno Leitao , Subbaraya Sundeep X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=1659; i=leitao@debian.org; h=from:subject:message-id; bh=OKbGb+qTrd7mgSuZ+uguuxpL+ep+/TBEvmLlF+53LxA=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcm8kGSg4mxjaQVxW5sCIoyLw+Ucz/Rvvk9zsD xchsU7W8X6JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXJvJAAKCRA1o5Of/Hh3 bQg5D/9xkqgE2hwe2CRiSoJId83kWO5WFcX3mwMiJAh6J9+bEMF8G9lacbkU2LCpoNDqM7PF3u8 SRGIX92RNGXa/n0z+MLdAxGy0BITb5+1Tru8e0JwDWIJi4IG+emgijgt1A6PwSH3IbizM6bYJQW 0yUQEbMfXnNc14rrPxAGrGS2VjZ7AcLj411/PGP6QNVjBJnVDnHfQW6Yiv55aW+OQOEhezB8GZ+ 7uJq9W+TBr6dphKHiue2OFycFJ9KaaM6TiGYJX/FM28WWs2rPEbaRANDAwxjz0evHdywMucSQfc DUYQW/NRaguuO36EqQ+MHHnPQF1ri1hleyTjJB8L28jjD7rBhGdwxHKGhVI39isLB4+1er6/GCL DJ/qNcakdiQR1twtgR6+xGChCJs0XJTjhu5mX8WunnG/YShj+9E5tgUpbivdosGbKLLejb1fF8F 072zUmgjmYGL4OKdcB3HajIbLOPGTsvzoIPzX2ps+960r32vzjtajfckP0quo+iwMRYcUykQF6R Xv2jVQhL5jeaevg25o/M2dNSiYPUt7TzcHXXVkDpDdMzp0/NbuKfgxc2ScsqxIZKjLQPPbdeQXX ikrFfieoos0zrD1MMBUD14VmYefBf8F6p7Lms7BrKtSEmoq8R99qcteh3nuuATQ6C9atGo2HKq7 8E8QAYeX+8lIMSA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Use the newly introduced .get_rx_ring_count ethtool ops callback instead of handling ETHTOOL_GRXRINGS directly in .get_rxnfc(). Reviewed-by: Subbaraya Sundeep Signed-off-by: Breno Leitao Reviewed-by: Brett Creeley --- drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers= /net/ethernet/netronome/nfp/nfp_net_ethtool.c index 16c828dd5c1a3..e88b1c4732a57 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c @@ -1435,15 +1435,19 @@ static int nfp_net_get_fs_loc(struct nfp_net *nn, u= 32 *rule_locs) return 0; } =20 +static u32 nfp_net_get_rx_ring_count(struct net_device *netdev) +{ + struct nfp_net *nn =3D netdev_priv(netdev); + + return nn->dp.num_rx_rings; +} + static int nfp_net_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, u32 *rule_locs) { struct nfp_net *nn =3D netdev_priv(netdev); =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D nn->dp.num_rx_rings; - return 0; case ETHTOOL_GRXCLSRLCNT: cmd->rule_cnt =3D nn->fs.count; return 0; @@ -2501,6 +2505,7 @@ static const struct ethtool_ops nfp_net_ethtool_ops = =3D { .get_sset_count =3D nfp_net_get_sset_count, .get_rxnfc =3D nfp_net_get_rxnfc, .set_rxnfc =3D nfp_net_set_rxnfc, + .get_rx_ring_count =3D nfp_net_get_rx_ring_count, .get_rxfh_indir_size =3D nfp_net_get_rxfh_indir_size, .get_rxfh_key_size =3D nfp_net_get_rxfh_key_size, .get_rxfh =3D nfp_net_get_rxfh, --=20 2.47.3 From nobody Mon Feb 9 01:51:43 2026 Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5906837FF61; Thu, 22 Jan 2026 18:41:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769107292; cv=none; b=rRVY/8fo+rzYfD3UK7eSdy15/B16UPOlvBAMJgSDPDO5ZJvQfB6YfY/4CdQw/E/vO3XH6szADpZORt/mfEpJx/J7WMgL5HLlturrEFg2QQvHliyEN1DkDxTWKQIMO+x8LfFF8V3w/BdH81MQ7RR3/HjMDZlh7CgUlOuNX04gfDE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769107292; c=relaxed/simple; bh=mMx0aIPpyYJ0H01ZGMQAA+ncQnIVJMLNwVGdNwLKfmc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TPSMifWCWMFmI8k6fqQ9rKdm/9fyjmyxbxU5TzpjLmrro/+nHaCFF5r5wYH38iwM0PsYiArjJ/t1j5cb8uIDd2dYWZyLuTMCblCoxJXYuHyLhVSg1qdfbD+CpDO6e5SkJI+mstvdTHvVowAkz4XG5AxVi/3kNG/37BO+kraCc1I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=D5eBdvVm; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="D5eBdvVm" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description; bh=K5z6kZHNlZ4qDFaNpaW1u+BLQ1VLld41mAaOnnhvfhg=; b=D5eBdvVmdSSe7qBg2iVil6Exai ex/rdNB5OyuFEh/xkFCMa9vC9cUr26UJ6IBaCn974eLSaidOzsqDJCnRa6Otf57XSQBsPOOWN/Zr5 6ayZBUJ8cCNVJ3SWJC4nYqd6NdnYBmho/+pi2pxgBjZDg0bnmaiz/D9lnl7+dT3ZXzHsFEh36ASmC 9TsAHJR/RjYcR4DI4pMKqrNDWR2J5zwFcg7EPCfkVJdVYtKLqVxnNNSFDepxEqtHzW9E3ez2yo0Fd z/zesaTltBJf59ybsNXPJHGvKLShkaZGl2tws5nsAJ5FJwBtVLg/9GC4GEciel7s6zA4FBTBMpLZY S0331+ZQ==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1vizcA-00DE17-5a; Thu, 22 Jan 2026 18:41:06 +0000 From: Breno Leitao Date: Thu, 22 Jan 2026 10:40:16 -0800 Subject: [PATCH net-next v2 4/9] net: mana: convert to use .get_rx_ring_count 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: <20260122-grxring_big_v4-v2-4-94dbe4dcaa10@debian.org> References: <20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org> In-Reply-To: <20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Igor Russkikh , Simon Horman , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Alexander Duyck , kernel-team@meta.com, Edward Cree , Brett Creeley Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, oss-drivers@corigine.com, linux-hyperv@vger.kernel.org, linux-net-drivers@amd.com, Breno Leitao , Subbaraya Sundeep X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=1704; i=leitao@debian.org; h=from:subject:message-id; bh=mMx0aIPpyYJ0H01ZGMQAA+ncQnIVJMLNwVGdNwLKfmc=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcm8k7ZhZGf3/4AH5Gg6x772N/1BkpYBTWimTH 2xvENpY9PCJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXJvJAAKCRA1o5Of/Hh3 bd1bEACSRqL2pxbGTSGnFk82oEgpfRBnFsFkkBQkID0vM0ntGMtIba4SGj+ghDsKOeLW56L/ZOP RKTpfPQtFeHOdO4y6U9+HsCk1DO3sj6ugmtELYvjg7GQwKO7dsJ+gidXzNAyjEviy7ZFC5lwjuw 9oX1QJJHPsRhgwe55yfxJ9/Mr97OLTi6y7Mn9ScFWcjPHG1M2gVlrotpVbagC3SBHOskSGRzWgp dDBNlLFBJKVMXV9EzTQGlPXobxfMFQDUtp/MA2Tlh3xaKGrAd2fbXHajpnS2736VjIvZ+oj6p75 0H1i7bY03+S0FTQ6c2QzLAuH2shFAWSSjNBjtb1PbT7vLOhMuXkeaji4QQdETqpKlKsqLdn/LJb PKY0YjZ4xR9yCdFxyNuoypBboza0Dkh8UCA8+lYWomCGZ0jwsvUbLl47EzLzhf7WDlr6UdaBzL7 nXCR3WhXZW2/UUxRXiKQT9fDsUnpQdOLxeqEMwabblO2Hln3ievFNRzRXg1v9xazIZkRG5FtBGd /jGUm5YopuuFCfRQO7QGBI3kV05byxVYehc740OvA49uAPFvH7nO/fHYZJDLhWZRFdezBiLpGXG 6nUYSL6i19l9e3B9cXVybka5o2oXSHLR5+ziC/42P973vPg9V93ewHYFEKXvNDqyV2VJ9nVlSTT UYrHqLCZoTBPWLg== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Use the newly introduced .get_rx_ring_count ethtool ops callback instead of handling ETHTOOL_GRXRINGS directly in .get_rxnfc(). Since ETHTOOL_GRXRINGS was the only command handled by mana_get_rxnfc(), remove the function entirely. Reviewed-by: Subbaraya Sundeep Signed-off-by: Breno Leitao Reviewed-by: Brett Creeley --- drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c b/drivers/n= et/ethernet/microsoft/mana/mana_ethtool.c index 0e2f4343ac67f..f2d220b371b5d 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c +++ b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c @@ -282,18 +282,11 @@ static void mana_get_ethtool_stats(struct net_device = *ndev, } } =20 -static int mana_get_rxnfc(struct net_device *ndev, struct ethtool_rxnfc *c= md, - u32 *rules) +static u32 mana_get_rx_ring_count(struct net_device *ndev) { struct mana_port_context *apc =3D netdev_priv(ndev); =20 - switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D apc->num_queues; - return 0; - } - - return -EOPNOTSUPP; + return apc->num_queues; } =20 static u32 mana_get_rxfh_key_size(struct net_device *ndev) @@ -520,7 +513,7 @@ const struct ethtool_ops mana_ethtool_ops =3D { .get_ethtool_stats =3D mana_get_ethtool_stats, .get_sset_count =3D mana_get_sset_count, .get_strings =3D mana_get_strings, - .get_rxnfc =3D mana_get_rxnfc, + .get_rx_ring_count =3D mana_get_rx_ring_count, .get_rxfh_key_size =3D mana_get_rxfh_key_size, .get_rxfh_indir_size =3D mana_rss_indir_size, .get_rxfh =3D mana_get_rxfh, --=20 2.47.3 From nobody Mon Feb 9 01:51:43 2026 Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE0F9385ED3; Thu, 22 Jan 2026 18:41:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769107292; cv=none; b=bFGuWfj5T20lqYPKxMay4YyitUNfvkeB5/iNou7H7QAZBYy9cL8SHX5R61OEu4laGx9DWhxang0J2E+fm/WK0cwQWxrQWKDdtBMWbb7wfdvuCxnOtvvn37uOmEObQAyR/CVgZrWoxNZvJTgopIkmy28E18cyQQZ6Tn78JWPkIus= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769107292; c=relaxed/simple; bh=IMKgxRU1sol0qv3q4ykIX98inRbeR6UTILUypHJQ1KU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Lc2oyZFirPiZNOS2mb1SECcNFmQsrO2Db5kc0dWoKOATqOFPbmR+xLHVg9LJh2ZFwl+Q9IVeupE7xkL/Ie3CErdePXbRdhOPHUJl94PzXTio0DdmC1VbmPLkJD4jmGyH2S7yzBBmE5xLc5fQgI9BnCyoar9HRNDsXJ25leDHXpo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=MKyKrV08; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="MKyKrV08" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description; bh=6idYD0AKGESVEMq5nLW+uYD0VvpAsFD+VjX/8Dx4wWo=; b=MKyKrV08Sx5QbmdCbkNRDtkaDJ fvnArC5vm8BIbXB9LY8sGgYFRtbYWFEA0ZvMllxNtqcJwGqItmJG2DoDBtshPY5z5IAnUJ4SefnRq 6kgv2E7Zz7MMiht+JnHralKiPgZB5varnYjsWqSJWxjSGcOdE9YBTSpeAkl8vFeMMK71TxoagYh+z wPYaeNZz9U3XXOIdR2WR7p0f7gndQ0IHUWyEl9za0Za1cvmpXKtGGzGUdGcVSPwWpfNIKUlFztkLf yekpw5Lp6XGT910ym1VH8nkayNspFL6bLwV9fz17hdTgftgemkrN6s4p73ZvrrEJxfVpEfrtZ2622 SBJG6p3w==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1vizcF-00DE1S-S0; Thu, 22 Jan 2026 18:41:12 +0000 From: Breno Leitao Date: Thu, 22 Jan 2026 10:40:17 -0800 Subject: [PATCH net-next v2 5/9] net: fbnic: convert to use .get_rx_ring_count 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: <20260122-grxring_big_v4-v2-5-94dbe4dcaa10@debian.org> References: <20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org> In-Reply-To: <20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Igor Russkikh , Simon Horman , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Alexander Duyck , kernel-team@meta.com, Edward Cree , Brett Creeley Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, oss-drivers@corigine.com, linux-hyperv@vger.kernel.org, linux-net-drivers@amd.com, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=1641; i=leitao@debian.org; h=from:subject:message-id; bh=IMKgxRU1sol0qv3q4ykIX98inRbeR6UTILUypHJQ1KU=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcm8ksyt9eH41AQ3+MfJ/92osnDOR8V5uk3YWS uKMEGyYCZaJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXJvJAAKCRA1o5Of/Hh3 bbpgD/9Jw+nYWfKZ9fc3wYv6g6rcQS18RwauPhB//bzj12HJml938592iXIwdagqqNlfoifz/Fr 0JN4J8wVZVHbO3YLBEbl1Igp5tL7asU+GECeo0JbrgdYxlRG14S/rN++HhgTkzVUXVkCM7SSiHK PPL3ERYKMGW2N/LPHYUQvHVrQq42UztgnXfOZwTCZX2PmH8QeJRpbzkod5kLpI62LDeF2boCJxs EZhcAiAcMSGkEpkAgHYOKbtQUkH+s5jWFwm3ITq0+VO/jhe9BDd7MozZTH7rmUf4rhjnw0XJwLM EPEiS+4SxBNw+KEf7oIzQGGtUvD2Nwf27vXqVuUosOye+EfcLHPDheHsUDWXfZL5rtR1iuqEO7j LcdLgoaPFydm2YzYYyDDfQtz/W1qYij+Q3OSd/KCaBD87Cm2r7jCtfbxuTALiCIiLQ0uxZj5qLa Zz3+qgjhaG/ZisoUSMakVsuYczG2FgYI18hzjX1l9kffKyMgQ9c+lEItaapYthtAoPwGm46YzCA 8z6rNAuEo9sB/3IkNOq4u4BOi/hr4SQ/4cV1VkqGvU+aknL8pzIEb0xCX/+hpuqxT1YvuvtjqW7 1kfSFt1VyP1yHA3fwcijhbSQeVj5l5bEbocgoV43KbDcLqjjd/UZzobu3VFgP+tmAx+3I/E9w0v aT4Lc2IoYT2lroQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Use the newly introduced .get_rx_ring_count ethtool ops callback instead of handling ETHTOOL_GRXRINGS directly in .get_rxnfc(). Signed-off-by: Breno Leitao Reviewed-by: Brett Creeley --- drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c b/drivers/net/= ethernet/meta/fbnic/fbnic_ethtool.c index 61b8005a0db5f..11745a2d8a443 100644 --- a/drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c +++ b/drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c @@ -825,6 +825,13 @@ static int fbnic_get_cls_rule(struct fbnic_net *fbn, s= truct ethtool_rxnfc *cmd) return 0; } =20 +static u32 fbnic_get_rx_ring_count(struct net_device *netdev) +{ + struct fbnic_net *fbn =3D netdev_priv(netdev); + + return fbn->num_rx_queues; +} + static int fbnic_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, u32 *rule_locs) { @@ -833,10 +840,6 @@ static int fbnic_get_rxnfc(struct net_device *netdev, u32 special =3D 0; =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D fbn->num_rx_queues; - ret =3D 0; - break; case ETHTOOL_GRXCLSRULE: ret =3D fbnic_get_cls_rule(fbn, cmd); break; @@ -1895,6 +1898,7 @@ static const struct ethtool_ops fbnic_ethtool_ops =3D= { .get_sset_count =3D fbnic_get_sset_count, .get_rxnfc =3D fbnic_get_rxnfc, .set_rxnfc =3D fbnic_set_rxnfc, + .get_rx_ring_count =3D fbnic_get_rx_ring_count, .get_rxfh_key_size =3D fbnic_get_rxfh_key_size, .get_rxfh_indir_size =3D fbnic_get_rxfh_indir_size, .get_rxfh =3D fbnic_get_rxfh, --=20 2.47.3 From nobody Mon Feb 9 01:51:43 2026 Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E3B27385523; Thu, 22 Jan 2026 18:41:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769107289; cv=none; b=Y4DpRm6hU6yvieb+a1UMvVIhNYihL4DVn4sP+TBPL4cDaH3n2lPBB1YO3A+oIMQw14uKQyyuhuciMNvfA/hbzilYdFeFGuZqeTBiaTJwAeCKMHVHc3TRTPQf0/rC21oWzmeLem/5+uyo2L/xFJv0uL4VMEyRXPjkmntDl0RupFA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769107289; c=relaxed/simple; bh=hcqyM75IhDs1llDj+Jc/tRBAmN6d3Y2GPI2HR0+kOEk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=t/FHtmflpOS0YCh9Jp1VLY6bfWiwEgp4ttEn3RIOXv6u5uQf8hGWwjSGuwFjAypmeLQb5QZ284pphiRcUE5wd00cPMtANFFEEI4a9Pk196aAjhpw/kYGIDzU3DnEltmBESDWdNL/EtSVDsDKSSFzOe4pwrjC7v5egHIPeJ5aYUo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=B87wqEox; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="B87wqEox" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description; bh=BLDbgw2RbJKl24Wt0v/fHeCv4g6QFtZXh1UHirohJQY=; b=B87wqEoxoqNxrfJlqatHqFodEi YC7kb0os1bPtlRdxo8z5QhItiHs9G+L5ot7Q+Nfp56LQ3tq/EEVuk9WN1ZMxAfqaUOQXztpGYEMqL 8dDN0NttE4Gv5qDq3wv+dYRgg46XcBbrU7FhpbtYBSWGxWakoqk6qfbUaK0590WU93J+it3fLj6ZV zonRGw8go9YDWLZdWnAWPPZdRVHi+s51sQDEeudU12qL+GWb5RKxAJ6FAlmp2OgXq1rKezgAZZBxn 2ScepCB3WxVlREbvLm7IX+Q6QJ5TnDWeoAS2l2VpNhWlycM6SceJuVgb98gCHni+jcQjb9HRAET1N PZ38nMVA==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1vizcL-00DE1q-GU; Thu, 22 Jan 2026 18:41:17 +0000 From: Breno Leitao Date: Thu, 22 Jan 2026 10:40:18 -0800 Subject: [PATCH net-next v2 6/9] net: ionic: convert to use .get_rx_ring_count 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: <20260122-grxring_big_v4-v2-6-94dbe4dcaa10@debian.org> References: <20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org> In-Reply-To: <20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Igor Russkikh , Simon Horman , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Alexander Duyck , kernel-team@meta.com, Edward Cree , Brett Creeley Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, oss-drivers@corigine.com, linux-hyperv@vger.kernel.org, linux-net-drivers@amd.com, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=1858; i=leitao@debian.org; h=from:subject:message-id; bh=hcqyM75IhDs1llDj+Jc/tRBAmN6d3Y2GPI2HR0+kOEk=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcm8k0kk3ABjJYbC9BPOONFr6Q4C+8FeRjPtbo j4zk+VDdPGJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXJvJAAKCRA1o5Of/Hh3 bW7uD/96h8iVT+YSeMRE7CQILrkHvBXsdVsDCO+yv3k2OS4MBLR793NHDm7ymgcdctxCG0U3oe+ XTQRKqfD56wMqL/ZaPMg51DoCZJzF9VGxUp2uzGlUazfIMRCiUSFFU0SMoExOe1epSXXjTgKWYl PvogDldi7XZ/wIAm6V9y1CpsSl5oGylLQsbWDNWXCyYy+nMifNMFfp++VeyP0zmLknO+f+ffMIM eqzblXmj21luh0fixVwrsXYgKEkKlfAdRm9iiiY5+JW+GMoptCFj1Rj/nm28X8Q1B4In/YnSX6X 5ECJDIEYUVRzSaR4lXxVIW3729HsAVqVyPxlM5XD3CI51ANkbPO1sw/VQcutlpoak9CtMxlh9fG jPEGreeLi+Un35UCS4Nx/G7z/w2xuPDgo7pDRXtxxfxS3pNdAV9OxB//n3toFWzeGcfagiyGOLn BAyn6r5iJaCwfNSVm6eRU5+PpdfoEAtw/OpOMJVDk3I11Wk/vxn5vqvoqAxHAAPMV5Fe35aH7Yx jb1Ke00Rnr+lKZBGGLZH29tsEU6KHXYnfchzO7txDjGVjN6UOzcuJmdit71X3bE7QqAhV3J5P1V 8jDV1S9A96dKpJgrxL0642gA9x90CVlVq8acZDTtUXD00IkpTWkxxQ08J0xX8QltXBphuFtwd/9 E4H0aFNh/bO9jdg== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Use the newly introduced .get_rx_ring_count ethtool ops callback instead of handling ETHTOOL_GRXRINGS directly in .get_rxnfc(). Since ETHTOOL_GRXRINGS was the only command handled by ionic_get_rxnfc(), remove the function entirely. Reviewed-by: Brett Creeley Signed-off-by: Breno Leitao --- drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c b/drivers/= net/ethernet/pensando/ionic/ionic_ethtool.c index 2d9efadb5d2ae..b0a459eeaa640 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c @@ -843,23 +843,11 @@ static int ionic_set_channels(struct net_device *netd= ev, return err; } =20 -static int ionic_get_rxnfc(struct net_device *netdev, - struct ethtool_rxnfc *info, u32 *rules) +static u32 ionic_get_rx_ring_count(struct net_device *netdev) { struct ionic_lif *lif =3D netdev_priv(netdev); - int err =3D 0; - - switch (info->cmd) { - case ETHTOOL_GRXRINGS: - info->data =3D lif->nxqs; - break; - default: - netdev_dbg(netdev, "Command parameter %d is not supported\n", - info->cmd); - err =3D -EOPNOTSUPP; - } =20 - return err; + return lif->nxqs; } =20 static u32 ionic_get_rxfh_indir_size(struct net_device *netdev) @@ -1152,7 +1140,7 @@ static const struct ethtool_ops ionic_ethtool_ops =3D= { .get_strings =3D ionic_get_strings, .get_ethtool_stats =3D ionic_get_stats, .get_sset_count =3D ionic_get_sset_count, - .get_rxnfc =3D ionic_get_rxnfc, + .get_rx_ring_count =3D ionic_get_rx_ring_count, .get_rxfh_indir_size =3D ionic_get_rxfh_indir_size, .get_rxfh_key_size =3D ionic_get_rxfh_key_size, .get_rxfh =3D ionic_get_rxfh, --=20 2.47.3 From nobody Mon Feb 9 01:51:43 2026 Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E52A73859C7; Thu, 22 Jan 2026 18:41:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769107311; cv=none; b=G3aJuTyK0TUrVFmypG/IKwlNNKtarDc0O7KX9TBJkTjWgrAI3thXGV3jqVSsHGfAJpxjDTj/rHcRggWldBH4O9PSigcPEqOvTaQK/7BPFeP58huy8OxvtMO//K94pnpUGuMsHfwtlBDBspx2tDt6QHz68g1mcnVrsdOogWZ1AXA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769107311; c=relaxed/simple; bh=xqDRg42cn9s+PQJV3QJKXzwsDuQzgQ88O7+U4GmtgGA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=I6UYZGhBCMf18LgAuKCco4IcQg/CwuxfX9az7y62NJI+aRxRxjVYFw5Cc+RUsrtkCjRPti5VGgOdQgMtk2Af5byWTmwSxDUV1mot8k/GdApXLDL1YOKR3MmQZRd37aHDGYNtcCOx1dyi+ofyY8JWgpHvXx6L/pInDnm6XRT/gxI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=cXwHMWjO; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="cXwHMWjO" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description; bh=yFPLZuBBqgdNTKRLDjxt0gL81wNcNDScS38n9r2rPKI=; b=cXwHMWjOm2oEhkNAPnQNLncQOK IbzQGv9QHEcU7F+A0JLGARqBMP+TjTf27DERgtvH455obdEe4YZo39JrFjco4MtS5pOPKQJBQtwOJ DGSoHp6b/rBoKwEF6XdFTidjwwGEZIVgIseWlL1Nuzt+tdCa+MTZZIL9bCGHmUpCYq9XRnZbrKfix CrCztLjStvIfETNqZUYy06fNR3QyRCN5BDiFkB/aAKFg3qltAjTmyri/UltYFW1tfFvcjMGT0WYIf q4/ALOZQkua15laKIgs0K8N7hYdjnsriKFj+6r+Nhl+2IKS3o9h7GSwKH5mTRXXD9uP6QcPXwhnqz fBisX80w==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1vizcR-00DE26-CJ; Thu, 22 Jan 2026 18:41:23 +0000 From: Breno Leitao Date: Thu, 22 Jan 2026 10:40:19 -0800 Subject: [PATCH net-next v2 7/9] net: sfc: efx: convert to use .get_rx_ring_count 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: <20260122-grxring_big_v4-v2-7-94dbe4dcaa10@debian.org> References: <20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org> In-Reply-To: <20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Igor Russkikh , Simon Horman , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Alexander Duyck , kernel-team@meta.com, Edward Cree , Brett Creeley Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, oss-drivers@corigine.com, linux-hyperv@vger.kernel.org, linux-net-drivers@amd.com, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=3292; i=leitao@debian.org; h=from:subject:message-id; bh=xqDRg42cn9s+PQJV3QJKXzwsDuQzgQ88O7+U4GmtgGA=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcm8k2zH1hNIRx9gt6FzGD69x/pKtOG+BPB2RL 7pnd4lsxuyJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXJvJAAKCRA1o5Of/Hh3 bfR/EACpjiHLVOIMBpWzjxFrlLEJAP011LzkGj+DHLfV2S9dBjWYs0pzbrZQ43umUl4/RkOrnIn WPwSu4+KKDlj4UMZUZ2GP2OyITqvJY5MS9U7nbrtzvXgWusDf/UMI0AZ8zxW2E+xx4/xCXha2F0 dzqqwuzvd7zLaMEmr1332fap1yqzt/9X3SwvPWFOwCaKpKsO8GRie0PV+dqMDy2kDSST+E7gxoN 9w+7F0oNCg8eBBhXugRysLKMhV4LkqKEHaRy1dVQJRKAATx9LvDXG/jBe4qCc10Ps2515oQ3JTb m2d2lPQr8xHtOrTGU+MkFJnkB5seOtgBiPxk602RgW/PIaXdcQuzmDqwvZRNatU7fNblgfErEV9 nPIr1vr2v9oE1oqxydOdGYOHON473MWbPhI3ZzR0KGj6EeVSO+r62/9dRt2EaErPR6UnO96IsR2 lCrO0+N3m39SXg8p6CBDVhh9Aj1MIUC3TnpDa4fcq/vHUi2ceMK4eWppVJ8hWB5MQU6ozsMk8Al PsvACpFPCXvIDTx9bi5FC1tHHNKIaT4NW/uzmJUndRYPquq71jUjMzS5TrzkGiw+F6WMFbmk/r9 0AwyLVNo8HkYGSpqLHUvYwtyKX0+004GYd2uVY4o3cZNxiAn1J4BuUh90arm7Ex2HZhHwXHfs+V CRvTQSNMrs2iTPw== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Use the newly introduced .get_rx_ring_count ethtool ops callback instead of handling ETHTOOL_GRXRINGS directly in .get_rxnfc(). Signed-off-by: Breno Leitao Reviewed-by: Brett Creeley --- drivers/net/ethernet/sfc/ef100_ethtool.c | 1 + drivers/net/ethernet/sfc/ethtool.c | 1 + drivers/net/ethernet/sfc/ethtool_common.c | 11 +++++++---- drivers/net/ethernet/sfc/ethtool_common.h | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/sfc/ef100_ethtool.c b/drivers/net/etherne= t/sfc/ef100_ethtool.c index 6c3b74000d3b6..05dc7b10c8855 100644 --- a/drivers/net/ethernet/sfc/ef100_ethtool.c +++ b/drivers/net/ethernet/sfc/ef100_ethtool.c @@ -54,6 +54,7 @@ const struct ethtool_ops ef100_ethtool_ops =3D { .get_ethtool_stats =3D efx_ethtool_get_stats, .get_rxnfc =3D efx_ethtool_get_rxnfc, .set_rxnfc =3D efx_ethtool_set_rxnfc, + .get_rx_ring_count =3D efx_ethtool_get_rx_ring_count, .reset =3D efx_ethtool_reset, =20 .get_rxfh_indir_size =3D efx_ethtool_get_rxfh_indir_size, diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/= ethtool.c index 18fe5850a9786..362388754a292 100644 --- a/drivers/net/ethernet/sfc/ethtool.c +++ b/drivers/net/ethernet/sfc/ethtool.c @@ -261,6 +261,7 @@ const struct ethtool_ops efx_ethtool_ops =3D { .reset =3D efx_ethtool_reset, .get_rxnfc =3D efx_ethtool_get_rxnfc, .set_rxnfc =3D efx_ethtool_set_rxnfc, + .get_rx_ring_count =3D efx_ethtool_get_rx_ring_count, .get_rxfh_indir_size =3D efx_ethtool_get_rxfh_indir_size, .get_rxfh_key_size =3D efx_ethtool_get_rxfh_key_size, .rxfh_per_ctx_fields =3D true, diff --git a/drivers/net/ethernet/sfc/ethtool_common.c b/drivers/net/ethern= et/sfc/ethtool_common.c index fa303e171d98b..2fc42b1a2bfb7 100644 --- a/drivers/net/ethernet/sfc/ethtool_common.c +++ b/drivers/net/ethernet/sfc/ethtool_common.c @@ -850,6 +850,13 @@ int efx_ethtool_get_rxfh_fields(struct net_device *net= _dev, return rc; } =20 +u32 efx_ethtool_get_rx_ring_count(struct net_device *net_dev) +{ + struct efx_nic *efx =3D efx_netdev_priv(net_dev); + + return efx->n_rx_channels; +} + int efx_ethtool_get_rxnfc(struct net_device *net_dev, struct ethtool_rxnfc *info, u32 *rule_locs) { @@ -858,10 +865,6 @@ int efx_ethtool_get_rxnfc(struct net_device *net_dev, s32 rc =3D 0; =20 switch (info->cmd) { - case ETHTOOL_GRXRINGS: - info->data =3D efx->n_rx_channels; - return 0; - case ETHTOOL_GRXCLSRLCNT: info->data =3D efx_filter_get_rx_id_limit(efx); if (info->data =3D=3D 0) diff --git a/drivers/net/ethernet/sfc/ethtool_common.h b/drivers/net/ethern= et/sfc/ethtool_common.h index 24db4fccbe78a..f96db42534546 100644 --- a/drivers/net/ethernet/sfc/ethtool_common.h +++ b/drivers/net/ethernet/sfc/ethtool_common.h @@ -40,6 +40,7 @@ int efx_ethtool_set_fecparam(struct net_device *net_dev, struct ethtool_fecparam *fecparam); int efx_ethtool_get_rxnfc(struct net_device *net_dev, struct ethtool_rxnfc *info, u32 *rule_locs); +u32 efx_ethtool_get_rx_ring_count(struct net_device *net_dev); int efx_ethtool_set_rxnfc(struct net_device *net_dev, struct ethtool_rxnfc *info); u32 efx_ethtool_get_rxfh_indir_size(struct net_device *net_dev); --=20 2.47.3 From nobody Mon Feb 9 01:51:43 2026 Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D44923859CB; Thu, 22 Jan 2026 18:41:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769107318; cv=none; b=mXEir8V7z3tWpRQXfOE2tI5GAEJnZueY1Oz5N/Ju4ScQrT9GjbE2Uu3D585oMogiaon6HqJbMwYhAYXP0+AdELJPpviQ1fzyauGA0Qp42x9pYjXrKfs0ynr1CEIqpGriLP2wxsGsOqb2sZEl7SrouMhu9V7wkY7vh2XUGAg5cq8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769107318; c=relaxed/simple; bh=xjfGrJ9ogmU02tXh4UwJsiacW3KcvGXHd/h59cpJCJU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EkRugySm1EJzmSX/k6LoALIn1YacEpd5OBtJ3SNkjPML/ibrOP1uu7u6f3QSB7OoJE2O1KEsbUEdJQ/VuVQAR87w8VcrRmikLlyMZssw/dy5wVqeiY+Nz4UsgRKrzhzQyE6UzM+6a8l40Bgzdala67VzoztB0F+b9fZOpKoAolE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=bNfNiXPB; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="bNfNiXPB" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description; bh=+Ieldrz0yCTZzK/huBW1mkitT5A3IA5rZUXCCnhdv+8=; b=bNfNiXPBqOd4lHTo+SwidUgz8T 0uM096VXGUo0YE14qMLTSvNXpw6+k4SEqpmXs5pEEXMw+/vu1TEh0Fsit1iaQssibsDpJWP51H2Kn wZVqib+ZW3o2bupfS2PrAx0u7cu9gMJ57VRhMiOZsFMhiKk4A+VGiLJp93AHe/VlJMdZD1V6+Ezze DcbGz1CSntKWhMQEo5UED9mgzHXMidSIkgPVOtzUsYzbts7wUTQrpsNJZFqe5lJQPi2RTu69df4Yy OvAVY8hlFcZs0e4UBpGfm801N7DKQVcz9b9yhS1eZIViJgCVB133QJc+4LOfyMAWOIZ95dF7bk3IL oxhUOIiA==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1vizcX-00DE2W-Ib; Thu, 22 Jan 2026 18:41:29 +0000 From: Breno Leitao Date: Thu, 22 Jan 2026 10:40:20 -0800 Subject: [PATCH net-next v2 8/9] net: sfc: siena: convert to use .get_rx_ring_count 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: <20260122-grxring_big_v4-v2-8-94dbe4dcaa10@debian.org> References: <20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org> In-Reply-To: <20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Igor Russkikh , Simon Horman , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Alexander Duyck , kernel-team@meta.com, Edward Cree , Brett Creeley Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, oss-drivers@corigine.com, linux-hyperv@vger.kernel.org, linux-net-drivers@amd.com, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=2810; i=leitao@debian.org; h=from:subject:message-id; bh=xjfGrJ9ogmU02tXh4UwJsiacW3KcvGXHd/h59cpJCJU=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcm8kwMgayWGZil65b7m91kTJjZMqKDCbx4NDa 3ny/Yf0Sl6JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXJvJAAKCRA1o5Of/Hh3 bfEsD/9GFdvicyZuKksa/LMwMan8K3l2ul6AbpK+dk0soRUKMkhZOBa8M1Rs+GmAmMVY6kS0A7s B6n1MKjcxLSzkX2ZOcexcD3hEzx72woM8b8GU/sDHc97GDRyRnYNUPBWMnkM6Imim4TiUIz5oZa xdK2r4vYkFIlAQPvVlSGRZnDWf08/y8Yre4FD61jK3pJZbYCRDG9iMLQnLS9YQ3+x02YOKU8pvz WEAhRokUN2USk3qFyUsP8D/ACO/22I4d3fxiYTMCuDZ4dqJgS3uBMrgM7noyQxHdNehe74UGd/d CBVOTtTIXJzu5MBsveBv0yN/4u1uUKqXIm1cwFUlSxyHL62IhXtFG8XJTn0kQvHh8mtpN/+KoD+ A327CRIZDiPv1CwuK8YAjYpGe8LTXjIZSIxPCDKqMYLdmrsumP//6N9lPC4jUXqVxrWe1DZKELI jDHDPpkYUVaai3BPUE4l0c0MrUxYi09HLfYAasVJC5csDgF6OcWAfsquYF6sJuOWZeYV21mujtG 1jRwctHNQZhASgWtpElJI+muqrGM1Tmr2gtIe2WANfPVgdkMm8cJTIsuW0FNYB5ZmiyQvajLkH0 AiC5zyhgnGryduqWCnB89Qr8/BqUBLwcNAKa/VWjZe1UkDMrdiJHGZbV6XKHqwjbOwliRquKN8r yoNTjNDZuw0nCgQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Use the newly introduced .get_rx_ring_count ethtool ops callback instead of handling ETHTOOL_GRXRINGS directly in .get_rxnfc(). Signed-off-by: Breno Leitao Reviewed-by: Brett Creeley --- drivers/net/ethernet/sfc/siena/ethtool.c | 1 + drivers/net/ethernet/sfc/siena/ethtool_common.c | 11 +++++++---- drivers/net/ethernet/sfc/siena/ethtool_common.h | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/sfc/siena/ethtool.c b/drivers/net/etherne= t/sfc/siena/ethtool.c index 8c3ebd0617fb1..36feedffe4444 100644 --- a/drivers/net/ethernet/sfc/siena/ethtool.c +++ b/drivers/net/ethernet/sfc/siena/ethtool.c @@ -261,6 +261,7 @@ const struct ethtool_ops efx_siena_ethtool_ops =3D { .reset =3D efx_siena_ethtool_reset, .get_rxnfc =3D efx_siena_ethtool_get_rxnfc, .set_rxnfc =3D efx_siena_ethtool_set_rxnfc, + .get_rx_ring_count =3D efx_siena_ethtool_get_rx_ring_count, .get_rxfh_indir_size =3D efx_siena_ethtool_get_rxfh_indir_size, .get_rxfh_key_size =3D efx_siena_ethtool_get_rxfh_key_size, .get_rxfh =3D efx_siena_ethtool_get_rxfh, diff --git a/drivers/net/ethernet/sfc/siena/ethtool_common.c b/drivers/net/= ethernet/sfc/siena/ethtool_common.c index 47cd16a113cf1..c56e0b54d8541 100644 --- a/drivers/net/ethernet/sfc/siena/ethtool_common.c +++ b/drivers/net/ethernet/sfc/siena/ethtool_common.c @@ -841,6 +841,13 @@ int efx_siena_ethtool_get_rxfh_fields(struct net_devic= e *net_dev, return 0; } =20 +u32 efx_siena_ethtool_get_rx_ring_count(struct net_device *net_dev) +{ + struct efx_nic *efx =3D netdev_priv(net_dev); + + return efx->n_rx_channels; +} + int efx_siena_ethtool_get_rxnfc(struct net_device *net_dev, struct ethtool_rxnfc *info, u32 *rule_locs) { @@ -849,10 +856,6 @@ int efx_siena_ethtool_get_rxnfc(struct net_device *net= _dev, s32 rc =3D 0; =20 switch (info->cmd) { - case ETHTOOL_GRXRINGS: - info->data =3D efx->n_rx_channels; - return 0; - case ETHTOOL_GRXCLSRLCNT: info->data =3D efx_filter_get_rx_id_limit(efx); if (info->data =3D=3D 0) diff --git a/drivers/net/ethernet/sfc/siena/ethtool_common.h b/drivers/net/= ethernet/sfc/siena/ethtool_common.h index 278d69e920d9f..7b445b0ba38aa 100644 --- a/drivers/net/ethernet/sfc/siena/ethtool_common.h +++ b/drivers/net/ethernet/sfc/siena/ethtool_common.h @@ -37,6 +37,7 @@ int efx_siena_ethtool_set_fecparam(struct net_device *net= _dev, struct ethtool_fecparam *fecparam); int efx_siena_ethtool_get_rxnfc(struct net_device *net_dev, struct ethtool_rxnfc *info, u32 *rule_locs); +u32 efx_siena_ethtool_get_rx_ring_count(struct net_device *net_dev); int efx_siena_ethtool_set_rxnfc(struct net_device *net_dev, struct ethtool_rxnfc *info); u32 efx_siena_ethtool_get_rxfh_indir_size(struct net_device *net_dev); --=20 2.47.3 From nobody Mon Feb 9 01:51:43 2026 Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1D81385EDB; Thu, 22 Jan 2026 18:41:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769107318; cv=none; b=hxbARCQY/INwbihn+QYDktMae/cIRKktdXOe0zWmRo2GZ8Mf6BIU9/BXJTihfu/Dvv20rIy7FYVhYrBR+iwHB8LK9YrTGO2abTZ9yPE9q7ul5pkn+F3rXgs/OU1xXUNTE/+gCvJ8uRzPRCIR5GcTWRz+p3+w+B2eW1durt0bABU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769107318; c=relaxed/simple; bh=kqzS/7eXjKQG4xiemTDsmFZRs2ALv2BsjFw/ViIR5ug=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Qcyv3WEWcelBCu8NcI75g0Bdf0owZcRfaoI5o32NbI9cLrAqQrNd7LUesAxLKWXCiUhAp6Wdf5Gp8kAMkp/HmLxaqv0aeFrz1PRev04hA/AcHj9SIAMlQZ0KZTi7s69wEsInaK4P4YAY5i+wmbe6eVbcILMbJLqWQoDNUWsvoXg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=MjVJRlKC; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="MjVJRlKC" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description; bh=BvlsW4lqNl+1+09mnU3bYFr4itCF0ttr+C2yEDPsR5w=; b=MjVJRlKCGyZitSaGfubXNbCTR3 JQWhQS/Jh0GMybhRRgIm6m1Wu0Fz7CUvg/mhRi82OWRUNIxyLNKEMmtLOxS5bMaxliitPSZJgtK7y DfzYT8idPV731aAGA/Hr8umsp0k3syVU3MSWhTk8YXXoN/OtA7leMGJ05vrBFRWo+lk+Wr+QXE4T2 tZAnUdXWjrGlar7zyyQrNgND3JUwMjybc8zRWq1lFC73BznNynj9CsQ4qq8d/n8S7bXjmRMq2qGZX ZayB+D6jKt/Z8JjuOipgN2wXMSknQbLVlP9Qm59bot7C/Lh+SGsQ+BG+HYT2ufonsXtxDw4zoHVgJ bYqw5Nbw==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1vizcd-00DE2u-5u; Thu, 22 Jan 2026 18:41:35 +0000 From: Breno Leitao Date: Thu, 22 Jan 2026 10:40:21 -0800 Subject: [PATCH net-next v2 9/9] net: sfc: falcon: convert to use .get_rx_ring_count 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: <20260122-grxring_big_v4-v2-9-94dbe4dcaa10@debian.org> References: <20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org> In-Reply-To: <20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Igor Russkikh , Simon Horman , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Alexander Duyck , kernel-team@meta.com, Edward Cree , Brett Creeley Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, oss-drivers@corigine.com, linux-hyperv@vger.kernel.org, linux-net-drivers@amd.com, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=1636; i=leitao@debian.org; h=from:subject:message-id; bh=kqzS/7eXjKQG4xiemTDsmFZRs2ALv2BsjFw/ViIR5ug=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcm8lVobBKIKaWbL7Kss5QdFLbdCw83xm1pGqR Jhg6DdcOk2JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXJvJQAKCRA1o5Of/Hh3 bVgsEACbbq3yhlNMWTg6qovyWCNCsnQeGJQ1kp70ENZUKf6zzrXDEkDuUw87rbiYVXUFYdzRsEd oYipnvd5VN554x5zlGhZ0xkoy/aBtMYQLos6kNRW7Qf44a/Ugw1DAMXg3+65OIeio+NsMGlvu92 FbzQIEj3XjSfNvZFhd+GvwRgpMxmqKzuQi2U1N7Zn3Wh2ForP8Hwcvd1t9jpq85Nb5oZCjXsxSW +b//phb6v0+GEInAZsQrfxM3YHrxXKVuC1e3NXd0SY8QtdKGD4dioZerHtZ4RH1yxcOAt0+6KFp q+2stGci5wPFkzwx39Q9nMn9v1C1GLdCxSzMO54/tQS2v/D3RSJ1Kf5Ivbp1bqYH8NVBmIV4koY GYMNi+C8i0jGCi/Vw59LxF4EwQV4TcDpFeOhPla/5EcgwzmnfA7NE4h8Vps20pzIMhvwX2aW1AX go7lj6/vaCbuuMe3ES5fUaTps6xJ+Sdm4KH4UihpC8/XKQ7RH3/HcqZoCFg9v5aHPFP3z0K3zff Cu0BCDRt8Ef7/gnZnvpnwdbxAhDd3rbRWAjqxf4HeRFwiXTH3x6A8dWxQw/+qQLms/zt8Pacl+5 KW3+u6qol2KvXxlwoHsIX9wB2zCNMB0lsyJ5Ij048rRYEozpSZmqOg/awmvTaGL8WeSJsI+miIE ULO2KvsOGmHv0Qw== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Use the newly introduced .get_rx_ring_count ethtool ops callback instead of handling ETHTOOL_GRXRINGS directly in .get_rxnfc(). Signed-off-by: Breno Leitao Reviewed-by: Brett Creeley --- drivers/net/ethernet/sfc/falcon/ethtool.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/sfc/falcon/ethtool.c b/drivers/net/ethern= et/sfc/falcon/ethtool.c index 27d1cd6f24ca1..0493640315454 100644 --- a/drivers/net/ethernet/sfc/falcon/ethtool.c +++ b/drivers/net/ethernet/sfc/falcon/ethtool.c @@ -974,6 +974,13 @@ ef4_ethtool_get_rxfh_fields(struct net_device *net_dev, return 0; } =20 +static u32 ef4_ethtool_get_rx_ring_count(struct net_device *net_dev) +{ + struct ef4_nic *efx =3D netdev_priv(net_dev); + + return efx->n_rx_channels; +} + static int ef4_ethtool_get_rxnfc(struct net_device *net_dev, struct ethtool_rxnfc *info, u32 *rule_locs) @@ -981,10 +988,6 @@ ef4_ethtool_get_rxnfc(struct net_device *net_dev, struct ef4_nic *efx =3D netdev_priv(net_dev); =20 switch (info->cmd) { - case ETHTOOL_GRXRINGS: - info->data =3D efx->n_rx_channels; - return 0; - case ETHTOOL_GRXCLSRLCNT: info->data =3D ef4_filter_get_rx_id_limit(efx); if (info->data =3D=3D 0) @@ -1348,6 +1351,7 @@ const struct ethtool_ops ef4_ethtool_ops =3D { .reset =3D ef4_ethtool_reset, .get_rxnfc =3D ef4_ethtool_get_rxnfc, .set_rxnfc =3D ef4_ethtool_set_rxnfc, + .get_rx_ring_count =3D ef4_ethtool_get_rx_ring_count, .get_rxfh_indir_size =3D ef4_ethtool_get_rxfh_indir_size, .get_rxfh =3D ef4_ethtool_get_rxfh, .set_rxfh =3D ef4_ethtool_set_rxfh, --=20 2.47.3