mm: introduce memfd_secret system call to create "secret" memory areas
Subsystems (13)
Mike Rapoport
maintainerv3 cover mm: introduce memfd_secret system call to create "secret" memory areas
From: Mike Rapoport <[email protected]>
Hi,
This is an implementation of "secret" mappings backed by a file descriptor.
v3 changes:
* Squash kernel-parameters.txt update into the commit that added the command line option.
* Make uncached mode explicitly selectable by architectures. For now enable it only on x86.
v2 changes:
* Follow Michael's suggestion and name the new system call 'memfd_secret'
* Add kernel-parameters documentation about the boot option
* Fix i386-tinyconfig regression reported by the kbuild bot. CONFIG_SECRETMEM now depends on !EMBEDDED to disable it on small systems from one side and still make it available unconditionally on architectures that support SET_DIRECT_MAP.
The file descriptor backing secret memory mappings is created using a dedicated memfd_secret system call The desired protection mode for the memory is configured using flags parameter of the system call. The mmap() of the file descriptor created with memfd_secret() will create a "secret" memory mapping. The pages in that mapping will be marked as not present in the direct map and will have desired protection bits set in the user page table. For instance, current implementation allows uncached mappings.
Although normally Linux userspace mappings are protected from other users, such secret mappings are useful for environments where a hostile tenant is trying to trick the kernel into giving them access to other tenants mappings.
Additionally, the secret mappings may be used as a mean to protect guest memory in a virtual machine host.
For demonstration of secret memory usage we've created a userspace library
[1] that does two things: the first is act as a preloader for openssl to redirect all the OPENSSL_malloc calls to secret memory meaning any secret keys get automatically protected this way and the other thing it does is expose the API to the user who needs it. We anticipate that a lot of the use cases would be like the openssl one: many toolkits that deal with secret keys already have special handling for the memory to try to give them greater protection, so this would simply be pluggable into the toolkits without any need for user application modification.
I've hesitated whether to continue to use new flags to memfd_create() or to add a new system call and I've decided to use a new system call after I've started to look into man pages update. There would have been two completely independent descriptions and I think it would have been very confusing.
Hiding secret memory mappings behind an anonymous file allows (ab)use of the page cache for tracking pages allocated for the "secret" mappings as well as using address_space_operations for e.g. page migration callbacks.
The anonymous file may be also used implicitly, like hugetlb files, to implement mmap(MAP_SECRET) and use the secret memory areas with "native" mm ABIs in the future.
As the fragmentation of the direct map was one of the major concerns raised during the previous postings, I've added an amortizing cache of PMD-size pages to each file descriptor and an ability to reserve large chunks of the physical memory at boot time and then use this memory as an allocation pool for the secret memory areas.
v2: https://lore.kernel.org/lkml/20200727162935.31714-1-rppt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
v1: https://lore.kernel.org/lkml/20200720092435.17469-1-rppt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org/
rfc-v2: https://lore.kernel.org/lkml/20200706172051.19465-1-rppt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org/
rfc-v1: https://lore.kernel.org/lkml/20200130162340.GA14232@rapoport-lnx/
Mike Rapoport (6):
mm: add definition of PMD_PAGE_ORDER
mmap: make mlock_future_check() global
mm: introduce memfd_secret system call to create "secret" memory areas arch, mm: wire up memfd_secret system call were relevant
mm: secretmem: use PMD-size pages to amortize direct map fragmentation
mm: secretmem: add ability to reserve memory at boot
arch/Kconfig | 7 + arch/arm64/include/asm/unistd.h | 2 +- arch/arm64/include/asm/unistd32.h | 2 + arch/arm64/include/uapi/asm/unistd.h | 1 + arch/riscv/include/asm/unistd.h | 1 + arch/x86/Kconfig | 1 + arch/x86/entry/syscalls/syscall_32.tbl | 1 + arch/x86/entry/syscalls/syscall_64.tbl | 1 + fs/dax.c | 10 +- include/linux/pgtable.h | 3 + include/linux/syscalls.h | 1 + include/uapi/asm-generic/unistd.h | 7 +- include/uapi/linux/magic.h | 1 + include/uapi/linux/secretmem.h | 9 + kernel/sys_ni.c | 2 + mm/Kconfig | 4 + mm/Makefile | 1 + mm/internal.h | 3 + mm/mmap.c | 5 +- mm/secretmem.c | 458 +++++++++++++++++++++++++ 20 files changed, 510 insertions(+), 10 deletions(-) create mode 100644 include/uapi/linux/secretmem.h create mode 100644 mm/secretmem.c
Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v3 4/6 arch, mm: wire up memfd_secret system call were relevant
From: Mike Rapoport <[email protected]>
Wire up memfd_secret system call on architectures that define ARCH_HAS_SET_DIRECT_MAP, namely arm64, risc-v and x86.
--- arch/arm64/include/asm/unistd.h | 2 +- arch/arm64/include/asm/unistd32.h | 2 ++ arch/arm64/include/uapi/asm/unistd.h | 1 + arch/riscv/include/asm/unistd.h | 1 + arch/x86/entry/syscalls/syscall_32.tbl | 1 + arch/x86/entry/syscalls/syscall_64.tbl | 1 + include/linux/syscalls.h | 1 + include/uapi/asm-generic/unistd.h | 7 ++++++- 8 files changed, 14 insertions(+), 2 deletions(-)
arch/arm64/include/asm/unistd.h +1 -1
@@ -38,7 +38,7 @@#define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE + 5)#define __ARM_NR_COMPAT_END (__ARM_NR_COMPAT_BASE + 0x800) -#define __NR_compat_syscalls 440 +#define __NR_compat_syscalls 441#endif #define __ARCH_WANT_SYS_CLONE
arch/arm64/include/asm/unistd32.h +2 -0
@@ -885,6 +885,8 @@ __SYSCALL(__NR_openat2, sys_openat2) __SYSCALL(__NR_pidfd_getfd, sys_pidfd_getfd)#define __NR_faccessat2 439 __SYSCALL(__NR_faccessat2, sys_faccessat2) +#define __NR_memfd_secret 440 +__SYSCALL (__NR_memfd_secret, sys_memfd_secret)/* * Please add new compat syscalls above this comment and update
arch/arm64/include/uapi/asm/unistd.h +1 -0
@@ -20,5 +20,6 @@#define __ARCH_WANT_SET_GET_RLIMIT#define __ARCH_WANT_TIME32_SYSCALLS#define __ARCH_WANT_SYS_CLONE3 +#define __ARCH_WANT_MEMFD_SECRET#include <asm-generic/unistd.h>
arch/riscv/include/asm/unistd.h +1 -0
@@ -9,6 +9,7 @@*/ #define __ARCH_WANT_SYS_CLONE +#define __ARCH_WANT_MEMFD_SECRET#include <uapi/asm/unistd.h>
arch/x86/entry/syscalls/syscall_32.tbl +1 -0
@@ -443,3 +443,4 @@ 437 i386 openat2 sys_openat2 438 i386 pidfd_getfd sys_pidfd_getfd 439 i386 faccessat2 sys_faccessat2 +440 i386 memfd_secret sys_memfd_secret
arch/x86/entry/syscalls/syscall_64.tbl +1 -0
@@ -360,6 +360,7 @@ 437 common openat2 sys_openat2 438 common pidfd_getfd sys_pidfd_getfd 439 common faccessat2 sys_faccessat2 +440 common memfd_secret sys_memfd_secret # # x32-specific system call numbers start at 512 to avoid cache impact
include/linux/syscalls.h +1 -0
@@ -1005,6 +1005,7 @@ asmlinkage long sys_pidfd_send_signal(int pidfd, int sig,siginfo_t __user *info, unsigned int flags);asmlinkage long sys_pidfd_getfd (int pidfd,int fd,unsigned int flags); +asmlinkage long sys_memfd_secret (unsigned long flags);/* * Architecture-specific system calls
include/uapi/asm-generic/unistd.h +6 -1
@@ -858,8 +858,13 @@ __SYSCALL(__NR_pidfd_getfd, sys_pidfd_getfd)#define __NR_faccessat2 439 __SYSCALL(__NR_faccessat2, sys_faccessat2) +#ifdef __ARCH_WANT_MEMFD_SECRET +#define __NR_memfd_secret 440 +__SYSCALL(__NR_memfd_secret, sys_memfd_secret) +#endif +#undef __NR_syscalls -#define __NR_syscalls 440 +#define __NR_syscalls 441/* * 32 bit systems traditionally used different
Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v3 6/6 mm: secretmem: add ability to reserve memory at boot
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
Taking pages out from the direct map and bringing them back may create undesired fragmentation and usage of the smaller pages in the direct mapping of the physical memory.
This can be avoided if a significantly large area of the physical memory would be reserved for secretmem purposes at boot time.
Add ability to reserve physical memory for secretmem at boot time using "secretmem" kernel parameter and then use that reserved memory as a global pool for secret memory needs.
--- mm/secretmem.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 126 insertions(+), 8 deletions(-)
mm/secretmem.c +126 -8
@@ -8,6 +8,7 @@#include <linux/pagemap.h> #include <linux/genalloc.h> #include <linux/syscalls.h> +#include <linux/memblock.h> #include <linux/pseudo_fs.h> #include <linux/set_memory.h> #include <linux/sched/signal.h>
@@ -35,6 +36,39 @@ struct secretmem_ctx {unsigned int mode; }; +struct secretmem_pool { +struct gen_pool *pool; +unsigned long reserved_size; +void *reserved; +}; + +static struct secretmem_pool secretmem_pool; + +static struct page *secretmem_alloc_huge_page (gfp_t gfp) +{ +struct gen_pool *pool = secretmem_pool.pool; +unsigned long addr =0 ; +struct page *page =NULL ; + +if (pool) { +if (gen_pool_avail (pool) <PMD_SIZE ) +return NULL ; + + addr =gen_pool_alloc (pool,PMD_SIZE ); +if (!addr) +return NULL ; + + page =virt_to_page (addr); + }else { + page =alloc_pages (gfp,PMD_PAGE_ORDER ); + +if (page) +split_page (page,PMD_PAGE_ORDER ); + } + +return page; +} +static int secretmem_pool_increase (struct secretmem_ctx *ctx,gfp_t gfp) {unsigned long nr_pages = (1 <<PMD_PAGE_ORDER );
@@ -43,12 +77,11 @@ static int secretmem_pool_increase(struct secretmem_ctx *ctx, gfp_t gfp)struct page *page;int err; - page =alloc_pages (gfp,PMD_PAGE_ORDER ); + page =secretmem_alloc_huge_page (gfp);if (!page)return -ENOMEM ; addr = (unsigned long )page_address (page); -split_page (page,PMD_PAGE_ORDER ); err =gen_pool_add (pool, addr,PMD_SIZE ,NUMA_NO_NODE );if (err) {
@@ -274,11 +307,13 @@ SYSCALL_DEFINE1(memfd_secret, unsigned long, flags)return err; } -static void secretmem_cleanup_chunk (struct gen_pool *pool, -struct gen_pool_chunk *chunk,void *data) +static void secretmem_recycle_range (unsigned long start,unsigned long end) +{ +gen_pool_free (secretmem_pool.pool, start,PMD_SIZE ); +} + +static void secretmem_release_range (unsigned long start,unsigned long end) { -unsigned long start = chunk->start_addr; -unsigned long end = chunk->end_addr;unsigned long nr_pages, addr; nr_pages = (end - start +1 ) /PAGE_SIZE ;
@@ -288,6 +323,18 @@ static void secretmem_cleanup_chunk(struct gen_pool *pool,put_page (virt_to_page (addr)); } +static void secretmem_cleanup_chunk (struct gen_pool *pool, +struct gen_pool_chunk *chunk,void *data) +{ +unsigned long start = chunk->start_addr; +unsigned long end = chunk->end_addr; + +if (secretmem_pool.pool) +secretmem_recycle_range (start, end); +else +secretmem_release_range (start, end); +} +static void secretmem_cleanup_pool (struct secretmem_ctx *ctx) {struct gen_pool *pool = ctx->pool;
@@ -327,14 +374,85 @@ static struct file_system_type secretmem_fs = { .kill_sb = kill_anon_super, }; +static int secretmem_reserved_mem_init (void ) +{ +struct gen_pool *pool; +struct page *page; +void *addr; +int err; + +if (!secretmem_pool.reserved) +return 0 ; + + pool =gen_pool_create (PMD_SHIFT ,NUMA_NO_NODE ); +if (!pool) +return -ENOMEM ; + + err =gen_pool_add (pool, (unsigned long )secretmem_pool.reserved, + secretmem_pool.reserved_size,NUMA_NO_NODE ); +if (err) + goto err_destroy_pool; + +for (addr = secretmem_pool.reserved; + addr < secretmem_pool.reserved + secretmem_pool.reserved_size; + addr +=PAGE_SIZE ) { + page =virt_to_page (addr); +__ClearPageReserved (page); +set_page_count (page,1 ); + } + + secretmem_pool.pool = pool; + page =virt_to_page (secretmem_pool.reserved); +__kernel_map_pages (page, secretmem_pool.reserved_size /PAGE_SIZE ,0 ); +return 0 ; + +err_destroy_pool: +gen_pool_destroy (pool); +return err; +} +static int secretmem_init (void ) { -int ret =0 ; +int ret; + + ret =secretmem_reserved_mem_init (); +if (ret) +return ret; secretmem_mnt =kern_mount (&secretmem_fs); -if (IS_ERR (secretmem_mnt)) +if (IS_ERR (secretmem_mnt)) { +gen_pool_destroy (secretmem_pool.pool); ret =PTR_ERR (secretmem_mnt); + }return ret; }fs_initcall (secretmem_init); + +static int __init secretmem_setup (char *str) +{ +phys_addr_t align =PMD_SIZE ; +unsigned long reserved_size; +void *reserved; + + reserved_size =memparse (str,NULL ); +if (!reserved_size) +return 0 ; + +if (reserved_size *2 >PUD_SIZE ) + align =PUD_SIZE ; + + reserved =memblock_alloc (reserved_size, align); +if (!reserved) { +pr_err ("failed to reserve %lu bytes\n" , secretmem_pool.reserved_size); +return 0 ; + } + + secretmem_pool.reserved_size = reserved_size; + secretmem_pool.reserved = reserved; + +pr_info ("reserved %luM\n" , reserved_size >>20 ); + +return 1 ; +} +__setup ("secretmem=" , secretmem_setup);
Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v3 1/6 mm: add definition of PMD_PAGE_ORDER
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
The definition of PMD_PAGE_ORDER denoting the number of base pages in the second-level leaf page is already used by DAX and maybe handy in other cases as well.
Several architectures already have definition of PMD_ORDER as the size of second level page table, so to avoid conflict with these definitions use PMD_PAGE_ORDER name and update DAX respectively.
--- fs/dax.c | 10 +++++----- include/linux/pgtable.h | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-)
fs/dax.c +5 -5
@@ -50,7 +50,7 @@ static inline unsigned int pe_order(enum page_entry_size pe_size)#define PG_PMD_NR (PMD_SIZE >> PAGE_SHIFT)/* The order of a PMD entry */ -#define PMD_ORDER (PMD_SHIFT - PAGE_SHIFT) +#define PMD_PAGE_ORDER (PMD_SHIFT - PAGE_SHIFT)static wait_queue_head_t wait_table[DAX_WAIT_TABLE_ENTRIES ];
@@ -98,7 +98,7 @@ static bool dax_is_locked(void *entry)static unsigned int dax_entry_order (void *entry) {if (xa_to_value (entry) &DAX_PMD ) -return PMD_ORDER ; +return PMD_PAGE_ORDER ;return 0 ; }
@@ -1456,7 +1456,7 @@ static vm_fault_t dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp, {struct vm_area_struct *vma = vmf->vma;struct address_space *mapping = vma->vm_file->f_mapping; -XA_STATE_ORDER (xas, &mapping->i_pages, vmf->pgoff,PMD_ORDER ); +XA_STATE_ORDER (xas, &mapping->i_pages, vmf->pgoff,PMD_PAGE_ORDER );unsigned long pmd_addr = vmf->address &PMD_MASK ;bool write = vmf->flags &FAULT_FLAG_WRITE ;bool sync;
@@ -1515,7 +1515,7 @@ static vm_fault_t dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp,* entry is already in the array, for instance), it will return * VM_FAULT_FALLBACK. */ - entry =grab_mapping_entry (&xas, mapping,PMD_ORDER ); + entry =grab_mapping_entry (&xas, mapping,PMD_PAGE_ORDER );if (xa_is_internal (entry)) { result =xa_to_internal (entry); goto fallback;
@@ -1681,7 +1681,7 @@ dax_insert_pfn_mkwrite(struct vm_fault *vmf, pfn_t pfn, unsigned int order)if (order ==0 ) ret =vmf_insert_mixed_mkwrite (vmf->vma, vmf->address, pfn);#ifdef CONFIG_FS_DAX_PMD - else if (order == PMD_ORDER) + else if (order == PMD_PAGE_ORDER) ret =vmf_insert_pfn_pmd (vmf, pfn,FAULT_FLAG_WRITE );#endif else
include/linux/pgtable.h +3 -0
@@ -28,6 +28,9 @@#define USER_PGTABLES_CEILING 0UL#endif +/* Number of base pages in a second level leaf page */ +#define PMD_PAGE_ORDER (PMD_SHIFT - PAGE_SHIFT) +/* * A page table page can be thought of an array like this: pXd_t[PTRS_PER_PxD] *
Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v3 2/6 mmap: make mlock_future_check() global
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
It will be used by the upcoming secret memory implementation.
--- mm/internal.h | 3 +++ mm/mmap.c | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-)
mm/internal.h +3 -0
@@ -349,6 +349,9 @@ static inline void munlock_vma_pages_all(struct vm_area_struct *vma)extern void mlock_vma_page (struct page *page);extern unsigned int munlock_vma_page (struct page *page); +extern int mlock_future_check (struct mm_struct *mm,unsigned long flags, +unsigned long len); +/* * Clear the page's PageMlocked(). This can be useful in a situation where * we want to unconditionally remove a page from the pagecache -- e.g.,
mm/mmap.c +2 -3
@@ -1310,9 +1310,8 @@ static inline unsigned long round_hint_to_min(unsigned long hint)return hint; } -static inline int mlock_future_check (struct mm_struct *mm, -unsigned long flags, -unsigned long len) +int mlock_future_check (struct mm_struct *mm,unsigned long flags, +unsigned long len) {unsigned long locked, lock_limit;
Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v3 3/6 mm: introduce memfd_secret system call to create "secret" memory areas
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
Introduce "memfd_secret" system call with the ability to create memory areas visible only in the context of the owning process and not mapped not only to other processes but in the kernel page tables as well.
The user will create a file descriptor using the memfd_secret() system call where flags supplied as a parameter to this system call will define the desired protection mode for the memory associated with that file descriptor. Currently there are two protection modes:
* exclusive - the memory area is unmapped from the kernel direct map and it is present only in the page tables of the owning mm.
* uncached - the memory area is present only in the page tables of the owning mm and it is mapped there as uncached.
For instance, the following example will create an uncached mapping (error handling is omitted):
fd = memfd_secret(SECRETMEM_UNCACHED); ftruncate(fd, MAP_SIZE); ptr = mmap(NULL, MAP_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
--- arch/Kconfig | 7 + arch/x86/Kconfig | 1 + include/uapi/linux/magic.h | 1 + include/uapi/linux/secretmem.h | 9 ++ kernel/sys_ni.c | 2 + mm/Kconfig | 4 + mm/Makefile | 1 + mm/secretmem.c | 271 +++++++++++++++++++++++++++++++++ 8 files changed, 296 insertions(+) create mode 100644 include/uapi/linux/secretmem.h create mode 100644 mm/secretmem.c
arch/Kconfig +7 -0
@@ -979,6 +979,13 @@ config HAVE_SPARSE_SYSCALL_NR entries at 4000, 5000 and 6000 locations. This option turns on syscall related optimizations for a given architecture. +config HAVE_SECRETMEM_UNCACHED + bool + help + An architecture can select this if its semantics of non-cached + mappings can be used to prevent speculative loads and it is + useful for secret protection. + source "kernel/gcov/Kconfig" source "scripts/gcc-plugins/Kconfig"
arch/x86/Kconfig +1 -0
@@ -218,6 +218,7 @@ config X86 select HAVE_UNSTABLE_SCHED_CLOCK select HAVE_USER_RETURN_NOTIFIER select HAVE_GENERIC_VDSO + select HAVE_SECRETMEM_UNCACHED select HOTPLUG_SMT if SMP select IRQ_FORCED_THREADING select NEED_SG_DMA_LENGTH
include/uapi/linux/magic.h +1 -0
@@ -97,5 +97,6 @@#define DEVMEM_MAGIC 0x454d444d/* "DMEM" */ #define Z3FOLD_MAGIC 0x33#define PPC_CMM_MAGIC 0xc7571590 +#define SECRETMEM_MAGIC 0x5345434d/* "SECM" */ #endif /* __LINUX_MAGIC_H__ */
include/uapi/linux/secretmem.h new file +9 -0
@@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef _UAPI_LINUX_SECRERTMEM_H +#define _UAPI_LINUX_SECRERTMEM_H + +/* secretmem operation modes */ +#define SECRETMEM_EXCLUSIVE 0x1 +#define SECRETMEM_UNCACHED 0x2 + +#endif /* _UAPI_LINUX_SECRERTMEM_H */
kernel/sys_ni.c +2 -0
@@ -349,6 +349,8 @@ COND_SYSCALL(pkey_mprotect);COND_SYSCALL (pkey_alloc);COND_SYSCALL (pkey_free); +/* memfd_secret */ +COND_SYSCALL (memfd_secret);/* * Architecture specific weak syscall entries.
mm/Kconfig +4 -0
@@ -872,4 +872,8 @@ config ARCH_HAS_HUGEPD config MAPPING_DIRTY_HELPERS bool +config SECRETMEM + def_bool ARCH_HAS_SET_DIRECT_MAP && !EMBEDDED + select GENERIC_ALLOCATOR + endmenu
mm/Makefile +1 -0
@@ -121,3 +121,4 @@ obj-$(CONFIG_MEMFD_CREATE) += memfd.o obj-$(CONFIG_MAPPING_DIRTY_HELPERS) += mapping_dirty_helpers.o obj-$(CONFIG_PTDUMP_CORE) += ptdump.o obj-$(CONFIG_PAGE_REPORTING) += page_reporting.o +obj-$(CONFIG_SECRETMEM) += secretmem.o
mm/secretmem.c new file +271 -0
271 lines not on this page · raw message
Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v3 5/6 mm: secretmem: use PMD-size pages to amortize direct map fragmentation
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
Removing a PAGE_SIZE page from the direct map every time such page is allocated for a secret memory mapping will cause severe fragmentation of the direct map. This fragmentation can be reduced by using PMD-size pages as a pool for small pages for secret memory mappings.
Add a gen_pool per secretmem inode and lazily populate this pool with PMD-size pages.
--- mm/secretmem.c | 107 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 88 insertions(+), 19 deletions(-)
mm/secretmem.c +88 -19
@@ -6,6 +6,7 @@#include <linux/bitops.h> #include <linux/printk.h> #include <linux/pagemap.h> +#include <linux/genalloc.h> #include <linux/syscalls.h> #include <linux/pseudo_fs.h> #include <linux/set_memory.h>
@@ -30,24 +31,66 @@#define SECRETMEM_FLAGS_MASK SECRETMEM_MODE_MASKstruct secretmem_ctx { +struct gen_pool *pool;unsigned int mode; }; -static struct page *secretmem_alloc_page (gfp_t gfp) +static int secretmem_pool_increase (struct secretmem_ctx *ctx,gfp_t gfp) { -/* -* FIXME: use a cache of large pages to reduce the direct map -* fragmentation -*/ -return alloc_page (gfp); +unsigned long nr_pages = (1 <<PMD_PAGE_ORDER ); +struct gen_pool *pool = ctx->pool; +unsigned long addr; +struct page *page; +int err; + + page =alloc_pages (gfp,PMD_PAGE_ORDER ); +if (!page) +return -ENOMEM ; + + addr = (unsigned long )page_address (page); +split_page (page,PMD_PAGE_ORDER ); + + err =gen_pool_add (pool, addr,PMD_SIZE ,NUMA_NO_NODE ); +if (err) { +__free_pages (page,PMD_PAGE_ORDER ); +return err; + } + +__kernel_map_pages (page, nr_pages,0 ); + +return 0 ; +} + +static struct page *secretmem_alloc_page (struct secretmem_ctx *ctx, +gfp_t gfp) +{ +struct gen_pool *pool = ctx->pool; +unsigned long addr; +struct page *page; +int err; + +if (gen_pool_avail (pool) <PAGE_SIZE ) { + err =secretmem_pool_increase (ctx, gfp); +if (err) +return NULL ; + } + + addr =gen_pool_alloc (pool,PAGE_SIZE ); +if (!addr) +return NULL ; + + page =virt_to_page (addr); +get_page (page); + +return page; }static vm_fault_t secretmem_fault (struct vm_fault *vmf) { +struct secretmem_ctx *ctx = vmf->vma->vm_file->private_data;struct address_space *mapping = vmf->vma->vm_file->f_mapping;struct inode *inode =file_inode (vmf->vma->vm_file);pgoff_t offset = vmf->pgoff; -unsigned long addr;struct page *page;int ret =0 ;
@@ -56,7 +99,7 @@ static vm_fault_t secretmem_fault(struct vm_fault *vmf) page =find_get_entry (mapping, offset);if (!page) { - page =secretmem_alloc_page (vmf->gfp_mask); + page =secretmem_alloc_page (ctx, vmf->gfp_mask);if (!page)return vmf_error (-ENOMEM );
@@ -64,14 +107,8 @@ static vm_fault_t secretmem_fault(struct vm_fault *vmf)if (unlikely (ret)) goto err_put_page; - ret =set_direct_map_invalid_noflush (page); -if (ret) - goto err_del_page_cache; - - addr = (unsigned long )page_address (page); -flush_tlb_kernel_range (addr, addr +PAGE_SIZE ); -__SetPageUptodate (page); +set_page_private (page, (unsigned long )ctx); ret =VM_FAULT_LOCKED ; }
@@ -79,8 +116,6 @@ static vm_fault_t secretmem_fault(struct vm_fault *vmf) vmf->page = page;return ret; -err_del_page_cache: -delete_from_page_cache (page); err_put_page:put_page (page);return vmf_error (ret);
@@ -139,7 +174,11 @@ static int secretmem_migratepage(struct address_space *mapping,static void secretmem_freepage (struct page *page) { -set_direct_map_default_noflush (page); +unsigned long addr = (unsigned long )page_address (page); +struct secretmem_ctx *ctx = (struct secretmem_ctx *)page_private (page); +struct gen_pool *pool = ctx->pool; + +gen_pool_free (pool, addr,PAGE_SIZE ); }static const struct address_space_operations secretmem_aops = {
@@ -164,13 +203,18 @@ static struct file *secretmem_file_create(unsigned long flags)if (!ctx) goto err_free_inode; + ctx->pool =gen_pool_create (PAGE_SHIFT ,NUMA_NO_NODE ); +if (!ctx->pool) + goto err_free_ctx; + file =alloc_file_pseudo (inode, secretmem_mnt,"secretmem" ,O_RDWR , &secretmem_fops);if (IS_ERR (file)) - goto err_free_ctx; + goto err_free_pool;mapping_set_unevictable (inode->i_mapping); + inode->i_private = ctx; inode->i_mapping->private_data = ctx; inode->i_mapping->a_ops = &secretmem_aops;
@@ -184,6 +228,8 @@ static struct file *secretmem_file_create(unsigned long flags)return file; +err_free_pool: +gen_pool_destroy (ctx->pool); err_free_ctx:kfree (ctx); err_free_inode:
@@ -228,11 +274,34 @@ SYSCALL_DEFINE1(memfd_secret, unsigned long, flags)return err; } +static void secretmem_cleanup_chunk (struct gen_pool *pool, +struct gen_pool_chunk *chunk,void *data) +{ +unsigned long start = chunk->start_addr; +unsigned long end = chunk->end_addr; +unsigned long nr_pages, addr; + + nr_pages = (end - start +1 ) /PAGE_SIZE ; +__kernel_map_pages (virt_to_page (start), nr_pages,1 ); + +for (addr = start; addr < end; addr +=PAGE_SIZE ) +put_page (virt_to_page (addr)); +} + +static void secretmem_cleanup_pool (struct secretmem_ctx *ctx) +{ +struct gen_pool *pool = ctx->pool; + +gen_pool_for_each_chunk (pool, secretmem_cleanup_chunk, ctx); +gen_pool_destroy (pool); +} +static void secretmem_evict_inode (struct inode *inode) {struct secretmem_ctx *ctx = inode->i_private;truncate_inode_pages_final (&inode->i_data); +secretmem_cleanup_pool (ctx);clear_inode (inode);kfree (ctx); }
Signature · 1 line
2.26.2
mm/Kconfig config ARCH_HAS_HUGEPD · line 876
Quoted 10 lines · Mike Rapoport
mm/Kconfig +2
-0@@ -872,4 +872,8 @@ config ARCH_HAS_HUGEPD config MAPPING_DIRTY_HELPERS bool +config SECRETMEM + def_bool ARCH_HAS_SET_DIRECT_MAP && !EMBEDDED
use tab above, not spaces.
Quoted 3 lines
mm/Kconfig +2
-0+ select GENERIC_ALLOCATOR + endmenu
Signature · 1 line
~Randy
Re: [PATCH v3 1/6] mm: add definition of PMD_PAGE_ORDER
In reply to Mike RapoportQuoted 21 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
The definition of
PMD_PAGE_ORDERdenoting the number of base pages in the second-level leaf page is already used by DAX and maybe handy in other cases as well.Several architectures already have definition of
PMD_ORDERas the size of second level page table, so to avoid conflict with these definitions usePMD_PAGE_ORDERname and update DAX respectively.Signed-off-by Mike Rapoport <[email protected]>--- fs/dax.c | 10 +++++----- include/linux/pgtable.h | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-)fs/dax.c +0
-0
fs/dax.c static inline unsigned int pe_order(enum page_entry_size pe_size) · line 53
Quoted 5 lines
fs/dax.c +1
-1@@ -50,7 +50,7 @@ static inline unsigned int pe_order(enum page_entry_size pe_size)#define PG_PMD_NR (PMD_SIZE >> PAGE_SHIFT)/* The order of a PMD entry */ -#define PMD_ORDER (PMD_SHIFT - PAGE_SHIFT) +#define PMD_PAGE_ORDER (PMD_SHIFT - PAGE_SHIFT)
Hm. Wouldn't it conflict with definition in pgtable.h? Or should we include it instead?
Quoted 14 lines
include/linux/pgtable.h +3
-0@@ -28,6 +28,9 @@#define USER_PGTABLES_CEILING 0UL#endif +/* Number of base pages in a second level leaf page */ +#define PMD_PAGE_ORDER (PMD_SHIFT - PAGE_SHIFT) +/* * A page table page can be thought of an array like this: pXd_t[PTRS_PER_PxD] *
Signature · 1 line
Kirill A. Shutemov
Quoted 11 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
Introduce "
memfd_secret" system call with the ability to create memory areas visible only in the context of the owning process and not mapped not only to other processes but in the kernel page tables as well.The user will create a file descriptor using the
memfd_secret()system call where flags supplied as a parameter to this system call will define the desired protection mode for the memory associated with that file descriptor. Currently there are two protection modes:
Quoted 4 lines
* exclusive - the memory area is unmapped from the kernel direct map and it is present only in the page tables of the owning mm.
* uncached - the memory area is present only in the page tables of the owning mm and it is mapped there as uncached.
I'm not sure why flag for exclusive mode is needed. It has to be default. And if you want uncached on top of that set the flag.
What am I missing?
Signature · 1 line
Kirill A. Shutemov
Re: [PATCH v3 1/6] mm: add definition of PMD_PAGE_ORDER
In reply to Kirill A. ShutemovQuoted 24 lines · Kirill A. Shutemov
Quoted 23 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
The definition of
PMD_PAGE_ORDERdenoting the number of base pages in the second-level leaf page is already used by DAX and maybe handy in other cases as well.Several architectures already have definition of
PMD_ORDERas the size of second level page table, so to avoid conflict with these definitions usePMD_PAGE_ORDERname and update DAX respectively.Signed-off-by Mike Rapoport <[email protected]>--- fs/dax.c | 10 +++++----- include/linux/pgtable.h | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-)fs/dax.c +0
-0@@ -50,7 +50,7 @@ static inline unsigned int pe_order(enum page_entry_size pe_size)#define PG_PMD_NR (PMD_SIZE >> PAGE_SHIFT)
Quoted 6 lines
fs/dax.c static inline unsigned int pe_order(enum page_entry_size pe_size) · line 53
Quoted 3 lines
fs/dax.c +1
-1/* The order of a PMD entry */ -#define PMD_ORDER (PMD_SHIFT - PAGE_SHIFT) +#define PMD_PAGE_ORDER (PMD_SHIFT - PAGE_SHIFT)Hm. Wouldn't it conflict with definition in
pgtable.h? Or should we include it instead?
Actually I meant to remove it here and keep only the definition in pgtable.h.
Will fix.
Quoted 17 lines
Quoted 14 lines
include/linux/pgtable.h +3
-0@@ -28,6 +28,9 @@#define USER_PGTABLES_CEILING 0UL#endif +/* Number of base pages in a second level leaf page */ +#define PMD_PAGE_ORDER (PMD_SHIFT - PAGE_SHIFT) +/* * A page table page can be thought of an array like this: pXd_t[PTRS_PER_PxD] * Signature · 1 line
Kirill A. Shutemov
Signature · 2 lines
Sincerely yours, Mike.
Quoted 9 lines · Randy Dunlap
Quoted 8 lines · Mike Rapoport
mm/Kconfig +0
-0@@ -872,4 +872,8 @@ config ARCH_HAS_HUGEPD config MAPPING_DIRTY_HELPERS bool
Quoted 4 lines
mm/Kconfig config ARCH_HAS_HUGEPD · line 876
Quoted 2 lines
mm/Kconfig +2
-0+config SECRETMEM + def_bool ARCH_HAS_SET_DIRECT_MAP && !EMBEDDEDuse tab above, not spaces.
Will fix.
Quoted 8 lines
Quoted 3 lines
mm/Kconfig +2
-0+ select GENERIC_ALLOCATOR + endmenuSignature · 1 line
~Randy
Signature · 2 lines
Sincerely yours, Mike.
Quoted 12 lines · Kirill A. Shutemov
Quoted 11 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
Introduce "
memfd_secret" system call with the ability to create memory areas visible only in the context of the owning process and not mapped not only to other processes but in the kernel page tables as well.The user will create a file descriptor using the
memfd_secret()system call where flags supplied as a parameter to this system call will define the desired protection mode for the memory associated with that file descriptor. Currently there are two protection modes:
Quoted 7 lines
Quoted 4 lines
* exclusive - the memory area is unmapped from the kernel direct map and it is present only in the page tables of the owning mm.
* uncached - the memory area is present only in the page tables of the owning mm and it is mapped there as uncached.I'm not sure why flag for exclusive mode is needed. It has to be default. And if you want uncached on top of that set the flag.
Makes sense.
Quoted 4 lines
What am I missing?
Signature · 1 line
Kirill A. Shutemov
Signature · 2 lines
Sincerely yours, Mike.