From nobody Tue Dec 2 00:25:39 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