From 06bf8101debe879447d0ef3a7a5b84cb11fa5acf Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sun, 2 Jun 2024 11:58:29 +0200 Subject: executor: remove noshmem mode All OSes we have now support shmem. Support for Fuchia/Starnix/Windows wasn't implemented, but generally they support shared memory. Remove all of the complexity and code associated with noshmem mode. If/when we revive these OSes, it's easier to properly implement shmem mode for them. --- sys/test/arch_32.txt | 2 +- sys/test/csource.txt.const | 2 +- sys/test/expressions.txt.const | 4 ++-- sys/test/test.txt.const | 4 ++-- sys/test/test/align0 | 4 ++-- sys/test/test/align0_be | 4 ++-- sys/test/test/bf | 4 ++-- sys/test/test/bf2 | 4 ++-- sys/test/test/bf2_be | 4 ++-- sys/test/test/bf_be | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) (limited to 'sys/test') diff --git a/sys/test/arch_32.txt b/sys/test/arch_32.txt index 192f308c3..aaa9963a9 100644 --- a/sys/test/arch_32.txt +++ b/sys/test/arch_32.txt @@ -1,7 +1,7 @@ # Copyright 2022 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. -meta arches["32_shmem", "32_fork_shmem"] +meta arches["32", "32_fork"] resource unsupported3[int32] diff --git a/sys/test/csource.txt.const b/sys/test/csource.txt.const index 2c90daac7..3a0343e4d 100644 --- a/sys/test/csource.txt.const +++ b/sys/test/csource.txt.const @@ -1,4 +1,4 @@ -arches = 32_fork_shmem, 32_shmem, 64, 64_fork +arches = 32, 32_fork, 64, 64_fork BIT_0 = 1 BIT_1 = 2 BIT_0_AND_1 = 3 diff --git a/sys/test/expressions.txt.const b/sys/test/expressions.txt.const index 77e181281..02c3c0e23 100644 --- a/sys/test/expressions.txt.const +++ b/sys/test/expressions.txt.const @@ -1,3 +1,3 @@ -arches = 32_fork_shmem, 32_shmem, 64, 64_fork, 64_fuzz +arches = 32, 32_fork, 64, 64_fork, 64_fuzz FIELD_FLAG1 = 2 -FIELD_FLAG2 = 4 \ No newline at end of file +FIELD_FLAG2 = 4 diff --git a/sys/test/test.txt.const b/sys/test/test.txt.const index 11f548df0..de2507e56 100644 --- a/sys/test/test.txt.const +++ b/sys/test/test.txt.const @@ -1,6 +1,6 @@ -arches = 32_fork_shmem, 32_shmem, 64, 64_fork +arches = 32, 32_fork, 64, 64_fork IPPROTO_ICMPV6 = 58 IPPROTO_TCP = 6 IPPROTO_UDP = 17 -ONLY_32BITS_CONST = 32_fork_shmem:1, 32_shmem:1 +ONLY_32BITS_CONST = 32:1, 32_fork:1 ARCH_64_SPECIFIC_CONST = 64:10 diff --git a/sys/test/test/align0 b/sys/test/test/align0 index 82272f5a9..e2aaf61ee 100644 --- a/sys/test/test/align0 +++ b/sys/test/test/align0 @@ -1,5 +1,5 @@ -# 32_shmem has 4-byte alignment for int64 and everything goes havoc. -# requires: -arch=32_shmem littleendian +# 32 has 4-byte alignment for int64 and everything goes havoc. +# requires: -arch=32 littleendian syz_compare(&AUTO="010000000200000003000400000000000500000000000000", 0x18, &AUTO=@align0={0x1, 0x2, 0x3, 0x4, 0x5}, AUTO) syz_compare(&AUTO="", 0x18, &AUTO=@align0={0x0, 0x0, 0x0, 0x0, 0x0}, 0x17) # EBADF diff --git a/sys/test/test/align0_be b/sys/test/test/align0_be index 00f251cc9..f9072e841 100644 --- a/sys/test/test/align0_be +++ b/sys/test/test/align0_be @@ -1,5 +1,5 @@ -# 32_shmem has 4-byte alignment for int64 and everything goes havoc. -# requires: -arch=32_shmem -littleendian +# 32 has 4-byte alignment for int64 and everything goes havoc. +# requires: -arch=32 -littleendian syz_compare(&AUTO="000100000000000203000004000000000000000000000005", 0x18, &AUTO=@align0={0x1, 0x2, 0x3, 0x4, 0x5}, AUTO) syz_compare(&AUTO="", 0x18, &AUTO=@align0={0x0, 0x0, 0x0, 0x0, 0x0}, 0x17) # EBADF diff --git a/sys/test/test/bf b/sys/test/test/bf index f35ff1336..6d7bb6364 100644 --- a/sys/test/test/bf +++ b/sys/test/test/bf @@ -1,5 +1,5 @@ -# 32_shmem has 4-byte alignment for int64 and everything goes havoc. -# requires: -arch=32_shmem littleendian +# 32 has 4-byte alignment for int64 and everything goes havoc. +# requires: -arch=32 littleendian syz_compare(&AUTO="ab03000000000000cdcdcdcdcdcdcdcdebffff03ab0303abaa00000000000000", 0x20, &AUTO=@bf0={0xabab, 0xcdcdcdcdcdcdcdcd, 0xabab, 0xffff, 0xffffff, 0xabab, 0xabab, 0xaaa}, AUTO) syz_compare(&AUTO="dcfcde563422f10e", 0x8, &AUTO=@bf2={0x0abc, 0x0bcd, 0xcdef, 0x123456, 0x78ef12}, AUTO) diff --git a/sys/test/test/bf2 b/sys/test/test/bf2 index e0345388b..82b9a0a1f 100644 --- a/sys/test/test/bf2 +++ b/sys/test/test/bf2 @@ -1,5 +1,5 @@ -# 32_shmem has 4-byte alignment for int64 and everything goes havoc. -# requires: -arch=32_shmem littleendian +# 32 has 4-byte alignment for int64 and everything goes havoc. +# requires: -arch=32 littleendian syz_compare(&AUTO="1200000034067800", AUTO, &AUTO=@bf4={0x12, {0x34, 0x56, 0x78}}, AUTO) syz_compare(&AUTO="1200000034060000", AUTO, &AUTO=@bf5={0x12, {0x34, 0x56}}, AUTO) diff --git a/sys/test/test/bf2_be b/sys/test/test/bf2_be index 094c3f6e2..1c39a9f99 100644 --- a/sys/test/test/bf2_be +++ b/sys/test/test/bf2_be @@ -1,5 +1,5 @@ -# 32_shmem has 4-byte alignment for int64 and everything goes havoc. -# requires: -arch=32_shmem -littleendian +# 32 has 4-byte alignment for int64 and everything goes havoc. +# requires: -arch=32 -littleendian syz_compare(&AUTO="1200000034607800", AUTO, &AUTO=@bf4={0x12, {0x34, 0x56, 0x78}}, AUTO) syz_compare(&AUTO="1200000034600000", AUTO, &AUTO=@bf5={0x12, {0x34, 0x56}}, AUTO) diff --git a/sys/test/test/bf_be b/sys/test/test/bf_be index 4c7fc85ec..b03794e91 100644 --- a/sys/test/test/bf_be +++ b/sys/test/test/bf_be @@ -1,5 +1,5 @@ -# 32_shmem has 4-byte alignment for int64 and everything goes havoc. -# requires: -arch=32_shmem -littleendian +# 32 has 4-byte alignment for int64 and everything goes havoc. +# requires: -arch=32 -littleendian syz_compare(&AUTO="eac0000000000000cdcdcdcdcdcdcdcd5fffffc075607560aa", 0x20, &AUTO=@bf0={0xabab, 0xcdcdcdcdcdcdcdcd, 0xabab, 0xffff, 0xffffff, 0xabab, 0xabab, 0xaaa}, AUTO) syz_compare(&AUTO="ccddef23456ef120", 0x8, &AUTO=@bf2={0x0abc, 0x0bcd, 0xcdef, 0x123456, 0x78ef12}, AUTO) -- cgit mrf-deployment