cleanups, fixes, and progress towards avoiding "make headers"
Subsystems (4)
v3 cover cleanups, fixes, and progress towards avoiding "make headers"
Changes since v2:
a) After some disussion with David Hildenbrand, simplified the "fix missing __NR_mseal" patch down to just two lines of diff, after all.
b) Improved the "kvm, mdwe fixes to avoid requiring "make headers"" patch by taking a snapshot of the prctl.h, instead of manually creating defines. Thanks also to David Hildenbrand for that.
c) Fixed up the final patch to use asm-generic/unistd.h.
d) Added acks.
e) Rebased onto 6.10-rc4+ (today's top of tree).
Changes since v1:
Jeff Xu, I apologize for this churn: I was forced to drop your Reviewed-by and Tested-by tags from 2 of the 3 mseal patches, because the __NR_mseal fix is completely different now.
a) Reworked the mseal fix to use the kernel's in-tree unistd*.h files, instead of hacking in a __NR_mseal definition directly. (Thanks to David Hildenbrand for pointing out that this needed to be done.)
b) Fixed the subject line of the kvm and mdwe patch.
c) Reordered the patches so as to group the mseal changes together.
d) ADDED an additional patch, 6/6, to remove various __NR_xx items and checks from the mm selftests.
Cover letter, updated for v2:
Eventually, once the build succeeds on a sufficiently old distro, the idea is to delete $(KHDR_INCLUDES) from the selftests/mm build, and then after that, from selftests/lib.mk and all of the other selftest builds.
For now, this series merely achieves a clean build of selftests/mm on a not-so-old distro: Ubuntu 23.04. In other words, after this series is applied, it is possible to delete $(KHDR_INCLUDES) from selftests/mm/Makefile and the build will still succeed.
1. Add tools/uapi/asm/unistd_[32|x32|64].h files, which include definitions of __NR_mseal, and include them (indirectly) from the files that use __NR_mseal. The new files are copied from ./usr/include/asm, which is how we have agreed to do this sort of thing, see [1].
2. Add fs.h, similarly created: it was copied directly from a snapshot of ./usr/include/linux/fs.h after running "make headers".
3. Add a few selected prctl.h values that the ksm and mdwe tests require.
4. Factor out some common code from mseal_test.c and seal_elf.c, into a new mseal_helpers.h file.
5. Remove local __NR_* definitions and checks.
[1] commit e076eaca5906 ("selftests: break the dependency upon local header files")
John Hubbard (6):
selftests/mm: mseal, self_elf: fix missing __NR_mseal selftests/mm: mseal, self_elf: factor out test macros and other
duplicated items
selftests/mm: mseal, self_elf: rename TEST_END_CHECK to
REPORT_TEST_PASS
selftests/mm: fix vm_util.c build failures: add snapshot of fs.h selftests/mm: kvm, mdwe fixes to avoid requiring "make headers" selftests/mm: remove local __NR_* definitions
tools/include/uapi/linux/fs.h | 392 ++++++++++++++++++ tools/include/uapi/linux/prctl.h | 331 +++++++++++++++ tools/testing/selftests/mm/hugepage-mremap.c | 2 +- .../selftests/mm/ksm_functional_tests.c | 8 +- tools/testing/selftests/mm/memfd_secret.c | 14 +- tools/testing/selftests/mm/mkdirty.c | 8 +- tools/testing/selftests/mm/mlock2.h | 1 + tools/testing/selftests/mm/mseal_helpers.h | 41 ++ tools/testing/selftests/mm/mseal_test.c | 143 +++---- tools/testing/selftests/mm/pagemap_ioctl.c | 2 +- tools/testing/selftests/mm/protection_keys.c | 2 +- tools/testing/selftests/mm/seal_elf.c | 37 +- tools/testing/selftests/mm/uffd-common.c | 4 - tools/testing/selftests/mm/uffd-stress.c | 16 +- tools/testing/selftests/mm/uffd-unit-tests.c | 14 +- 15 files changed, 824 insertions(+), 191 deletions(-) create mode 100644 tools/include/uapi/linux/fs.h create mode 100644 tools/include/uapi/linux/prctl.h create mode 100644 tools/testing/selftests/mm/mseal_helpers.h
base-commit: 14d7c92f8df9c0964ae6f8b813c1b3ac38120825
Signature · 1 line
2.45.2
PATCH v3 1/6 selftests/mm: mseal, self_elf: fix missing __NR_mseal
The selftests/mm build isn't exactly "broken", according to the current documentation, which still claims that one must run "make headers", before building the kselftests. However, according to the new plan to get rid of that requirement [1], they are future-broken: attempting to build selftests/mm *without* first running "make headers" will fail due to not finding __NR_mseal.
Therefore, include asm-generic/unistd.h, which has all of the system call numbers that are needed, abstracted across the various CPU arches.
[1] commit e076eaca5906 ("selftests: break the dependency upon local header files")
--- tools/testing/selftests/mm/mseal_test.c | 2 +- tools/testing/selftests/mm/seal_elf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/mm/mseal_test.c +1 -1
@@ -3,7 +3,7 @@#include <linux/mman.h> #include <sys/mman.h> #include <stdint.h> -#include <unistd.h> +#include <asm-generic/unistd.h> #include <string.h> #include <sys/time.h> #include <sys/resource.h>
tools/testing/selftests/mm/seal_elf.c +1 -1
@@ -2,7 +2,7 @@#define _GNU_SOURCE#include <sys/mman.h> #include <stdint.h> -#include <unistd.h> +#include <asm-generic/unistd.h> #include <string.h> #include <sys/time.h> #include <sys/resource.h>
Signature · 1 line
2.45.2
Re: [PATCH v3 1/6] selftests/mm: mseal, self_elf: fix missing __NR_mseal
Quoted 40 lines · John Hubbard
The selftests/mm build isn't exactly "broken", according to the current documentation, which still claims that one must run "make headers", before building the kselftests. However, according to the new plan to get rid of that requirement [1], they are future-broken: attempting to build selftests/mm *without* first running "make headers" will fail due to not finding
__NR_mseal.Therefore, include
asm-generic/unistd.h, which has all of the system call numbers that are needed, abstracted across the various CPU arches.[1] commit
e076eaca5906("selftests: break the dependency upon local header files")Fixes 4926c7a52de7 ("selftest mm/mseal memory sealing")Cc Jeff Xu <[email protected]>Cc David Hildenbrand <[email protected]>Signed-off-by John Hubbard <[email protected]>--- tools/testing/selftests/mm/mseal_test.c | 2 +- tools/testing/selftests/mm/seal_elf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)tools/testing/selftests/mm/mseal_test.c +1
-1@@ -3,7 +3,7 @@#include <linux/mman.h> #include <sys/mman.h> #include <stdint.h> -#include <unistd.h> +#include <asm-generic/unistd.h> #include <string.h> #include <sys/time.h> #include <sys/resource.h> tools/testing/selftests/mm/seal_elf.c +0
-0
tools/testing/selftests/mm/seal_elf.c line 8
Quoted 8 lines
tools/testing/selftests/mm/seal_elf.c +1
-1@@ -2,7 +2,7 @@#define _GNU_SOURCE#include <sys/mman.h> #include <stdint.h> -#include <unistd.h> +#include <asm-generic/unistd.h> #include <string.h> #include <sys/time.h> #include <sys/resource.h>
Still confused. Let's take a look at "microblaze".
arch/microblaze/include/asm/unistd.h
-> #include <uapi/asm/unistd.h>
arch/microblaze/include/uapi/asm/unistd.h
-> #include <asm/unistd_32.h>
-> Generated during "make headers"
usr/include/asm/unistd_32.h is generated via arch/microblaze/kernel/syscalls/Makefile with the syshdr command.
So we never end up including asm-generic/unistd.h directly on microblaze, but rather converts it (IIUC) to something else.
That will work as expected here?
Signature · 3 lines
Cheers, David / dhildenb
Re: [PATCH v3 1/6] selftests/mm: mseal, self_elf: fix missing __NR_mseal
Quoted 1 line · David Hildenbrand
On 18.06.24 04:24, John Hubbard wrote:
...
Quoted 19 lines
tools/testing/selftests/mm/seal_elf.c line 8
Quoted 13 lines
tools/testing/selftests/mm/seal_elf.c +1
-1@@ -2,7 +2,7 @@ #define _GNU_SOURCE #include <sys/mman.h> #include <stdint.h> -#include <unistd.h> +#include <asm-generic/unistd.h> #include <string.h> #include <sys/time.h> #include <sys/resource.h>Still confused. Let's take a look at "microblaze".
arch/microblaze/include/asm/unistd.h
-> #include <uapi/asm/unistd.h>
Quoted 9 lines
arch/microblaze/include/uapi/asm/unistd.h
-> #include <asm/unistd_32.h>
-> Generated during "make headers"
usr/include/asm/unistd_32.his generated viaarch/microblaze/kernel/syscalls/Makefilewith the syshdr command.So we never end up including
asm-generic/unistd.hdirectly on microblaze, but rather converts it (IIUC) to something else.
Yes.
Quoted 2 lines
That will work as expected here?
No. :)
The problem, and the source of confusion here, is that for most user space programs, the header file inclusion behaves as you've mentioned above. However, those programs are installed on a single computer that has a single set of asm and kernel headers installed.
We are quite special here, because we are building a set of user space programs that:
a) Mostly avoids using the installed (distro) system header files.
b) Must build (and run) on all supported CPU architectures
c) Must occasionally use symbols that have so new that they have not yet been included in the distro's header files.
Doing (a) creates a new problem: how to get a set of cross-platform headers that works in all cases.
Fortunately, asm-generic headers solve that one. Which is why we need to use them here.
The reason this hasn't really come up yet, is that until now, the kselftests requirement (which I'm trying to remove) was that "make headers" must first be run. That allowed the selftests to get a snapshot of sufficiently new header files that looked just like (and conflict with) the installed system headers.
I can update the commit description with some of the above, if it helps.
thanks,
Signature · 2 lines
John Hubbard NVIDIA
Re: [PATCH v3 1/6] selftests/mm: mseal, self_elf: fix missing __NR_mseal
Quoted 60 lines · John Hubbard
Quoted 1 line · David Hildenbrand
On 18.06.24 04:24, John Hubbard wrote:
...
Quoted 19 lines
tools/testing/selftests/mm/seal_elf.c line 8
Quoted 13 lines
tools/testing/selftests/mm/seal_elf.c +1
-1@@ -2,7 +2,7 @@ #define _GNU_SOURCE #include <sys/mman.h> #include <stdint.h> -#include <unistd.h> +#include <asm-generic/unistd.h> #include <string.h> #include <sys/time.h> #include <sys/resource.h>Still confused. Let's take a look at "microblaze".
arch/microblaze/include/asm/unistd.h
-> #include <uapi/asm/unistd.h>Quoted 9 lines
arch/microblaze/include/uapi/asm/unistd.h
-> #include <asm/unistd_32.h>
-> Generated during "make headers"
usr/include/asm/unistd_32.his generated viaarch/microblaze/kernel/syscalls/Makefilewith the syshdr command.So we never end up including
asm-generic/unistd.hdirectly on microblaze, but rather converts it (IIUC) to something else.Yes.
Quoted 2 lines
That will work as expected here?
No. :)
The problem, and the source of confusion here, is that for most user space programs, the header file inclusion behaves as you've mentioned above. However, those programs are installed on a single computer that has a single set of asm and kernel headers installed.
We are quite special here, because we are building a set of user space programs that:
a) Mostly avoids using the installed (distro) system header files.
b) Must build (and run) on all supported CPU architectures
c) Must occasionally use symbols that have so new that they have not yet been included in the distro's header files.
Doing (a) creates a new problem: how to get a set of cross-platform headers that works in all cases.
Fortunately, asm-generic headers solve that one. Which is why we need to use them here.
Quoted 7 lines
The reason this hasn't really come up yet, is that until now, the kselftests requirement (which I'm trying to remove) was that "make headers" must first be run. That allowed the selftests to get a snapshot of sufficiently new header files that looked just like (and conflict with) the installed system headers.
I can update the commit description with some of the above, if it helps.
I think it will. The main concern I had was that we could be ending up including headers with *wrong* data. As long as (a) it compiles where it's supposed to compile (b) it runs where it's supposed to run, we're good :)
Signature · 3 lines
Cheers, David / dhildenb
Re: [PATCH v3 1/6] selftests/mm: mseal, self_elf: fix missing __NR_mseal
Quoted 4 lines · David Hildenbrand
Quoted 3 lines · John Hubbard
Quoted 1 line · David Hildenbrand
On 18.06.24 04:24, John Hubbard wrote:
...
...
Quoted 4 lines
Quoted 1 line
I can update the commit description with some of the above, if it helps.
I think it will. The main concern I had was that we could be ending up including headers with *wrong* data. As long as (a) it compiles where it's supposed to compile (b) it runs where it's supposed to run, we're good :)
OK, I've drafted an updated commit description (below), and in order to reduce email churn perhaps it's best for me to hold onto it for a day or two, while we see how v3 fares in linux-next. (Thanks, Andrew, for patching that up with my Makefile fix.)
Here's the draft:
selftests/mm: mseal, self_elf: fix missing __NR_mseal
The selftests/mm build isn't exactly "broken", according to the current documentation, which still claims that one must run "make headers", before building the kselftests. However, according to the new plan to get rid of that requirement [1], they are future-broken: attempting to build selftests/mm *without* first running "make headers" will fail due to not finding __NR_mseal.
Therefore, include asm-generic/unistd.h, which has all of the system call numbers that are needed, abstracted across the various CPU arches.
Some explanation in support of this "asm-generic" approach:
For most user space programs, the header file inclusion behaves as per this microblaze example, which comes from David Hildenbrand (thanks!) :
arch/microblaze/include/asm/unistd.h
-> #include <uapi/asm/unistd.h>
arch/microblaze/include/uapi/asm/unistd.h
-> #include <asm/unistd_32.h>
-> Generated during "make headers"
usr/include/asm/unistd_32.h is generated via
arch/microblaze/kernel/syscalls/Makefile with the syshdr command.
So we never end up including asm-generic/unistd.h directly on
microblaze... [2]However, those programs are installed on a single computer that has a single set of asm and kernel headers installed.
In contrast, the kselftests are quite special, because they must provide a set of user space programs that:
a) Mostly avoid using the installed (distro) system header files.
b) Build (and run) on all supported CPU architectures
c) Occasionally use symbols that have so new that they have not yet been included in the distro's header files.
Doing (a) creates a new problem: how to get a set of cross-platform headers that works in all cases.
Fortunately, asm-generic headers solve that one. Which is why we need to use them here--at least, for particularly difficult headers such as unistd.h.
The reason this hasn't really come up yet, is that until now, the kselftests requirement (which I'm trying to eventually remove) was that "make headers" must first be run. That allowed the selftests to get a snapshot of sufficiently new header files that looked just like (and conflict with) the installed system headers.
And as an aside, this is also an improvement over past practices of simply open-coding in a single (not per-arch) definition of a new symbol, directly into the selftest code.
[1] commit e076eaca5906 ("selftests: break the dependency upon local header files")
[2] https://lore.kernel.org/all/[email protected]/
thanks,
Signature · 2 lines
John Hubbard NVIDIA
Andrew Morton
maintainerRe: [PATCH v3 1/6] selftests/mm: mseal, self_elf: fix missing __NR_mseal
Quoted 1 line · On Tue, 18 Jun 2024 14:29:32 -0700 John Hubbard <[email protected]> wrote:
OK, I've drafted an updated commit description (below)
<copy><paste>
Re: [PATCH v3 1/6] selftests/mm: mseal, self_elf: fix missing __NR_mseal
Quoted 5 lines · Andrew Morton
Quoted 1 line · On Tue, 18 Jun 2024 14:29:32 -0700 John Hubbard <[email protected]> wrote:
OK, I've drafted an updated commit description (below)
<copy><paste>
Awesome! :)
thanks,
Signature · 2 lines
John Hubbard NVIDIA
David Hildenbrand
Acked-byRe: [PATCH v3 1/6] selftests/mm: mseal, self_elf: fix missing __NR_mseal
In reply to John HubbardQuoted 81 lines · John Hubbard
Quoted 4 lines · David Hildenbrand
Quoted 3 lines · John Hubbard
Quoted 1 line · David Hildenbrand
On 18.06.24 04:24, John Hubbard wrote:
...
...
Quoted 4 lines
Quoted 1 line
I can update the commit description with some of the above, if it helps.
I think it will. The main concern I had was that we could be ending up including headers with *wrong* data. As long as (a) it compiles where it's supposed to compile (b) it runs where it's supposed to run, we're good :)
OK, I've drafted an updated commit description (below), and in order to reduce email churn perhaps it's best for me to hold onto it for a day or two, while we see how v3 fares in linux-next. (Thanks, Andrew, for patching that up with my
Makefilefix.)Here's the draft:
selftests/mm: mseal,self_elf: fix missing__NR_msealThe selftests/mm build isn't exactly "broken", according to the current documentation, which still claims that one must run "make headers", before building the kselftests. However, according to the new plan to get rid of that requirement [1], they are future-broken: attempting to build selftests/mm *without* first running "make headers" will fail due to not finding
__NR_mseal.Therefore, include
asm-generic/unistd.h, which has all of the system call numbers that are needed, abstracted across the various CPU arches.Some explanation in support of this "asm-generic" approach:
For most user space programs, the header file inclusion behaves as per this microblaze example, which comes from David Hildenbrand (thanks!) :
arch/microblaze/include/asm/unistd.h -> #include <uapi/asm/unistd.h> arch/microblaze/include/uapi/asm/unistd.h -> #include <asm/unistd_32.h> -> Generated during "make headers" usr/include/asm/unistd_32.h is generated via arch/microblaze/kernel/syscalls/Makefile with the syshdr command. So we never end up including asm-generic/unistd.h directly on microblaze... [2]However, those programs are installed on a single computer that has a single set of asm and kernel headers installed.
In contrast, the kselftests are quite special, because they must provide a set of user space programs that:
a) Mostly avoid using the installed (distro) system header files.
b) Build (and run) on all supported CPU architectures
c) Occasionally use symbols that have so new that they have not yet been included in the distro's header files.
Doing (a) creates a new problem: how to get a set of cross-platform headers that works in all cases.
Fortunately, asm-generic headers solve that one. Which is why we need to use them here--at least, for particularly difficult headers such as
unistd.h.The reason this hasn't really come up yet, is that until now, the kselftests requirement (which I'm trying to eventually remove) was that "make headers" must first be run. That allowed the selftests to get a snapshot of sufficiently new header files that looked just like (and conflict with) the installed system headers.
And as an aside, this is also an improvement over past practices of simply open-coding in a single (not per-arch) definition of a new symbol, directly into the selftest code.
[1] commit
e076eaca5906("selftests: break the dependency upon local header files")
Quoted 6 lines
[2] https://lore.kernel.org/all/[email protected]/
Fixes 4926c7a52de7 ("selftest mm/mseal memory sealing")Cc Jeff Xu <[email protected]>Cc David Hildenbrand <[email protected]>Signed-off-by John Hubbard <[email protected]>
Thanks!
Signature · 3 lines
Cheers, David / dhildenb
PATCH v3 2/6 selftests/mm: mseal, self_elf: factor out test macros and other duplicated items
In reply to John HubbardClean up and move some copy-pasted items into a new mseal_helpers.h.
1. The test macros can be made safer and simpler, by observing that they are invariably called when about to return. This means that the macros do not need an intrusive label to goto; they can simply return.
2. PKEY* items. We cannot, unfortunately use pkey-helpers.h. The best we can do is to factor out these few items into mseal_helpers.h.
3. These tests still need their own definition of u64, so also move that to the header file.
--- tools/testing/selftests/mm/mseal_helpers.h | 41 ++++++++++++++++++ tools/testing/selftests/mm/mseal_test.c | 49 +--------------------- tools/testing/selftests/mm/seal_elf.c | 33 +-------------- 3 files changed, 43 insertions(+), 80 deletions(-) create mode 100644 tools/testing/selftests/mm/mseal_helpers.h
tools/testing/selftests/mm/mseal_helpers.h new file +41 -0
@@ -0,0 +1,41 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#define FAIL_TEST_IF_FALSE (test_passed) \ + do { \ + if (!(test_passed)) { \ + ksft_test_result_fail("%s: line:%d\n", \ + __func__, __LINE__); \ + return; \ + } \ + } while (0) + +#define SKIP_TEST_IF_FALSE (test_passed) \ + do { \ + if (!(test_passed)) { \ + ksft_test_result_skip("%s: line:%d\n", \ + __func__, __LINE__); \ + return; \ + } \ + } while (0) + +#define TEST_END_CHECK () ksft_test_result_pass("%s\n", __func__) + +#ifndef PKEY_DISABLE_ACCESS +#define PKEY_DISABLE_ACCESS 0x1 +#endif + +#ifndef PKEY_DISABLE_WRITE +#define PKEY_DISABLE_WRITE 0x2 +#endif + +#ifndef PKEY_BITS_PER_PKEY +#define PKEY_BITS_PER_PKEY 2 +#endif + +#ifndef PKEY_MASK +#define PKEY_MASK (PKEY_DISABLE_ACCESS | PKEY_DISABLE_WRITE) +#endif + +#ifndef u64 +#define u64 unsigned long long +#endif
tools/testing/selftests/mm/mseal_test.c +1 -48
55 lines not on this page · raw message
tools/testing/selftests/mm/seal_elf.c +1 -32
@@ -16,38 +16,7 @@#include <sys/ioctl.h> #include <sys/vfs.h> #include <sys/stat.h> - -/* -* need those definition for manually build using gcc. -* gcc -I ../../../../usr/include -DDEBUG -O3 -DDEBUG -O3 seal_elf.c -o seal_elf -*/ -#define FAIL_TEST_IF_FALSE (c) do {\ - if (!(c)) {\ - ksft_test_result_fail("%s, line:%d\n", __func__, __LINE__);\ - goto test_end;\ - } \ - } \ - while (0) - -#define SKIP_TEST_IF_FALSE (c) do {\ - if (!(c)) {\ - ksft_test_result_skip("%s, line:%d\n", __func__, __LINE__);\ - goto test_end;\ - } \ - } \ - while (0) - - -#define TEST_END_CHECK () {\ - ksft_test_result_pass("%s\n", __func__);\ - return;\ -test_end:\ - return;\ -} - -#ifndef u64 -#define u64 unsigned long long -#endif +#include "mseal_helpers.h" /* * define sys_xyx to call syscall directly.
Signature · 1 line
2.45.2
Re: [PATCH v3 2/6] selftests/mm: mseal, self_elf: factor out test macros and other duplicated items
Quoted 11 lines · John Hubbard
Clean up and move some copy-pasted items into a new
mseal_helpers.h.1. The test macros can be made safer and simpler, by observing that they are invariably called when about to return. This means that the macros do not need an intrusive label to goto; they can simply return.
2. PKEY* items. We cannot, unfortunately use
pkey-helpers.h. The best we can do is to factor out these few items intomseal_helpers.h.3. These tests still need their own definition of u64, so also move that to the header file.
And I just noticed that I left out this one:
4. Be sure to include the new mseal_helpers.h in the Makefile dependencies.
In other words, this hunk is also needed:
tools/testing/selftests/mm/Makefile +1 -0
@@ -2,6 +2,7 @@ # Makefile for mm selftests LOCAL_HDRS += $(selfdir)/mm/local_config.h $(top_srcdir)/mm/gup_test.h +LOCAL_HDRS += $(selfdir)/mm/mseal_helpers.h include local_config.mk
I'll send out a v4 with that, once we resolve the discussion around patch 1/6.
thanks,
Signature · 2 lines
John Hubbard NVIDIA
Quoted 162 lines
Cc Jeff Xu <[email protected]>Signed-off-by John Hubbard <[email protected]>--- tools/testing/selftests/mm/mseal_helpers.h | 41 ++++++++++++++++++ tools/testing/selftests/mm/mseal_test.c | 49 +--------------------- tools/testing/selftests/mm/seal_elf.c | 33 +-------------- 3 files changed, 43 insertions(+), 80 deletions(-)create mode 100644
tools/testing/selftests/mm/mseal_helpers.htools/testing/selftests/mm/mseal_helpers.h new file +41
-0@@ -0,0 +1,41 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#define FAIL_TEST_IF_FALSE (test_passed) \ + do { \ + if (!(test_passed)) { \ + ksft_test_result_fail("%s: line:%d\n", \ + __func__, __LINE__); \ + return; \ + } \ + } while (0) + +#define SKIP_TEST_IF_FALSE (test_passed) \ + do { \ + if (!(test_passed)) { \ + ksft_test_result_skip("%s: line:%d\n", \ + __func__, __LINE__); \ + return; \ + } \ + } while (0) + +#define TEST_END_CHECK () ksft_test_result_pass("%s\n", __func__) + +#ifndef PKEY_DISABLE_ACCESS +#define PKEY_DISABLE_ACCESS 0x1 +#endif + +#ifndef PKEY_DISABLE_WRITE +#define PKEY_DISABLE_WRITE 0x2 +#endif + +#ifndef PKEY_BITS_PER_PKEY +#define PKEY_BITS_PER_PKEY 2 +#endif + +#ifndef PKEY_MASK +#define PKEY_MASK (PKEY_DISABLE_ACCESS | PKEY_DISABLE_WRITE) +#endif + +#ifndef u64 +#define u64 unsigned long long +#endif tools/testing/selftests/mm/mseal_test.c +1
-48@@ -17,54 +17,7 @@#include <sys/ioctl.h> #include <sys/vfs.h> #include <sys/stat.h> - -/* -* need those definition for manually build using gcc. -* gcc -I ../../../../usr/include -DDEBUG -O3 -DDEBUG -O3 mseal_test.c -o mseal_test -*/ -#ifndef PKEY_DISABLE_ACCESS -# define PKEY_DISABLE_ACCESS 0x1 -#endif - -#ifndef PKEY_DISABLE_WRITE -# define PKEY_DISABLE_WRITE 0x2 -#endif - -#ifndef PKEY_BITS_PER_PKEY -#define PKEY_BITS_PER_PKEY 2 -#endif - -#ifndef PKEY_MASK -#define PKEY_MASK (PKEY_DISABLE_ACCESS | PKEY_DISABLE_WRITE) -#endif - -#define FAIL_TEST_IF_FALSE (c) do {\ - if (!(c)) {\ - ksft_test_result_fail("%s, line:%d\n", __func__, __LINE__);\ - goto test_end;\ - } \ - } \ - while (0) - -#define SKIP_TEST_IF_FALSE (c) do {\ - if (!(c)) {\ - ksft_test_result_skip("%s, line:%d\n", __func__, __LINE__);\ - goto test_end;\ - } \ - } \ - while (0) - - -#define TEST_END_CHECK () {\ - ksft_test_result_pass("%s\n", __func__);\ - return;\ -test_end:\ - return;\ -} - -#ifndef u64 -#define u64 unsigned long long -#endif +#include "mseal_helpers.h" static unsigned long get_vma_size (void *addr,int *prot) {tools/testing/selftests/mm/seal_elf.c +1
-32@@ -16,38 +16,7 @@#include <sys/ioctl.h> #include <sys/vfs.h> #include <sys/stat.h> - -/* -* need those definition for manually build using gcc. -* gcc -I ../../../../usr/include -DDEBUG -O3 -DDEBUG -O3 seal_elf.c -o seal_elf -*/ -#define FAIL_TEST_IF_FALSE (c) do {\ - if (!(c)) {\ - ksft_test_result_fail("%s, line:%d\n", __func__, __LINE__);\ - goto test_end;\ - } \ - } \ - while (0) - -#define SKIP_TEST_IF_FALSE (c) do {\ - if (!(c)) {\ - ksft_test_result_skip("%s, line:%d\n", __func__, __LINE__);\ - goto test_end;\ - } \ - } \ - while (0) - - -#define TEST_END_CHECK () {\ - ksft_test_result_pass("%s\n", __func__);\ - return;\ -test_end:\ - return;\ -} - -#ifndef u64 -#define u64 unsigned long long -#endif +#include "mseal_helpers.h" /* * define sys_xyx to call syscall directly.
PATCH v3 3/6 selftests/mm: mseal, self_elf: rename TEST_END_CHECK to REPORT_TEST_PASS
In reply to John HubbardNow that the test macros are factored out into their final location, and simplified, it's time to rename TEST_END_CHECK to something that represents its new functionality: REPORT_TEST_PASS.
--- tools/testing/selftests/mm/mseal_helpers.h | 2 +- tools/testing/selftests/mm/mseal_test.c | 92 +++++++++++----------- tools/testing/selftests/mm/seal_elf.c | 2 +- 3 files changed, 48 insertions(+), 48 deletions(-)
tools/testing/selftests/mm/mseal_helpers.h +1 -1
@@ -18,7 +18,7 @@ } \ } while (0) -#define TEST_END_CHECK () ksft_test_result_pass("%s\n", __func__) +#define REPORT_TEST_PASS () ksft_test_result_pass("%s\n", __func__)#ifndef PKEY_DISABLE_ACCESS #define PKEY_DISABLE_ACCESS 0x1
tools/testing/selftests/mm/mseal_test.c +46 -46
368 lines not on this page · raw message
tools/testing/selftests/mm/seal_elf.c +1 -1
@@ -127,7 +127,7 @@ static void test_seal_elf(void)FAIL_TEST_IF_FALSE (ret <0 );ksft_print_msg ("somestr is sealed, mprotect is rejected\n" ); -TEST_END_CHECK (); +REPORT_TEST_PASS (); }int main (int argc,char **argv)
Signature · 1 line
2.45.2
PATCH v3 4/6 selftests/mm: fix vm_util.c build failures: add snapshot of fs.h
In reply to John HubbardOn Ubuntu 23.04, on a clean git tree, the selftests/mm build fails due 10 or 20 missing items, all of which are found in fs.h, which is created via "make headers". However, as per [1], the idea is to stop requiring "make headers", and instead, take a snapshot of the files and check them in.
Here are a few of the build errors:
vm_util.c:34:21: error: variable has incomplete type 'struct pm_scan_arg'
struct pm_scan_arg arg;
...
vm_util.c:45:28: error: use of undeclared identifier 'PAGE_IS_WPALLOWED'
...
vm_util.c:55:21: error: variable has incomplete type 'struct page_region'
...
vm_util.c:105:20: error: use of undeclared identifier 'PAGE_IS_SOFT_DIRTY'
To fix this, add fs.h, taken from a snapshot of ./usr/include/linux/fs.h after running "make headers".
[1] commit e076eaca5906 ("selftests: break the dependency upon local header files")
--- tools/include/uapi/linux/fs.h | 392 ++++++++++++++++++++++++++++++++++ 1 file changed, 392 insertions(+) create mode 100644 tools/include/uapi/linux/fs.h
tools/include/uapi/linux/fs.h new file +392 -0
@@ -0,0 +1,392 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef _LINUX_FS_H +#define _LINUX_FS_H + +/* +* This file has definitions for some important file table structures +* and constants and structures used by various generic file system +* ioctl's. Please do not make any changes in this file before +* sending patches for review to [email protected] and +* [email protected]. +*/ + +#include <linux/limits.h> +#include <linux/ioctl.h> +#include <linux/types.h> +#include <linux/fscrypt.h> + +/* Use of MS_* flags within the kernel is restricted to core mount(2) code. */ +#include <linux/mount.h> + +/* +* It's silly to have NR_OPEN bigger than NR_FILE, but you can change +* the file limit at runtime and only root can increase the per-process +* nr_file rlimit, so it's safe to set up a ridiculously high absolute +* upper limit on files-per-process. +* +* Some programs (notably those using select()) may have to be +* recompiled to take full advantage of the new limits.. +*/ + +/* Fixed constants first: */ +#undef NR_OPEN +#define INR_OPEN_CUR 1024/* Initial setting for nfile rlimits */ +#define INR_OPEN_MAX 4096/* Hard limit for nfile rlimits */ + +#define BLOCK_SIZE_BITS 10 +#define BLOCK_SIZE (1<<BLOCK_SIZE_BITS) + +#define SEEK_SET 0/* seek relative to beginning of file */ +#define SEEK_CUR 1/* seek relative to current file position */ +#define SEEK_END 2/* seek relative to end of file */ +#define SEEK_DATA 3/* seek to the next data */ +#define SEEK_HOLE 4/* seek to the next hole */ +#define SEEK_MAX SEEK_HOLE + +#define RENAME_NOREPLACE (1 << 0)/* Don't overwrite target */ +#define RENAME_EXCHANGE (1 << 1)/* Exchange source and dest */ +#define RENAME_WHITEOUT (1 << 2)/* Whiteout source */ + +struct file_clone_range { +__s64 src_fd; +__u64 src_offset; +__u64 src_length; +__u64 dest_offset; +}; + +struct fstrim_range { +__u64 start; +__u64 len; +__u64 minlen; +}; + +/* +* We include a length field because some filesystems (vfat) have an identifier +* that we do want to expose as a UUID, but doesn't have the standard length. +* +* We use a fixed size buffer beacuse this interface will, by fiat, never +* support "UUIDs" longer than 16 bytes; we don't want to force all downstream +* users to have to deal with that. +*/ +struct fsuuid2 { +__u8 len; +__u8 uuid[16 ]; +}; + +struct fs_sysfs_path { +__u8 len; +__u8 name[128 ]; +}; + +/* extent-same (dedupe) ioctls; these MUST match the btrfs ioctl definitions */ +#define FILE_DEDUPE_RANGE_SAME 0 +#define FILE_DEDUPE_RANGE_DIFFERS 1 + +/* from struct btrfs_ioctl_file_extent_same_info */ +struct file_dedupe_range_info { +__s64 dest_fd;/* in - destination file */ +__u64 dest_offset;/* in - start of extent in destination */ +__u64 bytes_deduped;/* out - total # of bytes we were able +* to dedupe from this file. */ +/* status of this dedupe operation: +* < 0 for error +* == FILE_DEDUPE_RANGE_SAME if dedupe succeeds +* == FILE_DEDUPE_RANGE_DIFFERS if data differs +*/ +__s32 status;/* out - see above description */ +__u32 reserved;/* must be zero */ +}; + +/* from struct btrfs_ioctl_file_extent_same_args */ +struct file_dedupe_range { +__u64 src_offset;/* in - start of extent in source */ +__u64 src_length;/* in - length of extent */ +__u16 dest_count;/* in - total elements in info array */ +__u16 reserved1;/* must be zero */ +__u32 reserved2;/* must be zero */ +struct file_dedupe_range_info info[]; +}; + +/* And dynamically-tunable limits and defaults: */ +struct files_stat_struct { +unsigned long nr_files;/* read only */ +unsigned long nr_free_files;/* read only */ +unsigned long max_files;/* tunable */ +}; + +struct inodes_stat_t { +long nr_inodes; +long nr_unused; +long dummy[5 ];/* padding for sysctl ABI compatibility */ +}; + + +#define NR_FILE 8192/* this can well be larger on a larger system */ + +/* +* Structure for FS_IOC_FSGETXATTR[A] and FS_IOC_FSSETXATTR. +*/ +struct fsxattr { +__u32 fsx_xflags;/* xflags field value (get/set) */ +__u32 fsx_extsize;/* extsize field value (get/set)*/ +__u32 fsx_nextents;/* nextents field value (get) */ +__u32 fsx_projid;/* project identifier (get/set) */ +__u32 fsx_cowextsize;/* CoW extsize field value (get/set)*/ +unsigned char fsx_pad[8 ]; +}; + +/* +* Flags for the fsx_xflags field +*/ +#define FS_XFLAG_REALTIME 0x00000001/* data in realtime volume */ +#define FS_XFLAG_PREALLOC 0x00000002/* preallocated file extents */ +#define FS_XFLAG_IMMUTABLE 0x00000008/* file cannot be modified */ +#define FS_XFLAG_APPEND 0x00000010/* all writes append */ +#define FS_XFLAG_SYNC 0x00000020/* all writes synchronous */ +#define FS_XFLAG_NOATIME 0x00000040/* do not update access time */ +#define FS_XFLAG_NODUMP 0x00000080/* do not include in backups */ +#define FS_XFLAG_RTINHERIT 0x00000100/* create with rt bit set */ +#define FS_XFLAG_PROJINHERIT 0x00000200/* create with parents projid */ +#define FS_XFLAG_NOSYMLINKS 0x00000400/* disallow symlink creation */ +#define FS_XFLAG_EXTSIZE 0x00000800/* extent size allocator hint */ +#define FS_XFLAG_EXTSZINHERIT 0x00001000/* inherit inode extent size */ +#define FS_XFLAG_NODEFRAG 0x00002000/* do not defragment */ +#define FS_XFLAG_FILESTREAM 0x00004000/* use filestream allocator */ +#define FS_XFLAG_DAX 0x00008000/* use DAX for IO */ +#define FS_XFLAG_COWEXTSIZE 0x00010000/* CoW extent size allocator hint */ +#define FS_XFLAG_HASATTR 0x80000000/* no DIFLAG for this */ + +/* the read-only stuff doesn't really belong here, but any other place is +probably as bad and I don't want to create yet another include file. */ + +#define BLKROSET _IO(0x12,93)/* set device read-only (0 = read-write) */ +#define BLKROGET _IO(0x12,94)/* get read-only status (0 = read_write) */ +#define BLKRRPART _IO(0x12,95)/* re-read partition table */ +#define BLKGETSIZE _IO(0x12,96)/* return device size /512 (long *arg) */ +#define BLKFLSBUF _IO(0x12,97)/* flush buffer cache */ +#define BLKRASET _IO(0x12,98)/* set read ahead for block device */ +#define BLKRAGET _IO(0x12,99)/* get current read ahead setting */ +#define BLKFRASET _IO(0x12,100)/* set filesystem (mm/filemap.c) read-ahead */ +#define BLKFRAGET _IO(0x12,101)/* get filesystem (mm/filemap.c) read-ahead */ +#define BLKSECTSET _IO(0x12,102)/* set max sectors per request (ll_rw_blk.c) */ +#define BLKSECTGET _IO(0x12,103)/* get max sectors per request (ll_rw_blk.c) */ +#define BLKSSZGET _IO(0x12,104)/* get block device sector size */ +#if 0 +#define BLKPG _IO(0x12,105)/* See blkpg.h */ + +/* Some people are morons. Do not use sizeof! */ + +#define BLKELVGET _IOR(0x12,106,size_t)/* elevator get */ +#define BLKELVSET _IOW(0x12,107,size_t)/* elevator set */ +/* This was here just to show that the number is taken - +probably all these _IO(0x12,*) ioctls should be moved to blkpg.h. */ +#endif +/* A jump here: 108-111 have been used for various private purposes. */ +#define BLKBSZGET _IOR(0x12,112,size_t) +#define BLKBSZSET _IOW(0x12,113,size_t) +#define BLKGETSIZE64 _IOR(0x12,114,size_t)/* return device size in bytes (u64 *arg) */ +#define BLKTRACESETUP _IOWR(0x12,115,struct blk_user_trace_setup) +#define BLKTRACESTART _IO(0x12,116) +#define BLKTRACESTOP _IO(0x12,117) +#define BLKTRACETEARDOWN _IO(0x12,118) +#define BLKDISCARD _IO(0x12,119) +#define BLKIOMIN _IO(0x12,120) +#define BLKIOOPT _IO(0x12,121) +#define BLKALIGNOFF _IO(0x12,122) +#define BLKPBSZGET _IO(0x12,123) +#define BLKDISCARDZEROES _IO(0x12,124) +#define BLKSECDISCARD _IO(0x12,125) +#define BLKROTATIONAL _IO(0x12,126) +#define BLKZEROOUT _IO(0x12,127) +#define BLKGETDISKSEQ _IOR(0x12,128,__u64) +/* +* A jump here: 130-136 are reserved for zoned block devices +* (see uapi/linux/blkzoned.h) +*/ + +#define BMAP_IOCTL 1/* obsolete - kept for compatibility */ +#define FIBMAP _IO(0x00,1)/* bmap access */ +#define FIGETBSZ _IO(0x00,2)/* get the block size used for bmap */ +#define FIFREEZE _IOWR('X', 119, int)/* Freeze */ +#define FITHAW _IOWR('X', 120, int)/* Thaw */ +#define FITRIM _IOWR('X', 121, struct fstrim_range)/* Trim */ +#define FICLONE _IOW(0x94, 9, int) +#define FICLONERANGE _IOW(0x94, 13, struct file_clone_range) +#define FIDEDUPERANGE _IOWR(0x94, 54, struct file_dedupe_range) + +#define FSLABEL_MAX 256/* Max chars for the interface; each fs may differ */ + +#define FS_IOC_GETFLAGS _IOR('f', 1, long) +#define FS_IOC_SETFLAGS _IOW('f', 2, long) +#define FS_IOC_GETVERSION _IOR('v', 1, long) +#define FS_IOC_SETVERSION _IOW('v', 2, long) +#define FS_IOC_FIEMAP _IOWR('f', 11, struct fiemap) +#define FS_IOC32_GETFLAGS _IOR('f', 1, int) +#define FS_IOC32_SETFLAGS _IOW('f', 2, int) +#define FS_IOC32_GETVERSION _IOR('v', 1, int) +#define FS_IOC32_SETVERSION _IOW('v', 2, int) +#define FS_IOC_FSGETXATTR _IOR('X', 31, struct fsxattr) +#define FS_IOC_FSSETXATTR _IOW('X', 32, struct fsxattr) +#define FS_IOC_GETFSLABEL _IOR(0x94, 49, char[FSLABEL_MAX]) +#define FS_IOC_SETFSLABEL _IOW(0x94, 50, char[FSLABEL_MAX]) +/* Returns the external filesystem UUID, the same one blkid returns */ +#define FS_IOC_GETFSUUID _IOR(0x15, 0, struct fsuuid2) +/* +* Returns the path component under /sys/fs/ that refers to this filesystem; +* also /sys/kernel/debug/ for filesystems with debugfs exports +*/ +#define FS_IOC_GETFSSYSFSPATH _IOR(0x15, 1, struct fs_sysfs_path) + +/* +* Inode flags (FS_IOC_GETFLAGS / FS_IOC_SETFLAGS) +* +* Note: for historical reasons, these flags were originally used and +* defined for use by ext2/ext3, and then other file systems started +* using these flags so they wouldn't need to write their own version +* of chattr/lsattr (which was shipped as part of e2fsprogs). You +* should think twice before trying to use these flags in new +* contexts, or trying to assign these flags, since they are used both +* as the UAPI and the on-disk encoding for ext2/3/4. Also, we are +* almost out of 32-bit flags. :-) +* +* We have recently hoisted FS_IOC_FSGETXATTR / FS_IOC_FSSETXATTR from +* XFS to the generic FS level interface. This uses a structure that +* has padding and hence has more room to grow, so it may be more +* appropriate for many new use cases. +* +* Please do not change these flags or interfaces before checking with +* [email protected] and [email protected]. +*/ +#define FS_SECRM_FL 0x00000001/* Secure deletion */ +#define FS_UNRM_FL 0x00000002/* Undelete */ +#define FS_COMPR_FL 0x00000004/* Compress file */ +#define FS_SYNC_FL 0x00000008/* Synchronous updates */ +#define FS_IMMUTABLE_FL 0x00000010/* Immutable file */ +#define FS_APPEND_FL 0x00000020/* writes to file may only append */ +#define FS_NODUMP_FL 0x00000040/* do not dump file */ +#define FS_NOATIME_FL 0x00000080/* do not update atime */ +/* Reserved for compression usage... */ +#define FS_DIRTY_FL 0x00000100 +#define FS_COMPRBLK_FL 0x00000200/* One or more compressed clusters */ +#define FS_NOCOMP_FL 0x00000400/* Don't compress */ +/* End compression flags --- maybe not all used */ +#define FS_ENCRYPT_FL 0x00000800/* Encrypted file */ +#define FS_BTREE_FL 0x00001000/* btree format dir */ +#define FS_INDEX_FL 0x00001000/* hash-indexed directory */ +#define FS_IMAGIC_FL 0x00002000/* AFS directory */ +#define FS_JOURNAL_DATA_FL 0x00004000/* Reserved for ext3 */ +#define FS_NOTAIL_FL 0x00008000/* file tail should not be merged */ +#define FS_DIRSYNC_FL 0x00010000/* dirsync behaviour (directories only) */ +#define FS_TOPDIR_FL 0x00020000/* Top of directory hierarchies*/ +#define FS_HUGE_FILE_FL 0x00040000/* Reserved for ext4 */ +#define FS_EXTENT_FL 0x00080000/* Extents */ +#define FS_VERITY_FL 0x00100000/* Verity protected inode */ +#define FS_EA_INODE_FL 0x00200000/* Inode used for large EA */ +#define FS_EOFBLOCKS_FL 0x00400000/* Reserved for ext4 */ +#define FS_NOCOW_FL 0x00800000/* Do not cow file */ +#define FS_DAX_FL 0x02000000/* Inode is DAX */ +#define FS_INLINE_DATA_FL 0x10000000/* Reserved for ext4 */ +#define FS_PROJINHERIT_FL 0x20000000/* Create with parents projid */ +#define FS_CASEFOLD_FL 0x40000000/* Folder is case insensitive */ +#define FS_RESERVED_FL 0x80000000/* reserved for ext2 lib */ + +#define FS_FL_USER_VISIBLE 0x0003DFFF/* User visible flags */ +#define FS_FL_USER_MODIFIABLE 0x000380FF/* User modifiable flags */ + + +#define SYNC_FILE_RANGE_WAIT_BEFORE 1 +#define SYNC_FILE_RANGE_WRITE 2 +#define SYNC_FILE_RANGE_WAIT_AFTER 4 +#define SYNC_FILE_RANGE_WRITE_AND_WAIT (SYNC_FILE_RANGE_WRITE | \ + SYNC_FILE_RANGE_WAIT_BEFORE | \ + SYNC_FILE_RANGE_WAIT_AFTER) + +/* +* Flags for preadv2/pwritev2: +*/ + +typedef int __bitwise __kernel_rwf_t ; + +/* high priority request, poll if possible */ +#define RWF_HIPRI ((__kernel_rwf_t)0x00000001) + +/* per-IO O_DSYNC */ +#define RWF_DSYNC ((__kernel_rwf_t)0x00000002) + +/* per-IO O_SYNC */ +#define RWF_SYNC ((__kernel_rwf_t)0x00000004) + +/* per-IO, return -EAGAIN if operation would block */ +#define RWF_NOWAIT ((__kernel_rwf_t)0x00000008) + +/* per-IO O_APPEND */ +#define RWF_APPEND ((__kernel_rwf_t)0x00000010) + +/* per-IO negation of O_APPEND */ +#define RWF_NOAPPEND ((__kernel_rwf_t)0x00000020) + +/* mask of flags supported by the kernel */ +#define RWF_SUPPORTED (RWF_HIPRI | RWF_DSYNC | RWF_SYNC | RWF_NOWAIT |\ + RWF_APPEND | RWF_NOAPPEND) + +/* Pagemap ioctl */ +#define PAGEMAP_SCAN _IOWR('f', 16, struct pm_scan_arg) + +/* Bitmasks provided in pm_scan_args masks and reported in page_region.categories. */ +#define PAGE_IS_WPALLOWED (1 << 0) +#define PAGE_IS_WRITTEN (1 << 1) +#define PAGE_IS_FILE (1 << 2) +#define PAGE_IS_PRESENT (1 << 3) +#define PAGE_IS_SWAPPED (1 << 4) +#define PAGE_IS_PFNZERO (1 << 5) +#define PAGE_IS_HUGE (1 << 6) +#define PAGE_IS_SOFT_DIRTY (1 << 7) + +/* +* struct page_region - Page region with flags +* @start: Start of the region +* @end: End of the region (exclusive) +* @categories: PAGE_IS_* category bitmask for the region +*/ +struct page_region { +__u64 start; +__u64 end; +__u64 categories; +}; + +/* Flags for PAGEMAP_SCAN ioctl */ +#define PM_SCAN_WP_MATCHING (1 << 0)/* Write protect the pages matched. */ +#define PM_SCAN_CHECK_WPASYNC (1 << 1)/* Abort the scan when a non-WP-enabled page is found. */ + +/* +* struct pm_scan_arg - Pagemap ioctl argument +* @size: Size of the structure +* @flags: Flags for the IOCTL +* @start: Starting address of the region +* @end: Ending address of the region +* @walk_end Address where the scan stopped (written by kernel). +* walk_end == end (address tags cleared) informs that the scan completed on entire range. +* @vec: Address of page_region struct array for output +* @vec_len: Length of the page_region struct array +* @max_pages: Optional limit for number of returned pages (0 = disabled) +* @category_inverted: PAGE_IS_* categories which values match if 0 instead of 1 +* @category_mask: Skip pages for which any category doesn't match +* @category_anyof_mask: Skip pages for which no category matches +* @return_mask: PAGE_IS_* categories that are to be reported in `page_region`s returned +*/ +struct pm_scan_arg { +__u64 size; +__u64 flags; +__u64 start; +__u64 end; +__u64 walk_end; +__u64 vec; +__u64 vec_len; +__u64 max_pages; +__u64 category_inverted; +__u64 category_mask; +__u64 category_anyof_mask; +__u64 return_mask; +}; + +#endif /* _LINUX_FS_H */
Signature · 1 line
2.45.2
PATCH v3 5/6 selftests/mm: kvm, mdwe fixes to avoid requiring "make headers"
In reply to John HubbardOn Ubuntu 23.04, the kvm and mdwe selftests/mm build fails due to missing a few items that are found in prctl.h. Here is an excerpt of the build failures:
ksm_tests.c:252:13: error: use of undeclared identifier 'PR_SET_MEMORY_MERGE'
...
mdwe_test.c:26:18: error: use of undeclared identifier 'PR_SET_MDWE' mdwe_test.c:38:18: error: use of undeclared identifier 'PR_GET_MDWE'
Fix these errors by adding a new tools/include/uapi/linux/prctl.h . This file was created by running "make headers", and then copying a snapshot over from ./usr/include/linux/prctl.h, as per the approach we settled on in [1].
[1] commit e076eaca5906 ("selftests: break the dependency upon local header files")
--- tools/include/uapi/linux/prctl.h | 331 +++++++++++++++++++++++++++++++ 1 file changed, 331 insertions(+) create mode 100644 tools/include/uapi/linux/prctl.h
tools/include/uapi/linux/prctl.h new file +331 -0
@@ -0,0 +1,331 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef _LINUX_PRCTL_H +#define _LINUX_PRCTL_H + +#include <linux/types.h> + +/* Values to pass as first argument to prctl() */ + +#define PR_SET_PDEATHSIG 1/* Second arg is a signal */ +#define PR_GET_PDEATHSIG 2/* Second arg is a ptr to return the signal */ + +/* Get/set current->mm->dumpable */ +#define PR_GET_DUMPABLE 3 +#define PR_SET_DUMPABLE 4 + +/* Get/set unaligned access control bits (if meaningful) */ +#define PR_GET_UNALIGN 5 +#define PR_SET_UNALIGN 6 +# define PR_UNALIGN_NOPRINT 1/* silently fix up unaligned user accesses */ +# define PR_UNALIGN_SIGBUS 2/* generate SIGBUS on unaligned user access */ + +/* Get/set whether or not to drop capabilities on setuid() away from +* uid 0 (as per security/commoncap.c) */ +#define PR_GET_KEEPCAPS 7 +#define PR_SET_KEEPCAPS 8 + +/* Get/set floating-point emulation control bits (if meaningful) */ +#define PR_GET_FPEMU 9 +#define PR_SET_FPEMU 10 +# define PR_FPEMU_NOPRINT 1/* silently emulate fp operations accesses */ +# define PR_FPEMU_SIGFPE 2/* don't emulate fp operations, send SIGFPE instead */ + +/* Get/set floating-point exception mode (if meaningful) */ +#define PR_GET_FPEXC 11 +#define PR_SET_FPEXC 12 +# define PR_FP_EXC_SW_ENABLE 0x80/* Use FPEXC for FP exception enables */ +# define PR_FP_EXC_DIV 0x010000/* floating point divide by zero */ +# define PR_FP_EXC_OVF 0x020000/* floating point overflow */ +# define PR_FP_EXC_UND 0x040000/* floating point underflow */ +# define PR_FP_EXC_RES 0x080000/* floating point inexact result */ +# define PR_FP_EXC_INV 0x100000/* floating point invalid operation */ +# define PR_FP_EXC_DISABLED 0/* FP exceptions disabled */ +# define PR_FP_EXC_NONRECOV 1/* async non-recoverable exc. mode */ +# define PR_FP_EXC_ASYNC 2/* async recoverable exception mode */ +# define PR_FP_EXC_PRECISE 3/* precise exception mode */ + +/* Get/set whether we use statistical process timing or accurate timestamp +* based process timing */ +#define PR_GET_TIMING 13 +#define PR_SET_TIMING 14 +# define PR_TIMING_STATISTICAL 0/* Normal, traditional, +statistical process timing */ +# define PR_TIMING_TIMESTAMP 1/* Accurate timestamp based +process timing */ + +#define PR_SET_NAME 15/* Set process name */ +#define PR_GET_NAME 16/* Get process name */ + +/* Get/set process endian */ +#define PR_GET_ENDIAN 19 +#define PR_SET_ENDIAN 20 +# define PR_ENDIAN_BIG 0 +# define PR_ENDIAN_LITTLE 1/* True little endian mode */ +# define PR_ENDIAN_PPC_LITTLE 2/* "PowerPC" pseudo little endian */ + +/* Get/set process seccomp mode */ +#define PR_GET_SECCOMP 21 +#define PR_SET_SECCOMP 22 + +/* Get/set the capability bounding set (as per security/commoncap.c) */ +#define PR_CAPBSET_READ 23 +#define PR_CAPBSET_DROP 24 + +/* Get/set the process' ability to use the timestamp counter instruction */ +#define PR_GET_TSC 25 +#define PR_SET_TSC 26 +# define PR_TSC_ENABLE 1/* allow the use of the timestamp counter */ +# define PR_TSC_SIGSEGV 2/* throw a SIGSEGV instead of reading the TSC */ + +/* Get/set securebits (as per security/commoncap.c) */ +#define PR_GET_SECUREBITS 27 +#define PR_SET_SECUREBITS 28 + +/* +* Get/set the timerslack as used by poll/select/nanosleep +* A value of 0 means "use default" +*/ +#define PR_SET_TIMERSLACK 29 +#define PR_GET_TIMERSLACK 30 + +#define PR_TASK_PERF_EVENTS_DISABLE 31 +#define PR_TASK_PERF_EVENTS_ENABLE 32 + +/* +* Set early/late kill mode for hwpoison memory corruption. +* This influences when the process gets killed on a memory corruption. +*/ +#define PR_MCE_KILL 33 +# define PR_MCE_KILL_CLEAR 0 +# define PR_MCE_KILL_SET 1 + +# define PR_MCE_KILL_LATE 0 +# define PR_MCE_KILL_EARLY 1 +# define PR_MCE_KILL_DEFAULT 2 + +#define PR_MCE_KILL_GET 34 + +/* +* Tune up process memory map specifics. +*/ +#define PR_SET_MM 35 +# define PR_SET_MM_START_CODE 1 +# define PR_SET_MM_END_CODE 2 +# define PR_SET_MM_START_DATA 3 +# define PR_SET_MM_END_DATA 4 +# define PR_SET_MM_START_STACK 5 +# define PR_SET_MM_START_BRK 6 +# define PR_SET_MM_BRK 7 +# define PR_SET_MM_ARG_START 8 +# define PR_SET_MM_ARG_END 9 +# define PR_SET_MM_ENV_START 10 +# define PR_SET_MM_ENV_END 11 +# define PR_SET_MM_AUXV 12 +# define PR_SET_MM_EXE_FILE 13 +# define PR_SET_MM_MAP 14 +# define PR_SET_MM_MAP_SIZE 15 + +/* +* This structure provides new memory descriptor +* map which mostly modifies /proc/pid/stat[m] +* output for a task. This mostly done in a +* sake of checkpoint/restore functionality. +*/ +struct prctl_mm_map { +__u64 start_code;/* code section bounds */ +__u64 end_code; +__u64 start_data;/* data section bounds */ +__u64 end_data; +__u64 start_brk;/* heap for brk() syscall */ +__u64 brk; +__u64 start_stack;/* stack starts at */ +__u64 arg_start;/* command line arguments bounds */ +__u64 arg_end; +__u64 env_start;/* environment variables bounds */ +__u64 env_end; +__u64 *auxv;/* auxiliary vector */ +__u32 auxv_size;/* vector size */ +__u32 exe_fd;/* /proc/$pid/exe link file */ +}; + +/* +* Set specific pid that is allowed to ptrace the current task. +* A value of 0 mean "no process". +*/ +#define PR_SET_PTRACER 0x59616d61 +# define PR_SET_PTRACER_ANY ((unsigned long)-1) + +#define PR_SET_CHILD_SUBREAPER 36 +#define PR_GET_CHILD_SUBREAPER 37 + +/* +* If no_new_privs is set, then operations that grant new privileges (i.e. +* execve) will either fail or not grant them. This affects suid/sgid, +* file capabilities, and LSMs. +* +* Operations that merely manipulate or drop existing privileges (setresuid, +* capset, etc.) will still work. Drop those privileges if you want them gone. +* +* Changing LSM security domain is considered a new privilege. So, for example, +* asking selinux for a specific new context (e.g. with runcon) will result +* in execve returning -EPERM. +* +* See Documentation/userspace-api/no_new_privs.rst for more details. +*/ +#define PR_SET_NO_NEW_PRIVS 38 +#define PR_GET_NO_NEW_PRIVS 39 + +#define PR_GET_TID_ADDRESS 40 + +#define PR_SET_THP_DISABLE 41 +#define PR_GET_THP_DISABLE 42 + +/* +* No longer implemented, but left here to ensure the numbers stay reserved: +*/ +#define PR_MPX_ENABLE_MANAGEMENT 43 +#define PR_MPX_DISABLE_MANAGEMENT 44 + +#define PR_SET_FP_MODE 45 +#define PR_GET_FP_MODE 46 +# define PR_FP_MODE_FR (1 << 0)/* 64b FP registers */ +# define PR_FP_MODE_FRE (1 << 1)/* 32b compatibility */ + +/* Control the ambient capability set */ +#define PR_CAP_AMBIENT 47 +# define PR_CAP_AMBIENT_IS_SET 1 +# define PR_CAP_AMBIENT_RAISE 2 +# define PR_CAP_AMBIENT_LOWER 3 +# define PR_CAP_AMBIENT_CLEAR_ALL 4 + +/* arm64 Scalable Vector Extension controls */ +/* Flag values must be kept in sync with ptrace NT_ARM_SVE interface */ +#define PR_SVE_SET_VL 50/* set task vector length */ +# define PR_SVE_SET_VL_ONEXEC (1 << 18)/* defer effect until exec */ +#define PR_SVE_GET_VL 51/* get task vector length */ +/* Bits common to PR_SVE_SET_VL and PR_SVE_GET_VL */ +# define PR_SVE_VL_LEN_MASK 0xffff +# define PR_SVE_VL_INHERIT (1 << 17)/* inherit across exec */ + +/* Per task speculation control */ +#define PR_GET_SPECULATION_CTRL 52 +#define PR_SET_SPECULATION_CTRL 53 +/* Speculation control variants */ +# define PR_SPEC_STORE_BYPASS 0 +# define PR_SPEC_INDIRECT_BRANCH 1 +# define PR_SPEC_L1D_FLUSH 2 +/* Return and control values for PR_SET/GET_SPECULATION_CTRL */ +# define PR_SPEC_NOT_AFFECTED 0 +# define PR_SPEC_PRCTL (1UL << 0) +# define PR_SPEC_ENABLE (1UL << 1) +# define PR_SPEC_DISABLE (1UL << 2) +# define PR_SPEC_FORCE_DISABLE (1UL << 3) +# define PR_SPEC_DISABLE_NOEXEC (1UL << 4) + +/* Reset arm64 pointer authentication keys */ +#define PR_PAC_RESET_KEYS 54 +# define PR_PAC_APIAKEY (1UL << 0) +# define PR_PAC_APIBKEY (1UL << 1) +# define PR_PAC_APDAKEY (1UL << 2) +# define PR_PAC_APDBKEY (1UL << 3) +# define PR_PAC_APGAKEY (1UL << 4) + +/* Tagged user address controls for arm64 */ +#define PR_SET_TAGGED_ADDR_CTRL 55 +#define PR_GET_TAGGED_ADDR_CTRL 56 +# define PR_TAGGED_ADDR_ENABLE (1UL << 0) +/* MTE tag check fault modes */ +# define PR_MTE_TCF_NONE 0UL +# define PR_MTE_TCF_SYNC (1UL << 1) +# define PR_MTE_TCF_ASYNC (1UL << 2) +# define PR_MTE_TCF_MASK (PR_MTE_TCF_SYNC | PR_MTE_TCF_ASYNC) +/* MTE tag inclusion mask */ +# define PR_MTE_TAG_SHIFT 3 +# define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT) +/* Unused; kept only for source compatibility */ +# define PR_MTE_TCF_SHIFT 1 + +/* Control reclaim behavior when allocating memory */ +#define PR_SET_IO_FLUSHER 57 +#define PR_GET_IO_FLUSHER 58 + +/* Dispatch syscalls to a userspace handler */ +#define PR_SET_SYSCALL_USER_DISPATCH 59 +# define PR_SYS_DISPATCH_OFF 0 +# define PR_SYS_DISPATCH_ON 1 +/* The control values for the user space selector when dispatch is enabled */ +# define SYSCALL_DISPATCH_FILTER_ALLOW 0 +# define SYSCALL_DISPATCH_FILTER_BLOCK 1 + +/* Set/get enabled arm64 pointer authentication keys */ +#define PR_PAC_SET_ENABLED_KEYS 60 +#define PR_PAC_GET_ENABLED_KEYS 61 + +/* Request the scheduler to share a core */ +#define PR_SCHED_CORE 62 +# define PR_SCHED_CORE_GET 0 +# define PR_SCHED_CORE_CREATE 1/* create unique core_sched cookie */ +# define PR_SCHED_CORE_SHARE_TO 2/* push core_sched cookie to pid */ +# define PR_SCHED_CORE_SHARE_FROM 3/* pull core_sched cookie to pid */ +# define PR_SCHED_CORE_MAX 4 +# define PR_SCHED_CORE_SCOPE_THREAD 0 +# define PR_SCHED_CORE_SCOPE_THREAD_GROUP 1 +# define PR_SCHED_CORE_SCOPE_PROCESS_GROUP 2 + +/* arm64 Scalable Matrix Extension controls */ +/* Flag values must be in sync with SVE versions */ +#define PR_SME_SET_VL 63/* set task vector length */ +# define PR_SME_SET_VL_ONEXEC (1 << 18)/* defer effect until exec */ +#define PR_SME_GET_VL 64/* get task vector length */ +/* Bits common to PR_SME_SET_VL and PR_SME_GET_VL */ +# define PR_SME_VL_LEN_MASK 0xffff +# define PR_SME_VL_INHERIT (1 << 17)/* inherit across exec */ + +/* Memory deny write / execute */ +#define PR_SET_MDWE 65 +# define PR_MDWE_REFUSE_EXEC_GAIN (1UL << 0) +# define PR_MDWE_NO_INHERIT (1UL << 1) + +#define PR_GET_MDWE 66 + +#define PR_SET_VMA 0x53564d41 +# define PR_SET_VMA_ANON_NAME 0 + +#define PR_GET_AUXV 0x41555856 + +#define PR_SET_MEMORY_MERGE 67 +#define PR_GET_MEMORY_MERGE 68 + +#define PR_RISCV_V_SET_CONTROL 69 +#define PR_RISCV_V_GET_CONTROL 70 +# define PR_RISCV_V_VSTATE_CTRL_DEFAULT 0 +# define PR_RISCV_V_VSTATE_CTRL_OFF 1 +# define PR_RISCV_V_VSTATE_CTRL_ON 2 +# define PR_RISCV_V_VSTATE_CTRL_INHERIT (1 << 4) +# define PR_RISCV_V_VSTATE_CTRL_CUR_MASK 0x3 +# define PR_RISCV_V_VSTATE_CTRL_NEXT_MASK 0xc +# define PR_RISCV_V_VSTATE_CTRL_MASK 0x1f + +#define PR_RISCV_SET_ICACHE_FLUSH_CTX 71 +# define PR_RISCV_CTX_SW_FENCEI_ON 0 +# define PR_RISCV_CTX_SW_FENCEI_OFF 1 +# define PR_RISCV_SCOPE_PER_PROCESS 0 +# define PR_RISCV_SCOPE_PER_THREAD 1 + +/* PowerPC Dynamic Execution Control Register (DEXCR) controls */ +#define PR_PPC_GET_DEXCR 72 +#define PR_PPC_SET_DEXCR 73 +/* DEXCR aspect to act on */ +# define PR_PPC_DEXCR_SBHE 0/* Speculative branch hint enable */ +# define PR_PPC_DEXCR_IBRTPD 1/* Indirect branch recurrent target prediction disable */ +# define PR_PPC_DEXCR_SRAPD 2/* Subroutine return address prediction disable */ +# define PR_PPC_DEXCR_NPHIE 3/* Non-privileged hash instruction enable */ +/* Action to apply / return */ +# define PR_PPC_DEXCR_CTRL_EDITABLE 0x1/* Aspect can be modified with PR_PPC_SET_DEXCR */ +# define PR_PPC_DEXCR_CTRL_SET 0x2/* Set the aspect for this process */ +# define PR_PPC_DEXCR_CTRL_CLEAR 0x4/* Clear the aspect for this process */ +# define PR_PPC_DEXCR_CTRL_SET_ONEXEC 0x8/* Set the aspect on exec */ +# define PR_PPC_DEXCR_CTRL_CLEAR_ONEXEC 0x10/* Clear the aspect on exec */ +# define PR_PPC_DEXCR_CTRL_MASK 0x1f + +#endif /* _LINUX_PRCTL_H */
Signature · 1 line
2.45.2
Re: [PATCH v3 5/6] selftests/mm: kvm, mdwe fixes to avoid requiring "make headers"
Quoted 14 lines · John Hubbard
On Ubuntu 23.04, the kvm and mdwe selftests/mm build fails due to missing a few items that are found in
prctl.h. Here is an excerpt of the build failures:ksm_tests.c:252:13: error: use of undeclared identifier '
PR_SET_MEMORY_MERGE'
...
mdwe_test.c:26:18: error: use of undeclared identifier 'PR_SET_MDWE' mdwe_test.c:38:18: error: use of undeclared identifier 'PR_GET_MDWE'Fix these errors by adding a new
tools/include/uapi/linux/prctl.h. This file was created by running "make headers", and then copying a snapshot over from./usr/include/linux/prctl.h, as per the approach we settled on in [1].
Quoted 6 lines
[1] commit
e076eaca5906("selftests: break the dependency upon local header files")Cc David Hildenbrand <[email protected]>Signed-off-by John Hubbard <[email protected]>---
Signature · 3 lines
Cheers, David / dhildenb
PATCH v3 6/6 selftests/mm: remove local __NR_* definitions
In reply to John HubbardThis continues the work on getting the selftests to build without requiring people to first run "make headers" [1].
Now that the system call numbers are in the correct, checked-in locations in the kernel tree (./tools/include/uapi/asm/unistd*.h), make sure that the mm selftests include that file (indirectly).
Doing so provides guaranteed definitions at build time, so remove all of the checks for "ifdef __NR_xxx" in the mm selftests, because they will always be true (defined).
[1] commit e076eaca5906 ("selftests: break the dependency upon local header files")
--- tools/testing/selftests/mm/hugepage-mremap.c | 2 +- .../testing/selftests/mm/ksm_functional_tests.c | 8 +------- tools/testing/selftests/mm/memfd_secret.c | 14 +------------- tools/testing/selftests/mm/mkdirty.c | 8 +------- tools/testing/selftests/mm/mlock2.h | 1 + tools/testing/selftests/mm/pagemap_ioctl.c | 2 +- tools/testing/selftests/mm/protection_keys.c | 2 +- tools/testing/selftests/mm/uffd-common.c | 4 ---- tools/testing/selftests/mm/uffd-stress.c | 16 +--------------- tools/testing/selftests/mm/uffd-unit-tests.c | 14 +------------- 10 files changed, 9 insertions(+), 62 deletions(-)
tools/testing/selftests/mm/hugepage-mremap.c +1 -1
@@ -15,7 +15,7 @@#define _GNU_SOURCE#include <stdlib.h> #include <stdio.h> -#include <unistd.h> +#include <asm-generic/unistd.h> #include <sys/mman.h> #include <errno.h> #include <fcntl.h> /* Definition of O_* constants */
tools/testing/selftests/mm/ksm_functional_tests.c +1 -7
@@ -11,7 +11,7 @@#include <string.h> #include <stdbool.h> #include <stdint.h> -#include <unistd.h> +#include <asm-generic/unistd.h> #include <errno.h> #include <fcntl.h> #include <sys/mman.h>
@@ -369,7 +369,6 @@ static void test_unmerge_discarded(void)munmap (map, size); } -#ifdef __NR_userfaultfdstatic void test_unmerge_uffd_wp (void ) {struct uffdio_writeprotect uffd_writeprotect;
@@ -430,7 +429,6 @@ static void test_unmerge_uffd_wp(void) unmap:munmap (map, size); } -#endif /* Verify that KSM can be enabled / queried with prctl. */ static void test_prctl (void )
@@ -665,9 +663,7 @@ int main(int argc, char **argv)exit (test_child_ksm ()); } -#ifdef __NR_userfaultfd tests++; -#endif ksft_print_header ();ksft_set_plan (tests);
@@ -694,9 +690,7 @@ int main(int argc, char **argv)test_unmerge ();test_unmerge_zero_pages ();test_unmerge_discarded (); -#ifdef __NR_userfaultfdtest_unmerge_uffd_wp (); -#endif test_prot_none ();
tools/testing/selftests/mm/memfd_secret.c +1 -13
@@ -17,7 +17,7 @@#include <stdlib.h> #include <string.h> -#include <unistd.h> +#include <asm-generic/unistd.h> #include <errno.h> #include <stdio.h> #include <fcntl.h>
@@ -28,8 +28,6 @@#define pass (fmt, ...) ksft_test_result_pass(fmt, ##__VA_ARGS__)#define skip (fmt, ...) ksft_test_result_skip(fmt, ##__VA_ARGS__) -#ifdef __NR_memfd_secret -#define PATTERN 0x55static const int prot =PROT_READ |PROT_WRITE ;
@@ -334,13 +332,3 @@ int main(int argc, char *argv[])ksft_finished (); } - -#else /* __NR_memfd_secret */ - -int main (int argc,char *argv[]) -{ -printf ("skip: skipping memfd_secret test (missing __NR_memfd_secret)\n" ); -return KSFT_SKIP ; -} - -#endif /* __NR_memfd_secret */
tools/testing/selftests/mm/mkdirty.c +1 -7
@@ -9,7 +9,7 @@*/ #include <fcntl.h> #include <signal.h> -#include <unistd.h> +#include <asm-generic/unistd.h> #include <string.h> #include <errno.h> #include <stdlib.h>
@@ -265,7 +265,6 @@ static void test_pte_mapped_thp(void)munmap (mmap_mem, mmap_size); } -#ifdef __NR_userfaultfdstatic void test_uffdio_copy (void ) {struct uffdio_register uffdio_register;
@@ -322,7 +321,6 @@ static void test_uffdio_copy(void)munmap (dst, pagesize);free (src); } -#endif /* __NR_userfaultfd */ int main (void ) {
@@ -335,9 +333,7 @@ int main(void) thpsize / 1024); tests +=3 ; } -#ifdef __NR_userfaultfd tests +=1 ; -#endif /* __NR_userfaultfd */ ksft_print_header ();ksft_set_plan (tests);
@@ -367,9 +363,7 @@ int main(void)if (thpsize)test_pte_mapped_thp ();/* Placing a fresh page via userfaultfd may set the PTE dirty. */ -#ifdef __NR_userfaultfdtest_uffdio_copy (); -#endif /* __NR_userfaultfd */ err =ksft_get_fail_cnt ();if (err)
tools/testing/selftests/mm/mlock2.h +1 -0
@@ -3,6 +3,7 @@#include <errno.h> #include <stdio.h> #include <stdlib.h> +#include <asm-generic/unistd.h> static int mlock2_ (void *start,size_t len,int flags) {
tools/testing/selftests/mm/pagemap_ioctl.c +1 -1
@@ -15,7 +15,7 @@#include <sys/ioctl.h> #include <sys/stat.h> #include <math.h> -#include <asm/unistd.h> +#include <asm-generic/unistd.h> #include <pthread.h> #include <sys/resource.h> #include <assert.h>
tools/testing/selftests/mm/protection_keys.c +1 -1
@@ -42,7 +42,7 @@#include <sys/wait.h> #include <sys/stat.h> #include <fcntl.h> -#include <unistd.h> +#include <asm-generic/unistd.h> #include <sys/ptrace.h> #include <setjmp.h>
tools/testing/selftests/mm/uffd-common.c +0 -4
@@ -673,11 +673,7 @@ int uffd_open_dev(unsigned int flags)int uffd_open_sys (unsigned int flags) { -#ifdef __NR_userfaultfdreturn syscall (__NR_userfaultfd, flags); -#else -return -1 ; -#endif }int uffd_open (unsigned int flags)
tools/testing/selftests/mm/uffd-stress.c +1 -15
@@ -33,11 +33,9 @@* pthread_mutex_lock will also verify the atomicity of the memory * transfer (UFFDIO_COPY). */ - +#include <asm-generic/unistd.h> #include "uffd-common.h" -#ifdef __NR_userfaultfd -#define BOUNCE_RANDOM (1<<0)#define BOUNCE_RACINGFAULTS (1<<1)#define BOUNCE_VERIFY (1<<2)
@@ -466,15 +464,3 @@ int main(int argc, char **argv) nr_pages, nr_pages_per_cpu);return userfaultfd_stress (); } - -#else /* __NR_userfaultfd */ - -#warning "missing __NR_userfaultfd definition" - -int main (void ) -{ -printf ("skip: Skipping userfaultfd test (missing __NR_userfaultfd)\n" ); -return KSFT_SKIP ; -} - -#endif /* __NR_userfaultfd */
tools/testing/selftests/mm/uffd-unit-tests.c +1 -13
@@ -5,12 +5,11 @@* Copyright (C) 2015-2023 Red Hat, Inc. */ +#include <asm-generic/unistd.h> #include "uffd-common.h" #include "../../../../mm/gup_test.h" -#ifdef __NR_userfaultfd -/* The unit test doesn't need a large or random size, make it 32MB for now */ #define UFFD_TEST_MEM_SIZE (32UL << 20)
@@ -1554,14 +1553,3 @@ int main(int argc, char *argv[])return ksft_get_fail_cnt () ?KSFT_FAIL :KSFT_PASS ; } -#else /* __NR_userfaultfd */ - -#warning "missing __NR_userfaultfd definition" - -int main (void ) -{ -printf ("Skipping %s (missing __NR_userfaultfd)\n" , __file__); -return KSFT_SKIP ; -} - -#endif /* __NR_userfaultfd */
Signature · 1 line
2.45.2