[PATCH ethtool-next v2 0/2] Userspace code for ethtool HW TS statistics

[PATCH ethtool-next v2 0/2] Userspace code for ethtool HW TS statistics

[Rahul Rameshbabu]

Adds support for querying statistics related to tsinfo if the kernel supports
such statistics.

Changes:
  v1->v2:
    - Updated UAPI header copy to be based on a valid commit in the
      net-next tree. Thanks Alexandra Winter <wintera@linux.ibm.com> for
      the catch.
    - Refactored logic based on a suggestion from Jakub Kicinski
      <kuba@kernel.org>.

Signed-off-by: Rahul Rameshbabu <rrameshbabu@nvidia.com>
Link: https://lore.kernel.org/netdev/20240403212931.128541-1-rrameshbabu@nvidia.com/
Link: https://lore.kernel.org/netdev/20240416203723.104062-1-rrameshbabu@nvidia.com/
---
Rahul Rameshbabu (2):
  update UAPI header copies
  netlink: tsinfo: add statistics support

 netlink/tsinfo.c             | 65 +++++++++++++++++++++++++++++++++++-
 uapi/linux/ethtool.h         | 64 +++++++++++++++++++++++++++++++++++
 uapi/linux/ethtool_netlink.h | 30 +++++++++++++----
 uapi/linux/if_link.h         |  1 +
 4 files changed, 153 insertions(+), 7 deletions(-)

-- 
2.42.0

[PATCH ethtool-next v2 1/2] update UAPI header copies

[Rahul Rameshbabu]

Update to kernel commit 2bd99aef1b19.

Signed-off-by: Rahul Rameshbabu <rrameshbabu@nvidia.com>
Reviewed-by: Carolina Jubran <cjubran@nvidia.com>
Reviewed-by: Cosmin Ratiu <cratiu@nvidia.com>
---

Notes:
    Changes:
    
      v1->v2:
        - Updated UAPI header copy to be based on a valid commit in the
          net-next tree. Thanks Alexandra Winter <wintera@linux.ibm.com> for
          the catch.

 uapi/linux/ethtool.h         | 64 ++++++++++++++++++++++++++++++++++++
 uapi/linux/ethtool_netlink.h | 30 +++++++++++++----
 uapi/linux/if_link.h         |  1 +
 3 files changed, 89 insertions(+), 6 deletions(-)

diff --git a/uapi/linux/ethtool.h b/uapi/linux/ethtool.h
index 70f2b90..4d1738a 100644
--- a/uapi/linux/ethtool.h
+++ b/uapi/linux/ethtool.h
@@ -2021,6 +2021,53 @@ static __inline__ int ethtool_validate_duplex(__u8 duplex)
 #define	IPV4_FLOW	0x10	/* hash only */
 #define	IPV6_FLOW	0x11	/* hash only */
 #define	ETHER_FLOW	0x12	/* spec only (ether_spec) */
+
+/* Used for GTP-U IPv4 and IPv6.
+ * The format of GTP packets only includes
+ * elements such as TEID and GTP version.
+ * It is primarily intended for data communication of the UE.
+ */
+#define GTPU_V4_FLOW 0x13	/* hash only */
+#define GTPU_V6_FLOW 0x14	/* hash only */
+
+/* Use for GTP-C IPv4 and v6.
+ * The format of these GTP packets does not include TEID.
+ * Primarily expected to be used for communication
+ * to create sessions for UE data communication,
+ * commonly referred to as CSR (Create Session Request).
+ */
+#define GTPC_V4_FLOW 0x15	/* hash only */
+#define GTPC_V6_FLOW 0x16	/* hash only */
+
+/* Use for GTP-C IPv4 and v6.
+ * Unlike GTPC_V4_FLOW, the format of these GTP packets includes TEID.
+ * After session creation, it becomes this packet.
+ * This is mainly used for requests to realize UE handover.
+ */
+#define GTPC_TEID_V4_FLOW 0x17	/* hash only */
+#define GTPC_TEID_V6_FLOW 0x18	/* hash only */
+
+/* Use for GTP-U and extended headers for the PSC (PDU Session Container).
+ * The format of these GTP packets includes TEID and QFI.
+ * In 5G communication using UPF (User Plane Function),
+ * data communication with this extended header is performed.
+ */
+#define GTPU_EH_V4_FLOW 0x19	/* hash only */
+#define GTPU_EH_V6_FLOW 0x1a	/* hash only */
+
+/* Use for GTP-U IPv4 and v6 PSC (PDU Session Container) extended headers.
+ * This differs from GTPU_EH_V(4|6)_FLOW in that it is distinguished by
+ * UL/DL included in the PSC.
+ * There are differences in the data included based on Downlink/Uplink,
+ * and can be used to distinguish packets.
+ * The functions described so far are useful when you want to
+ * handle communication from the mobile network in UPF, PGW, etc.
+ */
+#define GTPU_UL_V4_FLOW 0x1b	/* hash only */
+#define GTPU_UL_V6_FLOW 0x1c	/* hash only */
+#define GTPU_DL_V4_FLOW 0x1d	/* hash only */
+#define GTPU_DL_V6_FLOW 0x1e	/* hash only */
+
 /* Flag to enable additional fields in struct ethtool_rx_flow_spec */
 #define	FLOW_EXT	0x80000000
 #define	FLOW_MAC_EXT	0x40000000
@@ -2035,6 +2082,7 @@ static __inline__ int ethtool_validate_duplex(__u8 duplex)
 #define	RXH_IP_DST	(1 << 5)
 #define	RXH_L4_B_0_1	(1 << 6) /* src port in case of TCP/UDP/SCTP */
 #define	RXH_L4_B_2_3	(1 << 7) /* dst port in case of TCP/UDP/SCTP */
+#define	RXH_GTP_TEID	(1 << 8) /* teid in case of GTP */
 #define	RXH_DISCARD	(1 << 31)
 
 #define	RX_CLS_FLOW_DISC	0xffffffffffffffffULL
@@ -2218,4 +2266,20 @@ struct ethtool_link_settings {
 	 * __u32 map_lp_advertising[link_mode_masks_nwords];
 	 */
 };
+
+/**
+ * enum phy_upstream - Represents the upstream component a given PHY device
+ * is connected to, as in what is on the other end of the MII bus. Most PHYs
+ * will be attached to an Ethernet MAC controller, but in some cases, there's
+ * an intermediate PHY used as a media-converter, which will driver another
+ * MII interface as its output.
+ * @PHY_UPSTREAM_MAC: Upstream component is a MAC (a switch port,
+ *		      or ethernet controller)
+ * @PHY_UPSTREAM_PHY: Upstream component is a PHY (likely a media converter)
+ */
+enum phy_upstream {
+	PHY_UPSTREAM_MAC,
+	PHY_UPSTREAM_PHY,
+};
+
 #endif /* _LINUX_ETHTOOL_H */
diff --git a/uapi/linux/ethtool_netlink.h b/uapi/linux/ethtool_netlink.h
index 447d922..2503b26 100644
--- a/uapi/linux/ethtool_netlink.h
+++ b/uapi/linux/ethtool_netlink.h
@@ -117,12 +117,11 @@ enum {
 
 /* request header */
 
-/* use compact bitsets in reply */
-#define ETHTOOL_FLAG_COMPACT_BITSETS	(1 << 0)
-/* provide optional reply for SET or ACT requests */
-#define ETHTOOL_FLAG_OMIT_REPLY	(1 << 1)
-/* request statistics, if supported by the driver */
-#define ETHTOOL_FLAG_STATS		(1 << 2)
+enum ethtool_header_flags {
+	ETHTOOL_FLAG_COMPACT_BITSETS	= 1 << 0,	/* use compact bitsets in reply */
+	ETHTOOL_FLAG_OMIT_REPLY		= 1 << 1,	/* provide optional reply for SET or ACT requests */
+	ETHTOOL_FLAG_STATS		= 1 << 2,	/* request statistics, if supported by the driver */
+};
 
 #define ETHTOOL_FLAG_ALL (ETHTOOL_FLAG_COMPACT_BITSETS | \
 			  ETHTOOL_FLAG_OMIT_REPLY | \
@@ -133,6 +132,7 @@ enum {
 	ETHTOOL_A_HEADER_DEV_INDEX,		/* u32 */
 	ETHTOOL_A_HEADER_DEV_NAME,		/* string */
 	ETHTOOL_A_HEADER_FLAGS,			/* u32 - ETHTOOL_FLAG_* */
+	ETHTOOL_A_HEADER_PHY_INDEX,		/* u32 */
 
 	/* add new constants above here */
 	__ETHTOOL_A_HEADER_CNT,
@@ -478,12 +478,26 @@ enum {
 	ETHTOOL_A_TSINFO_TX_TYPES,			/* bitset */
 	ETHTOOL_A_TSINFO_RX_FILTERS,			/* bitset */
 	ETHTOOL_A_TSINFO_PHC_INDEX,			/* u32 */
+	ETHTOOL_A_TSINFO_STATS,				/* nest - _A_TSINFO_STAT */
 
 	/* add new constants above here */
 	__ETHTOOL_A_TSINFO_CNT,
 	ETHTOOL_A_TSINFO_MAX = (__ETHTOOL_A_TSINFO_CNT - 1)
 };
 
+enum {
+	ETHTOOL_A_TS_STAT_UNSPEC,
+
+	ETHTOOL_A_TS_STAT_TX_PKTS,			/* uint */
+	ETHTOOL_A_TS_STAT_TX_LOST,			/* uint */
+	ETHTOOL_A_TS_STAT_TX_ERR,			/* uint */
+
+	/* add new constants above here */
+	__ETHTOOL_A_TS_STAT_CNT,
+	ETHTOOL_A_TS_STAT_MAX = (__ETHTOOL_A_TS_STAT_CNT - 1)
+
+};
+
 /* PHC VCLOCKS */
 
 enum {
@@ -515,6 +529,10 @@ enum {
 	ETHTOOL_A_CABLE_RESULT_CODE_OPEN,
 	ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT,
 	ETHTOOL_A_CABLE_RESULT_CODE_CROSS_SHORT,
+	/* detected reflection caused by the impedance discontinuity between
+	 * a regular 100 Ohm cable and a part with the abnormal impedance value
+	 */
+	ETHTOOL_A_CABLE_RESULT_CODE_IMPEDANCE_MISMATCH,
 };
 
 enum {
diff --git a/uapi/linux/if_link.h b/uapi/linux/if_link.h
index d17271f..ff4ceea 100644
--- a/uapi/linux/if_link.h
+++ b/uapi/linux/if_link.h
@@ -1503,6 +1503,7 @@ enum {
 	IFLA_BOND_AD_LACP_ACTIVE,
 	IFLA_BOND_MISSED_MAX,
 	IFLA_BOND_NS_IP6_TARGET,
+	IFLA_BOND_COUPLED_CONTROL,
 	__IFLA_BOND_MAX,
 };
 
-- 
2.42.0

[PATCH ethtool-next v2 2/2] netlink: tsinfo: add statistics support

[Rahul Rameshbabu]

If stats flag is present, report back statistics for tsinfo if the netlink
response body contains statistics information.

Signed-off-by: Rahul Rameshbabu <rrameshbabu@nvidia.com>
Reviewed-by: Carolina Jubran <cjubran@nvidia.com>
Reviewed-by: Cosmin Ratiu <cratiu@nvidia.com>
---

Notes:
    Changes:
    
      v1->v2:
        - Refactored logic based on a suggestion from Jakub Kicinski
          <kuba@kernel.org>.

 netlink/tsinfo.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/netlink/tsinfo.c b/netlink/tsinfo.c
index c6571ff..4df4141 100644
--- a/netlink/tsinfo.c
+++ b/netlink/tsinfo.c
@@ -5,6 +5,7 @@
  */
 
 #include <errno.h>
+#include <inttypes.h>
 #include <string.h>
 #include <stdio.h>
 
@@ -15,6 +16,60 @@
 
 /* TSINFO_GET */
 
+static int tsinfo_show_stats(const struct nlattr *nest)
+{
+	const struct nlattr *tb[ETHTOOL_A_TS_STAT_MAX + 1] = {};
+	DECLARE_ATTR_TB_INFO(tb);
+	static const struct {
+		unsigned int attr;
+		char *name;
+	} stats[] = {
+		{ ETHTOOL_A_TS_STAT_TX_PKTS, "tx_pkts" },
+		{ ETHTOOL_A_TS_STAT_TX_LOST, "tx_lost" },
+		{ ETHTOOL_A_TS_STAT_TX_ERR, "tx_err" },
+	};
+	bool header = false;
+	unsigned int i;
+	__u64 val;
+	int ret;
+
+	ret = mnl_attr_parse_nested(nest, attr_cb, &tb_info);
+	if (ret < 0)
+		return ret;
+
+	open_json_object("statistics");
+	for (i = 0; i < ARRAY_SIZE(stats); i++) {
+		char fmt[64];
+
+		if (!tb[stats[i].attr])
+			continue;
+
+		if (!header && !is_json_context()) {
+			printf("Statistics:\n");
+			header = true;
+		}
+
+		if (!mnl_attr_validate(tb[stats[i].attr], MNL_TYPE_U32)) {
+			val = mnl_attr_get_u32(tb[stats[i].attr]);
+		} else if (!mnl_attr_validate(tb[stats[i].attr], MNL_TYPE_U64)) {
+			val = mnl_attr_get_u64(tb[stats[i].attr]);
+		} else {
+			fprintf(stderr, "malformed netlink message (statistic)\n");
+			goto err_close_stats;
+		}
+
+		snprintf(fmt, sizeof(fmt), "  %s: %%" PRIu64 "\n", stats[i].name);
+		print_u64(PRINT_ANY, stats[i].name, fmt, val);
+	}
+	close_json_object();
+
+	return 0;
+
+err_close_stats:
+	close_json_object();
+	return -1;
+}
+
 static void tsinfo_dump_cb(unsigned int idx, const char *name, bool val,
 			   void *data __maybe_unused)
 {
@@ -99,6 +154,12 @@ int tsinfo_reply_cb(const struct nlmsghdr *nlhdr, void *data)
 	if (ret < 0)
 		return err_ret;
 
+	if (tb[ETHTOOL_A_TSINFO_STATS]) {
+		ret = tsinfo_show_stats(tb[ETHTOOL_A_TSINFO_STATS]);
+		if (ret < 0)
+			return err_ret;
+	}
+
 	return MNL_CB_OK;
 }
 
@@ -106,6 +167,7 @@ int nl_tsinfo(struct cmd_context *ctx)
 {
 	struct nl_context *nlctx = ctx->nlctx;
 	struct nl_socket *nlsk = nlctx->ethnl_socket;
+	u32 flags;
 	int ret;
 
 	if (netlink_cmd_check(ctx, ETHTOOL_MSG_TSINFO_GET, true))
@@ -116,8 +178,9 @@ int nl_tsinfo(struct cmd_context *ctx)
 		return 1;
 	}
 
+	flags = get_stats_flag(nlctx, ETHTOOL_MSG_TSINFO_GET, ETHTOOL_A_TSINFO_HEADER);
 	ret = nlsock_prep_get_request(nlsk, ETHTOOL_MSG_TSINFO_GET,
-				      ETHTOOL_A_TSINFO_HEADER, 0);
+				      ETHTOOL_A_TSINFO_HEADER, flags);
 	if (ret < 0)
 		return ret;
 	return nlsock_send_get_request(nlsk, tsinfo_reply_cb);
-- 
2.42.0

Re: [PATCH ethtool-next v2 0/2] Userspace code for ethtool HW TS statistics

[patchwork-bot+netdevbpf]

Hello:

This series was applied to ethtool/ethtool.git (next)
by Michal Kubecek <mkubecek@suse.cz>:

On Wed, 17 Apr 2024 13:38:27 -0700 you wrote:
> Adds support for querying statistics related to tsinfo if the kernel supports
> such statistics.
> 
> Changes:
>   v1->v2:
>     - Updated UAPI header copy to be based on a valid commit in the
>       net-next tree. Thanks Alexandra Winter <wintera@linux.ibm.com> for
>       the catch.
>     - Refactored logic based on a suggestion from Jakub Kicinski
>       <kuba@kernel.org>.
> 
> [...]

Here is the summary with links:
  - [ethtool-next,v2,1/2] update UAPI header copies
    https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/commit/?id=d324940988f3
  - [ethtool-next,v2,2/2] netlink: tsinfo: add statistics support
    (no matching commit)

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Re: [PATCH ethtool-next v2 0/2] Userspace code for ethtool HW TS statistics

[Michal Kubecek]

[-- Attachment #1: Type: text/plain, Size: 1238 bytes --]

On Wed, Apr 17, 2024 at 09:30:30PM +0000, patchwork-bot+netdevbpf@kernel.org wrote:
> Hello:
> 
> This series was applied to ethtool/ethtool.git (next)
> by Michal Kubecek <mkubecek@suse.cz>:
> 
> On Wed, 17 Apr 2024 13:38:27 -0700 you wrote:
> > Adds support for querying statistics related to tsinfo if the kernel supports
> > such statistics.
> > 
> > Changes:
> >   v1->v2:
> >     - Updated UAPI header copy to be based on a valid commit in the
> >       net-next tree. Thanks Alexandra Winter <wintera@linux.ibm.com> for
> >       the catch.
> >     - Refactored logic based on a suggestion from Jakub Kicinski
> >       <kuba@kernel.org>.
> > 
> > [...]
> 
> Here is the summary with links:
>   - [ethtool-next,v2,1/2] update UAPI header copies
>     https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/commit/?id=d324940988f3
>   - [ethtool-next,v2,2/2] netlink: tsinfo: add statistics support
>     (no matching commit)

Looks like the patchwork bot got a bit confused here. I accidentally
updated the UAPI header copies to the same mainline commit yesterday
which was probably identified as accepting the first patch. But the
second (i.e. the important one) is still in the queue.

Michal

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH ethtool-next v2 0/2] Userspace code for ethtool HW TS statistics

[Rahul Rameshbabu]

On Thu, 18 Apr, 2024 08:30:48 +0200 Michal Kubecek <mkubecek@suse.cz> wrote:
> [[PGP Signed Part:Undecided]]
> On Wed, Apr 17, 2024 at 09:30:30PM +0000, patchwork-bot+netdevbpf@kernel.org wrote:
>> Hello:
>> 
>> This series was applied to ethtool/ethtool.git (next)
>> by Michal Kubecek <mkubecek@suse.cz>:
>> 
>> On Wed, 17 Apr 2024 13:38:27 -0700 you wrote:
>> > Adds support for querying statistics related to tsinfo if the kernel supports
>> > such statistics.
>> > 
>> > Changes:
>> >   v1->v2:
>> >     - Updated UAPI header copy to be based on a valid commit in the
>> >       net-next tree. Thanks Alexandra Winter <wintera@linux.ibm.com> for
>> >       the catch.
>> >     - Refactored logic based on a suggestion from Jakub Kicinski
>> >       <kuba@kernel.org>.
>> > 
>> > [...]
>> 
>> Here is the summary with links:
>>   - [ethtool-next,v2,1/2] update UAPI header copies
>>     https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/commit/?id=d324940988f3
>>   - [ethtool-next,v2,2/2] netlink: tsinfo: add statistics support
>>     (no matching commit)
>
> Looks like the patchwork bot got a bit confused here. I accidentally
> updated the UAPI header copies to the same mainline commit yesterday
> which was probably identified as accepting the first patch. But the
> second (i.e. the important one) is still in the queue.

I saw this but was not sure it was intentional. Good to know it was
pw-bot hiccup.

--
Thanks,

Rahul Rameshbabu

Re: [PATCH ethtool-next v2 0/2] Userspace code for ethtool HW TS statistics

[Rahul Rameshbabu]

On Wed, 17 Apr, 2024 23:32:45 -0700 Rahul Rameshbabu <rrameshbabu@nvidia.com> wrote:
> On Thu, 18 Apr, 2024 08:30:48 +0200 Michal Kubecek <mkubecek@suse.cz> wrote:
>> [[PGP Signed Part:Undecided]]
>> On Wed, Apr 17, 2024 at 09:30:30PM +0000, patchwork-bot+netdevbpf@kernel.org wrote:
>>> Hello:
>>> 
>>> This series was applied to ethtool/ethtool.git (next)
>>> by Michal Kubecek <mkubecek@suse.cz>:
>>> 
>>> On Wed, 17 Apr 2024 13:38:27 -0700 you wrote:
>>> > Adds support for querying statistics related to tsinfo if the kernel supports
>>> > such statistics.
>>> > 
>>> > Changes:
>>> >   v1->v2:
>>> >     - Updated UAPI header copy to be based on a valid commit in the
>>> >       net-next tree. Thanks Alexandra Winter <wintera@linux.ibm.com> for
>>> >       the catch.
>>> >     - Refactored logic based on a suggestion from Jakub Kicinski
>>> >       <kuba@kernel.org>.
>>> > 
>>> > [...]
>>> 
>>> Here is the summary with links:
>>>   - [ethtool-next,v2,1/2] update UAPI header copies
>>>     https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/commit/?id=d324940988f3
>>>   - [ethtool-next,v2,2/2] netlink: tsinfo: add statistics support
>>>     (no matching commit)
>>
>> Looks like the patchwork bot got a bit confused here. I accidentally
>> updated the UAPI header copies to the same mainline commit yesterday
>> which was probably identified as accepting the first patch. But the
>> second (i.e. the important one) is still in the queue.
>
> I saw this but was not sure it was intentional. Good to know it was
> pw-bot hiccup.

Following up since I noticed these commits have not landed in next
recently.

  https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/log/?h=next

--
Thanks,

Rahul Rameshbabu