From c1caccc8334f39ba2bcae1dfe78e65c474af0160 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 14 May 2019 17:20:56 +0200 Subject: sys/linux: improve key and net_sch descriptions Use the len paths to resolve pending TODOs. --- executor/defs.h | 10 +++++----- sys/linux/gen/386.go | 33 +++++++++++++++++--------------- sys/linux/gen/amd64.go | 33 +++++++++++++++++--------------- sys/linux/gen/arm.go | 33 +++++++++++++++++--------------- sys/linux/gen/arm64.go | 33 +++++++++++++++++--------------- sys/linux/gen/ppc64le.go | 33 +++++++++++++++++--------------- sys/linux/key.txt | 6 ++---- sys/linux/socket_netlink_route_sched.txt | 20 ++++++++++--------- 8 files changed, 108 insertions(+), 93 deletions(-) diff --git a/executor/defs.h b/executor/defs.h index eae412e55..9a3b302f1 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -60,7 +60,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "ecea12af453eaa74530a427a5c7e22647d969dc5" +#define SYZ_REVISION "3d52a222b87f6036a84f338de14740f34a4a74d3" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -70,7 +70,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "3e61d6a5b5a63b1b857675fe0cfb8091c3913ef3" +#define SYZ_REVISION "1e8b2cbaae600fa5e394e2174cddf8ccf7041300" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -80,7 +80,7 @@ #if GOARCH_arm #define GOARCH "arm" -#define SYZ_REVISION "4da417a494a2d6f76ffabd2976b7e71d3102709a" +#define SYZ_REVISION "4a47ba2821cf130ddc502d985baaad7845663453" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -90,7 +90,7 @@ #if GOARCH_arm64 #define GOARCH "arm64" -#define SYZ_REVISION "49a6ef6e9fa8059bfa600ccf85d424cf9253c4c7" +#define SYZ_REVISION "dff930cd81891aa2da786dab8783efe0de057abb" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -100,7 +100,7 @@ #if GOARCH_ppc64le #define GOARCH "ppc64le" -#define SYZ_REVISION "7634c0a83a0baec4a6418161fac443836686bb6d" +#define SYZ_REVISION "0f540c7bfaa1f375f0b49062ef69700e13a1aa94" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go index 0786e62be..6e7e52017 100644 --- a/sys/linux/gen/386.go +++ b/sys/linux/gen/386.go @@ -4206,9 +4206,8 @@ var structDescs_386 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_ACT, int16], tca_actions]"}, FldName: "TCA_BPF_ACT"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_POLICE, int16], tca_polices]"}, FldName: "TCA_BPF_POLICE"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_CLASSID, int16], tcm_handle]"}, FldName: "TCA_BPF_CLASSID"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], int16[0:10]]"}, FldName: "TCA_BPF_OPS_LEN"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS, int16], array[sock_filter]]"}, FldName: "TCA_BPF_OPS"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FD, int16], fd]"}, FldName: "TCA_BPF_FD"}, + &StructType{Key: StructKey{Name: "tca_bpf_ops"}, FldName: "TCA_BPF_OPS"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FD, int16], fd_bpf_prog]"}, FldName: "TCA_BPF_FD"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_NAME, int16], string[filename]]"}, FldName: "TCA_BPF_NAME"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FLAGS, int16], int32[0:1]]"}, FldName: "TCA_BPF_FLAGS"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FLAGS_GEN, int16], int32[0:8]]"}, FldName: "TCA_BPF_FLAGS_GEN"}, @@ -9657,8 +9656,8 @@ var structDescs_386 = []*KeyedStruct{ }}}, {Key: StructKey{Name: "keyctl_pkey_params"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "keyctl_pkey_params", TypeSize: 40}, Fields: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "key", FldName: "key_id", TypeSize: 4}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "in_len", TypeSize: 4}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "out_len", TypeSize: 4}}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "in_len", TypeSize: 4}}, BitSize: 8, Path: []string{"syscall", "inout"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "out_len", TypeSize: 4}}, BitSize: 8, Path: []string{"syscall", "output"}}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "__spare", TypeSize: 28}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 4}}}, Kind: 1, RangeBegin: 7, RangeEnd: 7}, }}}, {Key: StructKey{Name: "kvm_arm_device_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_arm_device_addr", TypeSize: 16}, Fields: []Type{ @@ -16058,10 +16057,10 @@ var structDescs_386 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, &StructType{Key: StructKey{Name: "tcm_handle"}, FldName: "payload"}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FD, int16], fd]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_FD, int16], fd]", TypeSize: 8}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FD, int16], fd_bpf_prog]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_FD, int16], fd_bpf_prog]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 6}, - &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "payload", TypeSize: 4}}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_bpf_prog", FldName: "payload", TypeSize: 4}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FLAGS, int16], int32[0:1]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_FLAGS, int16], int32[0:1]]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, @@ -16083,10 +16082,10 @@ var structDescs_386 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 5}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "sock_filter"}}}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], int16[0:10]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], int16[0:10]]", TypeSize: 8}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], len[tca_bpf_ops:TCA_BPF_OPS:payload, int16]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], len[tca_bpf_ops:TCA_BPF_OPS:payload, int16]]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 4}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "payload", TypeSize: 2}}, Kind: 2, RangeEnd: 10}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "payload", TypeSize: 2}}, Path: []string{"tca_bpf_ops", "TCA_BPF_OPS", "payload"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_POLICE, int16], tca_polices]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_POLICE, int16], tca_polices]", IsVarlen: true}, Fields: []Type{ @@ -17447,17 +17446,17 @@ var structDescs_386 = []*KeyedStruct{ {Key: StructKey{Name: "nlattr_t[const[TCA_STAB, int16], array[stab_policy]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_STAB, int16], array[stab_policy]]", IsVarlen: true}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 8}, - &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "stab_policy"}}}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "stab_policy"}}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[TCA_STAB_BASE, int16], tc_sizespec]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_STAB_BASE, int16], tc_sizespec]", TypeSize: 28}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 1}, &StructType{Key: StructKey{Name: "tc_sizespec"}, FldName: "payload"}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16, 0:10]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16, 0:10]]", IsVarlen: true}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16]]", IsVarlen: true}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 2}, - &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", TypeSize: 2}}}, Kind: 1, RangeEnd: 10}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", TypeSize: 2}}}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[TCA_TBF_BURST, int16], int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_TBF_BURST, int16], int32]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, @@ -22289,7 +22288,7 @@ var structDescs_386 = []*KeyedStruct{ }}}, {Key: StructKey{Name: "stab_policy"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "stab_policy", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_STAB_BASE, int16], tc_sizespec]"}, FldName: "TCA_STAB_BASE"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16, 0:10]]"}, FldName: "TCA_STAB_DATA"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16]]"}, FldName: "TCA_STAB_DATA"}, }}}, {Key: StructKey{Name: "stat", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "stat", TypeSize: 68, ArgDir: 1}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "dev", TypeSize: 2, ArgDir: 1}}}, @@ -22640,7 +22639,7 @@ var structDescs_386 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "linklayer", FldName: "linklayer", TypeSize: 4}}, Vals: []uint64{0, 1, 2}, BitMask: true}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "mpu", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "mtu", TypeSize: 4}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "tsize", TypeSize: 4}}, Kind: 2, RangeEnd: 10}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "tsize", TypeSize: 4}}, Path: []string{"stab_policy", "TCA_STAB_DATA", "payload"}}, }}}, {Key: StructKey{Name: "tc_skbmod"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tc_skbmod", TypeSize: 32}, Fields: []Type{ &StructType{Key: StructKey{Name: "tc_gen"}, FldName: "tc_gen"}, @@ -22787,6 +22786,10 @@ var structDescs_386 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_ACT_OPTIONS, int16], array[m_vlan_options]]"}, FldName: "TCA_ACT_OPTIONS"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_ACT_COOKIE, int16], array[int8]]"}, FldName: "TCA_ACT_COOKIE"}, }, AlignAttr: 4}}, + {Key: StructKey{Name: "tca_bpf_ops"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tca_bpf_ops", IsVarlen: true}, Fields: []Type{ + &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], len[tca_bpf_ops:TCA_BPF_OPS:payload, int16]]"}, FldName: "TCA_BPF_OPS_LEN"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS, int16], array[sock_filter]]"}, FldName: "TCA_BPF_OPS"}, + }}}, {Key: StructKey{Name: "tca_ematch_tree_list"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tca_ematch_tree_list", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[int32, tcf_ematch_hdr[TCF_EM_CONTAINER, array[int8]]]"}, FldName: "TCF_EM_CONTAINER"}, &StructType{Key: StructKey{Name: "nlattr_t[int32, tcf_ematch_hdr[TCF_EM_CMP, tcf_em_cmp]]"}, FldName: "TCF_EM_CMP"}, @@ -51015,4 +51018,4 @@ var consts_386 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_386 = "ecea12af453eaa74530a427a5c7e22647d969dc5" +const revision_386 = "3d52a222b87f6036a84f338de14740f34a4a74d3" diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go index ffb5794eb..22f06feba 100644 --- a/sys/linux/gen/amd64.go +++ b/sys/linux/gen/amd64.go @@ -4281,9 +4281,8 @@ var structDescs_amd64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_ACT, int16], tca_actions]"}, FldName: "TCA_BPF_ACT"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_POLICE, int16], tca_polices]"}, FldName: "TCA_BPF_POLICE"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_CLASSID, int16], tcm_handle]"}, FldName: "TCA_BPF_CLASSID"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], int16[0:10]]"}, FldName: "TCA_BPF_OPS_LEN"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS, int16], array[sock_filter]]"}, FldName: "TCA_BPF_OPS"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FD, int16], fd]"}, FldName: "TCA_BPF_FD"}, + &StructType{Key: StructKey{Name: "tca_bpf_ops"}, FldName: "TCA_BPF_OPS"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FD, int16], fd_bpf_prog]"}, FldName: "TCA_BPF_FD"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_NAME, int16], string[filename]]"}, FldName: "TCA_BPF_NAME"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FLAGS, int16], int32[0:1]]"}, FldName: "TCA_BPF_FLAGS"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FLAGS_GEN, int16], int32[0:8]]"}, FldName: "TCA_BPF_FLAGS_GEN"}, @@ -9759,8 +9758,8 @@ var structDescs_amd64 = []*KeyedStruct{ }}}, {Key: StructKey{Name: "keyctl_pkey_params"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "keyctl_pkey_params", TypeSize: 40}, Fields: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "key", FldName: "key_id", TypeSize: 4}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "in_len", TypeSize: 4}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "out_len", TypeSize: 4}}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "in_len", TypeSize: 4}}, BitSize: 8, Path: []string{"syscall", "inout"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "out_len", TypeSize: 4}}, BitSize: 8, Path: []string{"syscall", "output"}}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "__spare", TypeSize: 28}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 4}}}, Kind: 1, RangeBegin: 7, RangeEnd: 7}, }}}, {Key: StructKey{Name: "kvm_arm_device_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_arm_device_addr", TypeSize: 16}, Fields: []Type{ @@ -16341,10 +16340,10 @@ var structDescs_amd64 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, &StructType{Key: StructKey{Name: "tcm_handle"}, FldName: "payload"}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FD, int16], fd]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_FD, int16], fd]", TypeSize: 8}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FD, int16], fd_bpf_prog]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_FD, int16], fd_bpf_prog]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 6}, - &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "payload", TypeSize: 4}}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_bpf_prog", FldName: "payload", TypeSize: 4}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FLAGS, int16], int32[0:1]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_FLAGS, int16], int32[0:1]]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, @@ -16366,10 +16365,10 @@ var structDescs_amd64 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 5}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "sock_filter"}}}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], int16[0:10]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], int16[0:10]]", TypeSize: 8}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], len[tca_bpf_ops:TCA_BPF_OPS:payload, int16]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], len[tca_bpf_ops:TCA_BPF_OPS:payload, int16]]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 4}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "payload", TypeSize: 2}}, Kind: 2, RangeEnd: 10}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "payload", TypeSize: 2}}, Path: []string{"tca_bpf_ops", "TCA_BPF_OPS", "payload"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_POLICE, int16], tca_polices]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_POLICE, int16], tca_polices]", IsVarlen: true}, Fields: []Type{ @@ -17730,17 +17729,17 @@ var structDescs_amd64 = []*KeyedStruct{ {Key: StructKey{Name: "nlattr_t[const[TCA_STAB, int16], array[stab_policy]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_STAB, int16], array[stab_policy]]", IsVarlen: true}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 8}, - &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "stab_policy"}}}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "stab_policy"}}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[TCA_STAB_BASE, int16], tc_sizespec]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_STAB_BASE, int16], tc_sizespec]", TypeSize: 28}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 1}, &StructType{Key: StructKey{Name: "tc_sizespec"}, FldName: "payload"}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16, 0:10]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16, 0:10]]", IsVarlen: true}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16]]", IsVarlen: true}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 2}, - &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", TypeSize: 2}}}, Kind: 1, RangeEnd: 10}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", TypeSize: 2}}}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[TCA_TBF_BURST, int16], int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_TBF_BURST, int16], int32]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, @@ -22596,7 +22595,7 @@ var structDescs_amd64 = []*KeyedStruct{ }}}, {Key: StructKey{Name: "stab_policy"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "stab_policy", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_STAB_BASE, int16], tc_sizespec]"}, FldName: "TCA_STAB_BASE"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16, 0:10]]"}, FldName: "TCA_STAB_DATA"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16]]"}, FldName: "TCA_STAB_DATA"}, }}}, {Key: StructKey{Name: "stat", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "stat", TypeSize: 68, ArgDir: 1}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "dev", TypeSize: 2, ArgDir: 1}}}, @@ -22947,7 +22946,7 @@ var structDescs_amd64 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "linklayer", FldName: "linklayer", TypeSize: 4}}, Vals: []uint64{0, 1, 2}, BitMask: true}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "mpu", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "mtu", TypeSize: 4}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "tsize", TypeSize: 4}}, Kind: 2, RangeEnd: 10}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "tsize", TypeSize: 4}}, Path: []string{"stab_policy", "TCA_STAB_DATA", "payload"}}, }}}, {Key: StructKey{Name: "tc_skbmod"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tc_skbmod", TypeSize: 32}, Fields: []Type{ &StructType{Key: StructKey{Name: "tc_gen"}, FldName: "tc_gen"}, @@ -23094,6 +23093,10 @@ var structDescs_amd64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_ACT_OPTIONS, int16], array[m_vlan_options]]"}, FldName: "TCA_ACT_OPTIONS"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_ACT_COOKIE, int16], array[int8]]"}, FldName: "TCA_ACT_COOKIE"}, }, AlignAttr: 4}}, + {Key: StructKey{Name: "tca_bpf_ops"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tca_bpf_ops", IsVarlen: true}, Fields: []Type{ + &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], len[tca_bpf_ops:TCA_BPF_OPS:payload, int16]]"}, FldName: "TCA_BPF_OPS_LEN"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS, int16], array[sock_filter]]"}, FldName: "TCA_BPF_OPS"}, + }}}, {Key: StructKey{Name: "tca_ematch_tree_list"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tca_ematch_tree_list", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[int32, tcf_ematch_hdr[TCF_EM_CONTAINER, array[int8]]]"}, FldName: "TCF_EM_CONTAINER"}, &StructType{Key: StructKey{Name: "nlattr_t[int32, tcf_ematch_hdr[TCF_EM_CMP, tcf_em_cmp]]"}, FldName: "TCF_EM_CMP"}, @@ -51537,4 +51540,4 @@ var consts_amd64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_amd64 = "3e61d6a5b5a63b1b857675fe0cfb8091c3913ef3" +const revision_amd64 = "1e8b2cbaae600fa5e394e2174cddf8ccf7041300" diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go index f86e524c1..6f7d9f71c 100644 --- a/sys/linux/gen/arm.go +++ b/sys/linux/gen/arm.go @@ -4204,9 +4204,8 @@ var structDescs_arm = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_ACT, int16], tca_actions]"}, FldName: "TCA_BPF_ACT"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_POLICE, int16], tca_polices]"}, FldName: "TCA_BPF_POLICE"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_CLASSID, int16], tcm_handle]"}, FldName: "TCA_BPF_CLASSID"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], int16[0:10]]"}, FldName: "TCA_BPF_OPS_LEN"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS, int16], array[sock_filter]]"}, FldName: "TCA_BPF_OPS"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FD, int16], fd]"}, FldName: "TCA_BPF_FD"}, + &StructType{Key: StructKey{Name: "tca_bpf_ops"}, FldName: "TCA_BPF_OPS"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FD, int16], fd_bpf_prog]"}, FldName: "TCA_BPF_FD"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_NAME, int16], string[filename]]"}, FldName: "TCA_BPF_NAME"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FLAGS, int16], int32[0:1]]"}, FldName: "TCA_BPF_FLAGS"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FLAGS_GEN, int16], int32[0:8]]"}, FldName: "TCA_BPF_FLAGS_GEN"}, @@ -9655,8 +9654,8 @@ var structDescs_arm = []*KeyedStruct{ }}}, {Key: StructKey{Name: "keyctl_pkey_params"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "keyctl_pkey_params", TypeSize: 40}, Fields: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "key", FldName: "key_id", TypeSize: 4}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "in_len", TypeSize: 4}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "out_len", TypeSize: 4}}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "in_len", TypeSize: 4}}, BitSize: 8, Path: []string{"syscall", "inout"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "out_len", TypeSize: 4}}, BitSize: 8, Path: []string{"syscall", "output"}}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "__spare", TypeSize: 28}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 4}}}, Kind: 1, RangeBegin: 7, RangeEnd: 7}, }}}, {Key: StructKey{Name: "kvm_arm_device_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_arm_device_addr", TypeSize: 16}, Fields: []Type{ @@ -15873,10 +15872,10 @@ var structDescs_arm = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, &StructType{Key: StructKey{Name: "tcm_handle"}, FldName: "payload"}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FD, int16], fd]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_FD, int16], fd]", TypeSize: 8}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FD, int16], fd_bpf_prog]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_FD, int16], fd_bpf_prog]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 6}, - &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "payload", TypeSize: 4}}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_bpf_prog", FldName: "payload", TypeSize: 4}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FLAGS, int16], int32[0:1]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_FLAGS, int16], int32[0:1]]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, @@ -15898,10 +15897,10 @@ var structDescs_arm = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 5}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "sock_filter"}}}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], int16[0:10]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], int16[0:10]]", TypeSize: 8}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], len[tca_bpf_ops:TCA_BPF_OPS:payload, int16]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], len[tca_bpf_ops:TCA_BPF_OPS:payload, int16]]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 4}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "payload", TypeSize: 2}}, Kind: 2, RangeEnd: 10}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "payload", TypeSize: 2}}, Path: []string{"tca_bpf_ops", "TCA_BPF_OPS", "payload"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_POLICE, int16], tca_polices]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_POLICE, int16], tca_polices]", IsVarlen: true}, Fields: []Type{ @@ -17262,17 +17261,17 @@ var structDescs_arm = []*KeyedStruct{ {Key: StructKey{Name: "nlattr_t[const[TCA_STAB, int16], array[stab_policy]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_STAB, int16], array[stab_policy]]", IsVarlen: true}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 8}, - &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "stab_policy"}}}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "stab_policy"}}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[TCA_STAB_BASE, int16], tc_sizespec]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_STAB_BASE, int16], tc_sizespec]", TypeSize: 28}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 1}, &StructType{Key: StructKey{Name: "tc_sizespec"}, FldName: "payload"}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16, 0:10]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16, 0:10]]", IsVarlen: true}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16]]", IsVarlen: true}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 2}, - &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", TypeSize: 2}}}, Kind: 1, RangeEnd: 10}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", TypeSize: 2}}}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[TCA_TBF_BURST, int16], int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_TBF_BURST, int16], int32]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, @@ -22109,7 +22108,7 @@ var structDescs_arm = []*KeyedStruct{ }}}, {Key: StructKey{Name: "stab_policy"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "stab_policy", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_STAB_BASE, int16], tc_sizespec]"}, FldName: "TCA_STAB_BASE"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16, 0:10]]"}, FldName: "TCA_STAB_DATA"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16]]"}, FldName: "TCA_STAB_DATA"}, }}}, {Key: StructKey{Name: "stat", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "stat", TypeSize: 68, ArgDir: 1}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "dev", TypeSize: 2, ArgDir: 1}}}, @@ -22460,7 +22459,7 @@ var structDescs_arm = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "linklayer", FldName: "linklayer", TypeSize: 4}}, Vals: []uint64{0, 1, 2}, BitMask: true}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "mpu", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "mtu", TypeSize: 4}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "tsize", TypeSize: 4}}, Kind: 2, RangeEnd: 10}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "tsize", TypeSize: 4}}, Path: []string{"stab_policy", "TCA_STAB_DATA", "payload"}}, }}}, {Key: StructKey{Name: "tc_skbmod"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tc_skbmod", TypeSize: 32}, Fields: []Type{ &StructType{Key: StructKey{Name: "tc_gen"}, FldName: "tc_gen"}, @@ -22607,6 +22606,10 @@ var structDescs_arm = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_ACT_OPTIONS, int16], array[m_vlan_options]]"}, FldName: "TCA_ACT_OPTIONS"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_ACT_COOKIE, int16], array[int8]]"}, FldName: "TCA_ACT_COOKIE"}, }, AlignAttr: 4}}, + {Key: StructKey{Name: "tca_bpf_ops"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tca_bpf_ops", IsVarlen: true}, Fields: []Type{ + &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], len[tca_bpf_ops:TCA_BPF_OPS:payload, int16]]"}, FldName: "TCA_BPF_OPS_LEN"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS, int16], array[sock_filter]]"}, FldName: "TCA_BPF_OPS"}, + }}}, {Key: StructKey{Name: "tca_ematch_tree_list"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tca_ematch_tree_list", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[int32, tcf_ematch_hdr[TCF_EM_CONTAINER, array[int8]]]"}, FldName: "TCF_EM_CONTAINER"}, &StructType{Key: StructKey{Name: "nlattr_t[int32, tcf_ematch_hdr[TCF_EM_CMP, tcf_em_cmp]]"}, FldName: "TCF_EM_CMP"}, @@ -50502,4 +50505,4 @@ var consts_arm = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm = "4da417a494a2d6f76ffabd2976b7e71d3102709a" +const revision_arm = "4a47ba2821cf130ddc502d985baaad7845663453" diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go index 260ce0536..2c620950f 100644 --- a/sys/linux/gen/arm64.go +++ b/sys/linux/gen/arm64.go @@ -4279,9 +4279,8 @@ var structDescs_arm64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_ACT, int16], tca_actions]"}, FldName: "TCA_BPF_ACT"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_POLICE, int16], tca_polices]"}, FldName: "TCA_BPF_POLICE"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_CLASSID, int16], tcm_handle]"}, FldName: "TCA_BPF_CLASSID"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], int16[0:10]]"}, FldName: "TCA_BPF_OPS_LEN"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS, int16], array[sock_filter]]"}, FldName: "TCA_BPF_OPS"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FD, int16], fd]"}, FldName: "TCA_BPF_FD"}, + &StructType{Key: StructKey{Name: "tca_bpf_ops"}, FldName: "TCA_BPF_OPS"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FD, int16], fd_bpf_prog]"}, FldName: "TCA_BPF_FD"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_NAME, int16], string[filename]]"}, FldName: "TCA_BPF_NAME"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FLAGS, int16], int32[0:1]]"}, FldName: "TCA_BPF_FLAGS"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FLAGS_GEN, int16], int32[0:8]]"}, FldName: "TCA_BPF_FLAGS_GEN"}, @@ -9757,8 +9756,8 @@ var structDescs_arm64 = []*KeyedStruct{ }}}, {Key: StructKey{Name: "keyctl_pkey_params"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "keyctl_pkey_params", TypeSize: 40}, Fields: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "key", FldName: "key_id", TypeSize: 4}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "in_len", TypeSize: 4}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "out_len", TypeSize: 4}}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "in_len", TypeSize: 4}}, BitSize: 8, Path: []string{"syscall", "inout"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "out_len", TypeSize: 4}}, BitSize: 8, Path: []string{"syscall", "output"}}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "__spare", TypeSize: 28}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 4}}}, Kind: 1, RangeBegin: 7, RangeEnd: 7}, }}}, {Key: StructKey{Name: "kvm_arm_device_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_arm_device_addr", TypeSize: 16}, Fields: []Type{ @@ -16156,10 +16155,10 @@ var structDescs_arm64 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, &StructType{Key: StructKey{Name: "tcm_handle"}, FldName: "payload"}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FD, int16], fd]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_FD, int16], fd]", TypeSize: 8}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FD, int16], fd_bpf_prog]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_FD, int16], fd_bpf_prog]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 6}, - &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "payload", TypeSize: 4}}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_bpf_prog", FldName: "payload", TypeSize: 4}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FLAGS, int16], int32[0:1]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_FLAGS, int16], int32[0:1]]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, @@ -16181,10 +16180,10 @@ var structDescs_arm64 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 5}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "sock_filter"}}}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], int16[0:10]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], int16[0:10]]", TypeSize: 8}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], len[tca_bpf_ops:TCA_BPF_OPS:payload, int16]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], len[tca_bpf_ops:TCA_BPF_OPS:payload, int16]]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 4}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "payload", TypeSize: 2}}, Kind: 2, RangeEnd: 10}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "payload", TypeSize: 2}}, Path: []string{"tca_bpf_ops", "TCA_BPF_OPS", "payload"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_POLICE, int16], tca_polices]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_POLICE, int16], tca_polices]", IsVarlen: true}, Fields: []Type{ @@ -17545,17 +17544,17 @@ var structDescs_arm64 = []*KeyedStruct{ {Key: StructKey{Name: "nlattr_t[const[TCA_STAB, int16], array[stab_policy]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_STAB, int16], array[stab_policy]]", IsVarlen: true}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 8}, - &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "stab_policy"}}}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "stab_policy"}}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[TCA_STAB_BASE, int16], tc_sizespec]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_STAB_BASE, int16], tc_sizespec]", TypeSize: 28}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 1}, &StructType{Key: StructKey{Name: "tc_sizespec"}, FldName: "payload"}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16, 0:10]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16, 0:10]]", IsVarlen: true}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16]]", IsVarlen: true}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 2}, - &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", TypeSize: 2}}}, Kind: 1, RangeEnd: 10}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", TypeSize: 2}}}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[TCA_TBF_BURST, int16], int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_TBF_BURST, int16], int32]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, @@ -22411,7 +22410,7 @@ var structDescs_arm64 = []*KeyedStruct{ }}}, {Key: StructKey{Name: "stab_policy"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "stab_policy", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_STAB_BASE, int16], tc_sizespec]"}, FldName: "TCA_STAB_BASE"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16, 0:10]]"}, FldName: "TCA_STAB_DATA"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16]]"}, FldName: "TCA_STAB_DATA"}, }}}, {Key: StructKey{Name: "stat", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "stat", TypeSize: 68, ArgDir: 1}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "dev", TypeSize: 2, ArgDir: 1}}}, @@ -22762,7 +22761,7 @@ var structDescs_arm64 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "linklayer", FldName: "linklayer", TypeSize: 4}}, Vals: []uint64{0, 1, 2}, BitMask: true}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "mpu", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "mtu", TypeSize: 4}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "tsize", TypeSize: 4}}, Kind: 2, RangeEnd: 10}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "tsize", TypeSize: 4}}, Path: []string{"stab_policy", "TCA_STAB_DATA", "payload"}}, }}}, {Key: StructKey{Name: "tc_skbmod"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tc_skbmod", TypeSize: 32}, Fields: []Type{ &StructType{Key: StructKey{Name: "tc_gen"}, FldName: "tc_gen"}, @@ -22909,6 +22908,10 @@ var structDescs_arm64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_ACT_OPTIONS, int16], array[m_vlan_options]]"}, FldName: "TCA_ACT_OPTIONS"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_ACT_COOKIE, int16], array[int8]]"}, FldName: "TCA_ACT_COOKIE"}, }, AlignAttr: 4}}, + {Key: StructKey{Name: "tca_bpf_ops"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tca_bpf_ops", IsVarlen: true}, Fields: []Type{ + &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], len[tca_bpf_ops:TCA_BPF_OPS:payload, int16]]"}, FldName: "TCA_BPF_OPS_LEN"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS, int16], array[sock_filter]]"}, FldName: "TCA_BPF_OPS"}, + }}}, {Key: StructKey{Name: "tca_ematch_tree_list"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tca_ematch_tree_list", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[int32, tcf_ematch_hdr[TCF_EM_CONTAINER, array[int8]]]"}, FldName: "TCF_EM_CONTAINER"}, &StructType{Key: StructKey{Name: "nlattr_t[int32, tcf_ematch_hdr[TCF_EM_CMP, tcf_em_cmp]]"}, FldName: "TCF_EM_CMP"}, @@ -50797,4 +50800,4 @@ var consts_arm64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm64 = "49a6ef6e9fa8059bfa600ccf85d424cf9253c4c7" +const revision_arm64 = "dff930cd81891aa2da786dab8783efe0de057abb" diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go index ae818c147..1e35697b0 100644 --- a/sys/linux/gen/ppc64le.go +++ b/sys/linux/gen/ppc64le.go @@ -4278,9 +4278,8 @@ var structDescs_ppc64le = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_ACT, int16], tca_actions]"}, FldName: "TCA_BPF_ACT"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_POLICE, int16], tca_polices]"}, FldName: "TCA_BPF_POLICE"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_CLASSID, int16], tcm_handle]"}, FldName: "TCA_BPF_CLASSID"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], int16[0:10]]"}, FldName: "TCA_BPF_OPS_LEN"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS, int16], array[sock_filter]]"}, FldName: "TCA_BPF_OPS"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FD, int16], fd]"}, FldName: "TCA_BPF_FD"}, + &StructType{Key: StructKey{Name: "tca_bpf_ops"}, FldName: "TCA_BPF_OPS"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FD, int16], fd_bpf_prog]"}, FldName: "TCA_BPF_FD"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_NAME, int16], string[filename]]"}, FldName: "TCA_BPF_NAME"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FLAGS, int16], int32[0:1]]"}, FldName: "TCA_BPF_FLAGS"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FLAGS_GEN, int16], int32[0:8]]"}, FldName: "TCA_BPF_FLAGS_GEN"}, @@ -9756,8 +9755,8 @@ var structDescs_ppc64le = []*KeyedStruct{ }}}, {Key: StructKey{Name: "keyctl_pkey_params"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "keyctl_pkey_params", TypeSize: 40}, Fields: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "key", FldName: "key_id", TypeSize: 4}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "in_len", TypeSize: 4}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "out_len", TypeSize: 4}}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "in_len", TypeSize: 4}}, BitSize: 8, Path: []string{"syscall", "inout"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "out_len", TypeSize: 4}}, BitSize: 8, Path: []string{"syscall", "output"}}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "__spare", TypeSize: 28}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 4}}}, Kind: 1, RangeBegin: 7, RangeEnd: 7}, }}}, {Key: StructKey{Name: "kvm_arm_device_addr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_arm_device_addr", TypeSize: 16}, Fields: []Type{ @@ -16108,10 +16107,10 @@ var structDescs_ppc64le = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, &StructType{Key: StructKey{Name: "tcm_handle"}, FldName: "payload"}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FD, int16], fd]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_FD, int16], fd]", TypeSize: 8}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FD, int16], fd_bpf_prog]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_FD, int16], fd_bpf_prog]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 6}, - &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "payload", TypeSize: 4}}, + &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_bpf_prog", FldName: "payload", TypeSize: 4}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_FLAGS, int16], int32[0:1]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_FLAGS, int16], int32[0:1]]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, @@ -16133,10 +16132,10 @@ var structDescs_ppc64le = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 5}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "sock_filter"}}}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], int16[0:10]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], int16[0:10]]", TypeSize: 8}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], len[tca_bpf_ops:TCA_BPF_OPS:payload, int16]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], len[tca_bpf_ops:TCA_BPF_OPS:payload, int16]]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 4}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "payload", TypeSize: 2}}, Kind: 2, RangeEnd: 10}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "payload", TypeSize: 2}}, Path: []string{"tca_bpf_ops", "TCA_BPF_OPS", "payload"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[TCA_BPF_POLICE, int16], tca_polices]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_BPF_POLICE, int16], tca_polices]", IsVarlen: true}, Fields: []Type{ @@ -17497,17 +17496,17 @@ var structDescs_ppc64le = []*KeyedStruct{ {Key: StructKey{Name: "nlattr_t[const[TCA_STAB, int16], array[stab_policy]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_STAB, int16], array[stab_policy]]", IsVarlen: true}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 8}, - &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "stab_policy"}}}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "stab_policy"}}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[TCA_STAB_BASE, int16], tc_sizespec]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_STAB_BASE, int16], tc_sizespec]", TypeSize: 28}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 1}, &StructType{Key: StructKey{Name: "tc_sizespec"}, FldName: "payload"}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16, 0:10]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16, 0:10]]", IsVarlen: true}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16]]", IsVarlen: true}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 2}, - &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", TypeSize: 2}}}, Kind: 1, RangeEnd: 10}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", TypeSize: 2}}}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[TCA_TBF_BURST, int16], int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[TCA_TBF_BURST, int16], int32]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, @@ -22363,7 +22362,7 @@ var structDescs_ppc64le = []*KeyedStruct{ }}}, {Key: StructKey{Name: "stab_policy"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "stab_policy", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_STAB_BASE, int16], tc_sizespec]"}, FldName: "TCA_STAB_BASE"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16, 0:10]]"}, FldName: "TCA_STAB_DATA"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_STAB_DATA, int16], array[int16]]"}, FldName: "TCA_STAB_DATA"}, }}}, {Key: StructKey{Name: "stat", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "stat", TypeSize: 68, ArgDir: 1}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "dev", TypeSize: 2, ArgDir: 1}}}, @@ -22714,7 +22713,7 @@ var structDescs_ppc64le = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "linklayer", FldName: "linklayer", TypeSize: 4}}, Vals: []uint64{0, 1, 2}, BitMask: true}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "mpu", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "mtu", TypeSize: 4}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "tsize", TypeSize: 4}}, Kind: 2, RangeEnd: 10}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "tsize", TypeSize: 4}}, Path: []string{"stab_policy", "TCA_STAB_DATA", "payload"}}, }}}, {Key: StructKey{Name: "tc_skbmod"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tc_skbmod", TypeSize: 32}, Fields: []Type{ &StructType{Key: StructKey{Name: "tc_gen"}, FldName: "tc_gen"}, @@ -22861,6 +22860,10 @@ var structDescs_ppc64le = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_ACT_OPTIONS, int16], array[m_vlan_options]]"}, FldName: "TCA_ACT_OPTIONS"}, &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_ACT_COOKIE, int16], array[int8]]"}, FldName: "TCA_ACT_COOKIE"}, }, AlignAttr: 4}}, + {Key: StructKey{Name: "tca_bpf_ops"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tca_bpf_ops", IsVarlen: true}, Fields: []Type{ + &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS_LEN, int16], len[tca_bpf_ops:TCA_BPF_OPS:payload, int16]]"}, FldName: "TCA_BPF_OPS_LEN"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[TCA_BPF_OPS, int16], array[sock_filter]]"}, FldName: "TCA_BPF_OPS"}, + }}}, {Key: StructKey{Name: "tca_ematch_tree_list"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tca_ematch_tree_list", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[int32, tcf_ematch_hdr[TCF_EM_CONTAINER, array[int8]]]"}, FldName: "TCF_EM_CONTAINER"}, &StructType{Key: StructKey{Name: "nlattr_t[int32, tcf_ematch_hdr[TCF_EM_CMP, tcf_em_cmp]]"}, FldName: "TCF_EM_CMP"}, @@ -50764,4 +50767,4 @@ var consts_ppc64le = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_ppc64le = "7634c0a83a0baec4a6418161fac443836686bb6d" +const revision_ppc64le = "0f540c7bfaa1f375f0b49062ef69700e13a1aa94" diff --git a/sys/linux/key.txt b/sys/linux/key.txt index 3af876634..24721bdc3 100644 --- a/sys/linux/key.txt +++ b/sys/linux/key.txt @@ -120,10 +120,8 @@ key_encrypted_update { keyctl_pkey_params { key_id key -# NEED: this is len of syscall input/output arguments. We don't have naming scheme to reference syscall arguments. -# Need e.g. "len[syscall.input]", or some abbreviation like ".input" or "$.input". - in_len int32 - out_len int32 + in_len bytesize[syscall:inout, int32] + out_len bytesize[syscall:output, int32] __spare array[const[0, int32], 7] } diff --git a/sys/linux/socket_netlink_route_sched.txt b/sys/linux/socket_netlink_route_sched.txt index 4824616d3..39238f59b 100644 --- a/sys/linux/socket_netlink_route_sched.txt +++ b/sys/linux/socket_netlink_route_sched.txt @@ -558,15 +558,18 @@ f_bpf_options [ TCA_BPF_ACT nlattr[TCA_BPF_ACT, tca_actions] TCA_BPF_POLICE nlattr[TCA_BPF_POLICE, tca_polices] TCA_BPF_CLASSID nlattr[TCA_BPF_CLASSID, tcm_handle] -# NEED: TCA_BPF_OPS should equal to TCA_BPF_OPS_LEN * sizeof(struct sock_filter) - TCA_BPF_OPS_LEN nlattr[TCA_BPF_OPS_LEN, int16[0:10]] - TCA_BPF_OPS nlattr[TCA_BPF_OPS, array[sock_filter]] - TCA_BPF_FD nlattr[TCA_BPF_FD, fd] + TCA_BPF_OPS tca_bpf_ops + TCA_BPF_FD nlattr[TCA_BPF_FD, fd_bpf_prog] TCA_BPF_NAME nlattr[TCA_BPF_NAME, string[filename]] TCA_BPF_FLAGS nlattr[TCA_BPF_FLAGS, int32[0:1]] TCA_BPF_FLAGS_GEN nlattr[TCA_BPF_FLAGS_GEN, int32[0:8]] ] [varlen] +tca_bpf_ops { + TCA_BPF_OPS_LEN nlattr[TCA_BPF_OPS_LEN, len[tca_bpf_ops:TCA_BPF_OPS:payload, int16]] + TCA_BPF_OPS nlattr[TCA_BPF_OPS, array[sock_filter]] +} [packed] + f_cgroup_options [ TCA_CGROUP_ACT nlattr[TCA_CGROUP_ACT, tca_actions] TCA_CGROUP_POLICE nlattr[TCA_CGROUP_POLICE, tca_polices] @@ -1069,11 +1072,10 @@ tc_estimator { ewma_log int8 } -stab_policy [ +stab_policy { TCA_STAB_BASE nlattr[TCA_STAB_BASE, tc_sizespec] -# NEED: stab data should be tc_sizespec.tsize * sizeof(__u16) - TCA_STAB_DATA nlattr[TCA_STAB_DATA, array[int16, 0:10]] -] [varlen] + TCA_STAB_DATA nlattr[TCA_STAB_DATA, array[int16]] +} [packed] tc_sizespec { cell_log int8 @@ -1083,7 +1085,7 @@ tc_sizespec { linklayer flags[linklayer, int32] mpu int32 mtu int32 - tsize int32[0:10] + tsize len[stab_policy:TCA_STAB_DATA:payload, int32] } tcm_handle_offsets = 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0xffe0, 0xfff1, 0xfff2, 0xfff3, 0xffff -- cgit mrf-deployment