diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2018-04-11 11:36:25 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-04-11 11:36:25 +0200 |
| commit | 9cd56d71a84c470aa92422144a76d42c8ff6d11d (patch) | |
| tree | 8c904de5471ce9094d68ee93e5b2e5047fb5436d /executor | |
| parent | cde43bc6bc3f8d3434d99f4e313c95f6b0ac53ec (diff) | |
sys/linux: add veth devices to devnames
Also comment new veth code for future me.
Diffstat (limited to 'executor')
| -rw-r--r-- | executor/common_linux.h | 5 | ||||
| -rw-r--r-- | executor/syscalls_linux.h | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/executor/common_linux.h b/executor/common_linux.h index 1d82a78e3..90566cb26 100644 --- a/executor/common_linux.h +++ b/executor/common_linux.h @@ -416,6 +416,7 @@ static void initialize_netdevices(void) #endif for (i = 0; i < sizeof(devtypes) / (sizeof(devtypes[0])); i++) execute_command(0, "ip link add dev %s0 type %s", devtypes[i], devtypes[i]); + // This adds connected veth0 and veth1 devices. execute_command(0, "ip link add type veth"); for (i = 0; i < sizeof(devnames) / (sizeof(devnames[0])); i++) { char addr[32]; @@ -430,7 +431,9 @@ static void initialize_netdevices(void) execute_command(0, "ip link set dev %s address %s", devnames[i], addr); execute_command(0, "ip link set dev %s up", devnames[i]); } - + // This creates connected bond_slave and team_slave devices of type veth, + // and makes them slaves of bond0 and team0 devices, respectively. + // Note: slave devices don't need MAC/IP addresses, only master devices. execute_command(0, "ip link add name bond_slave type veth peer name team_slave"); execute_command(0, "ip link set bond_slave master bond0"); execute_command(0, "ip link set team_slave master team0"); diff --git a/executor/syscalls_linux.h b/executor/syscalls_linux.h index b2d0d620b..1048d5f79 100644 --- a/executor/syscalls_linux.h +++ b/executor/syscalls_linux.h @@ -2,7 +2,7 @@ #if defined(__i386__) || 0 #define GOARCH "386" -#define SYZ_REVISION "17603edae446663d0a7abcb87c8ea5ed56fa3774" +#define SYZ_REVISION "b6931e8511cdb0dc86d657b24a3c6906e49d1983" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 @@ -1704,7 +1704,7 @@ call_t syscalls[] = { #if defined(__x86_64__) || 0 #define GOARCH "amd64" -#define SYZ_REVISION "2e1df3e71998de7cd48d74e9e5767cb4691a589c" +#define SYZ_REVISION "bc156a61819b83aea7bbcca531c2cd6de2978782" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 @@ -3458,7 +3458,7 @@ call_t syscalls[] = { #if defined(__arm__) || 0 #define GOARCH "arm" -#define SYZ_REVISION "d40ca8f361366bffc415b27539a066b709e331cd" +#define SYZ_REVISION "51d755b533f032f680d4b0ebaedcceb6234bba5e" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 @@ -5169,7 +5169,7 @@ call_t syscalls[] = { #if defined(__aarch64__) || 0 #define GOARCH "arm64" -#define SYZ_REVISION "277eb8ec66df64dc2ad8ca8ef8559208b070972c" +#define SYZ_REVISION "e9d3129a8b78c2178a8769d5849875255ab35c88" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 @@ -6852,7 +6852,7 @@ call_t syscalls[] = { #if defined(__ppc64__) || defined(__PPC64__) || defined(__powerpc64__) || 0 #define GOARCH "ppc64le" -#define SYZ_REVISION "2306403fe097ca06bb53a337f3a71953c1b6c00f" +#define SYZ_REVISION "1df94a2295231c3145823bebd24ff7c6b3503c2c" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 |