Sync if_link uapi header to the latest version as we need the refresher in tooling for netkit device. Given it's been a while since the last sync and the diff is fairly big, it has been done as its own commit.
Unified · Split
| @@ -211,6 +211,9 @@ struct rtnl_link_stats { · 210 unmodified lines | ||
| 211 | 211 | * @rx_nohandler: Number of packets received on the interface |
| 212 | 212 | * but dropped by the networking stack because the device is |
| 213 | 213 | * not designated to receive packets (e.g. backup link in a bond). |
| 214 | + * | |
| 215 | + * @rx_otherhost_dropped: Number of packets dropped due to mismatch | |
| 216 | + * in destination MAC address. | |
| 214 | 217 | */ |
| 215 | 218 | struct rtnl_link_stats64 { |
| 216 | 219 | __u64 rx_packets; |
| @@ -243,6 +246,23 @@ struct rtnl_link_stats64 { · 26 unmodified lines | ||
| 243 | 246 | __u64 rx_compressed; |
| 244 | 247 | __u64 tx_compressed; |
| 245 | 248 | __u64 rx_nohandler; |
| 249 | + | |
| 250 | + __u64 rx_otherhost_dropped; | |
| 251 | +}; | |
| 252 | + | |
| 253 | +/* Subset of link stats useful for in-HW collection. Meaning of the fields is as | |
| 254 | + * for struct rtnl_link_stats64. | |
| 255 | + */ | |
| 256 | +struct rtnl_hw_stats64 { | |
| 257 | + __u64 rx_packets; | |
| 258 | + __u64 tx_packets; | |
| 259 | + __u64 rx_bytes; | |
| 260 | + __u64 tx_bytes; | |
| 261 | + __u64 rx_errors; | |
| 262 | + __u64 tx_errors; | |
| 263 | + __u64 rx_dropped; | |
| 264 | + __u64 tx_dropped; | |
| 265 | + __u64 multicast; | |
| 246 | 266 | }; |
| 247 | 267 | |
| 248 | 268 | /* The struct should be in sync with struct ifmap */ |
| @@ -350,7 +370,13 @@ enum { · 101 unmodified lines | ||
| 350 | 370 | IFLA_GRO_MAX_SIZE, |
| 351 | 371 | IFLA_TSO_MAX_SIZE, |
| 352 | 372 | IFLA_TSO_MAX_SEGS, |
| 373 | + IFLA_ALLMULTI, /* Allmulti count: > 0 means acts ALLMULTI */ | |
| 374 | + | |
| 375 | + IFLA_DEVLINK_PORT, | |
| 353 | 376 | |
| 377 | + IFLA_GSO_IPV4_MAX_SIZE, | |
| 378 | + IFLA_GRO_IPV4_MAX_SIZE, | |
| 379 | + IFLA_DPLL_PIN, | |
| 354 | 380 | __IFLA_MAX |
| 355 | 381 | }; |
| 356 | 382 | |
| @@ -539,6 +565,12 @@ enum { · 182 unmodified lines | ||
| 539 | 565 | IFLA_BRPORT_MRP_IN_OPEN, |
| 540 | 566 | IFLA_BRPORT_MCAST_EHT_HOSTS_LIMIT, |
| 541 | 567 | IFLA_BRPORT_MCAST_EHT_HOSTS_CNT, |
| 568 | + IFLA_BRPORT_LOCKED, | |
| 569 | + IFLA_BRPORT_MAB, | |
| 570 | + IFLA_BRPORT_MCAST_N_GROUPS, | |
| 571 | + IFLA_BRPORT_MCAST_MAX_GROUPS, | |
| 572 | + IFLA_BRPORT_NEIGH_VLAN_SUPPRESS, | |
| 573 | + IFLA_BRPORT_BACKUP_NHID, | |
| 542 | 574 | __IFLA_BRPORT_MAX |
| 543 | 575 | }; |
| 544 | 576 | #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) |
| @@ -716,7 +748,79 @@ enum ipvlan_mode { · 171 unmodified lines | ||
| 716 | 748 | #define IPVLAN_F_PRIVATE 0x01 |
| 717 | 749 | #define IPVLAN_F_VEPA 0x02 |
| 718 | 750 | |
| 751 | +/* Tunnel RTM header */ | |
| 752 | +struct tunnel_msg { | |
| 753 | + __u8 family; | |
| 754 | + __u8 flags; | |
| 755 | + __u16 reserved2; | |
| 756 | + __u32 ifindex; | |
| 757 | +}; | |
| 758 | + | |
| 759 | +/* netkit section */ | |
| 760 | +enum netkit_action { | |
| 761 | + NETKIT_NEXT = -1, | |
| 762 | + NETKIT_PASS = 0, | |
| 763 | + NETKIT_DROP = 2, | |
| 764 | + NETKIT_REDIRECT = 7, | |
| 765 | +}; | |
| 766 | + | |
| 767 | +enum netkit_mode { | |
| 768 | + NETKIT_L2, | |
| 769 | + NETKIT_L3, | |
| 770 | +}; | |
| 771 | + | |
| 772 | +enum { | |
| 773 | + IFLA_NETKIT_UNSPEC, | |
| 774 | + IFLA_NETKIT_PEER_INFO, | |
| 775 | + IFLA_NETKIT_PRIMARY, | |
| 776 | + IFLA_NETKIT_POLICY, | |
| 777 | + IFLA_NETKIT_PEER_POLICY, | |
| 778 | + IFLA_NETKIT_MODE, | |
| 779 | + __IFLA_NETKIT_MAX, | |
| 780 | +}; | |
| 781 | +#define IFLA_NETKIT_MAX (__IFLA_NETKIT_MAX - 1) | |
| 782 | + | |
| 719 | 783 | /* VXLAN section */ |
| 784 | + | |
| 785 | +/* include statistics in the dump */ | |
| 786 | +#define TUNNEL_MSG_FLAG_STATS 0x01 | |
| 787 | + | |
| 788 | +#define TUNNEL_MSG_VALID_USER_FLAGS TUNNEL_MSG_FLAG_STATS | |
| 789 | + | |
| 790 | +/* Embedded inside VXLAN_VNIFILTER_ENTRY_STATS */ | |
| 791 | +enum { | |
| 792 | + VNIFILTER_ENTRY_STATS_UNSPEC, | |
| 793 | + VNIFILTER_ENTRY_STATS_RX_BYTES, | |
| 794 | + VNIFILTER_ENTRY_STATS_RX_PKTS, | |
| 795 | + VNIFILTER_ENTRY_STATS_RX_DROPS, | |
| 796 | + VNIFILTER_ENTRY_STATS_RX_ERRORS, | |
| 797 | + VNIFILTER_ENTRY_STATS_TX_BYTES, | |
| 798 | + VNIFILTER_ENTRY_STATS_TX_PKTS, | |
| 799 | + VNIFILTER_ENTRY_STATS_TX_DROPS, | |
| 800 | + VNIFILTER_ENTRY_STATS_TX_ERRORS, | |
| 801 | + VNIFILTER_ENTRY_STATS_PAD, | |
| 802 | + __VNIFILTER_ENTRY_STATS_MAX | |
| 803 | +}; | |
| 804 | +#define VNIFILTER_ENTRY_STATS_MAX (__VNIFILTER_ENTRY_STATS_MAX - 1) | |
| 805 | + | |
| 806 | +enum { | |
| 807 | + VXLAN_VNIFILTER_ENTRY_UNSPEC, | |
| 808 | + VXLAN_VNIFILTER_ENTRY_START, | |
| 809 | + VXLAN_VNIFILTER_ENTRY_END, | |
| 810 | + VXLAN_VNIFILTER_ENTRY_GROUP, | |
| 811 | + VXLAN_VNIFILTER_ENTRY_GROUP6, | |
| 812 | + VXLAN_VNIFILTER_ENTRY_STATS, | |
| 813 | + __VXLAN_VNIFILTER_ENTRY_MAX | |
| 814 | +}; | |
| 815 | +#define VXLAN_VNIFILTER_ENTRY_MAX (__VXLAN_VNIFILTER_ENTRY_MAX - 1) | |
| 816 | + | |
| 817 | +enum { | |
| 818 | + VXLAN_VNIFILTER_UNSPEC, | |
| 819 | + VXLAN_VNIFILTER_ENTRY, | |
| 820 | + __VXLAN_VNIFILTER_MAX | |
| 821 | +}; | |
| 822 | +#define VXLAN_VNIFILTER_MAX (__VXLAN_VNIFILTER_MAX - 1) | |
| 823 | + | |
| 720 | 824 | enum { |
| 721 | 825 | IFLA_VXLAN_UNSPEC, |
| 722 | 826 | IFLA_VXLAN_ID, |
| @@ -748,6 +852,8 @@ enum { · 25 unmodified lines | ||
| 748 | 852 | IFLA_VXLAN_GPE, |
| 749 | 853 | IFLA_VXLAN_TTL_INHERIT, |
| 750 | 854 | IFLA_VXLAN_DF, |
| 855 | + IFLA_VXLAN_VNIFILTER, /* only applicable with COLLECT_METADATA mode */ | |
| 856 | + IFLA_VXLAN_LOCALBYPASS, | |
| 751 | 857 | __IFLA_VXLAN_MAX |
| 752 | 858 | }; |
| 753 | 859 | #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1) |
| @@ -781,6 +887,7 @@ enum { · 27 unmodified lines | ||
| 781 | 887 | IFLA_GENEVE_LABEL, |
| 782 | 888 | IFLA_GENEVE_TTL_INHERIT, |
| 783 | 889 | IFLA_GENEVE_DF, |
| 890 | + IFLA_GENEVE_INNER_PROTO_INHERIT, | |
| 784 | 891 | __IFLA_GENEVE_MAX |
| 785 | 892 | }; |
| 786 | 893 | #define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1) |
| @@ -826,6 +933,8 @@ enum { · 39 unmodified lines | ||
| 826 | 933 | IFLA_GTP_FD1, |
| 827 | 934 | IFLA_GTP_PDP_HASHSIZE, |
| 828 | 935 | IFLA_GTP_ROLE, |
| 936 | + IFLA_GTP_CREATE_SOCKETS, | |
| 937 | + IFLA_GTP_RESTART_COUNT, | |
| 829 | 938 | __IFLA_GTP_MAX, |
| 830 | 939 | }; |
| 831 | 940 | #define IFLA_GTP_MAX (__IFLA_GTP_MAX - 1) |
| @@ -1162,6 +1271,17 @@ enum { · 330 unmodified lines | ||
| 1162 | 1271 | |
| 1163 | 1272 | #define IFLA_STATS_FILTER_BIT(ATTR) (1 << (ATTR - 1)) |
| 1164 | 1273 | |
| 1274 | +enum { | |
| 1275 | + IFLA_STATS_GETSET_UNSPEC, | |
| 1276 | + IFLA_STATS_GET_FILTERS, /* Nest of IFLA_STATS_LINK_xxx, each a u32 with | |
| 1277 | + * a filter mask for the corresponding group. | |
| 1278 | + */ | |
| 1279 | + IFLA_STATS_SET_OFFLOAD_XSTATS_L3_STATS, /* 0 or 1 as u8 */ | |
| 1280 | + __IFLA_STATS_GETSET_MAX, | |
| 1281 | +}; | |
| 1282 | + | |
| 1283 | +#define IFLA_STATS_GETSET_MAX (__IFLA_STATS_GETSET_MAX - 1) | |
| 1284 | + | |
| 1165 | 1285 | /* These are embedded into IFLA_STATS_LINK_XSTATS: |
| 1166 | 1286 | * [IFLA_STATS_LINK_XSTATS] |
| 1167 | 1287 | * -> [LINK_XSTATS_TYPE_xxx] |
| @@ -1179,10 +1299,21 @@ enum { · 11 unmodified lines | ||
| 1179 | 1299 | enum { |
| 1180 | 1300 | IFLA_OFFLOAD_XSTATS_UNSPEC, |
| 1181 | 1301 | IFLA_OFFLOAD_XSTATS_CPU_HIT, /* struct rtnl_link_stats64 */ |
| 1302 | + IFLA_OFFLOAD_XSTATS_HW_S_INFO, /* HW stats info. A nest */ | |
| 1303 | + IFLA_OFFLOAD_XSTATS_L3_STATS, /* struct rtnl_hw_stats64 */ | |
| 1182 | 1304 | __IFLA_OFFLOAD_XSTATS_MAX |
| 1183 | 1305 | }; |
| 1184 | 1306 | #define IFLA_OFFLOAD_XSTATS_MAX (__IFLA_OFFLOAD_XSTATS_MAX - 1) |
| 1185 | 1307 | |
| 1308 | +enum { | |
| 1309 | + IFLA_OFFLOAD_XSTATS_HW_S_INFO_UNSPEC, | |
| 1310 | + IFLA_OFFLOAD_XSTATS_HW_S_INFO_REQUEST, /* u8 */ | |
| 1311 | + IFLA_OFFLOAD_XSTATS_HW_S_INFO_USED, /* u8 */ | |
| 1312 | + __IFLA_OFFLOAD_XSTATS_HW_S_INFO_MAX, | |
| 1313 | +}; | |
| 1314 | +#define IFLA_OFFLOAD_XSTATS_HW_S_INFO_MAX \ | |
| 1315 | + (__IFLA_OFFLOAD_XSTATS_HW_S_INFO_MAX - 1) | |
| 1316 | + | |
| 1186 | 1317 | /* XDP section */ |
| 1187 | 1318 | |
| 1188 | 1319 | #define XDP_FLAGS_UPDATE_IF_NOEXIST (1U << 0) |
| @@ -1281,4 +1412,14 @@ enum { · 92 unmodified lines | ||
| 1281 | 1412 | |
| 1282 | 1413 | #define IFLA_MCTP_MAX (__IFLA_MCTP_MAX - 1) |
| 1283 | 1414 | |
| 1415 | +/* DSA section */ | |
| 1416 | + | |
| 1417 | +enum { | |
| 1418 | + IFLA_DSA_UNSPEC, | |
| 1419 | + IFLA_DSA_MASTER, | |
| 1420 | + __IFLA_DSA_MAX, | |
| 1421 | +}; | |
| 1422 | + | |
| 1423 | +#define IFLA_DSA_MAX (__IFLA_DSA_MAX - 1) | |
| 1424 | + | |
| 1284 | 1425 | #endif /* _UAPI_LINUX_IF_LINK_H */ |