From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     netdev@vger.kernel.org
Cc:     "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= <bjorn@kernel.org>,
        Magnus Karlsson <magnus.karlsson@intel.com>,
        Maciej Fijalkowski <maciej.fijalkowski@intel.com>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Jesper Dangaard Brouer <hawk@kernel.org>,
        John Fastabend <john.fastabend@gmail.com>, bpf@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [RFC PATCH net-next 05/11] net: enetc: add support for ethtool --show-channels
Date:   Mon,  6 Feb 2023 12:08:31 +0200
Message-Id: <20230206100837.451300-6-vladimir.oltean@nxp.com>
In-Reply-To: <20230206100837.451300-1-vladimir.oltean@nxp.com>
References: <20230206100837.451300-1-vladimir.oltean@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cNiCUmU7MmedTCDinnwDM9bF4z8cPLEZwQzKINoa8QLpM+CfqdlNfIto6B2Y?=
 =?us-ascii?Q?fekbELM5R5sAzfrYUazUPOhP2OAXnatR+obWf8q3cSwFF71xlH6cjcwQP81X?=
 =?us-ascii?Q?8fcXS4UBVg75Py/oEXmod+KVvteP7PXW6cTePJA+ygPISxJ0yTFDTkdWpqsL?=
 =?us-ascii?Q?8BXWJYILqpNeZ/ElOSBV9UdIUeNKZdB6c7y8y2IV/i822GJz5vrFQ49NK9ce?=
 =?us-ascii?Q?Cw3PiIBO491rdhOMoEEv57U9bb9ksLEqLbnU35cyEJe5Ac9NZvgn3cYy+Z0m?=
 =?us-ascii?Q?hAXmAf03PidELrt80iypbbIw3zDfgoAoGfI9rhZPws1swUSGn+4GxakRwin5?=
 =?us-ascii?Q?C2JYqq4W5CpfdLqMpyZSPEtqSyg4cmDjfA4Y+k3jm4tD/xZSUxEebYokpZyP?=
 =?us-ascii?Q?rhcPgiAYgD7m23X/MXKE6OeiShqn3Oz0F+9ii3GqCneuJor7VN01ZPK+as+9?=
 =?us-ascii?Q?2hSeFg/KxyS5H31uP7qpk76t1e427dx12WzzN7E9XMVsMlZtff+n5g187Abr?=
 =?us-ascii?Q?I3DP3lHiW8BiaD3DRG85pcTeI2njmzkwZA6EIBqnW9bCGTodSiJeB9rK5tju?=
 =?us-ascii?Q?aSB2qNSsLofQoU9VRRqPGAF1oFwaYR5538oTo6DRAD1tjS60Z85XPeuEAEA6?=
 =?us-ascii?Q?Z/KAXku4Kr3OnEsmxybFA6ZbBmti7ilbFi0pbaljG/ZA6p3y4Qa1xbsaHlyl?=
 =?us-ascii?Q?qHb5chTXhD/hGyy+Ufkk/eTf1TonIqv6z1u/P6Pzwz1M8NqDibEKP4V0QP/b?=
 =?us-ascii?Q?ogl7pVTQCyBga+UeqJ5x98fvB6g/QqJYMCgz46TaaTZsKxmkKCjmKLnEOxQZ?=
 =?us-ascii?Q?Wt4ffdOFxKwXbTit7KzHvTq1AQ+Lr20BRa/2JrBZVYaxVVR/ei+3NMPwRuHT?=
 =?us-ascii?Q?16t+rngfiq2HJfai7+FviwpYrME9eF1nQO9z+Ekm/Hff5rtLfigVdYLwnRDY?=
 =?us-ascii?Q?AM6QXEVnmHBU6m9XHnvhompDfI3ROWETzabUbPFhvOZ8nWdyu9Rtwli0F4hz?=
 =?us-ascii?Q?J8fLcXz5bEzxOaY67NosAagomrN2ilqxNqgBpQawpSpQIDnVRypizd8vXL0i?=
 =?us-ascii?Q?nSMSqt29H9DASiXYJlAljuVKEHoK7Yi+iFpSmCoSk0yCMaf42a26Knby/UiK?=
 =?us-ascii?Q?AZPnZhycLAbmVT/9NJ9KI/G6xTYFPxPiAbxOGgoOhHD99JHkyKrqP/XbKx06?=
 =?us-ascii?Q?wokO3mta1XVJodu4gr43zKaDjWzsxd65RSCpb2gUIhipdLfAPvRHt+blvr14?=
 =?us-ascii?Q?KwRcw/hc8MoVHH2r/Ey/ICTyj/nvThNyiFv0HLCkb+bhkjcLPoc2Ck5JDqq1?=
 =?us-ascii?Q?pkKlRn5wBQ6ZiJ72w3GgBeTmELWyuwqqWEqQ8v2WcYNoCU8N2HJy1CssVktV?=
 =?us-ascii?Q?QnT59AGJTPxWUet44BXAg+qV1MPWx6g/138PCQWv9JJb5yAHXBrqnP/3xg0L?=
 =?us-ascii?Q?cipDR+LV2yyZSf7jd3IbktQrGCq8d3T5jM+JvLPtfyQROlfpxzwlsPB/x1bO?=
 =?us-ascii?Q?1W5MSgzkfEaQ5Henq3mR7p+HHRKkX0wFaP2n8o9VXD1rhaTEFrAEm/8MHrYL?=
 =?us-ascii?Q?S1xN2xdMOyXOr/u/Ardae6dFlgOISSUH9ib8pBXgqUsw19wjFDbf09ZkOBUw?=
 =?us-ascii?Q?QQ=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 78a4fc3c-c3fa-4791-2ec7-08db082a2de8
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2023 10:09:05.6615
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: GNDDBUXi0MHUHDr3mAY+NsIaaRZCBA9NiiImGyGR4zdqwVC0KNn7TnwnzeWThR4Jmp+EQ4F+gB9C3t6dgCDqJw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7735
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

In a strange twist of events, some libraries such as libbpf perform an
ETHTOOL_GCHANNELS ioctl to find out the max number of queues owned by a
device, number which in turn is used for attaching XDP sockets to
queues.

To add compatibility with libbpf, it is therefore desirable to report
something to this ethtool callback.

According to the ethtool man page, "A channel is an IRQ and the set of
queues that can trigger that IRQ".

In enetc (embedded in NXP LS1028A, a dual core SoC, and LS1018A, a
single core SoC), the enetc_alloc_msix() function allocates a number of
MSI-X interrupt vectors equal to priv->bdr_int_num (which in turn is
equal to the number of CPUs, 2 or 1). Each interrupt vector has 1 RX
ring to process (there are more than 2 RX rings available on an ENETC
port, but the driver only uses up to 2). In addition, the up to 8 TX
rings are distributed in a round-robing manner between the up to 2
available interrupt vectors.

Therefore, even if we have more resources than 2 RX rings, given the
definitions, we can only report 2 combined channels. So do that.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 drivers/net/ethernet/freescale/enetc/enetc_ethtool.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
index 05e2bad609c6..dda02f8d102a 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
@@ -863,6 +863,15 @@ static int enetc_set_link_ksettings(struct net_device *dev,
 	return phylink_ethtool_ksettings_set(priv->phylink, cmd);
 }
 
+static void enetc_get_channels(struct net_device *ndev,
+			       struct ethtool_channels *chan)
+{
+	struct enetc_ndev_priv *priv = netdev_priv(ndev);
+
+	chan->max_combined = priv->bdr_int_num;
+	chan->combined_count = priv->bdr_int_num;
+}
+
 static const struct ethtool_ops enetc_pf_ethtool_ops = {
 	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |
 				     ETHTOOL_COALESCE_MAX_FRAMES |
@@ -893,6 +902,7 @@ static const struct ethtool_ops enetc_pf_ethtool_ops = {
 	.set_wol = enetc_set_wol,
 	.get_pauseparam = enetc_get_pauseparam,
 	.set_pauseparam = enetc_set_pauseparam,
+	.get_channels = enetc_get_channels,
 };
 
 static const struct ethtool_ops enetc_vf_ethtool_ops = {
-- 
2.34.1