From 8ca3b7d2bb7672b5608051fab4b825fdbbf2356a Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 25 May 2020 17:54:39 +0200 Subject: sys/linux: fix some warnings in descriptions --- sys/linux/socket_netlink_audit.txt | 1 + sys/linux/socket_netlink_audit.txt.warn | 2 -- sys/linux/socket_netlink_netfilter_nftables.txt | 16 ++++++++++++++++ sys/linux/socket_netlink_netfilter_nftables.txt.warn | 5 ----- sys/linux/socket_netlink_netfilter_nftables_386.const | 10 ++++++++++ sys/linux/socket_netlink_netfilter_nftables_amd64.const | 10 ++++++++++ sys/linux/socket_netlink_netfilter_nftables_arm.const | 10 ++++++++++ sys/linux/socket_netlink_netfilter_nftables_arm64.const | 10 ++++++++++ .../socket_netlink_netfilter_nftables_mips64le.const | 10 ++++++++++ .../socket_netlink_netfilter_nftables_ppc64le.const | 10 ++++++++++ sys/linux/socket_netlink_route.txt | 7 +++++-- sys/linux/socket_netlink_route.txt.warn | 4 +--- sys/linux/socket_netlink_route_386.const | 3 +++ sys/linux/socket_netlink_route_amd64.const | 3 +++ sys/linux/socket_netlink_route_arm.const | 3 +++ sys/linux/socket_netlink_route_arm64.const | 3 +++ sys/linux/socket_netlink_route_mips64le.const | 3 +++ sys/linux/socket_netlink_route_ppc64le.const | 3 +++ sys/linux/socket_netlink_route_sched.txt | 16 +++++++++++++--- sys/linux/socket_netlink_route_sched.txt.warn | 4 +--- sys/linux/socket_netlink_route_sched_386.const | 10 ++++++++++ sys/linux/socket_netlink_route_sched_amd64.const | 10 ++++++++++ sys/linux/socket_netlink_route_sched_arm.const | 10 ++++++++++ sys/linux/socket_netlink_route_sched_arm64.const | 10 ++++++++++ sys/linux/socket_netlink_route_sched_mips64le.const | 10 ++++++++++ sys/linux/socket_netlink_route_sched_ppc64le.const | 10 ++++++++++ sys/linux/sys.txt | 1 + sys/linux/sys.txt.warn | 2 -- 28 files changed, 176 insertions(+), 20 deletions(-) delete mode 100644 sys/linux/socket_netlink_audit.txt.warn (limited to 'sys/linux') diff --git a/sys/linux/socket_netlink_audit.txt b/sys/linux/socket_netlink_audit.txt index 1fd2f243a..82c04c04e 100644 --- a/sys/linux/socket_netlink_audit.txt +++ b/sys/linux/socket_netlink_audit.txt @@ -35,6 +35,7 @@ audit_status { rate_limit int32 backlog_limit int32 lost int32 + backlog int32 feature_bitmap const[0, int32] backlog_wait_time int32 } diff --git a/sys/linux/socket_netlink_audit.txt.warn b/sys/linux/socket_netlink_audit.txt.warn deleted file mode 100644 index 90852189a..000000000 --- a/sys/linux/socket_netlink_audit.txt.warn +++ /dev/null @@ -1,2 +0,0 @@ -bad-field-number: audit_status: syz=9 kernel=10 -bad-struct-size: audit_status: syz=36 kernel=40 diff --git a/sys/linux/socket_netlink_netfilter_nftables.txt b/sys/linux/socket_netlink_netfilter_nftables.txt index 99aa81001..8efd75ed6 100644 --- a/sys/linux/socket_netlink_netfilter_nftables.txt +++ b/sys/linux/socket_netlink_netfilter_nftables.txt @@ -150,6 +150,7 @@ nft_set_policy [ NFTA_SET_USERDATA nlnetw[NFTA_SET_USERDATA, array[int8]] NFTA_SET_OBJ_TYPE nlnetw[NFTA_SET_OBJ_TYPE, flags[nft_obj_type, int32be]] NFTA_SET_HANDLE nlnetw[NFTA_SET_HANDLE, nft_handle] + NFTA_SET_EXPR nlnest[NFTA_SET_EXPR, nft_expr_policy] ] [varlen] type nft_set_id int32be[0:3] @@ -160,6 +161,11 @@ nft_set_policies = NFT_SET_POL_PERFORMANCE, NFT_SET_POL_MEMORY nft_set_desc_policy [ NFTA_SET_DESC_SIZE nlnetw[NFTA_SET_DESC_SIZE, int32be] + NFTA_SET_DESC_CONCAT nlnest[NFTA_SET_DESC_CONCAT, array[nlnest[NFTA_LIST_ELEM, array[nft_concat_policy]]]] +] [varlen] + +nft_concat_policy [ + NFTA_SET_FIELD_LEN nlnetw[NFTA_SET_FIELD_LEN, int32be] ] [varlen] nft_set_elem_list_policy [ @@ -182,6 +188,7 @@ nft_set_elem_policy [ # TODO: is this used? NFTA_SET_ELEM_EXPR nlnest[NFTA_SET_ELEM_EXPR, void] NFTA_SET_ELEM_OBJREF nlattr[NFTA_SET_ELEM_OBJREF, string[nft_obj_name]] + NFTA_SET_ELEM_KEY_END nlnest[NFTA_SET_ELEM_KEY_END, array[nft_data_policy]] ] [varlen] nft_set_elem_flags = NFT_SET_ELEM_INTERVAL_END @@ -295,6 +302,8 @@ nft_tunnel_key_policy [ NFTA_TUNNEL_KEY_FLAGS nlnetw[NFTA_TUNNEL_KEY_FLAGS, flags[nft_tunnel_flags, int32be]] NFTA_TUNNEL_KEY_TOS nlattr[NFTA_TUNNEL_KEY_TOS, int8] NFTA_TUNNEL_KEY_TTL nlattr[NFTA_TUNNEL_KEY_TTL, int8] + NFTA_TUNNEL_KEY_SPORT nlnetw[NFTA_TUNNEL_KEY_SPORT, sock_port] + NFTA_TUNNEL_KEY_DPORT nlnetw[NFTA_TUNNEL_KEY_DPORT, sock_port] NFTA_TUNNEL_KEY_OPTS nlnest[NFTA_TUNNEL_KEY_OPTS, nft_tunnel_opts_policy] ] [varlen] @@ -313,6 +322,7 @@ nft_tunnel_ip6_policy [ nft_tunnel_opts_policy [ NFTA_TUNNEL_KEY_OPTS_VXLAN nlnest[NFTA_TUNNEL_KEY_OPTS_VXLAN, array[nft_tunnel_opts_vxlan_policy]] NFTA_TUNNEL_KEY_OPTS_ERSPAN nlnest[NFTA_TUNNEL_KEY_OPTS_ERSPAN, array[nft_tunnel_opts_erspan_policy]] + NFTA_TUNNEL_KEY_OPTS_GENEVE nlnest[NFTA_TUNNEL_KEY_OPTS_GENEVE, array[nft_tunnel_opts_geneve_policy]] ] [varlen] nft_tunnel_opts_vxlan_policy [ @@ -330,6 +340,12 @@ nft_tunnel_opts_erspan_policy [ nft_tunnel_flags = NFT_TUNNEL_F_ZERO_CSUM_TX, NFT_TUNNEL_F_DONT_FRAGMENT, NFT_TUNNEL_F_SEQ_NUMBER +nft_tunnel_opts_geneve_policy [ + NFTA_TUNNEL_KEY_GENEVE_CLASS nlnetw[NFTA_TUNNEL_KEY_GENEVE_CLASS, int16be] + NFTA_TUNNEL_KEY_GENEVE_TYPE nlattr[NFTA_TUNNEL_KEY_GENEVE_TYPE, int8] + NFTA_TUNNEL_KEY_GENEVE_DATA nlattr[NFTA_TUNNEL_KEY_GENEVE_DATA, array[int32]] +] [varlen] + nft_flowtable_policy [ NFTA_FLOWTABLE_TABLE nlattr[NFTA_FLOWTABLE_TABLE, string[nft_table_name]] NFTA_FLOWTABLE_NAME nlattr[NFTA_FLOWTABLE_NAME, string[nft_flowtable_name]] diff --git a/sys/linux/socket_netlink_netfilter_nftables.txt.warn b/sys/linux/socket_netlink_netfilter_nftables.txt.warn index a4aa3492f..70d39b5cb 100644 --- a/sys/linux/socket_netlink_netfilter_nftables.txt.warn +++ b/sys/linux/socket_netlink_netfilter_nftables.txt.warn @@ -2,10 +2,5 @@ no-such-struct: nft_nlmsghdr no-such-struct: nfgenmsg_nft bad-netlink-attr: nft_rule_compat_policy.NFTA_RULE_COMPAT_PROTO_IPV6: duplicate attribute bad-netlink-attr: nft_rule_compat_policy.NFTA_RULE_COMPAT_PROTO_BRIDGE: duplicate attribute -bad-netlink-attr: nft_set_policy: missing attributes: [17] -bad-netlink-attr: nft_set_desc_policy: missing attributes: [2] -bad-netlink-attr: nft_set_elem_policy: missing attributes: [10] -bad-netlink-attr: nft_tunnel_key_policy: missing attributes: [7 8] -bad-netlink-attr: nft_tunnel_opts_policy: missing attributes: [3] bad-netlink-attr: nft_bitwise_policy: missing attributes: [6 7] no-such-struct: nft_flow_offload_policy diff --git a/sys/linux/socket_netlink_netfilter_nftables_386.const b/sys/linux/socket_netlink_netfilter_nftables_386.const index 70fe49001..f3cbdf1f6 100644 --- a/sys/linux/socket_netlink_netfilter_nftables_386.const +++ b/sys/linux/socket_netlink_netfilter_nftables_386.const @@ -198,12 +198,14 @@ NFTA_SECMARK_CTX = 1 NFTA_SET_DATA_LEN = 7 NFTA_SET_DATA_TYPE = 6 NFTA_SET_DESC = 9 +NFTA_SET_DESC_CONCAT = 2 NFTA_SET_DESC_SIZE = 1 NFTA_SET_ELEM_DATA = 2 NFTA_SET_ELEM_EXPIRATION = 5 NFTA_SET_ELEM_EXPR = 7 NFTA_SET_ELEM_FLAGS = 3 NFTA_SET_ELEM_KEY = 1 +NFTA_SET_ELEM_KEY_END = 10 NFTA_SET_ELEM_LIST_ELEMENTS = 3 NFTA_SET_ELEM_LIST_SET = 2 NFTA_SET_ELEM_LIST_SET_ID = 4 @@ -211,6 +213,8 @@ NFTA_SET_ELEM_LIST_TABLE = 1 NFTA_SET_ELEM_OBJREF = 9 NFTA_SET_ELEM_TIMEOUT = 4 NFTA_SET_ELEM_USERDATA = 6 +NFTA_SET_EXPR = 17 +NFTA_SET_FIELD_LEN = 1 NFTA_SET_FLAGS = 3 NFTA_SET_GC_INTERVAL = 12 NFTA_SET_HANDLE = 16 @@ -239,11 +243,15 @@ NFTA_TPROXY_REG_ADDR = 2 NFTA_TPROXY_REG_PORT = 3 NFTA_TUNNEL_DREG = 2 NFTA_TUNNEL_KEY = 1 +NFTA_TUNNEL_KEY_DPORT = 8 NFTA_TUNNEL_KEY_ERSPAN_V1_INDEX = 2 NFTA_TUNNEL_KEY_ERSPAN_V2_DIR = 4 NFTA_TUNNEL_KEY_ERSPAN_V2_HWID = 3 NFTA_TUNNEL_KEY_ERSPAN_VERSION = 1 NFTA_TUNNEL_KEY_FLAGS = 4 +NFTA_TUNNEL_KEY_GENEVE_CLASS = 1 +NFTA_TUNNEL_KEY_GENEVE_DATA = 3 +NFTA_TUNNEL_KEY_GENEVE_TYPE = 2 NFTA_TUNNEL_KEY_ID = 1 NFTA_TUNNEL_KEY_IP = 2 NFTA_TUNNEL_KEY_IP6 = 3 @@ -254,7 +262,9 @@ NFTA_TUNNEL_KEY_IP_DST = 2 NFTA_TUNNEL_KEY_IP_SRC = 1 NFTA_TUNNEL_KEY_OPTS = 9 NFTA_TUNNEL_KEY_OPTS_ERSPAN = 2 +NFTA_TUNNEL_KEY_OPTS_GENEVE = 3 NFTA_TUNNEL_KEY_OPTS_VXLAN = 1 +NFTA_TUNNEL_KEY_SPORT = 7 NFTA_TUNNEL_KEY_TOS = 5 NFTA_TUNNEL_KEY_TTL = 6 NFTA_TUNNEL_KEY_VXLAN_GBP = 1 diff --git a/sys/linux/socket_netlink_netfilter_nftables_amd64.const b/sys/linux/socket_netlink_netfilter_nftables_amd64.const index 02b0ade12..bd5e393e1 100644 --- a/sys/linux/socket_netlink_netfilter_nftables_amd64.const +++ b/sys/linux/socket_netlink_netfilter_nftables_amd64.const @@ -198,12 +198,14 @@ NFTA_SECMARK_CTX = 1 NFTA_SET_DATA_LEN = 7 NFTA_SET_DATA_TYPE = 6 NFTA_SET_DESC = 9 +NFTA_SET_DESC_CONCAT = 2 NFTA_SET_DESC_SIZE = 1 NFTA_SET_ELEM_DATA = 2 NFTA_SET_ELEM_EXPIRATION = 5 NFTA_SET_ELEM_EXPR = 7 NFTA_SET_ELEM_FLAGS = 3 NFTA_SET_ELEM_KEY = 1 +NFTA_SET_ELEM_KEY_END = 10 NFTA_SET_ELEM_LIST_ELEMENTS = 3 NFTA_SET_ELEM_LIST_SET = 2 NFTA_SET_ELEM_LIST_SET_ID = 4 @@ -211,6 +213,8 @@ NFTA_SET_ELEM_LIST_TABLE = 1 NFTA_SET_ELEM_OBJREF = 9 NFTA_SET_ELEM_TIMEOUT = 4 NFTA_SET_ELEM_USERDATA = 6 +NFTA_SET_EXPR = 17 +NFTA_SET_FIELD_LEN = 1 NFTA_SET_FLAGS = 3 NFTA_SET_GC_INTERVAL = 12 NFTA_SET_HANDLE = 16 @@ -239,11 +243,15 @@ NFTA_TPROXY_REG_ADDR = 2 NFTA_TPROXY_REG_PORT = 3 NFTA_TUNNEL_DREG = 2 NFTA_TUNNEL_KEY = 1 +NFTA_TUNNEL_KEY_DPORT = 8 NFTA_TUNNEL_KEY_ERSPAN_V1_INDEX = 2 NFTA_TUNNEL_KEY_ERSPAN_V2_DIR = 4 NFTA_TUNNEL_KEY_ERSPAN_V2_HWID = 3 NFTA_TUNNEL_KEY_ERSPAN_VERSION = 1 NFTA_TUNNEL_KEY_FLAGS = 4 +NFTA_TUNNEL_KEY_GENEVE_CLASS = 1 +NFTA_TUNNEL_KEY_GENEVE_DATA = 3 +NFTA_TUNNEL_KEY_GENEVE_TYPE = 2 NFTA_TUNNEL_KEY_ID = 1 NFTA_TUNNEL_KEY_IP = 2 NFTA_TUNNEL_KEY_IP6 = 3 @@ -254,7 +262,9 @@ NFTA_TUNNEL_KEY_IP_DST = 2 NFTA_TUNNEL_KEY_IP_SRC = 1 NFTA_TUNNEL_KEY_OPTS = 9 NFTA_TUNNEL_KEY_OPTS_ERSPAN = 2 +NFTA_TUNNEL_KEY_OPTS_GENEVE = 3 NFTA_TUNNEL_KEY_OPTS_VXLAN = 1 +NFTA_TUNNEL_KEY_SPORT = 7 NFTA_TUNNEL_KEY_TOS = 5 NFTA_TUNNEL_KEY_TTL = 6 NFTA_TUNNEL_KEY_VXLAN_GBP = 1 diff --git a/sys/linux/socket_netlink_netfilter_nftables_arm.const b/sys/linux/socket_netlink_netfilter_nftables_arm.const index 717a8a654..a6784736a 100644 --- a/sys/linux/socket_netlink_netfilter_nftables_arm.const +++ b/sys/linux/socket_netlink_netfilter_nftables_arm.const @@ -198,12 +198,14 @@ NFTA_SECMARK_CTX = 1 NFTA_SET_DATA_LEN = 7 NFTA_SET_DATA_TYPE = 6 NFTA_SET_DESC = 9 +NFTA_SET_DESC_CONCAT = 2 NFTA_SET_DESC_SIZE = 1 NFTA_SET_ELEM_DATA = 2 NFTA_SET_ELEM_EXPIRATION = 5 NFTA_SET_ELEM_EXPR = 7 NFTA_SET_ELEM_FLAGS = 3 NFTA_SET_ELEM_KEY = 1 +NFTA_SET_ELEM_KEY_END = 10 NFTA_SET_ELEM_LIST_ELEMENTS = 3 NFTA_SET_ELEM_LIST_SET = 2 NFTA_SET_ELEM_LIST_SET_ID = 4 @@ -211,6 +213,8 @@ NFTA_SET_ELEM_LIST_TABLE = 1 NFTA_SET_ELEM_OBJREF = 9 NFTA_SET_ELEM_TIMEOUT = 4 NFTA_SET_ELEM_USERDATA = 6 +NFTA_SET_EXPR = 17 +NFTA_SET_FIELD_LEN = 1 NFTA_SET_FLAGS = 3 NFTA_SET_GC_INTERVAL = 12 NFTA_SET_HANDLE = 16 @@ -239,11 +243,15 @@ NFTA_TPROXY_REG_ADDR = 2 NFTA_TPROXY_REG_PORT = 3 NFTA_TUNNEL_DREG = 2 NFTA_TUNNEL_KEY = 1 +NFTA_TUNNEL_KEY_DPORT = 8 NFTA_TUNNEL_KEY_ERSPAN_V1_INDEX = 2 NFTA_TUNNEL_KEY_ERSPAN_V2_DIR = 4 NFTA_TUNNEL_KEY_ERSPAN_V2_HWID = 3 NFTA_TUNNEL_KEY_ERSPAN_VERSION = 1 NFTA_TUNNEL_KEY_FLAGS = 4 +NFTA_TUNNEL_KEY_GENEVE_CLASS = 1 +NFTA_TUNNEL_KEY_GENEVE_DATA = 3 +NFTA_TUNNEL_KEY_GENEVE_TYPE = 2 NFTA_TUNNEL_KEY_ID = 1 NFTA_TUNNEL_KEY_IP = 2 NFTA_TUNNEL_KEY_IP6 = 3 @@ -254,7 +262,9 @@ NFTA_TUNNEL_KEY_IP_DST = 2 NFTA_TUNNEL_KEY_IP_SRC = 1 NFTA_TUNNEL_KEY_OPTS = 9 NFTA_TUNNEL_KEY_OPTS_ERSPAN = 2 +NFTA_TUNNEL_KEY_OPTS_GENEVE = 3 NFTA_TUNNEL_KEY_OPTS_VXLAN = 1 +NFTA_TUNNEL_KEY_SPORT = 7 NFTA_TUNNEL_KEY_TOS = 5 NFTA_TUNNEL_KEY_TTL = 6 NFTA_TUNNEL_KEY_VXLAN_GBP = 1 diff --git a/sys/linux/socket_netlink_netfilter_nftables_arm64.const b/sys/linux/socket_netlink_netfilter_nftables_arm64.const index 641ff10df..a89c597b5 100644 --- a/sys/linux/socket_netlink_netfilter_nftables_arm64.const +++ b/sys/linux/socket_netlink_netfilter_nftables_arm64.const @@ -198,12 +198,14 @@ NFTA_SECMARK_CTX = 1 NFTA_SET_DATA_LEN = 7 NFTA_SET_DATA_TYPE = 6 NFTA_SET_DESC = 9 +NFTA_SET_DESC_CONCAT = 2 NFTA_SET_DESC_SIZE = 1 NFTA_SET_ELEM_DATA = 2 NFTA_SET_ELEM_EXPIRATION = 5 NFTA_SET_ELEM_EXPR = 7 NFTA_SET_ELEM_FLAGS = 3 NFTA_SET_ELEM_KEY = 1 +NFTA_SET_ELEM_KEY_END = 10 NFTA_SET_ELEM_LIST_ELEMENTS = 3 NFTA_SET_ELEM_LIST_SET = 2 NFTA_SET_ELEM_LIST_SET_ID = 4 @@ -211,6 +213,8 @@ NFTA_SET_ELEM_LIST_TABLE = 1 NFTA_SET_ELEM_OBJREF = 9 NFTA_SET_ELEM_TIMEOUT = 4 NFTA_SET_ELEM_USERDATA = 6 +NFTA_SET_EXPR = 17 +NFTA_SET_FIELD_LEN = 1 NFTA_SET_FLAGS = 3 NFTA_SET_GC_INTERVAL = 12 NFTA_SET_HANDLE = 16 @@ -239,11 +243,15 @@ NFTA_TPROXY_REG_ADDR = 2 NFTA_TPROXY_REG_PORT = 3 NFTA_TUNNEL_DREG = 2 NFTA_TUNNEL_KEY = 1 +NFTA_TUNNEL_KEY_DPORT = 8 NFTA_TUNNEL_KEY_ERSPAN_V1_INDEX = 2 NFTA_TUNNEL_KEY_ERSPAN_V2_DIR = 4 NFTA_TUNNEL_KEY_ERSPAN_V2_HWID = 3 NFTA_TUNNEL_KEY_ERSPAN_VERSION = 1 NFTA_TUNNEL_KEY_FLAGS = 4 +NFTA_TUNNEL_KEY_GENEVE_CLASS = 1 +NFTA_TUNNEL_KEY_GENEVE_DATA = 3 +NFTA_TUNNEL_KEY_GENEVE_TYPE = 2 NFTA_TUNNEL_KEY_ID = 1 NFTA_TUNNEL_KEY_IP = 2 NFTA_TUNNEL_KEY_IP6 = 3 @@ -254,7 +262,9 @@ NFTA_TUNNEL_KEY_IP_DST = 2 NFTA_TUNNEL_KEY_IP_SRC = 1 NFTA_TUNNEL_KEY_OPTS = 9 NFTA_TUNNEL_KEY_OPTS_ERSPAN = 2 +NFTA_TUNNEL_KEY_OPTS_GENEVE = 3 NFTA_TUNNEL_KEY_OPTS_VXLAN = 1 +NFTA_TUNNEL_KEY_SPORT = 7 NFTA_TUNNEL_KEY_TOS = 5 NFTA_TUNNEL_KEY_TTL = 6 NFTA_TUNNEL_KEY_VXLAN_GBP = 1 diff --git a/sys/linux/socket_netlink_netfilter_nftables_mips64le.const b/sys/linux/socket_netlink_netfilter_nftables_mips64le.const index 08b52a5d4..65d20c3c2 100644 --- a/sys/linux/socket_netlink_netfilter_nftables_mips64le.const +++ b/sys/linux/socket_netlink_netfilter_nftables_mips64le.const @@ -198,12 +198,14 @@ NFTA_SECMARK_CTX = 1 NFTA_SET_DATA_LEN = 7 NFTA_SET_DATA_TYPE = 6 NFTA_SET_DESC = 9 +NFTA_SET_DESC_CONCAT = 2 NFTA_SET_DESC_SIZE = 1 NFTA_SET_ELEM_DATA = 2 NFTA_SET_ELEM_EXPIRATION = 5 NFTA_SET_ELEM_EXPR = 7 NFTA_SET_ELEM_FLAGS = 3 NFTA_SET_ELEM_KEY = 1 +NFTA_SET_ELEM_KEY_END = 10 NFTA_SET_ELEM_LIST_ELEMENTS = 3 NFTA_SET_ELEM_LIST_SET = 2 NFTA_SET_ELEM_LIST_SET_ID = 4 @@ -211,6 +213,8 @@ NFTA_SET_ELEM_LIST_TABLE = 1 NFTA_SET_ELEM_OBJREF = 9 NFTA_SET_ELEM_TIMEOUT = 4 NFTA_SET_ELEM_USERDATA = 6 +NFTA_SET_EXPR = 17 +NFTA_SET_FIELD_LEN = 1 NFTA_SET_FLAGS = 3 NFTA_SET_GC_INTERVAL = 12 NFTA_SET_HANDLE = 16 @@ -239,11 +243,15 @@ NFTA_TPROXY_REG_ADDR = 2 NFTA_TPROXY_REG_PORT = 3 NFTA_TUNNEL_DREG = 2 NFTA_TUNNEL_KEY = 1 +NFTA_TUNNEL_KEY_DPORT = 8 NFTA_TUNNEL_KEY_ERSPAN_V1_INDEX = 2 NFTA_TUNNEL_KEY_ERSPAN_V2_DIR = 4 NFTA_TUNNEL_KEY_ERSPAN_V2_HWID = 3 NFTA_TUNNEL_KEY_ERSPAN_VERSION = 1 NFTA_TUNNEL_KEY_FLAGS = 4 +NFTA_TUNNEL_KEY_GENEVE_CLASS = 1 +NFTA_TUNNEL_KEY_GENEVE_DATA = 3 +NFTA_TUNNEL_KEY_GENEVE_TYPE = 2 NFTA_TUNNEL_KEY_ID = 1 NFTA_TUNNEL_KEY_IP = 2 NFTA_TUNNEL_KEY_IP6 = 3 @@ -254,7 +262,9 @@ NFTA_TUNNEL_KEY_IP_DST = 2 NFTA_TUNNEL_KEY_IP_SRC = 1 NFTA_TUNNEL_KEY_OPTS = 9 NFTA_TUNNEL_KEY_OPTS_ERSPAN = 2 +NFTA_TUNNEL_KEY_OPTS_GENEVE = 3 NFTA_TUNNEL_KEY_OPTS_VXLAN = 1 +NFTA_TUNNEL_KEY_SPORT = 7 NFTA_TUNNEL_KEY_TOS = 5 NFTA_TUNNEL_KEY_TTL = 6 NFTA_TUNNEL_KEY_VXLAN_GBP = 1 diff --git a/sys/linux/socket_netlink_netfilter_nftables_ppc64le.const b/sys/linux/socket_netlink_netfilter_nftables_ppc64le.const index 38300c7cc..cdc257673 100644 --- a/sys/linux/socket_netlink_netfilter_nftables_ppc64le.const +++ b/sys/linux/socket_netlink_netfilter_nftables_ppc64le.const @@ -198,12 +198,14 @@ NFTA_SECMARK_CTX = 1 NFTA_SET_DATA_LEN = 7 NFTA_SET_DATA_TYPE = 6 NFTA_SET_DESC = 9 +NFTA_SET_DESC_CONCAT = 2 NFTA_SET_DESC_SIZE = 1 NFTA_SET_ELEM_DATA = 2 NFTA_SET_ELEM_EXPIRATION = 5 NFTA_SET_ELEM_EXPR = 7 NFTA_SET_ELEM_FLAGS = 3 NFTA_SET_ELEM_KEY = 1 +NFTA_SET_ELEM_KEY_END = 10 NFTA_SET_ELEM_LIST_ELEMENTS = 3 NFTA_SET_ELEM_LIST_SET = 2 NFTA_SET_ELEM_LIST_SET_ID = 4 @@ -211,6 +213,8 @@ NFTA_SET_ELEM_LIST_TABLE = 1 NFTA_SET_ELEM_OBJREF = 9 NFTA_SET_ELEM_TIMEOUT = 4 NFTA_SET_ELEM_USERDATA = 6 +NFTA_SET_EXPR = 17 +NFTA_SET_FIELD_LEN = 1 NFTA_SET_FLAGS = 3 NFTA_SET_GC_INTERVAL = 12 NFTA_SET_HANDLE = 16 @@ -239,11 +243,15 @@ NFTA_TPROXY_REG_ADDR = 2 NFTA_TPROXY_REG_PORT = 3 NFTA_TUNNEL_DREG = 2 NFTA_TUNNEL_KEY = 1 +NFTA_TUNNEL_KEY_DPORT = 8 NFTA_TUNNEL_KEY_ERSPAN_V1_INDEX = 2 NFTA_TUNNEL_KEY_ERSPAN_V2_DIR = 4 NFTA_TUNNEL_KEY_ERSPAN_V2_HWID = 3 NFTA_TUNNEL_KEY_ERSPAN_VERSION = 1 NFTA_TUNNEL_KEY_FLAGS = 4 +NFTA_TUNNEL_KEY_GENEVE_CLASS = 1 +NFTA_TUNNEL_KEY_GENEVE_DATA = 3 +NFTA_TUNNEL_KEY_GENEVE_TYPE = 2 NFTA_TUNNEL_KEY_ID = 1 NFTA_TUNNEL_KEY_IP = 2 NFTA_TUNNEL_KEY_IP6 = 3 @@ -254,7 +262,9 @@ NFTA_TUNNEL_KEY_IP_DST = 2 NFTA_TUNNEL_KEY_IP_SRC = 1 NFTA_TUNNEL_KEY_OPTS = 9 NFTA_TUNNEL_KEY_OPTS_ERSPAN = 2 +NFTA_TUNNEL_KEY_OPTS_GENEVE = 3 NFTA_TUNNEL_KEY_OPTS_VXLAN = 1 +NFTA_TUNNEL_KEY_SPORT = 7 NFTA_TUNNEL_KEY_TOS = 5 NFTA_TUNNEL_KEY_TTL = 6 NFTA_TUNNEL_KEY_VXLAN_GBP = 1 diff --git a/sys/linux/socket_netlink_route.txt b/sys/linux/socket_netlink_route.txt index 1de0c5e57..67cece217 100644 --- a/sys/linux/socket_netlink_route.txt +++ b/sys/linux/socket_netlink_route.txt @@ -284,6 +284,7 @@ ipoib_policy [ macsec_rtnl_policy [ # TODO: all of these need better types. IFLA_MACSEC_SCI nlattr[IFLA_MACSEC_SCI, int64] + IFLA_MACSEC_PORT nlnetw[IFLA_MACSEC_PORT, sock_port] IFLA_MACSEC_ICV_LEN nlattr[IFLA_MACSEC_ICV_LEN, int8] IFLA_MACSEC_CIPHER_SUITE nlattr[IFLA_MACSEC_CIPHER_SUITE, int64] IFLA_MACSEC_WINDOW nlattr[IFLA_MACSEC_WINDOW, int32] @@ -685,6 +686,7 @@ fib4_rule_policy [ FRA_SRC nlattr[RTA_SRC, ipv4_addr] FRA_GENERIC_POLICY fib4_rule_policy_generic FRA_FLOW nlattr[FRA_FLOW, int32] + FRA_TUN_ID nlnetw[FRA_TUN_ID, int64be] ] [varlen] fib6_rule_policy [ @@ -847,8 +849,9 @@ ifla_port_policy [ ] [varlen] ifla_xdp_policy [ - IFLA_XDP_FD nlattr[IFLA_XDP_FD, fd_bpf_prog] - IFLA_XDP_FLAGS nlattr[IFLA_XDP_FLAGS, flags[ifla_xdp_flags, int32]] + IFLA_XDP_FD nlattr[IFLA_XDP_FD, fd_bpf_prog] + IFLA_XDP_FLAGS nlattr[IFLA_XDP_FLAGS, flags[ifla_xdp_flags, int32]] + IFLA_XDP_EXPECTED_FD nlattr[IFLA_XDP_EXPECTED_FD, fd_bpf_prog] ] [varlen] ifla_xdp_flags = XDP_FLAGS_UPDATE_IF_NOEXIST, XDP_FLAGS_SKB_MODE, XDP_FLAGS_DRV_MODE, XDP_FLAGS_HW_MODE diff --git a/sys/linux/socket_netlink_route.txt.warn b/sys/linux/socket_netlink_route.txt.warn index 7c2472968..1c34437d2 100644 --- a/sys/linux/socket_netlink_route.txt.warn +++ b/sys/linux/socket_netlink_route.txt.warn @@ -3,7 +3,6 @@ bad-netlink-attr: ifla_policy.IFLA_IFALIASn: duplicate attribute no-such-netlink-policy: ifla_af_spec_policy bad-netlink-attr: ifla_info_policy_t: missing attributes: [4] no-such-struct: ifla_info_policy_t -bad-netlink-attr: macsec_rtnl_policy: missing attributes: [2] bad-netlink-attr: macvlan_policy: missing attributes: [6] bad-netlink-attr: bond_policy: missing attributes: [23 28] bad-netlink-attr: br_policy: missing attributes: [45 46] @@ -13,7 +12,6 @@ bad-netlink-attr: vti6_policy: missing attributes: [1 2 3 6] bad-netlink-attr: ifa_ipv4_policy: missing attributes: [9 10] bad-netlink-attr: ifa_ipv6_policy: missing attributes: [9 10] bad-netlink-attr: rtm_ipv4_policy: missing attributes: [15 27 28 29 30] -bad-netlink-attr: fib4_rule_policy: missing attributes: [12] bad-netlink-attr: nda_policy: missing attributes: [12] bad-netlink-attr: nda_policy.NDA_DST_IPV6: duplicate attribute bad-netlink-attr: nda_policy.NDA_DST_MAC: duplicate attribute @@ -21,6 +19,6 @@ bad-netlink-attr: ifla_vf_policy: missing attributes: [8] bad-field-number: ifla_vf_mac: syz=3 kernel=2 bad-field-size: ifla_vf_mac.mac: syz=6 kernel=32 bad-netlink-attr: ifla_port_policy: missing attributes: [3 7] -bad-netlink-attr: ifla_xdp_policy: missing attributes: [2 4 8] +bad-netlink-attr: ifla_xdp_policy: missing attributes: [2 4] bad-netlink-attr: rtnl_net_policy: missing attributes: [4] bad-netlink-attr: cgw_policy: missing attributes: [15 16 17 18] diff --git a/sys/linux/socket_netlink_route_386.const b/sys/linux/socket_netlink_route_386.const index 92daa85b4..b1264f4d0 100644 --- a/sys/linux/socket_netlink_route_386.const +++ b/sys/linux/socket_netlink_route_386.const @@ -49,6 +49,7 @@ FRA_SPORT_RANGE = 23 FRA_SUPPRESS_IFGROUP = 13 FRA_SUPPRESS_PREFIXLEN = 14 FRA_TABLE = 15 +FRA_TUN_ID = 12 FRA_UID_RANGE = 20 FR_ACT_BLACKHOLE = 6 FR_ACT_GOTO = 2 @@ -273,6 +274,7 @@ IFLA_MACSEC_ENCRYPT = 7 IFLA_MACSEC_ES = 10 IFLA_MACSEC_ICV_LEN = 3 IFLA_MACSEC_INC_SCI = 9 +IFLA_MACSEC_PORT = 2 IFLA_MACSEC_PROTECT = 8 IFLA_MACSEC_REPLAY_PROTECT = 12 IFLA_MACSEC_SCB = 11 @@ -342,6 +344,7 @@ IFLA_VTI_OKEY = 3 IFLA_VTI_REMOTE = 5 IFLA_WEIGHT = 15 IFLA_XDP = 43 +IFLA_XDP_EXPECTED_FD = 8 IFLA_XDP_FD = 1 IFLA_XDP_FLAGS = 3 IFLA_XFRM_IF_ID = 2 diff --git a/sys/linux/socket_netlink_route_amd64.const b/sys/linux/socket_netlink_route_amd64.const index 1e9e533d3..e3d867c28 100644 --- a/sys/linux/socket_netlink_route_amd64.const +++ b/sys/linux/socket_netlink_route_amd64.const @@ -49,6 +49,7 @@ FRA_SPORT_RANGE = 23 FRA_SUPPRESS_IFGROUP = 13 FRA_SUPPRESS_PREFIXLEN = 14 FRA_TABLE = 15 +FRA_TUN_ID = 12 FRA_UID_RANGE = 20 FR_ACT_BLACKHOLE = 6 FR_ACT_GOTO = 2 @@ -273,6 +274,7 @@ IFLA_MACSEC_ENCRYPT = 7 IFLA_MACSEC_ES = 10 IFLA_MACSEC_ICV_LEN = 3 IFLA_MACSEC_INC_SCI = 9 +IFLA_MACSEC_PORT = 2 IFLA_MACSEC_PROTECT = 8 IFLA_MACSEC_REPLAY_PROTECT = 12 IFLA_MACSEC_SCB = 11 @@ -342,6 +344,7 @@ IFLA_VTI_OKEY = 3 IFLA_VTI_REMOTE = 5 IFLA_WEIGHT = 15 IFLA_XDP = 43 +IFLA_XDP_EXPECTED_FD = 8 IFLA_XDP_FD = 1 IFLA_XDP_FLAGS = 3 IFLA_XFRM_IF_ID = 2 diff --git a/sys/linux/socket_netlink_route_arm.const b/sys/linux/socket_netlink_route_arm.const index 1fa65368d..cb129b73b 100644 --- a/sys/linux/socket_netlink_route_arm.const +++ b/sys/linux/socket_netlink_route_arm.const @@ -49,6 +49,7 @@ FRA_SPORT_RANGE = 23 FRA_SUPPRESS_IFGROUP = 13 FRA_SUPPRESS_PREFIXLEN = 14 FRA_TABLE = 15 +FRA_TUN_ID = 12 FRA_UID_RANGE = 20 FR_ACT_BLACKHOLE = 6 FR_ACT_GOTO = 2 @@ -273,6 +274,7 @@ IFLA_MACSEC_ENCRYPT = 7 IFLA_MACSEC_ES = 10 IFLA_MACSEC_ICV_LEN = 3 IFLA_MACSEC_INC_SCI = 9 +IFLA_MACSEC_PORT = 2 IFLA_MACSEC_PROTECT = 8 IFLA_MACSEC_REPLAY_PROTECT = 12 IFLA_MACSEC_SCB = 11 @@ -342,6 +344,7 @@ IFLA_VTI_OKEY = 3 IFLA_VTI_REMOTE = 5 IFLA_WEIGHT = 15 IFLA_XDP = 43 +IFLA_XDP_EXPECTED_FD = 8 IFLA_XDP_FD = 1 IFLA_XDP_FLAGS = 3 IFLA_XFRM_IF_ID = 2 diff --git a/sys/linux/socket_netlink_route_arm64.const b/sys/linux/socket_netlink_route_arm64.const index f7c9439ee..b13b0a7bd 100644 --- a/sys/linux/socket_netlink_route_arm64.const +++ b/sys/linux/socket_netlink_route_arm64.const @@ -49,6 +49,7 @@ FRA_SPORT_RANGE = 23 FRA_SUPPRESS_IFGROUP = 13 FRA_SUPPRESS_PREFIXLEN = 14 FRA_TABLE = 15 +FRA_TUN_ID = 12 FRA_UID_RANGE = 20 FR_ACT_BLACKHOLE = 6 FR_ACT_GOTO = 2 @@ -273,6 +274,7 @@ IFLA_MACSEC_ENCRYPT = 7 IFLA_MACSEC_ES = 10 IFLA_MACSEC_ICV_LEN = 3 IFLA_MACSEC_INC_SCI = 9 +IFLA_MACSEC_PORT = 2 IFLA_MACSEC_PROTECT = 8 IFLA_MACSEC_REPLAY_PROTECT = 12 IFLA_MACSEC_SCB = 11 @@ -342,6 +344,7 @@ IFLA_VTI_OKEY = 3 IFLA_VTI_REMOTE = 5 IFLA_WEIGHT = 15 IFLA_XDP = 43 +IFLA_XDP_EXPECTED_FD = 8 IFLA_XDP_FD = 1 IFLA_XDP_FLAGS = 3 IFLA_XFRM_IF_ID = 2 diff --git a/sys/linux/socket_netlink_route_mips64le.const b/sys/linux/socket_netlink_route_mips64le.const index ffbe14d9b..e47333cf7 100644 --- a/sys/linux/socket_netlink_route_mips64le.const +++ b/sys/linux/socket_netlink_route_mips64le.const @@ -49,6 +49,7 @@ FRA_SPORT_RANGE = 23 FRA_SUPPRESS_IFGROUP = 13 FRA_SUPPRESS_PREFIXLEN = 14 FRA_TABLE = 15 +FRA_TUN_ID = 12 FRA_UID_RANGE = 20 FR_ACT_BLACKHOLE = 6 FR_ACT_GOTO = 2 @@ -273,6 +274,7 @@ IFLA_MACSEC_ENCRYPT = 7 IFLA_MACSEC_ES = 10 IFLA_MACSEC_ICV_LEN = 3 IFLA_MACSEC_INC_SCI = 9 +IFLA_MACSEC_PORT = 2 IFLA_MACSEC_PROTECT = 8 IFLA_MACSEC_REPLAY_PROTECT = 12 IFLA_MACSEC_SCB = 11 @@ -342,6 +344,7 @@ IFLA_VTI_OKEY = 3 IFLA_VTI_REMOTE = 5 IFLA_WEIGHT = 15 IFLA_XDP = 43 +IFLA_XDP_EXPECTED_FD = 8 IFLA_XDP_FD = 1 IFLA_XDP_FLAGS = 3 IFLA_XFRM_IF_ID = 2 diff --git a/sys/linux/socket_netlink_route_ppc64le.const b/sys/linux/socket_netlink_route_ppc64le.const index 9cb9917a0..a7f28be0c 100644 --- a/sys/linux/socket_netlink_route_ppc64le.const +++ b/sys/linux/socket_netlink_route_ppc64le.const @@ -49,6 +49,7 @@ FRA_SPORT_RANGE = 23 FRA_SUPPRESS_IFGROUP = 13 FRA_SUPPRESS_PREFIXLEN = 14 FRA_TABLE = 15 +FRA_TUN_ID = 12 FRA_UID_RANGE = 20 FR_ACT_BLACKHOLE = 6 FR_ACT_GOTO = 2 @@ -273,6 +274,7 @@ IFLA_MACSEC_ENCRYPT = 7 IFLA_MACSEC_ES = 10 IFLA_MACSEC_ICV_LEN = 3 IFLA_MACSEC_INC_SCI = 9 +IFLA_MACSEC_PORT = 2 IFLA_MACSEC_PROTECT = 8 IFLA_MACSEC_REPLAY_PROTECT = 12 IFLA_MACSEC_SCB = 11 @@ -342,6 +344,7 @@ IFLA_VTI_OKEY = 3 IFLA_VTI_REMOTE = 5 IFLA_WEIGHT = 15 IFLA_XDP = 43 +IFLA_XDP_EXPECTED_FD = 8 IFLA_XDP_FD = 1 IFLA_XDP_FLAGS = 3 IFLA_XFRM_IF_ID = 2 diff --git a/sys/linux/socket_netlink_route_sched.txt b/sys/linux/socket_netlink_route_sched.txt index b4c1e0be3..2cef239c7 100644 --- a/sys/linux/socket_netlink_route_sched.txt +++ b/sys/linux/socket_netlink_route_sched.txt @@ -214,6 +214,8 @@ fq_policy [ TCA_FQ_FLOW_REFILL_DELAY nlattr[TCA_FQ_FLOW_REFILL_DELAY, int32] TCA_FQ_ORPHAN_MASK nlattr[TCA_FQ_ORPHAN_MASK, int32] TCA_FQ_LOW_RATE_THRESHOLD nlattr[TCA_FQ_LOW_RATE_THRESHOLD, int32] + TCA_FQ_CE_THRESHOLD nlattr[TCA_FQ_CE_THRESHOLD, int32] + TCA_FQ_TIMER_SLACK nlattr[TCA_FQ_TIMER_SLACK, int32] ] [varlen] fq_codel_policy [ @@ -314,8 +316,11 @@ red_policy [ TCA_RED_PARMS nlattr[TCA_RED_PARMS, tc_red_qopt] TCA_RED_STAB nlattr[TCA_RED_STAB, array[int8, 256]] TCA_RED_MAX_P nlattr[TCA_RED_MAX_P, int32] + TCA_RED_FLAGS nlattr[TCA_RED_FLAGS, nla_bitfield32[red_supported_flags]] ] [varlen] +red_supported_flags = TC_RED_HISTORIC_FLAGS, TC_RED_NODROP + sfb_policy [ TCA_SFB_PARMS nlattr[TCA_SFB_PARMS, tc_sfb_qopt] ] [varlen] @@ -936,11 +941,16 @@ tca_actions [ ] [varlen] type tcf_action_policy[NAME, VALUES] { - TCA_ACT_KIND nlattr[TCA_ACT_KIND, string[NAME]] - TCA_ACT_OPTIONS nlnest[TCA_ACT_OPTIONS, array[VALUES]] - TCA_ACT_COOKIE nlattr[TCA_ACT_COOKIE, array[int8]] + TCA_ACT_KIND nlattr[TCA_ACT_KIND, string[NAME]] + TCA_ACT_OPTIONS nlnest[TCA_ACT_OPTIONS, array[VALUES]] + TCA_ACT_COOKIE nlattr[TCA_ACT_COOKIE, array[int8]] + TCA_ACT_FLAGS nlattr[TCA_ACT_FLAGS, nla_bitfield32[tcf_action_policy_flags]] + TCA_ACT_HW_STATS nlattr[TCA_ACT_HW_STATS, nla_bitfield32[tcf_action_policy_hw_stats]] } [packed, align[4]] +tcf_action_policy_flags = TCA_ACT_FLAGS_NO_PERCPU_STATS +tcf_action_policy_hw_stats = TCA_ACT_HW_STATS_IMMEDIATE, TCA_ACT_HW_STATS_DELAYED + act_bpf_policy [ TCA_ACT_BPF_PARMS nlattr[TCA_ACT_BPF_PARMS, tc_act_bpf] TCA_ACT_BPF_OPS_LEN nlattr[TCA_ACT_BPF_OPS_LEN, int16[0:10]] diff --git a/sys/linux/socket_netlink_route_sched.txt.warn b/sys/linux/socket_netlink_route_sched.txt.warn index af7f6b42d..e0c5e82d8 100644 --- a/sys/linux/socket_netlink_route_sched.txt.warn +++ b/sys/linux/socket_netlink_route_sched.txt.warn @@ -3,16 +3,14 @@ bad-netlink-attr: rtm_tca_policy: missing attributes: [1 10 11] no-such-netlink-policy: tca_kind_options_t no-such-netlink-policy: qdisc_kind_options bad-netlink-attr: cbq_policy: missing attributes: [4 7] -bad-netlink-attr: fq_policy: missing attributes: [12 13 14 15] +bad-netlink-attr: fq_policy: missing attributes: [14 15] bad-netlink-attr: gred_policy: missing attributes: [6] no-such-netlink-policy: netem_loss_policy bad-netlink-attr: pie_policy: missing attributes: [8] -bad-netlink-attr: red_policy: missing attributes: [4] bad-netlink-attr: entry_policy_taprio: missing attributes: [1] bad-netlink-attr: taprio_policy: missing attributes: [4] no-such-netlink-policy: tclass_kind_options no-such-netlink-policy: tca_actions -bad-netlink-attr: tcf_action_policy: missing attributes: [7 8] no-such-netlink-policy: tca_ife_meta_policy bad-field-size: xt_entry_target.u_target_size/u: syz=2 kernel=32 bad-field-offset: xt_entry_target.name/data: syz=2 kernel=32 diff --git a/sys/linux/socket_netlink_route_sched_386.const b/sys/linux/socket_netlink_route_sched_386.const index e6278d2e2..20f10dbde 100644 --- a/sys/linux/socket_netlink_route_sched_386.const +++ b/sys/linux/socket_netlink_route_sched_386.const @@ -69,6 +69,11 @@ TCA_ACT_BPF_OPS = 4 TCA_ACT_BPF_OPS_LEN = 3 TCA_ACT_BPF_PARMS = 2 TCA_ACT_COOKIE = 6 +TCA_ACT_FLAGS = 7 +TCA_ACT_FLAGS_NO_PERCPU_STATS = 1 +TCA_ACT_HW_STATS = 8 +TCA_ACT_HW_STATS_DELAYED = 2 +TCA_ACT_HW_STATS_IMMEDIATE = 1 TCA_ACT_INDEX = 3 TCA_ACT_KIND = 1 TCA_ACT_MAX_PRIO = 32 @@ -301,6 +306,7 @@ TCA_FLOW_POLICE = 10 TCA_FLOW_RSHIFT = 4 TCA_FLOW_XOR = 7 TCA_FQ_BUCKETS_LOG = 8 +TCA_FQ_CE_THRESHOLD = 12 TCA_FQ_CODEL_CE_THRESHOLD = 7 TCA_FQ_CODEL_DROP_BATCH_SIZE = 8 TCA_FQ_CODEL_ECN = 4 @@ -320,6 +326,7 @@ TCA_FQ_ORPHAN_MASK = 10 TCA_FQ_PLIMIT = 1 TCA_FQ_QUANTUM = 3 TCA_FQ_RATE_ENABLE = 5 +TCA_FQ_TIMER_SLACK = 13 TCA_FW_ACT = 4 TCA_FW_CLASSID = 1 TCA_FW_INDEV = 3 @@ -424,6 +431,7 @@ TCA_POLICE_TBF = 1 TCA_QFQ_LMAX = 2 TCA_QFQ_WEIGHT = 1 TCA_RATE = 5 +TCA_RED_FLAGS = 4 TCA_RED_MAX_P = 3 TCA_RED_PARMS = 1 TCA_RED_STAB = 2 @@ -555,5 +563,7 @@ TC_MQPRIO_SHAPER_BW_RATE = 1 TC_MQPRIO_SHAPER_DCB = 0 TC_PRIO_MAX1 = 16 TC_QOPT_MAX_QUEUE = 16 +TC_RED_HISTORIC_FLAGS = 7 +TC_RED_NODROP = 8 XT_TABLE_MAXNAMELEN = 32 __NR_sendmsg = 370 diff --git a/sys/linux/socket_netlink_route_sched_amd64.const b/sys/linux/socket_netlink_route_sched_amd64.const index 8139431b0..3126be10d 100644 --- a/sys/linux/socket_netlink_route_sched_amd64.const +++ b/sys/linux/socket_netlink_route_sched_amd64.const @@ -69,6 +69,11 @@ TCA_ACT_BPF_OPS = 4 TCA_ACT_BPF_OPS_LEN = 3 TCA_ACT_BPF_PARMS = 2 TCA_ACT_COOKIE = 6 +TCA_ACT_FLAGS = 7 +TCA_ACT_FLAGS_NO_PERCPU_STATS = 1 +TCA_ACT_HW_STATS = 8 +TCA_ACT_HW_STATS_DELAYED = 2 +TCA_ACT_HW_STATS_IMMEDIATE = 1 TCA_ACT_INDEX = 3 TCA_ACT_KIND = 1 TCA_ACT_MAX_PRIO = 32 @@ -301,6 +306,7 @@ TCA_FLOW_POLICE = 10 TCA_FLOW_RSHIFT = 4 TCA_FLOW_XOR = 7 TCA_FQ_BUCKETS_LOG = 8 +TCA_FQ_CE_THRESHOLD = 12 TCA_FQ_CODEL_CE_THRESHOLD = 7 TCA_FQ_CODEL_DROP_BATCH_SIZE = 8 TCA_FQ_CODEL_ECN = 4 @@ -320,6 +326,7 @@ TCA_FQ_ORPHAN_MASK = 10 TCA_FQ_PLIMIT = 1 TCA_FQ_QUANTUM = 3 TCA_FQ_RATE_ENABLE = 5 +TCA_FQ_TIMER_SLACK = 13 TCA_FW_ACT = 4 TCA_FW_CLASSID = 1 TCA_FW_INDEV = 3 @@ -424,6 +431,7 @@ TCA_POLICE_TBF = 1 TCA_QFQ_LMAX = 2 TCA_QFQ_WEIGHT = 1 TCA_RATE = 5 +TCA_RED_FLAGS = 4 TCA_RED_MAX_P = 3 TCA_RED_PARMS = 1 TCA_RED_STAB = 2 @@ -555,5 +563,7 @@ TC_MQPRIO_SHAPER_BW_RATE = 1 TC_MQPRIO_SHAPER_DCB = 0 TC_PRIO_MAX1 = 16 TC_QOPT_MAX_QUEUE = 16 +TC_RED_HISTORIC_FLAGS = 7 +TC_RED_NODROP = 8 XT_TABLE_MAXNAMELEN = 32 __NR_sendmsg = 46 diff --git a/sys/linux/socket_netlink_route_sched_arm.const b/sys/linux/socket_netlink_route_sched_arm.const index 89899278c..d3b353e3c 100644 --- a/sys/linux/socket_netlink_route_sched_arm.const +++ b/sys/linux/socket_netlink_route_sched_arm.const @@ -69,6 +69,11 @@ TCA_ACT_BPF_OPS = 4 TCA_ACT_BPF_OPS_LEN = 3 TCA_ACT_BPF_PARMS = 2 TCA_ACT_COOKIE = 6 +TCA_ACT_FLAGS = 7 +TCA_ACT_FLAGS_NO_PERCPU_STATS = 1 +TCA_ACT_HW_STATS = 8 +TCA_ACT_HW_STATS_DELAYED = 2 +TCA_ACT_HW_STATS_IMMEDIATE = 1 TCA_ACT_INDEX = 3 TCA_ACT_KIND = 1 TCA_ACT_MAX_PRIO = 32 @@ -301,6 +306,7 @@ TCA_FLOW_POLICE = 10 TCA_FLOW_RSHIFT = 4 TCA_FLOW_XOR = 7 TCA_FQ_BUCKETS_LOG = 8 +TCA_FQ_CE_THRESHOLD = 12 TCA_FQ_CODEL_CE_THRESHOLD = 7 TCA_FQ_CODEL_DROP_BATCH_SIZE = 8 TCA_FQ_CODEL_ECN = 4 @@ -320,6 +326,7 @@ TCA_FQ_ORPHAN_MASK = 10 TCA_FQ_PLIMIT = 1 TCA_FQ_QUANTUM = 3 TCA_FQ_RATE_ENABLE = 5 +TCA_FQ_TIMER_SLACK = 13 TCA_FW_ACT = 4 TCA_FW_CLASSID = 1 TCA_FW_INDEV = 3 @@ -424,6 +431,7 @@ TCA_POLICE_TBF = 1 TCA_QFQ_LMAX = 2 TCA_QFQ_WEIGHT = 1 TCA_RATE = 5 +TCA_RED_FLAGS = 4 TCA_RED_MAX_P = 3 TCA_RED_PARMS = 1 TCA_RED_STAB = 2 @@ -555,5 +563,7 @@ TC_MQPRIO_SHAPER_BW_RATE = 1 TC_MQPRIO_SHAPER_DCB = 0 TC_PRIO_MAX1 = 16 TC_QOPT_MAX_QUEUE = 16 +TC_RED_HISTORIC_FLAGS = 7 +TC_RED_NODROP = 8 XT_TABLE_MAXNAMELEN = 32 __NR_sendmsg = 296 diff --git a/sys/linux/socket_netlink_route_sched_arm64.const b/sys/linux/socket_netlink_route_sched_arm64.const index 2628a8bd4..3e5b19289 100644 --- a/sys/linux/socket_netlink_route_sched_arm64.const +++ b/sys/linux/socket_netlink_route_sched_arm64.const @@ -69,6 +69,11 @@ TCA_ACT_BPF_OPS = 4 TCA_ACT_BPF_OPS_LEN = 3 TCA_ACT_BPF_PARMS = 2 TCA_ACT_COOKIE = 6 +TCA_ACT_FLAGS = 7 +TCA_ACT_FLAGS_NO_PERCPU_STATS = 1 +TCA_ACT_HW_STATS = 8 +TCA_ACT_HW_STATS_DELAYED = 2 +TCA_ACT_HW_STATS_IMMEDIATE = 1 TCA_ACT_INDEX = 3 TCA_ACT_KIND = 1 TCA_ACT_MAX_PRIO = 32 @@ -301,6 +306,7 @@ TCA_FLOW_POLICE = 10 TCA_FLOW_RSHIFT = 4 TCA_FLOW_XOR = 7 TCA_FQ_BUCKETS_LOG = 8 +TCA_FQ_CE_THRESHOLD = 12 TCA_FQ_CODEL_CE_THRESHOLD = 7 TCA_FQ_CODEL_DROP_BATCH_SIZE = 8 TCA_FQ_CODEL_ECN = 4 @@ -320,6 +326,7 @@ TCA_FQ_ORPHAN_MASK = 10 TCA_FQ_PLIMIT = 1 TCA_FQ_QUANTUM = 3 TCA_FQ_RATE_ENABLE = 5 +TCA_FQ_TIMER_SLACK = 13 TCA_FW_ACT = 4 TCA_FW_CLASSID = 1 TCA_FW_INDEV = 3 @@ -424,6 +431,7 @@ TCA_POLICE_TBF = 1 TCA_QFQ_LMAX = 2 TCA_QFQ_WEIGHT = 1 TCA_RATE = 5 +TCA_RED_FLAGS = 4 TCA_RED_MAX_P = 3 TCA_RED_PARMS = 1 TCA_RED_STAB = 2 @@ -555,5 +563,7 @@ TC_MQPRIO_SHAPER_BW_RATE = 1 TC_MQPRIO_SHAPER_DCB = 0 TC_PRIO_MAX1 = 16 TC_QOPT_MAX_QUEUE = 16 +TC_RED_HISTORIC_FLAGS = 7 +TC_RED_NODROP = 8 XT_TABLE_MAXNAMELEN = 32 __NR_sendmsg = 211 diff --git a/sys/linux/socket_netlink_route_sched_mips64le.const b/sys/linux/socket_netlink_route_sched_mips64le.const index 19961b7cd..94e5bfe38 100644 --- a/sys/linux/socket_netlink_route_sched_mips64le.const +++ b/sys/linux/socket_netlink_route_sched_mips64le.const @@ -69,6 +69,11 @@ TCA_ACT_BPF_OPS = 4 TCA_ACT_BPF_OPS_LEN = 3 TCA_ACT_BPF_PARMS = 2 TCA_ACT_COOKIE = 6 +TCA_ACT_FLAGS = 7 +TCA_ACT_FLAGS_NO_PERCPU_STATS = 1 +TCA_ACT_HW_STATS = 8 +TCA_ACT_HW_STATS_DELAYED = 2 +TCA_ACT_HW_STATS_IMMEDIATE = 1 TCA_ACT_INDEX = 3 TCA_ACT_KIND = 1 TCA_ACT_MAX_PRIO = 32 @@ -301,6 +306,7 @@ TCA_FLOW_POLICE = 10 TCA_FLOW_RSHIFT = 4 TCA_FLOW_XOR = 7 TCA_FQ_BUCKETS_LOG = 8 +TCA_FQ_CE_THRESHOLD = 12 TCA_FQ_CODEL_CE_THRESHOLD = 7 TCA_FQ_CODEL_DROP_BATCH_SIZE = 8 TCA_FQ_CODEL_ECN = 4 @@ -320,6 +326,7 @@ TCA_FQ_ORPHAN_MASK = 10 TCA_FQ_PLIMIT = 1 TCA_FQ_QUANTUM = 3 TCA_FQ_RATE_ENABLE = 5 +TCA_FQ_TIMER_SLACK = 13 TCA_FW_ACT = 4 TCA_FW_CLASSID = 1 TCA_FW_INDEV = 3 @@ -424,6 +431,7 @@ TCA_POLICE_TBF = 1 TCA_QFQ_LMAX = 2 TCA_QFQ_WEIGHT = 1 TCA_RATE = 5 +TCA_RED_FLAGS = 4 TCA_RED_MAX_P = 3 TCA_RED_PARMS = 1 TCA_RED_STAB = 2 @@ -555,5 +563,7 @@ TC_MQPRIO_SHAPER_BW_RATE = 1 TC_MQPRIO_SHAPER_DCB = 0 TC_PRIO_MAX1 = 16 TC_QOPT_MAX_QUEUE = 16 +TC_RED_HISTORIC_FLAGS = 7 +TC_RED_NODROP = 8 XT_TABLE_MAXNAMELEN = 32 __NR_sendmsg = 5045 diff --git a/sys/linux/socket_netlink_route_sched_ppc64le.const b/sys/linux/socket_netlink_route_sched_ppc64le.const index d94a621e9..2d9cf85ff 100644 --- a/sys/linux/socket_netlink_route_sched_ppc64le.const +++ b/sys/linux/socket_netlink_route_sched_ppc64le.const @@ -69,6 +69,11 @@ TCA_ACT_BPF_OPS = 4 TCA_ACT_BPF_OPS_LEN = 3 TCA_ACT_BPF_PARMS = 2 TCA_ACT_COOKIE = 6 +TCA_ACT_FLAGS = 7 +TCA_ACT_FLAGS_NO_PERCPU_STATS = 1 +TCA_ACT_HW_STATS = 8 +TCA_ACT_HW_STATS_DELAYED = 2 +TCA_ACT_HW_STATS_IMMEDIATE = 1 TCA_ACT_INDEX = 3 TCA_ACT_KIND = 1 TCA_ACT_MAX_PRIO = 32 @@ -301,6 +306,7 @@ TCA_FLOW_POLICE = 10 TCA_FLOW_RSHIFT = 4 TCA_FLOW_XOR = 7 TCA_FQ_BUCKETS_LOG = 8 +TCA_FQ_CE_THRESHOLD = 12 TCA_FQ_CODEL_CE_THRESHOLD = 7 TCA_FQ_CODEL_DROP_BATCH_SIZE = 8 TCA_FQ_CODEL_ECN = 4 @@ -320,6 +326,7 @@ TCA_FQ_ORPHAN_MASK = 10 TCA_FQ_PLIMIT = 1 TCA_FQ_QUANTUM = 3 TCA_FQ_RATE_ENABLE = 5 +TCA_FQ_TIMER_SLACK = 13 TCA_FW_ACT = 4 TCA_FW_CLASSID = 1 TCA_FW_INDEV = 3 @@ -424,6 +431,7 @@ TCA_POLICE_TBF = 1 TCA_QFQ_LMAX = 2 TCA_QFQ_WEIGHT = 1 TCA_RATE = 5 +TCA_RED_FLAGS = 4 TCA_RED_MAX_P = 3 TCA_RED_PARMS = 1 TCA_RED_STAB = 2 @@ -555,5 +563,7 @@ TC_MQPRIO_SHAPER_BW_RATE = 1 TC_MQPRIO_SHAPER_DCB = 0 TC_PRIO_MAX1 = 16 TC_QOPT_MAX_QUEUE = 16 +TC_RED_HISTORIC_FLAGS = 7 +TC_RED_NODROP = 8 XT_TABLE_MAXNAMELEN = 32 __NR_sendmsg = 341 diff --git a/sys/linux/sys.txt b/sys/linux/sys.txt index 4bf2da380..1986d0554 100644 --- a/sys/linux/sys.txt +++ b/sys/linux/sys.txt @@ -285,6 +285,7 @@ clone_args { tls ptr64[out, array[int8]] set_tid ptr64[in, array[pid]] set_tid_size len[set_tid, int64] + cgroup align64[fd_cgroup] } resource pid[int32]: 0, -1 diff --git a/sys/linux/sys.txt.warn b/sys/linux/sys.txt.warn index 26c850088..3125182d0 100644 --- a/sys/linux/sys.txt.warn +++ b/sys/linux/sys.txt.warn @@ -27,8 +27,6 @@ compiler: unsupported syscall: lchown due to missing const __NR_lchown [arm64] compiler: unsupported syscall: utime due to missing const __NR_utime [arm,arm64] compiler: unsupported syscall: utimes due to missing const __NR_utimes [arm64] compiler: unsupported syscall: futimesat due to missing const __NR_futimesat [arm64] -bad-field-number: clone_args: syz=10 kernel=11 -bad-struct-size: clone_args: syz=80 kernel=88 compiler: unsupported syscall: getpgrp due to missing const __NR_getpgrp [arm64] compiler: unsupported syscall: link due to missing const __NR_link [arm64] compiler: unsupported syscall: symlink due to missing const __NR_symlink [arm64] -- cgit mrf-deployment