mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
Sean Christopherson
6d3790bc68
Include both linux/mman.h (the kernel provided version) and sys/mman.h (the
libc provided version) throughout KVM selftests, by way of kvm_syscalls.h
(which should have been including sys/mman.h anyways). Pulling in the
kernel's version fixes compilation errors with the guest_memfd test on
older versions of libc due to a recent commit adding MADV_COLLAPSE testing.
In file included from include/kvm_util.h:8,
from guest_memfd_test.c:21:
guest_memfd_test.c: In function ‘test_collapse’:
guest_memfd_test.c:219:47: error: ‘MADV_COLLAPSE’ undeclared (first use in this function); did you mean ‘MADV_COLD’?
219 | TEST_ASSERT_EQ(madvise(mem, pmd_size, MADV_COLLAPSE), -1);
| ^~~~~~~~~~~~~
include/test_util.h:62:16: note: in definition of macro ‘TEST_ASSERT_EQ’
62 | typeof(a) __a = (a); \
| ^
guest_memfd_test.c:219:47: note: each undeclared identifier is reported only once for each function it appears in
219 | TEST_ASSERT_EQ(madvise(mem, pmd_size, MADV_COLLAPSE), -1);
| ^~~~~~~~~~~~~
include/test_util.h:62:16: note: in definition of macro ‘TEST_ASSERT_EQ’
62 | typeof(a) __a = (a); \
| ^
Route the includes through kvm_syscalls.h to try and avoid a future game
of whack-a-mole, i.e. so that future expansion of test coverage doesn't run
into the same problem.
To discourage use of sys/mman.h, opportunistically include the kernel's
version of mman.h in test_util.h as it only needs MAP_SHARED, i.e. only
needs the full set of kernel defs, not the libc syscall wrappers.
Fixes: 9830209b4a ("KVM: selftests: Test MADV_COLLAPSE on guest_memfd")
Reported-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
Closes: https://lore.kernel.org/all/20260427204313.50741-1-rick.p.edgecombe@intel.com
Link: https://patch.msgid.link/20260428012503.1213654-1-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
93 lines
2.9 KiB
C
93 lines
2.9 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
#ifndef SELFTEST_KVM_SYSCALLS_H
|
|
#define SELFTEST_KVM_SYSCALLS_H
|
|
|
|
/*
|
|
* Include both the kernel and libc versions of mman.h. The kernel provides
|
|
* the most up-to-date flags and definitions, while libc provides the syscall
|
|
* wrappers tests expect.
|
|
*/
|
|
#include <linux/mman.h>
|
|
|
|
#include <sys/mman.h>
|
|
#include <sys/syscall.h>
|
|
|
|
#include <test_util.h>
|
|
|
|
#define MAP_ARGS0(m,...)
|
|
#define MAP_ARGS1(m,t,a,...) m(t,a)
|
|
#define MAP_ARGS2(m,t,a,...) m(t,a), MAP_ARGS1(m,__VA_ARGS__)
|
|
#define MAP_ARGS3(m,t,a,...) m(t,a), MAP_ARGS2(m,__VA_ARGS__)
|
|
#define MAP_ARGS4(m,t,a,...) m(t,a), MAP_ARGS3(m,__VA_ARGS__)
|
|
#define MAP_ARGS5(m,t,a,...) m(t,a), MAP_ARGS4(m,__VA_ARGS__)
|
|
#define MAP_ARGS6(m,t,a,...) m(t,a), MAP_ARGS5(m,__VA_ARGS__)
|
|
#define MAP_ARGS(n,...) MAP_ARGS##n(__VA_ARGS__)
|
|
|
|
#define __DECLARE_ARGS(t, a) t a
|
|
#define __UNPACK_ARGS(t, a) a
|
|
|
|
#define DECLARE_ARGS(nr_args, args...) MAP_ARGS(nr_args, __DECLARE_ARGS, args)
|
|
#define UNPACK_ARGS(nr_args, args...) MAP_ARGS(nr_args, __UNPACK_ARGS, args)
|
|
|
|
#define __KVM_SYSCALL_ERROR(_name, _ret) \
|
|
"%s failed, rc: %i errno: %i (%s)", (_name), (_ret), errno, strerror(errno)
|
|
|
|
/* Define a kvm_<syscall>() API to assert success. */
|
|
#define __KVM_SYSCALL_DEFINE(name, nr_args, args...) \
|
|
static inline void kvm_##name(DECLARE_ARGS(nr_args, args)) \
|
|
{ \
|
|
int r; \
|
|
\
|
|
r = name(UNPACK_ARGS(nr_args, args)); \
|
|
TEST_ASSERT(!r, __KVM_SYSCALL_ERROR(#name, r)); \
|
|
}
|
|
|
|
/*
|
|
* Macro to define syscall APIs, either because KVM selftests doesn't link to
|
|
* the standard library, e.g. libnuma, or because there is no library that yet
|
|
* provides the syscall. These
|
|
*/
|
|
#define KVM_SYSCALL_DEFINE(name, nr_args, args...) \
|
|
static inline long name(DECLARE_ARGS(nr_args, args)) \
|
|
{ \
|
|
return syscall(__NR_##name, UNPACK_ARGS(nr_args, args)); \
|
|
} \
|
|
__KVM_SYSCALL_DEFINE(name, nr_args, args)
|
|
|
|
/*
|
|
* Special case mmap(), as KVM selftest rarely/never specific an address,
|
|
* rarely specify an offset, and because the unique return code requires
|
|
* special handling anyways.
|
|
*/
|
|
static inline void *__kvm_mmap(size_t size, int prot, int flags, int fd,
|
|
off_t offset)
|
|
{
|
|
void *mem;
|
|
|
|
mem = mmap(NULL, size, prot, flags, fd, offset);
|
|
TEST_ASSERT(mem != MAP_FAILED, __KVM_SYSCALL_ERROR("mmap()",
|
|
(int)(unsigned long)MAP_FAILED));
|
|
return mem;
|
|
}
|
|
|
|
static inline void *kvm_mmap(size_t size, int prot, int flags, int fd)
|
|
{
|
|
return __kvm_mmap(size, prot, flags, fd, 0);
|
|
}
|
|
|
|
static inline int kvm_dup(int fd)
|
|
{
|
|
int new_fd = dup(fd);
|
|
|
|
TEST_ASSERT(new_fd >= 0, __KVM_SYSCALL_ERROR("dup()", new_fd));
|
|
return new_fd;
|
|
}
|
|
|
|
__KVM_SYSCALL_DEFINE(munmap, 2, void *, mem, size_t, size);
|
|
__KVM_SYSCALL_DEFINE(close, 1, int, fd);
|
|
__KVM_SYSCALL_DEFINE(fallocate, 4, int, fd, int, mode, loff_t, offset, loff_t, len);
|
|
__KVM_SYSCALL_DEFINE(ftruncate, 2, unsigned int, fd, off_t, length);
|
|
__KVM_SYSCALL_DEFINE(madvise, 3, void *, addr, size_t, length, int, advice);
|
|
|
|
#endif /* SELFTEST_KVM_SYSCALLS_H */
|