From 758cd203cb82b2fd04496478a05650321520c099 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sun, 26 Aug 2018 05:54:16 +0200 Subject: sys/linux: fix kvm_ioeventfd layout --- sys/linux/gen/386.go | 7 ++++--- sys/linux/gen/amd64.go | 8 ++++---- sys/linux/gen/arm.go | 7 ++++--- sys/linux/gen/arm64.go | 8 ++++---- sys/linux/gen/ppc64le.go | 8 ++++---- sys/linux/kvm.txt | 3 ++- 6 files changed, 22 insertions(+), 19 deletions(-) (limited to 'sys/linux') diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go index b68c5488b..8407e1d00 100644 --- a/sys/linux/gen/386.go +++ b/sys/linux/gen/386.go @@ -7487,12 +7487,13 @@ var structDescs_386 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pad", TypeSize: 4, ArgDir: 1}}}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "redir", TypeSize: 192, ArgDir: 1}, Type: &StructType{Key: StructKey{Name: "kvm_ioapic_redir", Dir: 1}}, Kind: 1, RangeBegin: 24, RangeEnd: 24}, }}}, - {Key: StructKey{Name: "kvm_ioeventfd"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_ioeventfd", TypeSize: 24}, Fields: []Type{ + {Key: StructKey{Name: "kvm_ioeventfd"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_ioeventfd", TypeSize: 64}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "datam", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 1048576, 65536}}, - &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "addr", TypeSize: 4}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", TypeSize: 8, ArgDir: 1}}}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "addr", TypeSize: 8}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", TypeSize: 8, ArgDir: 1}}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_ioeventfd_len", FldName: "len", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 4, 8}, BitMask: true}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_event", FldName: "fd", TypeSize: 4}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_ioeventfd_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{1, 2, 4, 8}, BitMask: true}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "pad", TypeSize: 36}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 1}}}, Kind: 1, RangeBegin: 36, RangeEnd: 36}, }}}, {Key: StructKey{Name: "kvm_irq_chip"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_irq_chip", TypeSize: 216}, Fields: []Type{ &StructType{Key: StructKey{Name: "kvm_pic_state"}, FldName: "pic"}, @@ -39888,4 +39889,4 @@ var consts_386 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_386 = "46831564e9e8b21b36b7d57d68e7f6fa0b7a20d8" +const revision_386 = "dbe73eab2bc3191354f1ed7116a1a76b277366e2" diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go index 394d98405..bfc2ffefe 100644 --- a/sys/linux/gen/amd64.go +++ b/sys/linux/gen/amd64.go @@ -7602,13 +7602,13 @@ var structDescs_amd64 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pad", TypeSize: 4, ArgDir: 1}}}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "redir", TypeSize: 192, ArgDir: 1}, Type: &StructType{Key: StructKey{Name: "kvm_ioapic_redir", Dir: 1}}, Kind: 1, RangeBegin: 24, RangeEnd: 24}, }}}, - {Key: StructKey{Name: "kvm_ioeventfd"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_ioeventfd", TypeSize: 32}, Fields: []Type{ + {Key: StructKey{Name: "kvm_ioeventfd"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_ioeventfd", TypeSize: 64}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "datam", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 1048576, 65536}}, - &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "addr", TypeSize: 8}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", TypeSize: 8, ArgDir: 1}}}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "addr", TypeSize: 8}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", TypeSize: 8, ArgDir: 1}}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_ioeventfd_len", FldName: "len", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 4, 8}, BitMask: true}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_event", FldName: "fd", TypeSize: 4}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_ioeventfd_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{1, 2, 4, 8}, BitMask: true}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "pad", TypeSize: 36}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 1}}}, Kind: 1, RangeBegin: 36, RangeEnd: 36}, }}}, {Key: StructKey{Name: "kvm_irq_chip"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_irq_chip", TypeSize: 216}, Fields: []Type{ &StructType{Key: StructKey{Name: "kvm_pic_state"}, FldName: "pic"}, @@ -40575,4 +40575,4 @@ var consts_amd64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_amd64 = "6e70625ceb5ead4c3172821af911c030b16cecb2" +const revision_amd64 = "e924cc8d4ebbccfbc29af933eb33d7e34cc8946c" diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go index ee87c9f90..e4af43017 100644 --- a/sys/linux/gen/arm.go +++ b/sys/linux/gen/arm.go @@ -7447,12 +7447,13 @@ var structDescs_arm = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pad", TypeSize: 4, ArgDir: 1}}}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "redir", TypeSize: 192, ArgDir: 1}, Type: &StructType{Key: StructKey{Name: "kvm_ioapic_redir", Dir: 1}}, Kind: 1, RangeBegin: 24, RangeEnd: 24}, }}}, - {Key: StructKey{Name: "kvm_ioeventfd"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_ioeventfd", TypeSize: 24}, Fields: []Type{ + {Key: StructKey{Name: "kvm_ioeventfd"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_ioeventfd", TypeSize: 64}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "datam", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 1048576, 65536}}, - &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "addr", TypeSize: 4}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", TypeSize: 8, ArgDir: 1}}}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "addr", TypeSize: 8}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", TypeSize: 8, ArgDir: 1}}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_ioeventfd_len", FldName: "len", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 4, 8}, BitMask: true}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_event", FldName: "fd", TypeSize: 4}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_ioeventfd_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{1, 2, 4, 8}, BitMask: true}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "pad", TypeSize: 36}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 1}}}, Kind: 1, RangeBegin: 36, RangeEnd: 36}, }}}, {Key: StructKey{Name: "kvm_irq_chip"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_irq_chip", TypeSize: 216}, Fields: []Type{ &StructType{Key: StructKey{Name: "kvm_pic_state"}, FldName: "pic"}, @@ -39754,4 +39755,4 @@ var consts_arm = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm = "6429970dbdfb419ca8fbd620e998c247f6cebf32" +const revision_arm = "ddb7b318ae5be82f0e3f939726efff84d9755b43" diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go index 7eebe5080..3f1af1514 100644 --- a/sys/linux/gen/arm64.go +++ b/sys/linux/gen/arm64.go @@ -7545,13 +7545,13 @@ var structDescs_arm64 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pad", TypeSize: 4, ArgDir: 1}}}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "redir", TypeSize: 192, ArgDir: 1}, Type: &StructType{Key: StructKey{Name: "kvm_ioapic_redir", Dir: 1}}, Kind: 1, RangeBegin: 24, RangeEnd: 24}, }}}, - {Key: StructKey{Name: "kvm_ioeventfd"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_ioeventfd", TypeSize: 32}, Fields: []Type{ + {Key: StructKey{Name: "kvm_ioeventfd"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_ioeventfd", TypeSize: 64}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "datam", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 1048576, 65536}}, - &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "addr", TypeSize: 8}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", TypeSize: 8, ArgDir: 1}}}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "addr", TypeSize: 8}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", TypeSize: 8, ArgDir: 1}}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_ioeventfd_len", FldName: "len", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 4, 8}, BitMask: true}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_event", FldName: "fd", TypeSize: 4}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_ioeventfd_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{1, 2, 4, 8}, BitMask: true}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "pad", TypeSize: 36}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 1}}}, Kind: 1, RangeBegin: 36, RangeEnd: 36}, }}}, {Key: StructKey{Name: "kvm_irq_chip"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_irq_chip", TypeSize: 216}, Fields: []Type{ &StructType{Key: StructKey{Name: "kvm_pic_state"}, FldName: "pic"}, @@ -39969,4 +39969,4 @@ var consts_arm64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm64 = "7c5e180631663cd2c261054b870b9dba069fc0c0" +const revision_arm64 = "ef0f71b538b41ef1b53876986ebbb854b51f1b9e" diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go index 583960f2b..e4d2d13b9 100644 --- a/sys/linux/gen/ppc64le.go +++ b/sys/linux/gen/ppc64le.go @@ -7523,13 +7523,13 @@ var structDescs_ppc64le = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pad", TypeSize: 4, ArgDir: 1}}}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "redir", TypeSize: 192, ArgDir: 1}, Type: &StructType{Key: StructKey{Name: "kvm_ioapic_redir", Dir: 1}}, Kind: 1, RangeBegin: 24, RangeEnd: 24}, }}}, - {Key: StructKey{Name: "kvm_ioeventfd"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_ioeventfd", TypeSize: 32}, Fields: []Type{ + {Key: StructKey{Name: "kvm_ioeventfd"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_ioeventfd", TypeSize: 64}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_guest_addrs", FldName: "datam", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 4, 4096, 8192, 12288, 16384, 20480, 24576, 53248, 61440, 1048576, 65536}}, - &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "addr", TypeSize: 8}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", TypeSize: 8, ArgDir: 1}}}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "addr", TypeSize: 8}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", TypeSize: 8, ArgDir: 1}}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_ioeventfd_len", FldName: "len", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 4, 8}, BitMask: true}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_event", FldName: "fd", TypeSize: 4}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "kvm_ioeventfd_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{1, 2, 4, 8}, BitMask: true}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "pad", TypeSize: 36}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 1}}}, Kind: 1, RangeBegin: 36, RangeEnd: 36}, }}}, {Key: StructKey{Name: "kvm_irq_chip"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "kvm_irq_chip", TypeSize: 216}, Fields: []Type{ &StructType{Key: StructKey{Name: "kvm_pic_state"}, FldName: "pic"}, @@ -37325,4 +37325,4 @@ var consts_ppc64le = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_ppc64le = "892a7c5f21ae94ddb2cf0767cf6a9cc395f3ffc4" +const revision_ppc64le = "0feb061fb6fa9489333c65648c531912f74ad46b" diff --git a/sys/linux/kvm.txt b/sys/linux/kvm.txt index ac8f26aab..35843f4f6 100644 --- a/sys/linux/kvm.txt +++ b/sys/linux/kvm.txt @@ -378,10 +378,11 @@ kvm_dirty_tlb { kvm_ioeventfd { datam flags[kvm_guest_addrs, int64] - addr ptr[out, int64] + addr ptr64[out, int64] len flags[kvm_ioeventfd_len, int32] fd fd_event flags flags[kvm_ioeventfd_flags, int32] + pad array[const[0, int8], 36] } kvm_lapic_state { -- cgit mrf-deployment