From patchwork Wed Jul 3 18:31:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason A. Donenfeld" X-Patchwork-Id: 13722702 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4E46C2BD09 for ; Wed, 3 Jul 2024 18:31:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F02D46B007B; Wed, 3 Jul 2024 14:31:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EB2646B0082; Wed, 3 Jul 2024 14:31:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D56346B0083; Wed, 3 Jul 2024 14:31:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B719D6B007B for ; Wed, 3 Jul 2024 14:31:38 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 660C91C0623 for ; Wed, 3 Jul 2024 18:31:38 +0000 (UTC) X-FDA: 82299284676.08.881D801 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf22.hostedemail.com (Postfix) with ESMTP id 8A954C000B for ; Wed, 3 Jul 2024 18:31:35 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=zx2c4.com header.s=20210105 header.b=olZfhcJB; spf=pass (imf22.hostedemail.com: domain of "SRS0=hdAS=OD=zx2c4.com=Jason@kernel.org" designates 139.178.84.217 as permitted sender) smtp.mailfrom="SRS0=hdAS=OD=zx2c4.com=Jason@kernel.org"; dmarc=pass (policy=quarantine) header.from=zx2c4.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720031472; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=d0Pby7OxE/1C+lYdUs8thNDbc8OeW5PLCiKIriM529Y=; b=aFIkXWH9uL+/A8XbPTInekAlx2Y81sNu2KOaqESj0YIUXwfj1n4lREgt1GbAbaizhTldxX hhx/4AaOlYAXMaByDv6ezjC2rkDk0RvkvQElo5okOZvFnguCt67bzdf3eWeYFH2CTqZCWX jlM24lXVkUxQAf51qtK8KQrCO5U57P4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720031472; a=rsa-sha256; cv=none; b=l2z9Aft+TLKRuruz/G8KN0qis7kbLNulBRvnLLb9Gudu4ExpYLpU7URE60GxC5PKsW37KC 4/ZhRKhA6yEhwP1IWJFtp5rJSPyr/IsinWqkGFReAK4509fMrwEHYU5fjomDOPfvc75q3K A6LQa5F/Qmt9LbB6FJDADqwYgxYqpK8= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=zx2c4.com header.s=20210105 header.b=olZfhcJB; spf=pass (imf22.hostedemail.com: domain of "SRS0=hdAS=OD=zx2c4.com=Jason@kernel.org" designates 139.178.84.217 as permitted sender) smtp.mailfrom="SRS0=hdAS=OD=zx2c4.com=Jason@kernel.org"; dmarc=pass (policy=quarantine) header.from=zx2c4.com Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 5A34C60C2D; Wed, 3 Jul 2024 18:31:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC01EC4AF0C; Wed, 3 Jul 2024 18:31:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zx2c4.com; s=20210105; t=1720031492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=d0Pby7OxE/1C+lYdUs8thNDbc8OeW5PLCiKIriM529Y=; b=olZfhcJBtdERpEzYierYBXSZcHY9wW3m4JgKW8osiVG1AtnVWrzjpmmfQjWLR/l3PO2gER AnSmT31iGX7v3oRkau/HpTo/Qjpf7que5DvirgjpRGybm+jP8V2OQLE+Lx2kIowK8T/Lyw QBKBbw3t+v195NYDmXiZ2K2gDY+2EoI= Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 5b4494b4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 3 Jul 2024 18:31:32 +0000 (UTC) From: "Jason A. Donenfeld" To: linux-kernel@vger.kernel.org, patches@lists.linux.dev, tglx@linutronix.de Cc: "Jason A. Donenfeld" , linux-crypto@vger.kernel.org, linux-api@vger.kernel.org, x86@kernel.org, Greg Kroah-Hartman , Adhemerval Zanella Netto , Carlos O'Donell , Florian Weimer , Arnd Bergmann , Jann Horn , Christian Brauner , David Hildenbrand , linux-mm@kvack.org Subject: [PATCH v20 1/5] mm: add VM_DROPPABLE for designating always lazily freeable mappings Date: Wed, 3 Jul 2024 20:31:10 +0200 Message-ID: <20240703183115.1075219-2-Jason@zx2c4.com> In-Reply-To: <20240703183115.1075219-1-Jason@zx2c4.com> References: <20240703183115.1075219-1-Jason@zx2c4.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 8A954C000B X-Stat-Signature: w1dx5xb1sj4o14zsmoz7n3pzdmb1rch5 X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1720031495-358734 X-HE-Meta: U2FsdGVkX19PnR7knTp2FpGR/XasURaYWgfiNAZ3aIASDqkruhMqDpzVEPOiqVxGFqDGvxlwKDO9xcbYlhMmOOI8wYeBulw3yixr9PBYszGZl2wCSi3XIIe8tsqqQm7T9Ew/ZgPscoTnwJJPTmcPa/c5cw8+2rPtNJVByh9hsBTetX60JspL2NFYAsHmtMseANk6OaEIhomUgLJy1shONcVvoemtkXuCK/6sjuEwmHqiAMAtNQmQcaqLQGdMN7XfS6kvCpjlYnEU9bbuiMQoWjlIVGHGBJhPnGXoNOT+ufZtThxB7C8p97BmUbFsoIyk9nDU926mZNEs/wvpU9EO6zHLvknIztR6uN1M7wr4QKZPrFg7uR6SOp40p6GFx5vb/9e6nGujEI0c/+mesBLmAVMe0UJDm9zKzuPtIJTLWTsawQQE3caEr0Aucg61/xWggDwj7Jr9ACJLFq2S66dpPxsJqBOO53gnrPChF0k+GevzDYsq74ntQ0ED3QWbwSEgYwNzHotoJYjyT5ULNCsDWJ9CocqPqP0bPLbxr5xfm9lFnfWbomBgttzSzdzJUkIcVplpdeGH8/3WpXQRkNBVhe9aQBkw4jMh0RT+eKJG61Bq908rBUaPAhRzHuWuXI37tO4zwb4BbUCstEvXsRFRX15vBTXf5vX3ow774GkxrIoZqzFay/axNwElsMzte1xSj2VSZGB35QCokQ4Lk0gmfw4v9tEON+KscBb6CllYhum0Fm2u4rfoKM+VBzq8vebNynyURorgmXXRnZngzawQHW4V0bOJsYdT0JrcwlWUPIqjT4wIfdHVFdSKUbdZcboHatwTGfa0joJzihq8f/tfhTm/vheVkEeWoP2pqcJ4UnaZ9wkv1o8HRiUHwUpGAbwuNLlHageEBUN3PPcHU5pzfpM3mmzuMU+gEqJZIIMH2nbFg3GwWGOCaJO0XQomJ61OgXWUN/3nvfSBBALnsdJ 7173f76K 9T3SJMOaU35vr9h1n7U7+PW/Rvt7HCT2C7MPTXR8fQIhU/9DVnX+CKPTZDIRxUwi3FPFpSq4KAf1Ld/56SCGP8fSB2qSd5RWLaEx7p+f+72NVujyVm6ers6AWuA4tz3B3nG1htaKqNuO/h3wEaFnaObv7Jizub+qQSDqHiihsZZB8Yd2o1bO68PNq65BBP83QLVDRbx5seJmlv3VrxtRv4OQveH0egZTNRaRIYAg4ojJKhWiKXAPxlpiO8K3g6Jky21HDvlzdDg4uFWVJCOcXyT3SE4fMvIzXO3bTn7Y5Uf072NXDMObL52DzAzu4aFiRQm3aNUP0IkPUwIdZUs+l72Yl84imkBmAt7HJZmadKn87oiOkcN8xqKXLtTLU+kjm2rd/2jkYwZX1qXKTd3BlPAjvQxwrSPxWLMlceK2gj8RDN9w/1gT3e6c56u3yb0ileOHWDDUgdMzOwyUfR6SFNNXB7z57ryb/LdJUoG5jaZwrbAxVHi06z404im1izp8f11L3cGVo+K2KQCLuHCHhX0HN2W3qoM1In5ITbzXWgx7RFsN4Ta168QvHygOxBi112mqY X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: The vDSO getrandom() implementation works with a buffer allocated with a new system call that has certain requirements: - It shouldn't be written to core dumps. * Easy: VM_DONTDUMP. - It should be zeroed on fork. * Easy: VM_WIPEONFORK. - It shouldn't be written to swap. * Uh-oh: mlock is rlimited. * Uh-oh: mlock isn't inherited by forks. It turns out that the vDSO getrandom() function has three really nice characteristics that we can exploit to solve this problem: 1) Due to being wiped during fork(), the vDSO code is already robust to having the contents of the pages it reads zeroed out midway through the function's execution. 2) In the absolute worst case of whatever contingency we're coding for, we have the option to fallback to the getrandom() syscall, and everything is fine. 3) The buffers the function uses are only ever useful for a maximum of 60 seconds -- a sort of cache, rather than a long term allocation. These characteristics mean that we can introduce VM_DROPPABLE, which has the following semantics: a) It never is written out to swap. b) Under memory pressure, mm can just drop the pages (so that they're zero when read back again). c) It is inherited by fork. d) It doesn't count against the mlock budget, since nothing is locked. This is fairly simple to implement, with the one snag that we have to use 64-bit VM_* flags, but this shouldn't be a problem, since the only consumers will probably be 64-bit anyway. This way, allocations used by vDSO getrandom() can use: VM_DROPPABLE | VM_DONTDUMP | VM_WIPEONFORK | VM_NORESERVE And there will be no problem with using memory when not in use, not wiping on fork(), coredumps, or writing out to swap. When this functionality is exposed via vgetrandom_alloc() later in this series, a userspace selftest is added that verifies this is working as intended. Cc: linux-mm@kvack.org Signed-off-by: Jason A. Donenfeld --- fs/proc/task_mmu.c | 3 +++ include/linux/mm.h | 8 ++++++++ include/trace/events/mmflags.h | 7 +++++++ mm/Kconfig | 3 +++ mm/mprotect.c | 2 +- mm/rmap.c | 16 +++++++++++++--- 6 files changed, 35 insertions(+), 4 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 71e5039d940d..b3bd8432f869 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -709,6 +709,9 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma) #endif #ifdef CONFIG_64BIT [ilog2(VM_SEALED)] = "sl", +#endif +#ifdef CONFIG_NEED_VM_DROPPABLE + [ilog2(VM_DROPPABLE)] = "dp", #endif }; size_t i; diff --git a/include/linux/mm.h b/include/linux/mm.h index eb7c96d24ac0..92454a0272ce 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -321,12 +321,14 @@ extern unsigned int kobjsize(const void *objp); #define VM_HIGH_ARCH_BIT_3 35 /* bit only usable on 64-bit architectures */ #define VM_HIGH_ARCH_BIT_4 36 /* bit only usable on 64-bit architectures */ #define VM_HIGH_ARCH_BIT_5 37 /* bit only usable on 64-bit architectures */ +#define VM_HIGH_ARCH_BIT_6 38 /* bit only usable on 64-bit architectures */ #define VM_HIGH_ARCH_0 BIT(VM_HIGH_ARCH_BIT_0) #define VM_HIGH_ARCH_1 BIT(VM_HIGH_ARCH_BIT_1) #define VM_HIGH_ARCH_2 BIT(VM_HIGH_ARCH_BIT_2) #define VM_HIGH_ARCH_3 BIT(VM_HIGH_ARCH_BIT_3) #define VM_HIGH_ARCH_4 BIT(VM_HIGH_ARCH_BIT_4) #define VM_HIGH_ARCH_5 BIT(VM_HIGH_ARCH_BIT_5) +#define VM_HIGH_ARCH_6 BIT(VM_HIGH_ARCH_BIT_6) #endif /* CONFIG_ARCH_USES_HIGH_VMA_FLAGS */ #ifdef CONFIG_ARCH_HAS_PKEYS @@ -357,6 +359,12 @@ extern unsigned int kobjsize(const void *objp); # define VM_SHADOW_STACK VM_NONE #endif +#ifdef CONFIG_NEED_VM_DROPPABLE +# define VM_DROPPABLE VM_HIGH_ARCH_6 +#else +# define VM_DROPPABLE VM_NONE +#endif + #if defined(CONFIG_X86) # define VM_PAT VM_ARCH_1 /* PAT reserves whole VMA at once (x86) */ #elif defined(CONFIG_PPC) diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h index e46d6e82765e..fab7848df50a 100644 --- a/include/trace/events/mmflags.h +++ b/include/trace/events/mmflags.h @@ -165,6 +165,12 @@ IF_HAVE_PG_ARCH_X(arch_3) # define IF_HAVE_UFFD_MINOR(flag, name) #endif +#ifdef CONFIG_NEED_VM_DROPPABLE +# define IF_HAVE_VM_DROPPABLE(flag, name) {flag, name}, +#else +# define IF_HAVE_VM_DROPPABLE(flag, name) +#endif + #define __def_vmaflag_names \ {VM_READ, "read" }, \ {VM_WRITE, "write" }, \ @@ -197,6 +203,7 @@ IF_HAVE_VM_SOFTDIRTY(VM_SOFTDIRTY, "softdirty" ) \ {VM_MIXEDMAP, "mixedmap" }, \ {VM_HUGEPAGE, "hugepage" }, \ {VM_NOHUGEPAGE, "nohugepage" }, \ +IF_HAVE_VM_DROPPABLE(VM_DROPPABLE, "droppable" ) \ {VM_MERGEABLE, "mergeable" } \ #define show_vma_flags(flags) \ diff --git a/mm/Kconfig b/mm/Kconfig index b4cb45255a54..6cd65ea4b3ad 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -1056,6 +1056,9 @@ config ARCH_USES_HIGH_VMA_FLAGS bool config ARCH_HAS_PKEYS bool +config NEED_VM_DROPPABLE + select ARCH_USES_HIGH_VMA_FLAGS + bool config ARCH_USES_PG_ARCH_X bool diff --git a/mm/mprotect.c b/mm/mprotect.c index 8c6cd8825273..57b8dad9adcc 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -623,7 +623,7 @@ mprotect_fixup(struct vma_iterator *vmi, struct mmu_gather *tlb, may_expand_vm(mm, oldflags, nrpages)) return -ENOMEM; if (!(oldflags & (VM_ACCOUNT|VM_WRITE|VM_HUGETLB| - VM_SHARED|VM_NORESERVE))) { + VM_SHARED|VM_NORESERVE|VM_DROPPABLE))) { charged = nrpages; if (security_vm_enough_memory_mm(mm, charged)) return -ENOMEM; diff --git a/mm/rmap.c b/mm/rmap.c index e8fc5ecb59b2..56d7535d5cf6 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1397,7 +1397,10 @@ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, VM_WARN_ON_FOLIO(folio_test_hugetlb(folio), folio); VM_BUG_ON_VMA(address < vma->vm_start || address + (nr << PAGE_SHIFT) > vma->vm_end, vma); - __folio_set_swapbacked(folio); + /* VM_DROPPABLE mappings don't swap; instead they're just dropped when + * under memory pressure. */ + if (!(vma->vm_flags & VM_DROPPABLE)) + __folio_set_swapbacked(folio); __folio_set_anon(folio, vma, address, true); if (likely(!folio_test_large(folio))) { @@ -1841,7 +1844,11 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, * plus the rmap(s) (dropped by discard:). */ if (ref_count == 1 + map_count && - !folio_test_dirty(folio)) { + (!folio_test_dirty(folio) || + /* Unlike MADV_FREE mappings, VM_DROPPABLE + * ones can be dropped even if they've + * been dirtied. */ + (vma->vm_flags & VM_DROPPABLE))) { dec_mm_counter(mm, MM_ANONPAGES); goto discard; } @@ -1851,7 +1858,10 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, * discarded. Remap the page to page table. */ set_pte_at(mm, address, pvmw.pte, pteval); - folio_set_swapbacked(folio); + /* Unlike MADV_FREE mappings, VM_DROPPABLE ones + * never get swap backed on failure to drop. */ + if (!(vma->vm_flags & VM_DROPPABLE)) + folio_set_swapbacked(folio); ret = false; page_vma_mapped_walk_done(&pvmw); break;