| Message ID | 20240608021023.176027-2-jhubbard@nvidia.com |
|---|---|
| State | New |
| Headers | show |
| Series | cleanups, fixes, and progress towards avoiding "make headers" | expand |
Hi On Fri, Jun 7, 2024 at 7:10 PM John Hubbard <jhubbard@nvidia.com> wrote: > > 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, add __NR_mseal, to a new mseal_helpers.h file. That file is > small right now, but subsequent patches will add a lot more content to > it. > > [1] commit e076eaca5906 ("selftests: break the dependency upon local > header files") > > Fixes: 4926c7a52de7 ("selftest mm/mseal memory sealing") > Cc: Jeff Xu <jeffxu@chromium.org> > Signed-off-by: John Hubbard <jhubbard@nvidia.com> Reviewed-by: Jeff Xu <jeffxu@chromium.org> Tested-by: Jeff Xu <jeffxu@chromium.org> > --- > tools/testing/selftests/mm/mseal_helpers.h | 5 +++++ > tools/testing/selftests/mm/mseal_test.c | 1 + > tools/testing/selftests/mm/seal_elf.c | 1 + > 3 files changed, 7 insertions(+) > create mode 100644 tools/testing/selftests/mm/mseal_helpers.h > > diff --git a/tools/testing/selftests/mm/mseal_helpers.h b/tools/testing/selftests/mm/mseal_helpers.h > new file mode 100644 > index 000000000000..b922d453a014 > --- /dev/null > +++ b/tools/testing/selftests/mm/mseal_helpers.h > @@ -0,0 +1,5 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > + > +#ifndef __NR_mseal > +#define __NR_mseal 462 > +#endif > diff --git a/tools/testing/selftests/mm/mseal_test.c b/tools/testing/selftests/mm/mseal_test.c > index 41998cf1dcf5..20949617a036 100644 > --- a/tools/testing/selftests/mm/mseal_test.c > +++ b/tools/testing/selftests/mm/mseal_test.c > @@ -17,6 +17,7 @@ > #include <sys/ioctl.h> > #include <sys/vfs.h> > #include <sys/stat.h> > +#include "mseal_helpers.h" > > /* > * need those definition for manually build using gcc. > diff --git a/tools/testing/selftests/mm/seal_elf.c b/tools/testing/selftests/mm/seal_elf.c > index f2babec79bb6..4053951a535c 100644 > --- a/tools/testing/selftests/mm/seal_elf.c > +++ b/tools/testing/selftests/mm/seal_elf.c > @@ -16,6 +16,7 @@ > #include <sys/ioctl.h> > #include <sys/vfs.h> > #include <sys/stat.h> > +#include "mseal_helpers.h" > > /* > * need those definition for manually build using gcc. > -- > 2.45.2 >
diff --git a/tools/testing/selftests/mm/mseal_helpers.h b/tools/testing/selftests/mm/mseal_helpers.h new file mode 100644 index 000000000000..b922d453a014 --- /dev/null +++ b/tools/testing/selftests/mm/mseal_helpers.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __NR_mseal +#define __NR_mseal 462 +#endif diff --git a/tools/testing/selftests/mm/mseal_test.c b/tools/testing/selftests/mm/mseal_test.c index 41998cf1dcf5..20949617a036 100644 --- a/tools/testing/selftests/mm/mseal_test.c +++ b/tools/testing/selftests/mm/mseal_test.c @@ -17,6 +17,7 @@ #include <sys/ioctl.h> #include <sys/vfs.h> #include <sys/stat.h> +#include "mseal_helpers.h" /* * need those definition for manually build using gcc. diff --git a/tools/testing/selftests/mm/seal_elf.c b/tools/testing/selftests/mm/seal_elf.c index f2babec79bb6..4053951a535c 100644 --- a/tools/testing/selftests/mm/seal_elf.c +++ b/tools/testing/selftests/mm/seal_elf.c @@ -16,6 +16,7 @@ #include <sys/ioctl.h> #include <sys/vfs.h> #include <sys/stat.h> +#include "mseal_helpers.h" /* * need those definition for manually build using gcc.
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, add __NR_mseal, to a new mseal_helpers.h file. That file is small right now, but subsequent patches will add a lot more content to it. [1] commit e076eaca5906 ("selftests: break the dependency upon local header files") Fixes: 4926c7a52de7 ("selftest mm/mseal memory sealing") Cc: Jeff Xu <jeffxu@chromium.org> Signed-off-by: John Hubbard <jhubbard@nvidia.com> --- tools/testing/selftests/mm/mseal_helpers.h | 5 +++++ tools/testing/selftests/mm/mseal_test.c | 1 + tools/testing/selftests/mm/seal_elf.c | 1 + 3 files changed, 7 insertions(+) create mode 100644 tools/testing/selftests/mm/mseal_helpers.h