From patchwork Mon Sep 2 19:17:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13787669 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 74D06CD13CF for ; Mon, 2 Sep 2024 19:17:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0BE2B8D0109; Mon, 2 Sep 2024 15:17:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 046788D00EF; Mon, 2 Sep 2024 15:17:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E026C8D0109; Mon, 2 Sep 2024 15:17:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id BCBC58D00EF for ; Mon, 2 Sep 2024 15:17:39 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 3194E1C6A36 for ; Mon, 2 Sep 2024 19:17:39 +0000 (UTC) X-FDA: 82520757438.04.D4B20E7 Received: from pegase2.c-s.fr (pegase2.c-s.fr [93.17.235.10]) by imf07.hostedemail.com (Postfix) with ESMTP id 14BC240011 for ; Mon, 2 Sep 2024 19:17:36 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=csgroup.eu; spf=pass (imf07.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.235.10 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725304552; 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; bh=tAg61Zyqrflk/oJA5T5Z5RbcySQiS7N9PdlZqAQYPWw=; b=qddIrbRBxaRmMCQ3rgmcUgNyIgCRTt8uNHm63MtViG7BiZapCyu4OoMy7XRVm067l6u44n gacL4Pe+QPLZ7e8Uo/G6dquER38NKxU4b0ptO8DVYonIDAsEf0PcwPdUYSqdye3YlejI6p ejK47LPUeJ7p04ZdGu11GxGP3tPixwo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725304552; a=rsa-sha256; cv=none; b=DZkVSPAjA7kaDAWbTZkdkaTk4rcl2b3M6LCGrO7J7lkrvXY8aiBKjgBa7qBAFRb20s/sna t05/T4Z5hV5rhaR+5Iws5MsO3BXKLQvr3mx4ICXWsC9R3I5S86ldLg7/nN4jZy/imKiPx5 CditOMA25inDBTYNU4zd3Kq33j1ci68= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=csgroup.eu; spf=pass (imf07.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.235.10 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4WyJRb4YChz9sSK; Mon, 2 Sep 2024 21:17:31 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase2.c-s.fr ([172.26.127.65]) by localhost (pegase2.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Rliv3BQP30eL; Mon, 2 Sep 2024 21:17:31 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase2.c-s.fr (Postfix) with ESMTP id 4WyJRb3KmGz9sS7; Mon, 2 Sep 2024 21:17:31 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 642888B773; Mon, 2 Sep 2024 21:17:31 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id RznGlAhRZuPR; Mon, 2 Sep 2024 21:17:31 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (unknown [192.168.234.167]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 5C7B58B770; Mon, 2 Sep 2024 21:17:30 +0200 (CEST) From: Christophe Leroy To: Andrew Morton , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Michael Ellerman , Nicholas Piggin , Naveen N Rao , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Shuah Khan , "Jason A . Donenfeld" Cc: Christophe Leroy , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kselftest@vger.kernel.org, llvm@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org, Adhemerval Zanella , Xi Ruoyao Subject: [PATCH v5 1/5] mm: Define VM_DROPPABLE for powerpc/32 Date: Mon, 2 Sep 2024 21:17:18 +0200 Message-ID: <0e6772967de99ca9282bb0310c874ea12d7451ac.1725304404.git.christophe.leroy@csgroup.eu> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1725304637; l=3068; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=D2XQkJzjCFhHvddcGK1wPF6zrU/7AFSP1S12xB5e/Jg=; b=wPREOAD0QoGI3TW4gibAz+4870cjqR2AP1EDXAzDUImqHYutjDy/A0w6uXuA0u18wT9L6TgOA YxZ/LTuImy+AoekkJJDf68lKw7vkcVjepyt1+WTQH38anbkqvsubuT+ X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 14BC240011 X-Stat-Signature: qmhft38b5awpyogw5777dwz4f7pnefdn X-Rspam-User: X-HE-Tag: 1725304656-593366 X-HE-Meta: U2FsdGVkX1/wNbKPbXRzDMM4ZViyvaahtNwLLvIsTc5bH0UnfoSCXmcc3Jb4W5lRKbXMoh57az1Fs9rLVthkK8NUGBdUUk60pu+UYiiU2wATpD3j6FIii8qoFGKqu7yIhn4r9ukjijKmYyUzcxr+CNasbDkTiFWHhLBo5ElxsT2+uI/jAfz4fEkAzk3SA2QeHCn5fjJvEIw+3EVRV+IhNBe5DKMM78KPLxESwuDmvd89aI54xhIv05voAhi2ac6RdoZlCgs/ol9y/oHE8u2J+lMxyurP+2LBJWDkqDU+azzWwXwMZFNU3WQQxG03kmkpAyeSpXD5dfIc/EIn9EOHehAVPbRjDWdYf4izHtqUxv+VUqSjvxcZASkU31wQRpd1uJQLqEWCZKHl+KJNWXuWB0ke8zkno5CTjmWedo3zH1V8xZi0wR2R0ax7Eer/7Soar3OaKd/ypj164THhHYyB7XI3fAyqb4OGu4Z+mdHiMuwqQ69nvRHson6ddr07uue3ap9PreeboxVH/gorNXo4AF7Av/fe3YaHHlN+6DNPIAufvh+2ku+fXtHbdE08u5Kb53qAfPV41oi3DylryVX6hgJO3p1S4Xez/vWwfSBx05xb+SOJepenjAupPt3ACxLWk+o4lDMD0X8EsMmhK+YXKxnKlA8j4ktKSHzqJk7uZHARtWqYPqHdWrJZ10hrDK/gkYZ2ISTEeDgBpu0UiviPPZB+Lkx7ZD6YJZHEQNHjkNO9CKtojqago1BdcrlZyP0AHzBmnYYclaZGrt+9504ph9H2bLB6ntx8rSdqdKbWWUi3FWIy1/0R8VNgNhTS2SX+FLcHcExiZhOtkekQYBA/lKes0ftU/idO8FTG6mlhlAbawJ6aKRlBYQzCBp0OZDG6xcJrvXQHG4HjM1lDEbmzwNS1do9KqAOnIhrn9nEFBGzA8cPBcUI2Wfv4lk25LkVYeLOs0jB6IkL8rJnHzE9 wduIanSL 1mbUI3KpNOnEEIiYDntyfBS5i7xXH+6CBZ6xgUaB2UunVPflKJ6gm67vGF7YHdzHY+2ETbsqFiiEJPo3oF64YfoqqUGId0KKBkfs1BjVVNXSqBc1kbTFwvAgPFYumizz7yVd2JRQfeWJcdTVzmyE926m8YcFkJPN/ZrTM0AF+F3wjIyE= 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: Commit 9651fcedf7b9 ("mm: add MAP_DROPPABLE for designating always lazily freeable mappings") only adds VM_DROPPABLE for 64 bits architectures. In order to also use the getrandom vDSO implementation on powerpc/32, use VM_ARCH_1 for VM_DROPPABLE on powerpc/32. This is possible because VM_ARCH_1 is used for VM_SAO on powerpc and VM_SAO is only for powerpc/64. It is used in combination with PROT_SAO in some parts of code that are restricted to CONFIG_PPC64 through #ifdefs, it is therefore possible to define VM_SAO for CONFIG_PPC64 only. Signed-off-by: Christophe Leroy --- v4: Added more details in commit message following comment from Michael. v3: Fixed build failure reported by robots. --- fs/proc/task_mmu.c | 4 +++- include/linux/mm.h | 4 +++- include/trace/events/mmflags.h | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 5f171ad7b436..3a07e13e2f81 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -987,8 +987,10 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma) #ifdef CONFIG_X86_USER_SHADOW_STACK [ilog2(VM_SHADOW_STACK)] = "ss", #endif -#ifdef CONFIG_64BIT +#if defined(CONFIG_64BIT) || defined(CONFIG_PPC32) [ilog2(VM_DROPPABLE)] = "dp", +#endif +#ifdef CONFIG_64BIT [ilog2(VM_SEALED)] = "sl", #endif }; diff --git a/include/linux/mm.h b/include/linux/mm.h index 6549d0979b28..028847f39442 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -359,7 +359,7 @@ extern unsigned int kobjsize(const void *objp); #if defined(CONFIG_X86) # define VM_PAT VM_ARCH_1 /* PAT reserves whole VMA at once (x86) */ -#elif defined(CONFIG_PPC) +#elif defined(CONFIG_PPC64) # define VM_SAO VM_ARCH_1 /* Strong Access Ordering (powerpc) */ #elif defined(CONFIG_PARISC) # define VM_GROWSUP VM_ARCH_1 @@ -409,6 +409,8 @@ extern unsigned int kobjsize(const void *objp); #ifdef CONFIG_64BIT #define VM_DROPPABLE_BIT 40 #define VM_DROPPABLE BIT(VM_DROPPABLE_BIT) +#elif defined(CONFIG_PPC32) +#define VM_DROPPABLE VM_ARCH_1 #else #define VM_DROPPABLE VM_NONE #endif diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h index b63d211bd141..37265977d524 100644 --- a/include/trace/events/mmflags.h +++ b/include/trace/events/mmflags.h @@ -143,7 +143,7 @@ IF_HAVE_PG_ARCH_X(arch_3) #if defined(CONFIG_X86) #define __VM_ARCH_SPECIFIC_1 {VM_PAT, "pat" } -#elif defined(CONFIG_PPC) +#elif defined(CONFIG_PPC64) #define __VM_ARCH_SPECIFIC_1 {VM_SAO, "sao" } #elif defined(CONFIG_PARISC) #define __VM_ARCH_SPECIFIC_1 {VM_GROWSUP, "growsup" } @@ -165,7 +165,7 @@ IF_HAVE_PG_ARCH_X(arch_3) # define IF_HAVE_UFFD_MINOR(flag, name) #endif -#ifdef CONFIG_64BIT +#if defined(CONFIG_64BIT) || defined(CONFIG_PPC32) # define IF_HAVE_VM_DROPPABLE(flag, name) {flag, name}, #else # define IF_HAVE_VM_DROPPABLE(flag, name)