From ef27ba34a6922b02adfa5e61472acf7693c04a7d Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Thu, 11 Jun 2020 00:19:34 +0200 Subject: sys/linux: rename mptcp.txt to vnet_mptcp.txt --- sys/linux/mptcp.txt | 121 ------------------------------------- sys/linux/mptcp.txt.warn | 8 --- sys/linux/mptcp_386.const | 10 --- sys/linux/mptcp_amd64.const | 10 --- sys/linux/mptcp_arm.const | 10 --- sys/linux/mptcp_arm64.const | 10 --- sys/linux/mptcp_ppc64le.const | 10 --- sys/linux/vnet_mptcp.txt | 121 +++++++++++++++++++++++++++++++++++++ sys/linux/vnet_mptcp.txt.warn | 8 +++ sys/linux/vnet_mptcp_386.const | 10 +++ sys/linux/vnet_mptcp_amd64.const | 10 +++ sys/linux/vnet_mptcp_arm.const | 10 +++ sys/linux/vnet_mptcp_arm64.const | 10 +++ sys/linux/vnet_mptcp_ppc64le.const | 10 +++ sys/syz-extract/extract.go | 2 +- 15 files changed, 180 insertions(+), 180 deletions(-) delete mode 100644 sys/linux/mptcp.txt delete mode 100644 sys/linux/mptcp.txt.warn delete mode 100644 sys/linux/mptcp_386.const delete mode 100644 sys/linux/mptcp_amd64.const delete mode 100644 sys/linux/mptcp_arm.const delete mode 100644 sys/linux/mptcp_arm64.const delete mode 100644 sys/linux/mptcp_ppc64le.const create mode 100644 sys/linux/vnet_mptcp.txt create mode 100644 sys/linux/vnet_mptcp.txt.warn create mode 100644 sys/linux/vnet_mptcp_386.const create mode 100644 sys/linux/vnet_mptcp_amd64.const create mode 100644 sys/linux/vnet_mptcp_arm.const create mode 100644 sys/linux/vnet_mptcp_arm64.const create mode 100644 sys/linux/vnet_mptcp_ppc64le.const (limited to 'sys') diff --git a/sys/linux/mptcp.txt b/sys/linux/mptcp.txt deleted file mode 100644 index 637e3624f..000000000 --- a/sys/linux/mptcp.txt +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 2018 syzkaller project authors. All rights reserved. -# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. - -# TCP Extensions for Multipath Operation with Multiple Addresses -# https://tools.ietf.org/html/rfc6824 -# This is not upstream yes, constants for this descriptions were generated on the following tree: -# https://github.com/multipath-tcp/mptcp_net-next.git -# Once this is upstream we need to move this to vnet.txt - -include -include -include -include -include - -tcp_mptcp_option [ - generic mptcp_generic_option - syn mptcp_syn_option - synack mptcp_synack_option - ack mptcp_ack_option - capable mptcp_capable_option - add_addr mptcp_add_addr_option - mp_join mptcp_mp_join_option - mp_fclose mptcp_mp_fclose_option - remove_addr mptcp_remove_addr_option -] [varlen] - -mptcp_sub_types = OPTION_TYPE_SYN, OPTION_TYPE_SYNACK, OPTION_TYPE_ACK, OPTION_MP_CAPABLE, OPTION_ADD_ADDR, OPTION_MP_JOIN, OPTION_MP_FCLOSE - -# TODO: OPTION_REMOVE_ADDR was listed in mptcp_sub_types, but it does not fit into int8 below... -_ = OPTION_REMOVE_ADDR - -mptcp_generic_option { - type flags[mptcp_sub_types, int8] - length len[parent, int8] - data array[int8, 0:16] -} [packed] - -mptcp_capable_option { - type const[TCPOPT_MPTCP, int8] - length len[parent, int8] - version int8:4 - subtype const[OPTION_MP_CAPABLE, int8:4] - flags int8 - sender int64be - receiver array[int64be, 0:1] -} [packed] - -mptcp_add_addr_option { - type const[TCPOPT_MPTCP, int8] - length len[parent, int8] -# TODO: this was OPTION_ADD_ADDR, but it does not fit into 4 bits. - subtype const[0, int8:4] - version len[parent, int8:4] - addr_id int8 - address ipv4_addr - port int16be - mac array[int8, 0:8] -} [packed] - -_ = OPTION_ADD_ADDR - -mptcp_mp_join_option { - type const[TCPOPT_MPTCP, int8] - length len[parent, int8] - flags int8:4 -# TODO: this was OPTION_MP_JOIN, but it does not fit into 4 bits. - subtype const[0, int8:4] -} [packed] - -_ = OPTION_MP_JOIN - -mptcp_syn_option { - type const[TCPOPT_MPTCP, int8] - length len[parent, int8] - flags int8:4 - subtype const[OPTION_TYPE_SYN, int8:4] - addr_id int8 - token int32 - nonce int32 -} [packed] - -mptcp_synack_option { - type const[TCPOPT_MPTCP, int8] - length len[parent, int8] - flags int8:4 - subtype const[OPTION_TYPE_SYNACK, int8:4] - addr_id int8 - mac int64 - nonce int32 -} [packed] - -mptcp_ack_option { - type const[TCPOPT_MPTCP, int8] - length len[parent, int8] - reserved int16:12 - subtype const[OPTION_TYPE_ACK, int16:4] - mac array[int8, 0:20] -} [packed] - -mptcp_mp_fclose_option { - type const[TCPOPT_MPTCP, int8] - length len[parent, int8] - reserved int16:12 -# TODO: this was OPTION_MP_FCLOSE, but it does not fit into 4 bits. - subtype const[0, int16:4] - key int64 -} [packed] - -_ = OPTION_MP_FCLOSE - -mptcp_remove_addr_option { - type const[TCPOPT_MPTCP, int8] - length len[parent, int8] - reserved int8:4 -# TODO: this was OPTION_REMOVE_ADDR, but it does not fit into 4 bits. - subtype const[0, int8:4] - addrs_id array[int8] -} [packed] - -_ = OPTION_REMOVE_ADDR diff --git a/sys/linux/mptcp.txt.warn b/sys/linux/mptcp.txt.warn deleted file mode 100644 index ed75cddb2..000000000 --- a/sys/linux/mptcp.txt.warn +++ /dev/null @@ -1,8 +0,0 @@ -compiler: unsupported struct: mptcp_capable_option due to missing const OPTION_MP_CAPABLE [arm64] -no-such-struct: mptcp_mp_join_option -compiler: unsupported struct: mptcp_syn_option due to missing const OPTION_TYPE_SYN [arm64] -no-such-struct: mptcp_syn_option -compiler: unsupported struct: mptcp_synack_option due to missing const OPTION_TYPE_SYNACK [arm64] -no-such-struct: mptcp_synack_option -compiler: unsupported struct: mptcp_ack_option due to missing const OPTION_TYPE_ACK [arm64] -no-such-struct: mptcp_mp_fclose_option diff --git a/sys/linux/mptcp_386.const b/sys/linux/mptcp_386.const deleted file mode 100644 index a0c26da46..000000000 --- a/sys/linux/mptcp_386.const +++ /dev/null @@ -1,10 +0,0 @@ -# AUTOGENERATED FILE -OPTION_ADD_ADDR = 32 -OPTION_MP_CAPABLE = 8 -OPTION_MP_FCLOSE = 128 -OPTION_MP_JOIN = 64 -OPTION_REMOVE_ADDR = 256 -OPTION_TYPE_ACK = 4 -OPTION_TYPE_SYN = 1 -OPTION_TYPE_SYNACK = 2 -TCPOPT_MPTCP = 30 diff --git a/sys/linux/mptcp_amd64.const b/sys/linux/mptcp_amd64.const deleted file mode 100644 index a0c26da46..000000000 --- a/sys/linux/mptcp_amd64.const +++ /dev/null @@ -1,10 +0,0 @@ -# AUTOGENERATED FILE -OPTION_ADD_ADDR = 32 -OPTION_MP_CAPABLE = 8 -OPTION_MP_FCLOSE = 128 -OPTION_MP_JOIN = 64 -OPTION_REMOVE_ADDR = 256 -OPTION_TYPE_ACK = 4 -OPTION_TYPE_SYN = 1 -OPTION_TYPE_SYNACK = 2 -TCPOPT_MPTCP = 30 diff --git a/sys/linux/mptcp_arm.const b/sys/linux/mptcp_arm.const deleted file mode 100644 index a0c26da46..000000000 --- a/sys/linux/mptcp_arm.const +++ /dev/null @@ -1,10 +0,0 @@ -# AUTOGENERATED FILE -OPTION_ADD_ADDR = 32 -OPTION_MP_CAPABLE = 8 -OPTION_MP_FCLOSE = 128 -OPTION_MP_JOIN = 64 -OPTION_REMOVE_ADDR = 256 -OPTION_TYPE_ACK = 4 -OPTION_TYPE_SYN = 1 -OPTION_TYPE_SYNACK = 2 -TCPOPT_MPTCP = 30 diff --git a/sys/linux/mptcp_arm64.const b/sys/linux/mptcp_arm64.const deleted file mode 100644 index b51727b62..000000000 --- a/sys/linux/mptcp_arm64.const +++ /dev/null @@ -1,10 +0,0 @@ -# AUTOGENERATED FILE -# OPTION_ADD_ADDR is not set -# OPTION_MP_CAPABLE is not set -# OPTION_MP_FCLOSE is not set -# OPTION_MP_JOIN is not set -# OPTION_REMOVE_ADDR is not set -# OPTION_TYPE_ACK is not set -# OPTION_TYPE_SYN is not set -# OPTION_TYPE_SYNACK is not set -TCPOPT_MPTCP = 30 diff --git a/sys/linux/mptcp_ppc64le.const b/sys/linux/mptcp_ppc64le.const deleted file mode 100644 index a0c26da46..000000000 --- a/sys/linux/mptcp_ppc64le.const +++ /dev/null @@ -1,10 +0,0 @@ -# AUTOGENERATED FILE -OPTION_ADD_ADDR = 32 -OPTION_MP_CAPABLE = 8 -OPTION_MP_FCLOSE = 128 -OPTION_MP_JOIN = 64 -OPTION_REMOVE_ADDR = 256 -OPTION_TYPE_ACK = 4 -OPTION_TYPE_SYN = 1 -OPTION_TYPE_SYNACK = 2 -TCPOPT_MPTCP = 30 diff --git a/sys/linux/vnet_mptcp.txt b/sys/linux/vnet_mptcp.txt new file mode 100644 index 000000000..637e3624f --- /dev/null +++ b/sys/linux/vnet_mptcp.txt @@ -0,0 +1,121 @@ +# Copyright 2018 syzkaller project authors. All rights reserved. +# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. + +# TCP Extensions for Multipath Operation with Multiple Addresses +# https://tools.ietf.org/html/rfc6824 +# This is not upstream yes, constants for this descriptions were generated on the following tree: +# https://github.com/multipath-tcp/mptcp_net-next.git +# Once this is upstream we need to move this to vnet.txt + +include +include +include +include +include + +tcp_mptcp_option [ + generic mptcp_generic_option + syn mptcp_syn_option + synack mptcp_synack_option + ack mptcp_ack_option + capable mptcp_capable_option + add_addr mptcp_add_addr_option + mp_join mptcp_mp_join_option + mp_fclose mptcp_mp_fclose_option + remove_addr mptcp_remove_addr_option +] [varlen] + +mptcp_sub_types = OPTION_TYPE_SYN, OPTION_TYPE_SYNACK, OPTION_TYPE_ACK, OPTION_MP_CAPABLE, OPTION_ADD_ADDR, OPTION_MP_JOIN, OPTION_MP_FCLOSE + +# TODO: OPTION_REMOVE_ADDR was listed in mptcp_sub_types, but it does not fit into int8 below... +_ = OPTION_REMOVE_ADDR + +mptcp_generic_option { + type flags[mptcp_sub_types, int8] + length len[parent, int8] + data array[int8, 0:16] +} [packed] + +mptcp_capable_option { + type const[TCPOPT_MPTCP, int8] + length len[parent, int8] + version int8:4 + subtype const[OPTION_MP_CAPABLE, int8:4] + flags int8 + sender int64be + receiver array[int64be, 0:1] +} [packed] + +mptcp_add_addr_option { + type const[TCPOPT_MPTCP, int8] + length len[parent, int8] +# TODO: this was OPTION_ADD_ADDR, but it does not fit into 4 bits. + subtype const[0, int8:4] + version len[parent, int8:4] + addr_id int8 + address ipv4_addr + port int16be + mac array[int8, 0:8] +} [packed] + +_ = OPTION_ADD_ADDR + +mptcp_mp_join_option { + type const[TCPOPT_MPTCP, int8] + length len[parent, int8] + flags int8:4 +# TODO: this was OPTION_MP_JOIN, but it does not fit into 4 bits. + subtype const[0, int8:4] +} [packed] + +_ = OPTION_MP_JOIN + +mptcp_syn_option { + type const[TCPOPT_MPTCP, int8] + length len[parent, int8] + flags int8:4 + subtype const[OPTION_TYPE_SYN, int8:4] + addr_id int8 + token int32 + nonce int32 +} [packed] + +mptcp_synack_option { + type const[TCPOPT_MPTCP, int8] + length len[parent, int8] + flags int8:4 + subtype const[OPTION_TYPE_SYNACK, int8:4] + addr_id int8 + mac int64 + nonce int32 +} [packed] + +mptcp_ack_option { + type const[TCPOPT_MPTCP, int8] + length len[parent, int8] + reserved int16:12 + subtype const[OPTION_TYPE_ACK, int16:4] + mac array[int8, 0:20] +} [packed] + +mptcp_mp_fclose_option { + type const[TCPOPT_MPTCP, int8] + length len[parent, int8] + reserved int16:12 +# TODO: this was OPTION_MP_FCLOSE, but it does not fit into 4 bits. + subtype const[0, int16:4] + key int64 +} [packed] + +_ = OPTION_MP_FCLOSE + +mptcp_remove_addr_option { + type const[TCPOPT_MPTCP, int8] + length len[parent, int8] + reserved int8:4 +# TODO: this was OPTION_REMOVE_ADDR, but it does not fit into 4 bits. + subtype const[0, int8:4] + addrs_id array[int8] +} [packed] + +_ = OPTION_REMOVE_ADDR diff --git a/sys/linux/vnet_mptcp.txt.warn b/sys/linux/vnet_mptcp.txt.warn new file mode 100644 index 000000000..ed75cddb2 --- /dev/null +++ b/sys/linux/vnet_mptcp.txt.warn @@ -0,0 +1,8 @@ +compiler: unsupported struct: mptcp_capable_option due to missing const OPTION_MP_CAPABLE [arm64] +no-such-struct: mptcp_mp_join_option +compiler: unsupported struct: mptcp_syn_option due to missing const OPTION_TYPE_SYN [arm64] +no-such-struct: mptcp_syn_option +compiler: unsupported struct: mptcp_synack_option due to missing const OPTION_TYPE_SYNACK [arm64] +no-such-struct: mptcp_synack_option +compiler: unsupported struct: mptcp_ack_option due to missing const OPTION_TYPE_ACK [arm64] +no-such-struct: mptcp_mp_fclose_option diff --git a/sys/linux/vnet_mptcp_386.const b/sys/linux/vnet_mptcp_386.const new file mode 100644 index 000000000..a0c26da46 --- /dev/null +++ b/sys/linux/vnet_mptcp_386.const @@ -0,0 +1,10 @@ +# AUTOGENERATED FILE +OPTION_ADD_ADDR = 32 +OPTION_MP_CAPABLE = 8 +OPTION_MP_FCLOSE = 128 +OPTION_MP_JOIN = 64 +OPTION_REMOVE_ADDR = 256 +OPTION_TYPE_ACK = 4 +OPTION_TYPE_SYN = 1 +OPTION_TYPE_SYNACK = 2 +TCPOPT_MPTCP = 30 diff --git a/sys/linux/vnet_mptcp_amd64.const b/sys/linux/vnet_mptcp_amd64.const new file mode 100644 index 000000000..a0c26da46 --- /dev/null +++ b/sys/linux/vnet_mptcp_amd64.const @@ -0,0 +1,10 @@ +# AUTOGENERATED FILE +OPTION_ADD_ADDR = 32 +OPTION_MP_CAPABLE = 8 +OPTION_MP_FCLOSE = 128 +OPTION_MP_JOIN = 64 +OPTION_REMOVE_ADDR = 256 +OPTION_TYPE_ACK = 4 +OPTION_TYPE_SYN = 1 +OPTION_TYPE_SYNACK = 2 +TCPOPT_MPTCP = 30 diff --git a/sys/linux/vnet_mptcp_arm.const b/sys/linux/vnet_mptcp_arm.const new file mode 100644 index 000000000..a0c26da46 --- /dev/null +++ b/sys/linux/vnet_mptcp_arm.const @@ -0,0 +1,10 @@ +# AUTOGENERATED FILE +OPTION_ADD_ADDR = 32 +OPTION_MP_CAPABLE = 8 +OPTION_MP_FCLOSE = 128 +OPTION_MP_JOIN = 64 +OPTION_REMOVE_ADDR = 256 +OPTION_TYPE_ACK = 4 +OPTION_TYPE_SYN = 1 +OPTION_TYPE_SYNACK = 2 +TCPOPT_MPTCP = 30 diff --git a/sys/linux/vnet_mptcp_arm64.const b/sys/linux/vnet_mptcp_arm64.const new file mode 100644 index 000000000..b51727b62 --- /dev/null +++ b/sys/linux/vnet_mptcp_arm64.const @@ -0,0 +1,10 @@ +# AUTOGENERATED FILE +# OPTION_ADD_ADDR is not set +# OPTION_MP_CAPABLE is not set +# OPTION_MP_FCLOSE is not set +# OPTION_MP_JOIN is not set +# OPTION_REMOVE_ADDR is not set +# OPTION_TYPE_ACK is not set +# OPTION_TYPE_SYN is not set +# OPTION_TYPE_SYNACK is not set +TCPOPT_MPTCP = 30 diff --git a/sys/linux/vnet_mptcp_ppc64le.const b/sys/linux/vnet_mptcp_ppc64le.const new file mode 100644 index 000000000..a0c26da46 --- /dev/null +++ b/sys/linux/vnet_mptcp_ppc64le.const @@ -0,0 +1,10 @@ +# AUTOGENERATED FILE +OPTION_ADD_ADDR = 32 +OPTION_MP_CAPABLE = 8 +OPTION_MP_FCLOSE = 128 +OPTION_MP_JOIN = 64 +OPTION_REMOVE_ADDR = 256 +OPTION_TYPE_ACK = 4 +OPTION_TYPE_SYN = 1 +OPTION_TYPE_SYNACK = 2 +TCPOPT_MPTCP = 30 diff --git a/sys/syz-extract/extract.go b/sys/syz-extract/extract.go index 5ee42af50..168f4aa0f 100644 --- a/sys/syz-extract/extract.go +++ b/sys/syz-extract/extract.go @@ -246,7 +246,7 @@ func archFileList(os, arch string, files []string) (string, []string, []string, } manualFiles := map[string]bool{ // Not upstream, generated on https://github.com/multipath-tcp/mptcp_net-next - "mptcp.txt": true, + "vnet_mptcp.txt": true, // Not upstream, generated on unknown tree. "futex.txt": true, // Was in linux-next, but then was removed, fate is unknown. -- cgit mrf-deployment