support tunnel info dumping
Subsystems (3)
Jakub Kicinski
maintainerv2 cover support tunnel info dumping
Hi!
This set adds support for ETHTOOL_MSG_TUNNEL_INFO_GET.
Jakub Kicinski (2):
update UAPI header copies
tunnels: implement new --show-tunnels command
Makefile.am | 2 +- ethtool.8.in | 9 ++ ethtool.c | 5 + netlink/extapi.h | 2 + netlink/tunnels.c | 236 +++++++++++++++++++++++++++++++++++ uapi/linux/ethtool.h | 17 +++ uapi/linux/ethtool_netlink.h | 55 ++++++++ uapi/linux/if_link.h | 227 ++++++++++++++++++++++++++++++--- uapi/linux/rtnetlink.h | 46 +++---- 9 files changed, 558 insertions(+), 41 deletions(-) create mode 100644 netlink/tunnels.c
Signature · 1 line
2.26.2
Jakub Kicinski
maintainerPATCH v2 1/2 update UAPI header copies
Update to kernel commit 4f6a5caf187f.
Signed-off-by Jakub Kicinski <[email protected]>
--- uapi/linux/ethtool.h | 17 +++ uapi/linux/ethtool_netlink.h | 55 +++++++++ uapi/linux/if_link.h | 227 ++++++++++++++++++++++++++++++++--- uapi/linux/rtnetlink.h | 46 +++---- 4 files changed, 305 insertions(+), 40 deletions(-)
uapi/linux/ethtool.h +17 -0
@@ -667,6 +667,7 @@ enum ethtool_link_ext_substate_cable_issue {* @ETH_SS_SOF_TIMESTAMPING: SOF_TIMESTAMPING_* flags * @ETH_SS_TS_TX_TYPES: timestamping Tx types * @ETH_SS_TS_RX_FILTERS: timestamping Rx filters +* @ETH_SS_UDP_TUNNEL_TYPES: UDP tunnel types */ enum ethtool_stringset {ETH_SS_TEST =0 ,
@@ -684,6 +685,7 @@ enum ethtool_stringset {ETH_SS_SOF_TIMESTAMPING ,ETH_SS_TS_TX_TYPES ,ETH_SS_TS_RX_FILTERS , +ETH_SS_UDP_TUNNEL_TYPES ,/* add new constants above here */ ETH_SS_COUNT
@@ -1598,6 +1600,21 @@ enum ethtool_link_mode_bit_indices { ETHTOOL_LINK_MODE_400000baseDR8_Full_BIT =72 , ETHTOOL_LINK_MODE_400000baseCR8_Full_BIT =73 ,ETHTOOL_LINK_MODE_FEC_LLRS_BIT =74 , + ETHTOOL_LINK_MODE_100000baseKR_Full_BIT =75 , + ETHTOOL_LINK_MODE_100000baseSR_Full_BIT =76 , + ETHTOOL_LINK_MODE_100000baseLR_ER_FR_Full_BIT =77 , + ETHTOOL_LINK_MODE_100000baseCR_Full_BIT =78 , + ETHTOOL_LINK_MODE_100000baseDR_Full_BIT =79 , + ETHTOOL_LINK_MODE_200000baseKR2_Full_BIT =80 , + ETHTOOL_LINK_MODE_200000baseSR2_Full_BIT =81 , + ETHTOOL_LINK_MODE_200000baseLR2_ER2_FR2_Full_BIT =82 , + ETHTOOL_LINK_MODE_200000baseDR2_Full_BIT =83 , + ETHTOOL_LINK_MODE_200000baseCR2_Full_BIT =84 , + ETHTOOL_LINK_MODE_400000baseKR4_Full_BIT =85 , + ETHTOOL_LINK_MODE_400000baseSR4_Full_BIT =86 , + ETHTOOL_LINK_MODE_400000baseLR4_ER4_FR4_Full_BIT =87 , + ETHTOOL_LINK_MODE_400000baseDR4_Full_BIT =88 , + ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT =89 ,/* must be last entry */ __ETHTOOL_LINK_MODE_MASK_NBITS };
uapi/linux/ethtool_netlink.h +55 -0
67 lines not on this page · raw message
uapi/linux/if_link.h +209 -18
274 lines not on this page · raw message
uapi/linux/rtnetlink.h +24 -22
64 lines not on this page · raw message
Signature · 1 line
2.26.2
Jakub Kicinski
maintainerPATCH v2 2/2 tunnels: implement new --show-tunnels command
In reply to Jakub KicinskiAdd support for the new show-tunnels command. Support dump.
# ethtool --show-tunnels \*
Tunnel information for eth0:
UDP port table 0:
Size: 4
Types: vxlan
No entries
UDP port table 1:
Size: 4
Types: geneve, vxlan-gpe
Entries (2):
port 1230, vxlan-gpe
port 6081, genevev2: htons -> ntohs
Signed-off-by Jakub Kicinski <[email protected]>
--- Makefile.am | 2 +- ethtool.8.in | 9 ++ ethtool.c | 5 + netlink/extapi.h | 2 + netlink/tunnels.c | 236 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 253 insertions(+), 1 deletion(-) create mode 100644 netlink/tunnels.c
Makefile.am +1 -1
@@ -37,7 +37,7 @@ ethtool_SOURCES += \ netlink/channels.c netlink/coalesce.c netlink/pause.c \ netlink/eee.c netlink/tsinfo.c \ netlink/desc-ethtool.c netlink/desc-genlctrl.c \ - netlink/desc-rtnl.c netlink/cable_test.c \ + netlink/desc-rtnl.c netlink/cable_test.c netlink/tunnels.c \ uapi/linux/ethtool_netlink.h \ uapi/linux/netlink.h uapi/linux/genetlink.h \ uapi/linux/rtnetlink.h uapi/linux/if_link.h
ethtool.8.in +9 -0
@@ -459,6 +459,9 @@ ethtool \- query or control network driver and hardware settings .BN last N .BN step N .BN pair N +.HP +.B ethtool \-\-show\-tunnels +.I devname . .\" Adjust lines (i.e. full justification) and hyphenate. .ad
@@ -1383,6 +1386,12 @@ shown. If a device name is used as argument, only notification for this device are shown. Default is to show notifications for all devices. .RE +.TP +.B \-\-show\-tunnels +Show tunnel-related device capabilities and state. +List UDP ports kernel has programmed the device to parse as VxLAN, +or GENEVE tunnels. +.RE .SH BUGS Not supported (in part or whole) on all network drivers. .SH AUTHOR
ethtool.c +5 -0
@@ -5919,6 +5919,11 @@ static const struct option args[] = {" [ step N ]\n" " [ pair N ]\n" }, + { + .opts = "--show-tunnels", + .nlfunc = nl_gtunnels, + .help = "Show NIC tunnel offload information", + }, { .opts = "-h|--help", .no_dev = true,
netlink/extapi.h +2 -0
@@ -37,6 +37,7 @@ int nl_seee(struct cmd_context *ctx);int nl_tsinfo (struct cmd_context *ctx);int nl_cable_test (struct cmd_context *ctx);int nl_cable_test_tdr (struct cmd_context *ctx); +int nl_gtunnels (struct cmd_context *ctx);int nl_monitor (struct cmd_context *ctx);void nl_monitor_usage (void );
@@ -84,6 +85,7 @@ static inline void nl_monitor_usage(void)#define nl_tsinfo NULL#define nl_cable_test NULL#define nl_cable_test_tdr NULL +#define nl_gtunnels NULL#endif /* ETHTOOL_ENABLE_NETLINK */
netlink/tunnels.c new file +236 -0
236 lines not on this page · raw message
Signature · 1 line
2.26.2