From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C3416C2BD09 for ; Mon, 15 Jul 2024 07:53:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=HJ1v1knZbjNeava7qWpH/aEvyh36KvIO+XUKBwlm0g0=; b=WhH2v649e7GdR/HPs+jtOb6zfW n+26yzQGR9SX8gMXSDA8uEVXGcl4W/45hEZ30JNXYgb3EWwKJ+8YxgXuxYVqfS3kFyB5o0aOeet1I 8lbV+UxnpR7iU/CnLT99pwu4rNKsVYXaVyGyqWBxk2sggHWNUzM0j5bSDh4+4kk9VDlF+iSzIGdrq 7tMfG45XWsCOtHCKlMm1IJwsMWBJaXjL/8EoXDoO2f7XD1emErE9EF7Wrjh5oFleNlwGOgHzuLmtq 3w/5Ft0+8usPTGbcc/NBpNcW9FX3mzhBQfqzpbWqBWV830o+3PpTgnJtXVftQdR+qmXf/nU3UEmO7 +5xuCePw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sTGWc-00000006Elc-0Fi9; Mon, 15 Jul 2024 07:53:34 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sTGWJ-00000006EiL-2MGS for linux-arm-kernel@lists.infradead.org; Mon, 15 Jul 2024 07:53:16 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 493ADDA7; Mon, 15 Jul 2024 00:53:39 -0700 (PDT) Received: from [10.162.40.16] (a077893.blr.arm.com [10.162.40.16]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CA5403F73F; Mon, 15 Jul 2024 00:53:05 -0700 (PDT) Message-ID: <3e13f67a-b9b0-4cb1-9af9-19df06546ca4@arm.com> Date: Mon, 15 Jul 2024 13:23:02 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 03/29] mm: use ARCH_PKEY_BITS to define VM_PKEY_BITN To: Joey Gouly , linux-arm-kernel@lists.infradead.org Cc: akpm@linux-foundation.org, aneesh.kumar@kernel.org, aneesh.kumar@linux.ibm.com, bp@alien8.de, broonie@kernel.org, catalin.marinas@arm.com, christophe.leroy@csgroup.eu, dave.hansen@linux.intel.com, hpa@zytor.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, maz@kernel.org, mingo@redhat.com, mpe@ellerman.id.au, naveen.n.rao@linux.ibm.com, npiggin@gmail.com, oliver.upton@linux.dev, shuah@kernel.org, szabolcs.nagy@arm.com, tglx@linutronix.de, will@kernel.org, x86@kernel.org, kvmarm@lists.linux.dev References: <20240503130147.1154804-1-joey.gouly@arm.com> <20240503130147.1154804-4-joey.gouly@arm.com> Content-Language: en-US From: Anshuman Khandual In-Reply-To: <20240503130147.1154804-4-joey.gouly@arm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240715_005315_693644_0D5784FE X-CRM114-Status: GOOD ( 14.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 5/3/24 18:31, Joey Gouly wrote: > Use the new CONFIG_ARCH_PKEY_BITS to simplify setting these bits > for different architectures. > > Signed-off-by: Joey Gouly > > Cc: Andrew Morton > Cc: linux-fsdevel@vger.kernel.org > Cc: linux-mm@kvack.org > --- > fs/proc/task_mmu.c | 2 ++ > include/linux/mm.h | 16 ++++++++++------ > 2 files changed, 12 insertions(+), 6 deletions(-) > > diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c > index 23fbab954c20..0d152f460dcc 100644 > --- a/fs/proc/task_mmu.c > +++ b/fs/proc/task_mmu.c > @@ -692,7 +692,9 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma) > [ilog2(VM_PKEY_BIT0)] = "", > [ilog2(VM_PKEY_BIT1)] = "", > [ilog2(VM_PKEY_BIT2)] = "", > +#if VM_PKEY_BIT3 > [ilog2(VM_PKEY_BIT3)] = "", > +#endif > #if VM_PKEY_BIT4 > [ilog2(VM_PKEY_BIT4)] = "", > #endif > diff --git a/include/linux/mm.h b/include/linux/mm.h > index b6bdaa18b9e9..5605b938acce 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -329,12 +329,16 @@ extern unsigned int kobjsize(const void *objp); > #endif /* CONFIG_ARCH_USES_HIGH_VMA_FLAGS */ > > #ifdef CONFIG_ARCH_HAS_PKEYS > -# define VM_PKEY_SHIFT VM_HIGH_ARCH_BIT_0 > -# define VM_PKEY_BIT0 VM_HIGH_ARCH_0 /* A protection key is a 4-bit value */ > -# define VM_PKEY_BIT1 VM_HIGH_ARCH_1 /* on x86 and 5-bit value on ppc64 */ > -# define VM_PKEY_BIT2 VM_HIGH_ARCH_2 > -# define VM_PKEY_BIT3 VM_HIGH_ARCH_3 > -#ifdef CONFIG_PPC > +# define VM_PKEY_SHIFT VM_HIGH_ARCH_BIT_0 > +# define VM_PKEY_BIT0 VM_HIGH_ARCH_0 > +# define VM_PKEY_BIT1 VM_HIGH_ARCH_1 > +# define VM_PKEY_BIT2 VM_HIGH_ARCH_2 > +#if CONFIG_ARCH_PKEY_BITS > 3 > +# define VM_PKEY_BIT3 VM_HIGH_ARCH_3 > +#else > +# define VM_PKEY_BIT3 0 > +#endif > +#if CONFIG_ARCH_PKEY_BITS > 4 > # define VM_PKEY_BIT4 VM_HIGH_ARCH_4 > #else > # define VM_PKEY_BIT4 0 Agree with Dave that this is not very clean but does the job i.e getting rid of the platform #ifdef which in itself is an improvement. Reviewed-by: Anshuman Khandual