diff options
author | Lokesh Gidra <lokeshgidra@google.com> | 2022-02-25 17:14:13 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-25 17:14:13 +0000 |
commit | 85fdd8ebe9ccf1286ee9c092b9ae4cad1baa01ac (patch) | |
tree | acc053ece9dafdeb1977dccb7fc609716d86bfb2 | |
parent | f8ca01b17e9c1ca016183c6863e023c3d6347878 (diff) | |
parent | c2f3c6976a1b064810179e70351b67fa577fbc80 (diff) | |
download | x86_64-linux-glibc2.17-4.8-85fdd8ebe9ccf1286ee9c092b9ae4cad1baa01ac.tar.gz |
Add linux/userfaultfd.h header file to host glibc am: 9993489d1c am: e49b4b3477 am: 007101a451 am: c2f3c6976aaml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_ase_331311020aml_ase_331112000aml_ase_331011020android13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-appsearch-releaseaml_tz4_332714010
Original change: https://android-review.googlesource.com/c/platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8/+/1999534
Change-Id: If0081b37839684a5794e0d95723c12acb812404d
-rw-r--r-- | sysroot-patches/glibc-2.17-add-userfaultfd.patch | 147 | ||||
-rw-r--r-- | sysroot/usr/include/linux/userfaultfd.h | 141 |
2 files changed, 288 insertions, 0 deletions
diff --git a/sysroot-patches/glibc-2.17-add-userfaultfd.patch b/sysroot-patches/glibc-2.17-add-userfaultfd.patch new file mode 100644 index 0000000..fb3a19a --- /dev/null +++ b/sysroot-patches/glibc-2.17-add-userfaultfd.patch @@ -0,0 +1,147 @@ +diff --git a/sysroot/usr/include/linux/userfaultfd.h b/sysroot/usr/include/linux/userfaultfd.h +new file mode 100644 +index 0000000..ca7b7a5 +--- /dev/null ++++ b/sysroot/usr/include/linux/userfaultfd.h +@@ -0,0 +1,141 @@ ++/**************************************************************************** ++ **************************************************************************** ++ *** ++ *** This header was automatically generated from a Linux kernel header ++ *** of the same name, to make information necessary for userspace to ++ *** call into the kernel available to libc. It contains only constants, ++ *** structures, and macros generated from the original header, and thus, ++ *** contains no copyrightable information. ++ *** ++ *** To edit the content of this header, modify the corresponding ++ *** source file (e.g. under external/kernel-headers/original/) then ++ *** run bionic/libc/kernel/tools/update_all.py ++ *** ++ *** Any manual change here will be lost the next time this script will ++ *** be run. You've been warned! ++ *** ++ **************************************************************************** ++ ****************************************************************************/ ++#ifndef _LINUX_USERFAULTFD_H ++#define _LINUX_USERFAULTFD_H ++#include <linux/types.h> ++#define UFFD_API ((__u64) 0xAA) ++#define UFFD_API_REGISTER_MODES (UFFDIO_REGISTER_MODE_MISSING | UFFDIO_REGISTER_MODE_WP | UFFDIO_REGISTER_MODE_MINOR) ++#define UFFD_API_FEATURES (UFFD_FEATURE_PAGEFAULT_FLAG_WP | UFFD_FEATURE_EVENT_FORK | UFFD_FEATURE_EVENT_REMAP | UFFD_FEATURE_EVENT_REMOVE | UFFD_FEATURE_EVENT_UNMAP | UFFD_FEATURE_MISSING_HUGETLBFS | UFFD_FEATURE_MISSING_SHMEM | UFFD_FEATURE_SIGBUS | UFFD_FEATURE_THREAD_ID | UFFD_FEATURE_MINOR_HUGETLBFS | UFFD_FEATURE_MINOR_SHMEM) ++#define UFFD_API_IOCTLS ((__u64) 1 << _UFFDIO_REGISTER | (__u64) 1 << _UFFDIO_UNREGISTER | (__u64) 1 << _UFFDIO_API) ++#define UFFD_API_RANGE_IOCTLS ((__u64) 1 << _UFFDIO_WAKE | (__u64) 1 << _UFFDIO_COPY | (__u64) 1 << _UFFDIO_ZEROPAGE | (__u64) 1 << _UFFDIO_WRITEPROTECT | (__u64) 1 << _UFFDIO_CONTINUE) ++#define UFFD_API_RANGE_IOCTLS_BASIC ((__u64) 1 << _UFFDIO_WAKE | (__u64) 1 << _UFFDIO_COPY | (__u64) 1 << _UFFDIO_CONTINUE) ++#define _UFFDIO_REGISTER (0x00) ++#define _UFFDIO_UNREGISTER (0x01) ++#define _UFFDIO_WAKE (0x02) ++#define _UFFDIO_COPY (0x03) ++#define _UFFDIO_ZEROPAGE (0x04) ++#define _UFFDIO_WRITEPROTECT (0x06) ++#define _UFFDIO_CONTINUE (0x07) ++#define _UFFDIO_API (0x3F) ++#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) ++#define UFFDIO_WRITEPROTECT _IOWR(UFFDIO, _UFFDIO_WRITEPROTECT, struct uffdio_writeprotect) ++#define UFFDIO_CONTINUE _IOWR(UFFDIO, _UFFDIO_CONTINUE, struct uffdio_continue) ++struct uffd_msg { ++ __u8 event; ++ __u8 reserved1; ++ __u16 reserved2; ++ __u32 reserved3; ++ union { ++ struct { ++ __u64 flags; ++ __u64 address; ++ union { ++ __u32 ptid; ++ } feat; ++ } pagefault; ++ struct { ++ __u32 ufd; ++ } fork; ++ struct { ++ __u64 from; ++ __u64 to; ++ __u64 len; ++ } remap; ++ struct { ++ __u64 start; ++ __u64 end; ++ } remove; ++ struct { ++ __u64 reserved1; ++ __u64 reserved2; ++ __u64 reserved3; ++ } reserved; ++ } arg; ++} __packed; ++#define UFFD_EVENT_PAGEFAULT 0x12 ++#define UFFD_EVENT_FORK 0x13 ++#define UFFD_EVENT_REMAP 0x14 ++#define UFFD_EVENT_REMOVE 0x15 ++#define UFFD_EVENT_UNMAP 0x16 ++#define UFFD_PAGEFAULT_FLAG_WRITE (1 << 0) ++#define UFFD_PAGEFAULT_FLAG_WP (1 << 1) ++#define UFFD_PAGEFAULT_FLAG_MINOR (1 << 2) ++struct uffdio_api { ++ __u64 api; ++#define UFFD_FEATURE_PAGEFAULT_FLAG_WP (1 << 0) ++#define UFFD_FEATURE_EVENT_FORK (1 << 1) ++#define UFFD_FEATURE_EVENT_REMAP (1 << 2) ++#define UFFD_FEATURE_EVENT_REMOVE (1 << 3) ++#define UFFD_FEATURE_MISSING_HUGETLBFS (1 << 4) ++#define UFFD_FEATURE_MISSING_SHMEM (1 << 5) ++#define UFFD_FEATURE_EVENT_UNMAP (1 << 6) ++#define UFFD_FEATURE_SIGBUS (1 << 7) ++#define UFFD_FEATURE_THREAD_ID (1 << 8) ++#define UFFD_FEATURE_MINOR_HUGETLBFS (1 << 9) ++#define UFFD_FEATURE_MINOR_SHMEM (1 << 10) ++ __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) ++#define UFFDIO_REGISTER_MODE_MINOR ((__u64) 1 << 2) ++ __u64 mode; ++ __u64 ioctls; ++}; ++struct uffdio_copy { ++ __u64 dst; ++ __u64 src; ++ __u64 len; ++#define UFFDIO_COPY_MODE_DONTWAKE ((__u64) 1 << 0) ++#define UFFDIO_COPY_MODE_WP ((__u64) 1 << 1) ++ __u64 mode; ++ __s64 copy; ++}; ++struct uffdio_zeropage { ++ struct uffdio_range range; ++#define UFFDIO_ZEROPAGE_MODE_DONTWAKE ((__u64) 1 << 0) ++ __u64 mode; ++ __s64 zeropage; ++}; ++struct uffdio_writeprotect { ++ struct uffdio_range range; ++#define UFFDIO_WRITEPROTECT_MODE_WP ((__u64) 1 << 0) ++#define UFFDIO_WRITEPROTECT_MODE_DONTWAKE ((__u64) 1 << 1) ++ __u64 mode; ++}; ++struct uffdio_continue { ++ struct uffdio_range range; ++#define UFFDIO_CONTINUE_MODE_DONTWAKE ((__u64) 1 << 0) ++ __u64 mode; ++ __s64 mapped; ++}; ++#define UFFD_USER_MODE_ONLY 1 ++#endif diff --git a/sysroot/usr/include/linux/userfaultfd.h b/sysroot/usr/include/linux/userfaultfd.h new file mode 100644 index 0000000..ca7b7a5 --- /dev/null +++ b/sysroot/usr/include/linux/userfaultfd.h @@ -0,0 +1,141 @@ +/**************************************************************************** + **************************************************************************** + *** + *** This header was automatically generated from a Linux kernel header + *** of the same name, to make information necessary for userspace to + *** call into the kernel available to libc. It contains only constants, + *** structures, and macros generated from the original header, and thus, + *** contains no copyrightable information. + *** + *** To edit the content of this header, modify the corresponding + *** source file (e.g. under external/kernel-headers/original/) then + *** run bionic/libc/kernel/tools/update_all.py + *** + *** Any manual change here will be lost the next time this script will + *** be run. You've been warned! + *** + **************************************************************************** + ****************************************************************************/ +#ifndef _LINUX_USERFAULTFD_H +#define _LINUX_USERFAULTFD_H +#include <linux/types.h> +#define UFFD_API ((__u64) 0xAA) +#define UFFD_API_REGISTER_MODES (UFFDIO_REGISTER_MODE_MISSING | UFFDIO_REGISTER_MODE_WP | UFFDIO_REGISTER_MODE_MINOR) +#define UFFD_API_FEATURES (UFFD_FEATURE_PAGEFAULT_FLAG_WP | UFFD_FEATURE_EVENT_FORK | UFFD_FEATURE_EVENT_REMAP | UFFD_FEATURE_EVENT_REMOVE | UFFD_FEATURE_EVENT_UNMAP | UFFD_FEATURE_MISSING_HUGETLBFS | UFFD_FEATURE_MISSING_SHMEM | UFFD_FEATURE_SIGBUS | UFFD_FEATURE_THREAD_ID | UFFD_FEATURE_MINOR_HUGETLBFS | UFFD_FEATURE_MINOR_SHMEM) +#define UFFD_API_IOCTLS ((__u64) 1 << _UFFDIO_REGISTER | (__u64) 1 << _UFFDIO_UNREGISTER | (__u64) 1 << _UFFDIO_API) +#define UFFD_API_RANGE_IOCTLS ((__u64) 1 << _UFFDIO_WAKE | (__u64) 1 << _UFFDIO_COPY | (__u64) 1 << _UFFDIO_ZEROPAGE | (__u64) 1 << _UFFDIO_WRITEPROTECT | (__u64) 1 << _UFFDIO_CONTINUE) +#define UFFD_API_RANGE_IOCTLS_BASIC ((__u64) 1 << _UFFDIO_WAKE | (__u64) 1 << _UFFDIO_COPY | (__u64) 1 << _UFFDIO_CONTINUE) +#define _UFFDIO_REGISTER (0x00) +#define _UFFDIO_UNREGISTER (0x01) +#define _UFFDIO_WAKE (0x02) +#define _UFFDIO_COPY (0x03) +#define _UFFDIO_ZEROPAGE (0x04) +#define _UFFDIO_WRITEPROTECT (0x06) +#define _UFFDIO_CONTINUE (0x07) +#define _UFFDIO_API (0x3F) +#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) +#define UFFDIO_WRITEPROTECT _IOWR(UFFDIO, _UFFDIO_WRITEPROTECT, struct uffdio_writeprotect) +#define UFFDIO_CONTINUE _IOWR(UFFDIO, _UFFDIO_CONTINUE, struct uffdio_continue) +struct uffd_msg { + __u8 event; + __u8 reserved1; + __u16 reserved2; + __u32 reserved3; + union { + struct { + __u64 flags; + __u64 address; + union { + __u32 ptid; + } feat; + } pagefault; + struct { + __u32 ufd; + } fork; + struct { + __u64 from; + __u64 to; + __u64 len; + } remap; + struct { + __u64 start; + __u64 end; + } remove; + struct { + __u64 reserved1; + __u64 reserved2; + __u64 reserved3; + } reserved; + } arg; +} __packed; +#define UFFD_EVENT_PAGEFAULT 0x12 +#define UFFD_EVENT_FORK 0x13 +#define UFFD_EVENT_REMAP 0x14 +#define UFFD_EVENT_REMOVE 0x15 +#define UFFD_EVENT_UNMAP 0x16 +#define UFFD_PAGEFAULT_FLAG_WRITE (1 << 0) +#define UFFD_PAGEFAULT_FLAG_WP (1 << 1) +#define UFFD_PAGEFAULT_FLAG_MINOR (1 << 2) +struct uffdio_api { + __u64 api; +#define UFFD_FEATURE_PAGEFAULT_FLAG_WP (1 << 0) +#define UFFD_FEATURE_EVENT_FORK (1 << 1) +#define UFFD_FEATURE_EVENT_REMAP (1 << 2) +#define UFFD_FEATURE_EVENT_REMOVE (1 << 3) +#define UFFD_FEATURE_MISSING_HUGETLBFS (1 << 4) +#define UFFD_FEATURE_MISSING_SHMEM (1 << 5) +#define UFFD_FEATURE_EVENT_UNMAP (1 << 6) +#define UFFD_FEATURE_SIGBUS (1 << 7) +#define UFFD_FEATURE_THREAD_ID (1 << 8) +#define UFFD_FEATURE_MINOR_HUGETLBFS (1 << 9) +#define UFFD_FEATURE_MINOR_SHMEM (1 << 10) + __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) +#define UFFDIO_REGISTER_MODE_MINOR ((__u64) 1 << 2) + __u64 mode; + __u64 ioctls; +}; +struct uffdio_copy { + __u64 dst; + __u64 src; + __u64 len; +#define UFFDIO_COPY_MODE_DONTWAKE ((__u64) 1 << 0) +#define UFFDIO_COPY_MODE_WP ((__u64) 1 << 1) + __u64 mode; + __s64 copy; +}; +struct uffdio_zeropage { + struct uffdio_range range; +#define UFFDIO_ZEROPAGE_MODE_DONTWAKE ((__u64) 1 << 0) + __u64 mode; + __s64 zeropage; +}; +struct uffdio_writeprotect { + struct uffdio_range range; +#define UFFDIO_WRITEPROTECT_MODE_WP ((__u64) 1 << 0) +#define UFFDIO_WRITEPROTECT_MODE_DONTWAKE ((__u64) 1 << 1) + __u64 mode; +}; +struct uffdio_continue { + struct uffdio_range range; +#define UFFDIO_CONTINUE_MODE_DONTWAKE ((__u64) 1 << 0) + __u64 mode; + __s64 mapped; +}; +#define UFFD_USER_MODE_ONLY 1 +#endif |