From: David Hildenbrand <david@redhat.com>
To: ltp@lists.linux.it
Cc: David Hildenbrand <david@redhat.com>
Subject: [LTP] [PATCH v1 1/3] lapi/userfaultfd.h: Preparation for removing compile-time TCONF handling from userfaultfd testcases
Date: Mon, 28 Nov 2022 12:18:31 +0100 [thread overview]
Message-ID: <20221128111833.98937-2-david@redhat.com> (raw)
In-Reply-To: <20221128111833.98937-1-david@redhat.com>
Let's provide a minimal include/lapi/userfaultfd.h that contains the
initial userfaultfd uabi from v4.1, plus selected additions from other
releases relevant for the two testcases we have for now.
We can extend this header later as required, for example, once testcases
want to test userfaultfd-wp support.
Note that some dead code (#ifdef 0) and unnecessary definitions that keep
changing (UFFD_API_IOCTLS) were dropped from the v4.1 version.
Suggested-by: Martin Doucha <mdoucha@suse.cz>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
include/lapi/userfaultfd.h | 190 +++++++++++++++++++++++++++++++++++++
1 file changed, 190 insertions(+)
create mode 100644 include/lapi/userfaultfd.h
diff --git a/include/lapi/userfaultfd.h b/include/lapi/userfaultfd.h
new file mode 100644
index 000000000..4d52b7c4b
--- /dev/null
+++ b/include/lapi/userfaultfd.h
@@ -0,0 +1,190 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2007 Davide Libenzi <davidel@xmailserver.org>
+ * Copyright (C) 2015,2022 Red Hat, Inc.
+ *
+ * Mostly copied/adapted from <linux/userfaultfd.h>
+ */
+
+#ifndef LAPI_USERFAULTFD_H__
+#define LAPI_USERFAULTFD_H__
+
+#include <unistd.h>
+#include <sys/types.h>
+#include "lapi/syscalls.h"
+
+#ifdef HAVE_LINUX_USERFAULTFD_H
+#include <linux/userfaultfd.h>
+#endif
+
+/* userfaultfd support was added in v4.1 */
+#ifndef UFFD_API
+#define UFFD_API ((__u64)0xAA)
+
+/*
+ * Valid ioctl command number range with this API is from 0x00 to
+ * 0x3F. UFFDIO_API is the fixed number, everything else can be
+ * changed by implementing a different UFFD_API. If sticking to the
+ * same UFFD_API more ioctl can be added and userland will be aware of
+ * which ioctl the running kernel implements through the ioctl command
+ * bitmask written by the UFFDIO_API.
+ */
+#define _UFFDIO_REGISTER (0x00)
+#define _UFFDIO_UNREGISTER (0x01)
+#define _UFFDIO_WAKE (0x02)
+#define _UFFDIO_COPY (0x03)
+#define _UFFDIO_ZEROPAGE (0x04)
+#define _UFFDIO_API (0x3F)
+
+/* userfaultfd ioctl ids */
+#define UFFDIO 0xAA
+#define UFFDIO_API _IOWR(UFFDIO, _UFFDIO_API, \
+ struct uffdio_api)
+#define UFFDIO_REGISTER _IOWR(UFFDIO, _UFFDIO_REGISTER, \
+ struct uffdio_register)
+#define UFFDIO_UNREGISTER _IOR(UFFDIO, _UFFDIO_UNREGISTER, \
+ struct uffdio_range)
+#define UFFDIO_WAKE _IOR(UFFDIO, _UFFDIO_WAKE, \
+ struct uffdio_range)
+#define UFFDIO_COPY _IOWR(UFFDIO, _UFFDIO_COPY, \
+ struct uffdio_copy)
+#define UFFDIO_ZEROPAGE _IOWR(UFFDIO, _UFFDIO_ZEROPAGE, \
+ struct uffdio_zeropage)
+
+/* read() structure */
+struct uffd_msg {
+ __u8 event;
+
+ __u8 reserved1;
+ __u16 reserved2;
+ __u32 reserved3;
+
+ union {
+ struct {
+ __u64 flags;
+ __u64 address;
+ } pagefault;
+
+ struct {
+ /* unused reserved fields */
+ __u64 reserved1;
+ __u64 reserved2;
+ __u64 reserved3;
+ } reserved;
+ } arg;
+} __packed;
+
+/*
+ * Start at 0x12 and not at 0 to be more strict against bugs.
+ */
+#define UFFD_EVENT_PAGEFAULT 0x12
+
+/* flags for UFFD_EVENT_PAGEFAULT */
+#define UFFD_PAGEFAULT_FLAG_WRITE (1<<0) /* If this was a write fault */
+#define UFFD_PAGEFAULT_FLAG_WP (1<<1) /* If reason is VM_UFFD_WP */
+
+struct uffdio_api {
+ /* userland asks for an API number and the features to enable */
+ __u64 api;
+ /*
+ * Kernel answers below with the all available features for
+ * the API, this notifies userland of which events and/or
+ * which flags for each event are enabled in the current
+ * kernel.
+ *
+ * Note: UFFD_EVENT_PAGEFAULT and UFFD_PAGEFAULT_FLAG_WRITE
+ * are to be considered implicitly always enabled in all kernels as
+ * long as the uffdio_api.api requested matches UFFD_API.
+ */
+ __u64 features;
+
+ __u64 ioctls;
+};
+
+struct uffdio_range {
+ __u64 start;
+ __u64 len;
+};
+
+struct uffdio_register {
+ struct uffdio_range range;
+#define UFFDIO_REGISTER_MODE_MISSING ((__u64)1<<0)
+#define UFFDIO_REGISTER_MODE_WP ((__u64)1<<1)
+ __u64 mode;
+
+ /*
+ * kernel answers which ioctl commands are available for the
+ * range, keep at the end as the last 8 bytes aren't read.
+ */
+ __u64 ioctls;
+};
+
+struct uffdio_copy {
+ __u64 dst;
+ __u64 src;
+ __u64 len;
+ /*
+ * There will be a wrprotection flag later that allows to map
+ * pages wrprotected on the fly. And such a flag will be
+ * available if the wrprotection ioctl are implemented for the
+ * range according to the uffdio_register.ioctls.
+ */
+#define UFFDIO_COPY_MODE_DONTWAKE ((__u64)1<<0)
+ __u64 mode;
+
+ /*
+ * "copy" is written by the ioctl and must be at the end: the
+ * copy_from_user will not read the last 8 bytes.
+ */
+ __s64 copy;
+};
+
+struct uffdio_zeropage {
+ struct uffdio_range range;
+#define UFFDIO_ZEROPAGE_MODE_DONTWAKE ((__u64)1<<0)
+ __u64 mode;
+
+ /*
+ * "zeropage" is written by the ioctl and must be at the end:
+ * the copy_from_user will not read the last 8 bytes.
+ */
+ __s64 zeropage;
+};
+#endif /* UFFD_API */
+
+
+/* UFFD_USER_MODE_ONLY was added in v5.11 */
+#ifndef UFFD_USER_MODE_ONLY
+#define UFFD_USER_MODE_ONLY 1
+#endif /* UFFD_USER_MODE_ONLY */
+
+
+/* UFFD_PAGEFAULT_FLAG_MINOR and UFFDIO_CONTINUE were added in v5.13 */
+#ifndef UFFD_PAGEFAULT_FLAG_MINOR
+#define UFFD_FEATURE_MINOR_HUGETLBFS (1<<9)
+#define UFFDIO_REGISTER_MODE_MINOR ((__u64)1<<2)
+
+#define _UFFDIO_CONTINUE (0x07)
+#define UFFDIO_CONTINUE _IOWR(UFFDIO, _UFFDIO_CONTINUE, \
+ struct uffdio_continue)
+
+struct uffdio_continue {
+ struct uffdio_range range;
+#define UFFDIO_CONTINUE_MODE_DONTWAKE ((__u64)1<<0)
+ __u64 mode;
+
+ /*
+ * Fields below here are written by the ioctl and must be at the end:
+ * the copy_from_user will not read past here.
+ */
+ __s64 mapped;
+};
+#endif /* UFFD_PAGEFAULT_FLAG_MINOR */
+
+
+/* UFFD_FEATURE_MINOR_SHMEM was added in v5.14 */
+#ifndef UFFD_FEATURE_MINOR_SHMEM
+#define UFFD_FEATURE_MINOR_SHMEM (1<<10)
+#endif /* UFFD_FEATURE_MINOR_SHMEM */
+
+#endif /* LAPI_USERFAULTFD_H__ */
--
2.38.1
--
Mailing list info: https://lists.linux.it/listinfo/ltp
next prev parent reply other threads:[~2022-11-28 11:18 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-28 11:18 [LTP] [PATCH v1 0/3] userfaultfd: Fix and remove compile-time TCONF handling David Hildenbrand
2022-11-28 11:18 ` David Hildenbrand [this message]
2022-11-28 11:18 ` [LTP] [PATCH v1 2/3] security/dirtyc0w_shmem: Fix compile-time absence of UFFD_FEATURE_MINOR_SHMEM David Hildenbrand
2022-11-28 11:18 ` [LTP] [PATCH v1 3/3] syscalls/userfaultfd01: Remove compile-time TCONF handling David Hildenbrand
2022-11-28 11:57 ` [LTP] [PATCH v1 0/3] userfaultfd: Fix and remove " Petr Vorel
2022-11-28 12:29 ` Martin Doucha
2022-11-28 15:44 ` David Hildenbrand
2022-11-28 18:42 ` Petr Vorel
2022-11-29 8:29 ` Petr Vorel
2022-11-29 8:46 ` David Hildenbrand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221128111833.98937-2-david@redhat.com \
--to=david@redhat.com \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox