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=-13.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 B5806C4363A for ; Tue, 27 Oct 2020 18:45:57 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 546CC20760 for ; Tue, 27 Oct 2020 18:45:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="0I82Kgzk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 546CC20760 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=6YIKHN37066+gQpCbH6NrgjtFibt8sfEdtJxGUxbqSg=; b=0I82KgzklIeRsHAf1aO91Ix7N jZgoi2xCU/Eyi+F76FKXe5nQqCrB1BGE1s4cF5JecXTgchedGB3aeo5ty22l/3O64yARfpkWe/7lX KL4Z+EpUqZ6QGoC1wbdL8tncMWtqjECwxISxoMaUA23NMAIwBjpl5LJ31L0z6m/C6j3DJjeGOXrda ei4Sgs6FaB/oONC2dN5JsmBgDLoHjoPwdplQ67Fq9lKYjBeOleZYzwESonOWenCC2UwLJvGgKEADd J3wOLT5xLlN0hXZEjJh5HwcoBnhjraMqy7q19VfWIySfIahq6sRKpQZVFlPSp5kJuUEjOTjlTXxI3 WXMVdnIqg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXTyI-0007ep-V3; Tue, 27 Oct 2020 18:45:27 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXTyF-0007eA-Be for linux-arm-kernel@lists.infradead.org; Tue, 27 Oct 2020 18:45:25 +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 48DC0139F; Tue, 27 Oct 2020 11:45:19 -0700 (PDT) Received: from [10.57.50.191] (unknown [10.57.50.191]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CF0423F68F; Tue, 27 Oct 2020 11:45:17 -0700 (PDT) Subject: Re: [PATCHv3 13/17] arm64: uaccess cleanup macro naming To: Mark Rutland , linux-arm-kernel@lists.infradead.org References: <20201026133156.44186-1-mark.rutland@arm.com> <20201026133156.44186-14-mark.rutland@arm.com> From: Robin Murphy Message-ID: <39f1be4b-54b6-11be-2211-18c3e90a097e@arm.com> Date: Tue, 27 Oct 2020 18:45:16 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <20201026133156.44186-14-mark.rutland@arm.com> Content-Language: en-GB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201027_144524_316020_65F11723 X-CRM114-Status: GOOD ( 20.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: catalin.marinas@arm.com, james.morse@arm.com, hch@lst.de, will@kernel.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 2020-10-26 13:31, Mark Rutland wrote: > Now the uaccess primitives use LDTR/STTR unconditionally, the the > uao_{ldp,stp,user_alternative} asm macros are misnamed, and have a > redunant argument. Let's remove te redundant argument and rename these :set spell > to user_{ldp,stp,ldst} respectively to clean this up. > > Signed-off-by: Mark Rutland > Cc: Catalin Marinas > Cc: Christoph Hellwig > Cc: James Morse > Cc: Will Deacon > --- > arch/arm64/include/asm/asm-uaccess.h | 8 ++++---- > arch/arm64/lib/clear_user.S | 8 ++++---- > arch/arm64/lib/copy_from_user.S | 8 ++++---- > arch/arm64/lib/copy_in_user.S | 16 ++++++++-------- > arch/arm64/lib/copy_to_user.S | 8 ++++---- > arch/arm64/lib/mte.S | 6 +++--- > 6 files changed, 27 insertions(+), 27 deletions(-) > > diff --git a/arch/arm64/include/asm/asm-uaccess.h b/arch/arm64/include/asm/asm-uaccess.h > index 046196f08988b..5e3035fb2c802 100644 > --- a/arch/arm64/include/asm/asm-uaccess.h > +++ b/arch/arm64/include/asm/asm-uaccess.h > @@ -63,7 +63,7 @@ alternative_else_nop_endif > * This is complicated as there is no post-increment or pair versions of the > * unprivileged instructions, and USER() only works for single instructions. > */ > - .macro uao_ldp l, reg1, reg2, addr, post_inc > + .macro user_ldp l, reg1, reg2, addr, post_inc > 8888: ldtr \reg1, [\addr]; > 8889: ldtr \reg2, [\addr, #8]; > add \addr, \addr, \post_inc; > @@ -72,7 +72,7 @@ alternative_else_nop_endif > _asm_extable 8889b,\l; > .endm > > - .macro uao_stp l, reg1, reg2, addr, post_inc > + .macro user_stp l, reg1, reg2, addr, post_inc > 8888: sttr \reg1, [\addr]; > 8889: sttr \reg2, [\addr, #8]; > add \addr, \addr, \post_inc; > @@ -81,8 +81,8 @@ alternative_else_nop_endif > _asm_extable 8889b,\l; > .endm > > - .macro uao_user_alternative l, inst, alt_inst, reg, addr, post_inc > -8888: \alt_inst \reg, [\addr]; > + .macro user_ldst l, inst, reg, addr, post_inc > +8888: \inst \reg, [\addr]; > add \addr, \addr, \post_inc; > > _asm_extable 8888b,\l; > diff --git a/arch/arm64/lib/clear_user.S b/arch/arm64/lib/clear_user.S > index 48a3a26eff663..af9afcbec92cd 100644 > --- a/arch/arm64/lib/clear_user.S > +++ b/arch/arm64/lib/clear_user.S > @@ -24,20 +24,20 @@ SYM_FUNC_START(__arch_clear_user) > subs x1, x1, #8 > b.mi 2f > 1: > -uao_user_alternative 9f, str, sttr, xzr, x0, 8 > +user_ldst 9f, sttr, xzr, x0, 8 > subs x1, x1, #8 > b.pl 1b > 2: adds x1, x1, #4 > b.mi 3f > -uao_user_alternative 9f, str, sttr, wzr, x0, 4 > +user_ldst 9f, sttr, wzr, x0, 4 > sub x1, x1, #4 > 3: adds x1, x1, #2 > b.mi 4f > -uao_user_alternative 9f, strh, sttrh, wzr, x0, 2 > +user_ldst 9f, sttrh, wzr, x0, 2 > sub x1, x1, #2 > 4: adds x1, x1, #1 > b.mi 5f > -uao_user_alternative 9f, strb, sttrb, wzr, x0, 0 > +user_ldst 9f, sttrb, wzr, x0, 0 > 5: mov x0, #0 > ret > SYM_FUNC_END(__arch_clear_user) > diff --git a/arch/arm64/lib/copy_from_user.S b/arch/arm64/lib/copy_from_user.S > index 0f8a3a9e3795b..95cd62d673711 100644 > --- a/arch/arm64/lib/copy_from_user.S > +++ b/arch/arm64/lib/copy_from_user.S > @@ -21,7 +21,7 @@ > */ > > .macro ldrb1 reg, ptr, val > - uao_user_alternative 9998f, ldrb, ldtrb, \reg, \ptr, \val > + user_ldst 9998f, ldtrb, \reg, \ptr, \val > .endm > > .macro strb1 reg, ptr, val > @@ -29,7 +29,7 @@ > .endm > > .macro ldrh1 reg, ptr, val > - uao_user_alternative 9998f, ldrh, ldtrh, \reg, \ptr, \val > + user_ldst 9998f, ldtrh, \reg, \ptr, \val > .endm > > .macro strh1 reg, ptr, val > @@ -37,7 +37,7 @@ > .endm > > .macro ldr1 reg, ptr, val > - uao_user_alternative 9998f, ldr, ldtr, \reg, \ptr, \val > + user_ldst 9998f, ldtr, \reg, \ptr, \val > .endm > > .macro str1 reg, ptr, val > @@ -45,7 +45,7 @@ > .endm > > .macro ldp1 reg1, reg2, ptr, val > - uao_ldp 9998f, \reg1, \reg2, \ptr, \val > + user_ldp 9998f, \reg1, \reg2, \ptr, \val > .endm > > .macro stp1 reg1, reg2, ptr, val > diff --git a/arch/arm64/lib/copy_in_user.S b/arch/arm64/lib/copy_in_user.S > index 80e37ada0ee1a..1f61cd0df0627 100644 > --- a/arch/arm64/lib/copy_in_user.S > +++ b/arch/arm64/lib/copy_in_user.S > @@ -22,35 +22,35 @@ > * x0 - bytes not copied > */ > .macro ldrb1 reg, ptr, val > - uao_user_alternative 9998f, ldrb, ldtrb, \reg, \ptr, \val > + user_ldst 9998f, ldtrb, \reg, \ptr, \val > .endm > > .macro strb1 reg, ptr, val > - uao_user_alternative 9998f, strb, sttrb, \reg, \ptr, \val > + user_ldst 9998f, sttrb, \reg, \ptr, \val > .endm > > .macro ldrh1 reg, ptr, val > - uao_user_alternative 9998f, ldrh, ldtrh, \reg, \ptr, \val > + user_ldst 9998f, ldtrh, \reg, \ptr, \val > .endm > > .macro strh1 reg, ptr, val > - uao_user_alternative 9998f, strh, sttrh, \reg, \ptr, \val > + user_ldst 9998f, sttrh, \reg, \ptr, \val > .endm > > .macro ldr1 reg, ptr, val > - uao_user_alternative 9998f, ldr, ldtr, \reg, \ptr, \val > + user_ldst 9998f, ldtr, \reg, \ptr, \val > .endm > > .macro str1 reg, ptr, val > - uao_user_alternative 9998f, str, sttr, \reg, \ptr, \val > + user_ldst 9998f, sttr, \reg, \ptr, \val > .endm > > .macro ldp1 reg1, reg2, ptr, val > - uao_ldp 9998f, \reg1, \reg2, \ptr, \val > + user_ldp 9998f, \reg1, \reg2, \ptr, \val > .endm > > .macro stp1 reg1, reg2, ptr, val > - uao_stp 9998f, \reg1, \reg2, \ptr, \val > + user_stp 9998f, \reg1, \reg2, \ptr, \val > .endm > > end .req x5 > diff --git a/arch/arm64/lib/copy_to_user.S b/arch/arm64/lib/copy_to_user.S > index 4ec59704b8f2d..043da90f5dd7d 100644 > --- a/arch/arm64/lib/copy_to_user.S > +++ b/arch/arm64/lib/copy_to_user.S > @@ -24,7 +24,7 @@ > .endm > > .macro strb1 reg, ptr, val > - uao_user_alternative 9998f, strb, sttrb, \reg, \ptr, \val > + user_ldst 9998f, sttrb, \reg, \ptr, \val > .endm > > .macro ldrh1 reg, ptr, val > @@ -32,7 +32,7 @@ > .endm > > .macro strh1 reg, ptr, val > - uao_user_alternative 9998f, strh, sttrh, \reg, \ptr, \val > + user_ldst 9998f, sttrh, \reg, \ptr, \val > .endm > > .macro ldr1 reg, ptr, val > @@ -40,7 +40,7 @@ > .endm > > .macro str1 reg, ptr, val > - uao_user_alternative 9998f, str, sttr, \reg, \ptr, \val > + user_ldst 9998f, sttr, \reg, \ptr, \val > .endm > > .macro ldp1 reg1, reg2, ptr, val > @@ -48,7 +48,7 @@ > .endm > > .macro stp1 reg1, reg2, ptr, val > - uao_stp 9998f, \reg1, \reg2, \ptr, \val > + user_stp 9998f, \reg1, \reg2, \ptr, \val > .endm > > end .req x5 > diff --git a/arch/arm64/lib/mte.S b/arch/arm64/lib/mte.S > index 03ca6d8b86706..351537c12f36e 100644 > --- a/arch/arm64/lib/mte.S > +++ b/arch/arm64/lib/mte.S > @@ -4,7 +4,7 @@ > */ > #include > > -#include > +#include Shouldn't that be in patch #8? > #include > #include > #include > @@ -67,7 +67,7 @@ SYM_FUNC_START(mte_copy_tags_from_user) > mov x3, x1 > cbz x2, 2f > 1: > - uao_user_alternative 2f, ldrb, ldtrb, w4, x1, 0 > + user_ldst 2f, ldtrb, w4, x1, 0 > lsl x4, x4, #MTE_TAG_SHIFT > stg x4, [x0], #MTE_GRANULE_SIZE > add x1, x1, #1 > @@ -94,7 +94,7 @@ SYM_FUNC_START(mte_copy_tags_to_user) > 1: > ldg x4, [x1] > ubfx x4, x4, #MTE_TAG_SHIFT, #MTE_TAG_SIZE > - uao_user_alternative 2f, strb, sttrb, w4, x0, 0 > + user_ldst 2f, sttrb, w4, x0, 0 > add x0, x0, #1 > add x1, x1, #MTE_GRANULE_SIZE > subs x2, x2, #1 > Otherwise, the rename looks OK to me, so with the nits picked, Reviewed-by: Robin Murohy _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel