From patchwork Mon Aug 12 08:26:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Ellerman X-Patchwork-Id: 13760290 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 B858BC52D7C for ; Mon, 12 Aug 2024 08:26:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3F70D6B00C6; Mon, 12 Aug 2024 04:26:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 389AB6B00CA; Mon, 12 Aug 2024 04:26:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E7DD6B00C8; Mon, 12 Aug 2024 04:26:17 -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 EEE676B00C5 for ; Mon, 12 Aug 2024 04:26:16 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 93C6E121B1F for ; Mon, 12 Aug 2024 08:26:16 +0000 (UTC) X-FDA: 82442911152.03.6547F2D Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by imf07.hostedemail.com (Postfix) with ESMTP id 8D87C40003 for ; Mon, 12 Aug 2024 08:26:14 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=ellerman.id.au header.s=201909 header.b=fhxsz34w; dmarc=none; spf=pass (imf07.hostedemail.com: domain of michael@ellerman.id.au designates 150.107.74.76 as permitted sender) smtp.mailfrom=michael@ellerman.id.au ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723451124; a=rsa-sha256; cv=none; b=larYuczYjCqWj/LVfYc8uFgSOthPqDWIrBKYOTUpNGvLIECo8Vfr0T1KH0Uwy2IaFORdaE pvN5/LpMI2lEuuIvwxF1ubre4puCxjB8Zl+vgraPbm6h8vhCQMEIOjUCTG+EHz1+VE64C+ pmgwFuak2uWuZUk8u1mcWkAm4Dj/PRc= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=ellerman.id.au header.s=201909 header.b=fhxsz34w; dmarc=none; spf=pass (imf07.hostedemail.com: domain of michael@ellerman.id.au designates 150.107.74.76 as permitted sender) smtp.mailfrom=michael@ellerman.id.au ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723451124; 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:references:dkim-signature; bh=VDTeFKG0tWsaWgY5r4pEV0pX09s9ysckDeAKLLaIFRs=; b=6wTS5iW+K7XLik0+OVFwINOPOyudrYXP5Kr3PAmQJgehlUs4oRk7rpB4U7+6nOzEv9MVTN I726aTOGRCxOD5Gp1v9Dxg8TTQrGnoESUS0H820XjBMz/5esXirQHbP5drA8KfG9a8wSZ1 xtOR2WO43UVRE+lEwevPxGtLvT2ZErA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ellerman.id.au; s=201909; t=1723451171; bh=VDTeFKG0tWsaWgY5r4pEV0pX09s9ysckDeAKLLaIFRs=; h=From:To:Cc:Subject:Date:From; b=fhxsz34wOUUSnbdDDauItzNL8KbrPOk7aPwcBLdQypYkobErRlI50imsAL30scp4Z eXKETdiRr+U+E3qiwMLaSxlWuSJnrNmrmKLNCTA/G2NJ8867qYNafCfX9VWbnZZCnL uPOtIF7r8dFU2DF48vSD8LhCKd3cqpi6Jkg8gIQIXnXkrpkXF3Msyqsu1VO+DKOgD/ tQ1jxVLo0FWhKB1XV4icEInoLMAkmCr33AojWOhDDEtuQwrvFO0s0DjemBcYFg1Xce 5qVFHDIj1hYHLlHTIwAg5HBTIhtv9w+LTNZKa4gPH8+QUvKzS/5Myj08LAvTEMjTrx 5Xk7bT1INhDYA== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Wj6zk6yjDz4x8Q; Mon, 12 Aug 2024 18:26:10 +1000 (AEST) From: Michael Ellerman To: Cc: , torvalds@linux-foundation.org, akpm@linux-foundation.org, christophe.leroy@csgroup.eu, jeffxu@google.com, Liam.Howlett@oracle.com, linux-kernel@vger.kernel.org, npiggin@gmail.com, oliver.sang@intel.com, pedro.falcato@gmail.com Subject: [PATCH v2 1/4] mm: Add optional close() to struct vm_special_mapping Date: Mon, 12 Aug 2024 18:26:02 +1000 Message-ID: <20240812082605.743814-1-mpe@ellerman.id.au> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Rspamd-Queue-Id: 8D87C40003 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: pe3ofqstdcmgebkdnrmqk94epggimtnc X-HE-Tag: 1723451174-923293 X-HE-Meta: U2FsdGVkX1/srPvSknhYQaVk/KemyOwNLERTCS5njEMKMf7B30+m82QZG6Rc6FhB6x8Q1K42dAn5DlCl6KA17ykerTdEp0f6q1v54rS6hrTqxtfUwbvW/MgMP3+zgBQQQa41wa+GBht6spRqtQn0J9XrObvjS0pEddA1oZ0eHhWD0jE2jsZAow5aYgqyhDrmsfpXpqTMWbOvTUT5q2n8ZeZelc+CVhJlSbX0IEmVHUscXGIwtBCbs1+mBp1agAghjDjNRD/z8Isx8wFJOgpeFSkHKiba9WSoZwM7mwhQ4wjqbxMj9+X81Qy2Jc9frHdtb98+yCwccH/8gWWEx9LY5B2cycdeV706y5d6H30XPL/z16kell+kLeqBANml+H9NzRb1B5RbRJiJlteN1PXA4s6rPNLkD4+1S4kjEK3tQO1RzoSCBKtFqj0aTzwZf+HOrneaUrUB20ZywcPRttIfgeru+L1m/OujwYckm9Uodj+AuV745nkLTuFEeuUp7DJRoSgujgGx8ScvO43fh/CpkgL8hgbPKFC1kWGTO177T1QJJCJvS/uJVvTA+TJhBztgLl++L7QYaNXh/DifIs3JW4EnpBtS3H42QBgK/j6gLtDAhnICYWf/wqo+MXJXN30II6g/u0hY5sGJcjo44ymyA5vI2MshhQ9VPB5M4OK72m5rmUUBXdhElyR+IQ5tXm9yBi1uPQPy+Jv2nOOQUMWarPVSoRPpcg96ImGBqSUfRJNslpBoHbGsnO8J72tPTRMxWftuXJZ9M49b4T6TK9jaDv9OO/jZ7pDRJk6jNycAhDSK93YE575UvgtuI1cCXlYrNwVNNMmnCs8Yi+xvVIVBanbr2V9dsIW1m+1e1nNs1l02CZDjJT5ZrovgHXilJ2Q1W8FSgy+xJt3VfkiDr5w+BTi2WnDbXo0l8V2X23R5EzIleItfLKNBOjZcGgsU99J4feGds50J66xPDJA2cEU vMmELtYi WAa+yOF8lwqNEbpfoL0GGja9nrQL3QQ26caVD9n8oHbUlU3J2aCaHcTHC13nx+S7o1euZYmDYEOC3JhRNVdZmsZI2vgt6ojIcBAzUjJGzAworARTl6830pVNfzL7z3chTJ9TW4cXJB5NmtFFdXlXtlXFRYlU6sftsUNrNAs4KC+8hlHJa1kM/hYbcz5H3oxTJy+9gIbGUKp7fUJxEgFkXsbWbn0FEd/jpiOo1F6sR9wdR+ZpeIHN9xkGm+Y+RhPqpFkhzPV2mUfESs3iJsPyxJf6zjfbAiJYJhGDfdV1QX0iZqoDALzx4Sdf9pJCcUANfeQ/fMdz8Vw8tFzFIz5wz9rLARSPr8k/+LXtjQJ6gy0udE1wuAu8xrpnmkNsuCPTLz+5cKob75X5xOLvgWdENoZ7ZbbmXExAPrj2w1F5uHcj85NNiAk6wVnuQu4ZH6Bzp9jagw6/zFOZesSTL1mtK+1JEe7RDQ3PuKv9bssm8ZIiw1E60krKCtQF56XPG40e8nZikI/DVG9fc9e53b3ttauiUfLxS9QUlfL1HsbJnbcCCZEpdboAAlFxW+LlLITo5pXG8OZCSI5ZoaLzIs0oXjk/w8NyQ5MK5kP4COIBopFBj0BR8eU35KC5lK8rgkCNb4ZeF7MM8ZKxE1Nd6VWkiT4eAakMJ7H0XHReAm5YvtfOmuqvvPhOTuBKR68VffwdNGNGmptYKqNaAsscelRVbjscQbl+OKo37Puh0VkGV/ztMien3aTAeGeOKAA== 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: Add an optional close() callback to struct vm_special_mapping. It will be used, by powerpc at least, to handle unmapping of the VDSO. Although support for unmapping the VDSO was initially added for CRIU[1], it is not desirable to guard that support behind CONFIG_CHECKPOINT_RESTORE. There are other known users of unmapping the VDSO which are not related to CRIU, eg. Valgrind [2] and void-ship [3]. The powerpc arch_unmap() hook has been in place for ~9 years, with no ifdef, so there may be other unknown users that have come to rely on unmapping the VDSO. Even if the code was behind an ifdef, major distros enable CHECKPOINT_RESTORE so users may not realise unmapping the VDSO depends on that configuration option. It's also undesirable to have such core mm behaviour behind a relatively obscure CONFIG option. Longer term the unmap behaviour should be standardised across architectures, however that is complicated by the fact the VDSO pointer is stored differently across architectures. There was a previous attempt to unify that handling [4], which could be revived. See [5] for further discussion. [1]: commit 83d3f0e90c6c ("powerpc/mm: tracking vDSO remap") [2]: https://sourceware.org/git/?p=valgrind.git;a=commit;h=3a004915a2cbdcdebafc1612427576bf3321eef5 [3]: https://github.com/insanitybit/void-ship [4]: https://lore.kernel.org/lkml/20210611180242.711399-17-dima@arista.com/ [5]: https://lore.kernel.org/linuxppc-dev/shiq5v3jrmyi6ncwke7wgl76ojysgbhrchsk32q4lbx2hadqqc@kzyy2igem256 Suggested-by: Linus Torvalds Signed-off-by: Michael Ellerman Reviewed-by: David Hildenbrand Reviewed-by: Liam R. Howlett Tested-by: Rob Landley --- include/linux/mm_types.h | 3 +++ mm/mmap.c | 6 ++++++ 2 files changed, 9 insertions(+) v2: - Add some blank lines as requested. - Expand special_mapping_close() comment. - Add David's reviewed-by. - Expand change log to capture review discussion. diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 485424979254..78bdfc59abe5 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -1313,6 +1313,9 @@ struct vm_special_mapping { int (*mremap)(const struct vm_special_mapping *sm, struct vm_area_struct *new_vma); + + void (*close)(const struct vm_special_mapping *sm, + struct vm_area_struct *vma); }; enum tlb_flush_reason { diff --git a/mm/mmap.c b/mm/mmap.c index d0dfc85b209b..af4dbf0d3bd4 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -3620,10 +3620,16 @@ void vm_stat_account(struct mm_struct *mm, vm_flags_t flags, long npages) static vm_fault_t special_mapping_fault(struct vm_fault *vmf); /* + * Close hook, called for unmap() and on the old vma for mremap(). + * * Having a close hook prevents vma merging regardless of flags. */ static void special_mapping_close(struct vm_area_struct *vma) { + const struct vm_special_mapping *sm = vma->vm_private_data; + + if (sm->close) + sm->close(sm, vma); } static const char *special_mapping_name(struct vm_area_struct *vma)