From patchwork Fri Aug 30 15:57:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13785297 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 3C163CA1008 for ; Fri, 30 Aug 2024 15:57:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CD65C6B0188; Fri, 30 Aug 2024 11:57:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C86926B0189; Fri, 30 Aug 2024 11:57:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B4D736B018A; Fri, 30 Aug 2024 11:57:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 944C56B0188 for ; Fri, 30 Aug 2024 11:57:26 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 4ABB2C0636 for ; Fri, 30 Aug 2024 15:57:26 +0000 (UTC) X-FDA: 82509366492.25.2E7FC8E Received: from pegase2.c-s.fr (pegase2.c-s.fr [93.17.235.10]) by imf06.hostedemail.com (Postfix) with ESMTP id 1C037180025 for ; Fri, 30 Aug 2024 15:57:23 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=none; spf=pass (imf06.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.235.10 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu; dmarc=pass (policy=quarantine) header.from=csgroup.eu ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725033399; 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=ayUK2pr8smF7SVh+g5UUyIWNs282xIZKaVO//GfrcKQ=; b=E9rpvSvZWkmFSrtK+x+YT9i1giPgC7MYtPiam5f83sP3dBe9N2HahMnBlPmxBcJBMWqGLD z+tWe+k1yB2n1iAT1SVWXPkQmzitx9FTfMvOHXM1YF3o+8tCho+d6AweYP/zJ6vSEXUH8Y 2k5dSqwxopkEZMX8gkOpbwrkqyGL3Hc= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=none; spf=pass (imf06.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.235.10 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu; dmarc=pass (policy=quarantine) header.from=csgroup.eu ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725033399; a=rsa-sha256; cv=none; b=sPbs0vPrDzNiENGJDmT/7hnq/hNRbTNSl49zO4nhIz8KCZaCiw9t/KGcfcR/BqLO8AD+2U GE9nhExv98ZRU13/heC/qsy0eA40PEeYAqsN+jq3BX50eU90ZP1ZFYxkVNqFtSh49dpTKW IvlAniCJ9HrId2atAQjN3IHoY2QC12I= Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4WwN7y1Dknz9sSC; Fri, 30 Aug 2024 17:57:18 +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 lm1E0y2khmaS; Fri, 30 Aug 2024 17:57:18 +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 4WwN7x6THCz9sS7; Fri, 30 Aug 2024 17:57:17 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id CC6B38B799; Fri, 30 Aug 2024 17:57:17 +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 yyiLWwKmUyql; Fri, 30 Aug 2024 17:57:17 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (unknown [192.168.234.133]) by messagerie.si.c-s.fr (Postfix) with ESMTP id D53208B794; Fri, 30 Aug 2024 17:57:16 +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 v3 1/5] mm: Define VM_DROPPABLE for powerpc/32 Date: Fri, 30 Aug 2024 17:57:05 +0200 Message-ID: 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=1725033425; l=2812; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=/uJanEimm/Fnr8lBP4NFr4vOoV+ijz2MaIjmXbR52ek=; b=1tf5k5ovFZ5zvOOs0ROZ1zJin8FeyXW/XMwB35JKUkbdy50HnTLPUu5Rthe/j4vD2d3CUhq9h mkc1aRp0CyZAmDFhvAq0sK2FUPIXeJUTM5Pd+7zIiWOaabJTjWYkZRQ X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 1C037180025 X-Stat-Signature: ss6dtu9y6pw8tdnh453x7d46tt39uup1 X-HE-Tag: 1725033443-305528 X-HE-Meta: U2FsdGVkX1+kTi165Y1aPY68Tg47mW2a29hbdmkrUpMKbNQrY8FsGc2QwBnVLne0xJx2lHAwO/HhJagjhe04x7Z3ilLzq8szoNJcgfkPe05R/SxovLckQ+NjviGvlVZgybkKcH3NXXZGd1kVd1aEIS+jJ065cLn/6bRcRIgpdsh1WUhVnnl7MN80S9LHwx/7NpX6Cq7PThwjj86saRRHiWd3OrqNpvd+GSMAZZ97LxymH88vUuqRhtNR9Spz9dx/5FRE5hgqlsS/6kQW5bj5HRnLMgE3ye8bkl0hCyCm/d/VLdYsnuw6S+o7R7nb9H0VdCLpYnhVQ2+mX2OEgo1nW/ntooDDnLE1RXklYJMrjVDtwkg/awVLNV5e/+gCYO4Rx2DIuXQyOYltyhBKPZvEJYLcLwTy4YB4H3AVZCBXaGANGXPczZJrGFeGsyEJ6Fc2MRpocLk5BjwCDU2LLQEtrGTMNssqPcy3dGWmzhtjgN5Meu3WBZhh4/oYrbWkRCKRmqeTM6bWDLnTV45tMOIMWF5xyWUcM9FyXdhtfRbtt4SwmfwhGC0w1UUJZ/I/tzwU/F4wyFxZwLIR0vaU6qPabf7uup4dEWqL9FAY9uqEmi88cdpiRf2CRNH1tlokYyjysxKpQ+58n6xYv5EJHzrTBQASPas82uq1oeeAgJUmDE7SVVxMXsgkDWVcTZ3VtYJDt81XiVxvQHNu3QRne6lAW6JaSgWQ8QSi0R1kckDAuHp4kIxM6NK9fX8Py4lROUASsj74ktZn91znCAGRTyTGNKFk/BITXhcuqoF4Zj4kfCLagxHdQwBG35nwS01n0bGSUdo5OXxFWDacejl+RMuWyZLZEmSTsPGqFFoszny6ab1ILzDVEApRT+siPN+Vc28b9Av5EQUybPQgcLwHk09eTWnBLHB37bf84qa2OF+JcBEY19cI0UsiXCyGePi1IQ065nt9pd7djUmJQxBOQqr QCL8Si3A O3vANY/USr7+HSxiKQdUVaN7EkMKjPytZrvjp68BCacmnR1HxdCRADS4VTlPQC6FkVpJdRyQ1JDQ38kCpZcJJ0gTznasK2Rtgf95TgMerklNTMIS09Vg5nzAr9VD9l2fX4ySN8MKAK8ysqgiua7wT5lBsxJXlWx7OK+F2BuWEws1JyzQ= 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. Signed-off-by: Christophe Leroy --- 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)