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 X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7074AC4338F for ; Wed, 28 Jul 2021 06:49:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DFD3E60EB2 for ; Wed, 28 Jul 2021 06:49:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DFD3E60EB2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=pku.edu.cn Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 7C03E6B0036; Wed, 28 Jul 2021 02:49:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 770836B005D; Wed, 28 Jul 2021 02:49:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 637578D0001; Wed, 28 Jul 2021 02:49:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0051.hostedemail.com [216.40.44.51]) by kanga.kvack.org (Postfix) with ESMTP id 468E26B0036 for ; Wed, 28 Jul 2021 02:49:45 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id E630F1AB58 for ; Wed, 28 Jul 2021 06:49:44 +0000 (UTC) X-FDA: 78411071088.18.E7764A7 Received: from zg8tmty1ljiyny4xntqumjca.icoremail.net (zg8tmty1ljiyny4xntqumjca.icoremail.net [165.227.154.27]) by imf26.hostedemail.com (Postfix) with SMTP id 5A9342011FE9 for ; Wed, 28 Jul 2021 06:49:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pku.edu.cn; s=dkim; h=Received:From:To:Cc:Subject:Date: Message-Id:MIME-Version:Content-Transfer-Encoding; bh=Tsk7dHdWsL EbmV3FNfViCC4F9wAAdUC2y4rEc+9Pyjk=; b=QLdJCAL5t4H826FNnhHMNNB7cV 74QntP1txnNwaAs+owBLYRRdnzNCaEoPI/k1mzQkoM9jSp6uO3/U9q4YWpWxW+DT 2W0EzXZuIdkoIxyuQObIm91HTuK9dm3g7HTVPjDfmJXPzFJkHdveFpSC65jCsPol ouo7rLJbcmPetyzx4= Received: from lexp.lan (unknown [222.29.156.242]) by front01 (Coremail) with SMTP id 5oFpogDX3YXH_QBhrklqAQ--.51338S2; Wed, 28 Jul 2021 14:48:41 +0800 (CST) From: Jiashuo Liang To: Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Andrew Morton , Sandipan Das , Ram Pai , "Aneesh Kumar K.V" , Fenghua Yu , Kan Liang Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Jiashuo Liang Subject: [PATCH] mm/pkeys: Remove unused parameter in arch_set_user_pkey_access Date: Wed, 28 Jul 2021 14:47:04 +0800 Message-Id: <20210728064704.268879-1-liangjs@pku.edu.cn> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-CM-TRANSID:5oFpogDX3YXH_QBhrklqAQ--.51338S2 X-Coremail-Antispam: 1UD129KBjvJXoWxKryDtryUur4kWF43JrWkZwb_yoWxJw17pF 9Fkw1vgrW7Ga4jqFyDK397ZFy3Cry0gr1a9ryxK343ZFnFvw1rJF1rZr42kr92yrykG3WS kws2gFn5Zr4qgaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9a1xkIjI8I6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AE w4v_Jr0_Jr4l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2 IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2 z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcV Aq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r10 6r15McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64 vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7M4IIrI8v6xkF7I0E8cxan2IY04v7MxkIecxE wVAFwVW8AwCF04k20xvY0x0EwIxGrwCF04k20xvE74AGY7Cv6cx26w4UJr1UMxC20s026x CaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_ JrWlx4CE17CEb7AF67AKxVW8ZVWrXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r 1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_ Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8Jr UvcSsGvfC2KfnxnUUI43ZEXa7VUb2Nt3UUUUU== X-CM-SenderInfo: isqqijqrtqmio6sn3hxhgxhubq/1tbiAwEQBVPy7sYrGgABsu X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 5A9342011FE9 Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=pku.edu.cn header.s=dkim header.b=QLdJCAL5; spf=pass (imf26.hostedemail.com: domain of liangjs@pku.edu.cn designates 165.227.154.27 as permitted sender) smtp.mailfrom=liangjs@pku.edu.cn; dmarc=pass (policy=none) header.from=pku.edu.cn X-Stat-Signature: urssucxwz8cjeeqhonzp1k4iadiwddx8 X-HE-Tag: 1627454982-357197 Content-Transfer-Encoding: quoted-printable 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: The arch_set_user_pkey_access function never uses its first parameter (struct task_struct *tsk). It is only able to set the pkey permissions f= or the current task as implemented, and existing kernel code only passes "current" to arch_set_user_pkey_access. So remove the ambiguous paramete= r to make the code clean. Signed-off-by: Jiashuo Liang --- arch/powerpc/include/asm/pkeys.h | 8 +++----- arch/powerpc/mm/book3s64/pkeys.c | 3 +-- arch/x86/include/asm/pkeys.h | 12 ++++-------- arch/x86/kernel/fpu/xstate.c | 3 +-- arch/x86/mm/pkeys.c | 3 +-- include/linux/pkeys.h | 3 +-- mm/mprotect.c | 2 +- 7 files changed, 12 insertions(+), 22 deletions(-) diff --git a/arch/powerpc/include/asm/pkeys.h b/arch/powerpc/include/asm/= pkeys.h index 59a2c7dbc78f..e905b2ab31e2 100644 --- a/arch/powerpc/include/asm/pkeys.h +++ b/arch/powerpc/include/asm/pkeys.h @@ -143,10 +143,8 @@ static inline int arch_override_mprotect_pkey(struct= vm_area_struct *vma, return __arch_override_mprotect_pkey(vma, prot, pkey); } =20 -extern int __arch_set_user_pkey_access(struct task_struct *tsk, int pkey= , - unsigned long init_val); -static inline int arch_set_user_pkey_access(struct task_struct *tsk, int= pkey, - unsigned long init_val) +extern int __arch_set_user_pkey_access(int pkey, unsigned long init_val)= ; +static inline int arch_set_user_pkey_access(int pkey, unsigned long init= _val) { if (!mmu_has_feature(MMU_FTR_PKEY)) return -EINVAL; @@ -160,7 +158,7 @@ static inline int arch_set_user_pkey_access(struct ta= sk_struct *tsk, int pkey, if (pkey =3D=3D 0) return init_val ? -EINVAL : 0; =20 - return __arch_set_user_pkey_access(tsk, pkey, init_val); + return __arch_set_user_pkey_access(pkey, init_val); } =20 static inline bool arch_pkeys_enabled(void) diff --git a/arch/powerpc/mm/book3s64/pkeys.c b/arch/powerpc/mm/book3s64/= pkeys.c index a2d9ad138709..dc77c0a27291 100644 --- a/arch/powerpc/mm/book3s64/pkeys.c +++ b/arch/powerpc/mm/book3s64/pkeys.c @@ -333,8 +333,7 @@ static inline void init_iamr(int pkey, u8 init_bits) * Set the access rights in AMR IAMR and UAMOR registers for @pkey to th= at * specified in @init_val. */ -int __arch_set_user_pkey_access(struct task_struct *tsk, int pkey, - unsigned long init_val) +int __arch_set_user_pkey_access(int pkey, unsigned long init_val) { u64 new_amr_bits =3D 0x0ul; u64 new_iamr_bits =3D 0x0ul; diff --git a/arch/x86/include/asm/pkeys.h b/arch/x86/include/asm/pkeys.h index 5c7bcaa79623..26d872bdee49 100644 --- a/arch/x86/include/asm/pkeys.h +++ b/arch/x86/include/asm/pkeys.h @@ -11,8 +11,7 @@ */ #define arch_max_pkey() (cpu_feature_enabled(X86_FEATURE_OSPKE) ? 16 : 1= ) =20 -extern int arch_set_user_pkey_access(struct task_struct *tsk, int pkey, - unsigned long init_val); +extern int arch_set_user_pkey_access(int pkey, unsigned long init_val); =20 static inline bool arch_pkeys_enabled(void) { @@ -43,8 +42,7 @@ static inline int arch_override_mprotect_pkey(struct vm= _area_struct *vma, return __arch_override_mprotect_pkey(vma, prot, pkey); } =20 -extern int __arch_set_user_pkey_access(struct task_struct *tsk, int pkey= , - unsigned long init_val); +extern int __arch_set_user_pkey_access(int pkey, unsigned long init_val)= ; =20 #define ARCH_VM_PKEY_FLAGS (VM_PKEY_BIT0 | VM_PKEY_BIT1 | VM_PKEY_BIT2 |= VM_PKEY_BIT3) =20 @@ -120,10 +118,8 @@ int mm_pkey_free(struct mm_struct *mm, int pkey) return 0; } =20 -extern int arch_set_user_pkey_access(struct task_struct *tsk, int pkey, - unsigned long init_val); -extern int __arch_set_user_pkey_access(struct task_struct *tsk, int pkey= , - unsigned long init_val); +extern int arch_set_user_pkey_access(int pkey, unsigned long init_val); +extern int __arch_set_user_pkey_access(int pkey, unsigned long init_val)= ; =20 static inline int vma_pkey(struct vm_area_struct *vma) { diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c index c8def1b7f8fb..565de4a49c0a 100644 --- a/arch/x86/kernel/fpu/xstate.c +++ b/arch/x86/kernel/fpu/xstate.c @@ -912,8 +912,7 @@ EXPORT_SYMBOL_GPL(get_xsave_addr); * This will go out and modify PKRU register to set the access * rights for @pkey to @init_val. */ -int arch_set_user_pkey_access(struct task_struct *tsk, int pkey, - unsigned long init_val) +int arch_set_user_pkey_access(int pkey, unsigned long init_val) { u32 old_pkru, new_pkru_bits =3D 0; int pkey_shift; diff --git a/arch/x86/mm/pkeys.c b/arch/x86/mm/pkeys.c index e44e938885b7..fafc10ea7cf1 100644 --- a/arch/x86/mm/pkeys.c +++ b/arch/x86/mm/pkeys.c @@ -42,8 +42,7 @@ int __execute_only_pkey(struct mm_struct *mm) * Set up PKRU so that it denies access for everything * other than execution. */ - ret =3D arch_set_user_pkey_access(current, execute_only_pkey, - PKEY_DISABLE_ACCESS); + ret =3D arch_set_user_pkey_access(execute_only_pkey, PKEY_DISABLE_ACCES= S); /* * If the PKRU-set operation failed somehow, just return * 0 and effectively disable execute-only support. diff --git a/include/linux/pkeys.h b/include/linux/pkeys.h index 6beb26b7151d..c8a5d96ab461 100644 --- a/include/linux/pkeys.h +++ b/include/linux/pkeys.h @@ -33,8 +33,7 @@ static inline int mm_pkey_free(struct mm_struct *mm, in= t pkey) return -EINVAL; } =20 -static inline int arch_set_user_pkey_access(struct task_struct *tsk, int= pkey, - unsigned long init_val) +static inline int arch_set_user_pkey_access(int pkey, unsigned long init= _val) { return 0; } diff --git a/mm/mprotect.c b/mm/mprotect.c index 883e2cc85cad..fe2c4755d833 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -689,7 +689,7 @@ SYSCALL_DEFINE2(pkey_alloc, unsigned long, flags, uns= igned long, init_val) if (pkey =3D=3D -1) goto out; =20 - ret =3D arch_set_user_pkey_access(current, pkey, init_val); + ret =3D arch_set_user_pkey_access(pkey, init_val); if (ret) { mm_pkey_free(current->mm, pkey); goto out; --=20 2.32.0