sys/linux: refine tcp_zerocopy_receive

Use the new vma64 now that we have it.

6 files changed, 13 insertions, 14 deletions

diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go
index 56ee1368a..a5ccea9d3 100644
--- a/sys/linux/gen/386.go
+++ b/sys/linux/gen/386.go
@@ -19097,8 +19097,8 @@ var structDescs_386 = []*KeyedStruct{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "length", TypeSize: 1}}, Buf: "parent"},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "shift", TypeSize: 1}}},
 	}}},
-	{Key: StructKey{Name: "tcp_zerocopy_receive"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tcp_zerocopy_receive", TypeSize: 12}, Fields: []Type{
-		&VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "address", TypeSize: 4}},
+	{Key: StructKey{Name: "tcp_zerocopy_receive"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tcp_zerocopy_receive", TypeSize: 16}, Fields: []Type{
+		&VmaType{TypeCommon: TypeCommon{TypeName: "vma64", FldName: "address", TypeSize: 8}},
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "length", TypeSize: 4}}, Buf: "address"},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "recv_skip_hint", TypeSize: 4}}},
 	}}},
@@ -42350,4 +42350,4 @@ var consts_386 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_386 = "81e1aad90c0a21a605e862eb212079b9b333a8f3"
+const revision_386 = "889de3418b5aeb5b8944e28d81a6e58f35a2de00"
diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go
index f2fd74588..000cece88 100644
--- a/sys/linux/gen/amd64.go
+++ b/sys/linux/gen/amd64.go
@@ -19382,7 +19382,7 @@ var structDescs_amd64 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "shift", TypeSize: 1}}},
 	}}},
 	{Key: StructKey{Name: "tcp_zerocopy_receive"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tcp_zerocopy_receive", TypeSize: 16}, Fields: []Type{
-		&VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "address", TypeSize: 8}},
+		&VmaType{TypeCommon: TypeCommon{TypeName: "vma64", FldName: "address", TypeSize: 8}},
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "length", TypeSize: 4}}, Buf: "address"},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "recv_skip_hint", TypeSize: 4}}},
 	}}},
@@ -43052,4 +43052,4 @@ var consts_amd64 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_amd64 = "03c42a49553bc0ccf794b9c2d7a9ddef28f0bc36"
+const revision_amd64 = "e32c6394d60162fed74fefed4fe69ad856791ef4"
diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go
index ea4e8ab8b..a08c54336 100644
--- a/sys/linux/gen/arm.go
+++ b/sys/linux/gen/arm.go
@@ -18978,8 +18978,8 @@ var structDescs_arm = []*KeyedStruct{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "length", TypeSize: 1}}, Buf: "parent"},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "shift", TypeSize: 1}}},
 	}}},
-	{Key: StructKey{Name: "tcp_zerocopy_receive"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tcp_zerocopy_receive", TypeSize: 12}, Fields: []Type{
-		&VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "address", TypeSize: 4}},
+	{Key: StructKey{Name: "tcp_zerocopy_receive"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tcp_zerocopy_receive", TypeSize: 16}, Fields: []Type{
+		&VmaType{TypeCommon: TypeCommon{TypeName: "vma64", FldName: "address", TypeSize: 8}},
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "length", TypeSize: 4}}, Buf: "address"},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "recv_skip_hint", TypeSize: 4}}},
 	}}},
@@ -42189,4 +42189,4 @@ var consts_arm = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_arm = "c14b73154c70314bff7fda0ce0a1b1af89b2ee94"
+const revision_arm = "13db098d3755a831b648d5737cef30a60d4101f6"
diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go
index aa173a9bb..74281b88b 100644
--- a/sys/linux/gen/arm64.go
+++ b/sys/linux/gen/arm64.go
@@ -19199,7 +19199,7 @@ var structDescs_arm64 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "shift", TypeSize: 1}}},
 	}}},
 	{Key: StructKey{Name: "tcp_zerocopy_receive"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tcp_zerocopy_receive", TypeSize: 16}, Fields: []Type{
-		&VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "address", TypeSize: 8}},
+		&VmaType{TypeCommon: TypeCommon{TypeName: "vma64", FldName: "address", TypeSize: 8}},
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "length", TypeSize: 4}}, Buf: "address"},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "recv_skip_hint", TypeSize: 4}}},
 	}}},
@@ -42410,4 +42410,4 @@ var consts_arm64 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_arm64 = "702b73cdb13ed1ea89289858aca56d949beae1c6"
+const revision_arm64 = "cffd0640576d982f56158fb388041a2389ad541c"
diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go
index 9ce9ec8c8..53d3b3cb9 100644
--- a/sys/linux/gen/ppc64le.go
+++ b/sys/linux/gen/ppc64le.go
@@ -19081,7 +19081,7 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "shift", TypeSize: 1}}},
 	}}},
 	{Key: StructKey{Name: "tcp_zerocopy_receive"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tcp_zerocopy_receive", TypeSize: 16}, Fields: []Type{
-		&VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "address", TypeSize: 8}},
+		&VmaType{TypeCommon: TypeCommon{TypeName: "vma64", FldName: "address", TypeSize: 8}},
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "length", TypeSize: 4}}, Buf: "address"},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "recv_skip_hint", TypeSize: 4}}},
 	}}},
@@ -39768,4 +39768,4 @@ var consts_ppc64le = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_ppc64le = "ecb0de3bb5fee4cfba1adbd79e9bf092f43b15a7"
+const revision_ppc64le = "25892646607f8c880c1333864712db07bbb0579b"
diff --git a/sys/linux/socket_inet_tcp.txt b/sys/linux/socket_inet_tcp.txt
index 12797d811..fd4d2312e 100644
--- a/sys/linux/socket_inet_tcp.txt
+++ b/sys/linux/socket_inet_tcp.txt
@@ -53,8 +53,7 @@ getsockopt$inet_tcp_TCP_ZEROCOPY_RECEIVE(fd sock_tcp, level const[IPPROTO_TCP],
 getsockopt$inet6_tcp_TCP_ZEROCOPY_RECEIVE(fd sock_tcp6, level const[IPPROTO_TCP], optname const[TCP_ZEROCOPY_RECEIVE], optval ptr[in, tcp_zerocopy_receive], optlen ptr[inout, len[optval, int32]])
 
 tcp_zerocopy_receive {
-# TODO: this is 8-byte pointer that must be page-aligned, need vma64.
-	address		vma
+	address		vma64
 	length		len[address, int32]
 	recv_skip_hint	const[0, int32]
 }