fuse tests are skipped if lklfuse is not found, assuming that fuse was
not enabled. Be more strict and check the host autoconf instead.
Signed-off-by: Octavian Purdila <tavip@google.com>
The previous filter accepted non-usb block devices, which resulted in
unexpected EFI partition mounts. Split the filter and check for
ENV{ID_BUS}!="usb". Tested on systemd-udevd 254 and 257 systems.
Signed-off-by: David Disseldorp <ddiss@suse.de>
lklfuse, fs2tar and cptofs were accidentally dropped from the default
build target via a typo in commit 6d360d164e ("lkl: link tests
against common private library").
The install target was still triggering progs-y builds, which is
probably why this took longer to notice than expected.
Fixes: 6d360d164e ("lkl: link tests against common private library")
Signed-off-by: David Disseldorp <ddiss@suse.de>
This effectively reverts commit 3c97822a40 ("lkl: add tests build
barrier"), replacing the tests .WAIT barrier with a common-object
prerequisite to keep parallel builds working.
Prerequisites are preferable to explicit .WAIT barriers, as they better
allow for build concurrency and also avoid install target breakage
described in the previous commit.
One minor drawback is that some of the test binaries don't use any
cla.o symbols, but get linked nevertheless. E.g. Before:
text data bss dec hex filename
7878818 4851995 885880 13616693 cfc635 tools/lkl/tests/boot
After:
text data bss dec hex filename
7880494 4852094 885856 13618444 cfcd0c tools/lkl/tests/boot
I don't see it as a problem, but if it is then we could split up the
prerequisites.
Signed-off-by: David Disseldorp <ddiss@suse.de>
This is a follow up change for commit 3c97822a40 ("lkl: add tests
build barrier") tracked via https://github.com/lkl/linux/issues/558.
The hijack and zpoline libraries also share object files, so need extra
logic to avoid parallel build failures.
Add a new intermediate libhijack-priv-in.o prerequisite for the hijack
libraries, avoiding the .WAIT target which breaks make libraries_install
on older (e.g. 4.2.1) versions of make.
The existing liblkl$(SOSUF) target is currently unmatched, so fix it and
use it as a linker target which omits libhijack-priv-in.o.
Signed-off-by: David Disseldorp <ddiss@suse.de>
The sleep appears to have been there since the initial tests were added.
It shouldn't be necessary so remove it.
Signed-off-by: David Disseldorp <ddiss@suse.de>
This tests that two lklfuse instances using the same lock file result
in a lock conflict (exit status 2) for the instance started last.
Signed-off-by: David Disseldorp <ddiss@suse.de>
Use an ID_FS_UUID based lock file to avoid duplicate mounts.
If udev doesn't provide an id then use a static noid path, ensuring lock
conflict with any other id-less mount.
Signed-off-by: David Disseldorp <ddiss@suse.de>
This lock-while-mounted behaviour is similar to what QEMU does, and can
help avoid duplicate mounts.
Allowing for an explicit lock path that differs from the filesystem
image / block device path was intentional, to ensure non-flock
supporting filesystems can still be used. Also, there are cases where
a block device and partition (e.g. sda and sda1) can both provide access
to the same filesystem image, in which case an FS-ID based lock would
make sense.
Signed-off-by: David Disseldorp <ddiss@suse.de>
HOST_CALL() uses a (*host_##name)() function pointer while callers
provide regular syscall parameters. With gcc -std=gnu23 this results in:
lib/hijack/hijack.c: In function ‘hijack_setsockopt’:
lib/hijack/hijack.c:176:24: error: too many arguments to function ‘host_setsockopt’; expected 0, have 5
176 | return host_setsockopt(fd, level, optname, optval, optlen);
| ^~~~~~~~~~~~~~~ ~~
Signed-off-by: David Disseldorp <ddiss@suse.de>
Grep for the kunit kasan group summary so that we can log the test +
fail count.
Use a common exit path to ensure log is always freed.
Signed-off-by: David Disseldorp <ddiss@suse.de>
CONFIG_KASAN_KUNIT_TEST is a kernel specific build option, so expose it
via the arch config.h instead of the tools-generated lkl_autoconf.h.
Both LKL_HOST_CONFIG_KASAN and LKL_HOST_CONFIG_KASAN_KUNIT_TEST are now
unused so can be removed.
Signed-off-by: David Disseldorp <ddiss@suse.de>
The existing t.fn(t->arg1, t->arg2, t->arg3) call can lead to build
failures:
tests/test.c: In function ‘lkl_test_run’:
tests/test.c:93:23: error: too many arguments to function ‘t->fn’;
expected 0, have 3
The parameters don't appear to be used, so can be removed.
Signed-off-by: David Disseldorp <ddiss@suse.de>
Can be converted to a man page via rst2man.
The empty lines in the OPTIONS section aren't ideal, but it's the
simplest way to get the rst2man output on separate lines.
Signed-off-by: David Disseldorp <ddiss@suse.de>
In preparation for adding more arch specific documentation.
Add an additional F: Documentation/lkl entry to MAINTAINERS.
Signed-off-by: David Disseldorp <ddiss@suse.de>
The previous mainline commit 1f737846aa3c4 ("mm/shmem: inline
shmem_is_huge() for disabled transparent hugepages") fixes the described
build failure, so leave the CONFIG_SHMEM setting up to the user (it's
enabled by default with MMU=y).
Signed-off-by: David Disseldorp <ddiss@suse.de>
In order to minimize code size (CONFIG_CC_OPTIMIZE_FOR_SIZE=y),
compiler might choose to make a regular function call (out-of-line) for
shmem_is_huge() instead of inlining it. When transparent hugepages are
disabled (CONFIG_TRANSPARENT_HUGEPAGE=n), it can cause compilation
error.
mm/shmem.c: In function `shmem_getattr':
./include/linux/huge_mm.h:383:27: note: in expansion of macro `BUILD_BUG'
383 | #define HPAGE_PMD_SIZE ({ BUILD_BUG(); 0; })
| ^~~~~~~~~
mm/shmem.c:1148:33: note: in expansion of macro `HPAGE_PMD_SIZE'
1148 | stat->blksize = HPAGE_PMD_SIZE;
To prevent the possible error, always inline shmem_is_huge() when
transparent hugepages are disabled.
Link: https://lkml.kernel.org/r/20240409155407.2322714-1-sumanthk@linux.ibm.com
Signed-off-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
Acked-by: David Hildenbrand <david@redhat.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Ilya Leoshkevich <iii@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
(cherry picked from commit 1f737846aa3c45f07a06fa0d018b39e1afb8084a)
The LKL_MEMORY_START=0x50000000 and LKL_TASK_UNMAPPED_BASE=0x100000
kernel config values set in Makefile.autoconf match the arch/lkl/Kconfig
defaults, so avoid explicitly setting them.
The corresponding LKL_HOST_CONFIG_LKL_MEMORY_START/_TASK_UNMAPPED_BASE
lkl_autoconf.h consts appear to be unused, so also drop them for now.
Signed-off-by: David Disseldorp <ddiss@suse.de>
OUTPUT_FORMAT is known within Kconfig, so we can use the same
"elf64-x86-64" specific logic when setting the defaults for
CONFIG_KASAN_SHADOW_OFFSET and CONFIG_KASAN_SHADOW_SIZE.
The LKL_HOST_CONFIG_KASAN_SHADOW_OFFSET/_SIZE autoconf variables appear
to be unused, so drop them for now. If necessary we could put them back
in arch/lkl/include/generated/uapi/asm/config.h .
Signed-off-by: David Disseldorp <ddiss@suse.de>
The LKL_HOST_MEMCPY, LKL_HOST_MEMSET and LKL_HOST_MEMMOVE kernel config
parameters are currently set via tools/lkl/Makefile.autoconf based on
whether OUTPUT_FORMAT starts with "elf64" or "elf32".
Use the same logic in arch/lkl/Kconfig to set the parameter defaults and
remove the corresponding Makefile.autoconf set_kernel_config calls.
Signed-off-by: David Disseldorp <ddiss@suse.de>
Makefile.autoconf::do_autoconf_fuzzing sets KCONFIG=fuzzing_defconfig so
appending CONFIG_LKL_FUZZING=y to .config via tools/lkl/kernel.config
shouldn't be necessary.
Signed-off-by: David Disseldorp <ddiss@suse.de>
The existing scripts work for GCC but restrict LLVM builds to
elf64-x86-64 only. The new cc-objdump-file-format.sh helper script works
with both gcc/clang and objdump/llvm-objdump for CC and OBJDUMP
respectively.
Signed-off-by: David Disseldorp <ddiss@suse.de>
Kconfig makes it relatively easy to set kernel config parameters based
on compiler settings, etc. So move some of the logic from
tools/lkl/Makefile.autoconf into arch/lkl/Kconfig .
Moving non-tools specific parameters out of Makefile.autoconf should
make it easier to build LKL as a standalone library.
Signed-off-by: David Disseldorp <ddiss@suse.de>
CONFIG_STACK_HASH_ORDER was removed via mainline kernel commit
f9987921cb ("lib/stackdepot: replace CONFIG_STACK_HASH_ORDER with
automatic sizing") at around the same time as this was added via
downstream LKL commit facd006081 ("lkl: add KASAN support").
The automatic sizing uses a minimum of 12, which matches the obsolete
setting.
Signed-off-by: David Disseldorp <ddiss@suse.de>
windows-2019 is being phased out for GH actions:
This is a scheduled Windows Server 2019 brownout. The Windows Server
2019 image will be removed on 2025-06-30. For more details, see
https://github.com/actions/runner-images/issues/12045
We should be able to migrate to windows-2025, but use 2022 for now to
avoid any major surprises. A list of image differences can be found at:
https://github.com/actions/runner-images/issues/3949
Signed-off-by: David Disseldorp <ddiss@suse.de>
arch/lkl/include/generated/uapi/asm/config.h is generated at build time
with any of:
#define LKL_CONFIG_64BIT 1
#define LKL_CONFIG_CPU_BIG_ENDIAN 1
based on the build environment.
Generation is handled by Makefiles under tools/lkl, where it is then
copied to arch/lkl/include/generated/uapi/asm/config.h prior to kernel
compilation.
This change simplifies header generation by doing it directly in the
arch/lkl parent Makefile. It also improves rebuild times by only
rewriting config.h if its contents would change.
Signed-off-by: David Disseldorp <ddiss@suse.de>
LKL's final kernel config is created by appending the
tools/lkl/Makefile.autoconf generated kernel.config to .config and
then calling "make ARCH=lkl olddefconfig".
With the existing config CPU_BIG_ENDIAN setting of "def_bool n", a
.config with CONFIG_CPU_BIG_ENDIAN=y appended will drop the
CONFIG_CPU_BIG_ENDIAN=y setting when "make ARCH=lkl olddefconfig" is
called.
This issue is resolved by changing config CPU_BIG_ENDIAN to:
bool "Big-endian kernel"
default n
Signed-off-by: David Disseldorp <ddiss@suse.de>
s390x detection is broken in that filters for "elf64-s390" using the '-'
trimmed EXEC_FMT variable.
Additionally, set_kernel_config_h is called with LKL_CONFIG_ENDIAN,
which doesn't match LKL_CONFIG_BIG_ENDIAN checked for in byteorder.h.
Change this to LKL_CONFIG_CPU_BIG_ENDIAN in preparation for removing
the redundant CONFIG_BIG_ENDIAN setting.
Fixes: 0d680a3d58 ("lkl: remove CONFIG_ leaks in uapi headers")
Signed-off-by: David Disseldorp <ddiss@suse.de>
LKL can work without network support. The current Kconfig forces all LKL
builds to enable CONFIG_NET, which is not necessary.
LKL tests may still expect such features to be enabled by default, so
this commit removes the selects in Kconfig, but specifies them as
enabled in defconfigs.
End users using defconfigs should not be affected by this patch, but end
users with their own configs or allnoconfig may benefit from this patch
by having a minified kernel image.
Signed-off-by: Ruihan Li <lrh2000@pku.edu.cn>
host_ops.gettid is not called anywhere except in a boot test. The boot
test just checks to see if gettid returns a non-zero tid, which makes no
sense.
I suspect host_ops.gettid was added for some historical reason, but it
can now be safely removed. This commit removes it as well as the silly
test.
Signed-off-by: Ruihan Li <lrh2000@pku.edu.cn>
The defconfig files should be created with make savedefconfig rather
than edited manually. This command will automatically remove unnecessary
comments in .config, identify the necessary configs that need to be
listed in the defconfig file, and sort the config options properly.
If we don't use it, the contents of the defconfig files can get messy
and hard to maintain.
This commit is created via the following commands:
make ARCH=lkl defconfig
make ARCH=lkl savedefconfig
mv defconfig arch/lkl/configs/defconfig
make ARCH=lkl fuzzing_defconfig
make ARCH=lkl savedefconfig
mv defconfig arch/lkl/configs/fuzzing_defconfig
Signed-off-by: Ruihan Li <lrh2000@pku.edu.cn>
