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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,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 4AD45CA9EA0 for ; Fri, 25 Oct 2019 09:41:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2B77121D7B for ; Fri, 25 Oct 2019 09:41:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2438801AbfJYJln (ORCPT ); Fri, 25 Oct 2019 05:41:43 -0400 Received: from foss.arm.com ([217.140.110.172]:37896 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2438778AbfJYJlm (ORCPT ); Fri, 25 Oct 2019 05:41:42 -0400 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 E8EB228; Fri, 25 Oct 2019 02:41:41 -0700 (PDT) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CA8C73F71F; Fri, 25 Oct 2019 02:41:39 -0700 (PDT) Date: Fri, 25 Oct 2019 10:41:37 +0100 From: Mark Rutland To: samitolvanen@google.com Cc: Will Deacon , Catalin Marinas , Steven Rostedt , Masami Hiramatsu , Ard Biesheuvel , Dave Martin , Kees Cook , Laura Abbott , Nick Desaulniers , Jann Horn , Miguel Ojeda , Masahiro Yamada , clang-built-linux@googlegroups.com, kernel-hardening@lists.openwall.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 02/17] arm64/lib: copy_page: avoid x18 register in assembler code Message-ID: <20191025094137.GB40270@lakrids.cambridge.arm.com> References: <20191018161033.261971-1-samitolvanen@google.com> <20191024225132.13410-1-samitolvanen@google.com> <20191024225132.13410-3-samitolvanen@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191024225132.13410-3-samitolvanen@google.com> User-Agent: Mutt/1.11.1+11 (2f07cb52) (2018-12-01) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Oct 24, 2019 at 03:51:17PM -0700, samitolvanen@google.com wrote: > From: Ard Biesheuvel > > Register x18 will no longer be used as a caller save register in the > future, so stop using it in the copy_page() code. > > Link: https://patchwork.kernel.org/patch/9836869/ > Signed-off-by: Ard Biesheuvel > Signed-off-by: Sami Tolvanen > --- > arch/arm64/lib/copy_page.S | 38 +++++++++++++++++++------------------- > 1 file changed, 19 insertions(+), 19 deletions(-) > > diff --git a/arch/arm64/lib/copy_page.S b/arch/arm64/lib/copy_page.S > index bbb8562396af..8b562264c165 100644 > --- a/arch/arm64/lib/copy_page.S > +++ b/arch/arm64/lib/copy_page.S > @@ -34,45 +34,45 @@ alternative_else_nop_endif > ldp x14, x15, [x1, #96] > ldp x16, x17, [x1, #112] > > - mov x18, #(PAGE_SIZE - 128) > + add x0, x0, #256 > add x1, x1, #128 > 1: > - subs x18, x18, #128 > + tst x0, #(PAGE_SIZE - 1) > > alternative_if ARM64_HAS_NO_HW_PREFETCH > prfm pldl1strm, [x1, #384] > alternative_else_nop_endif > > - stnp x2, x3, [x0] > + stnp x2, x3, [x0, #-256] > ldp x2, x3, [x1] > - stnp x4, x5, [x0, #16] > + stnp x4, x5, [x0, #-240] > ldp x4, x5, [x1, #16] For legibility, could we make the offset and bias explicit in the STNPs so that these line up? e.g. stnp x4, x5, [x0, #16 - 256] ldp x4, x5, [x1, #16] ... that'd make it much easier to see by eye that this is sound, much as I trust my mental arithmetic. ;) > - stnp x6, x7, [x0, #32] > + stnp x6, x7, [x0, #-224] > ldp x6, x7, [x1, #32] > - stnp x8, x9, [x0, #48] > + stnp x8, x9, [x0, #-208] > ldp x8, x9, [x1, #48] > - stnp x10, x11, [x0, #64] > + stnp x10, x11, [x0, #-192] > ldp x10, x11, [x1, #64] > - stnp x12, x13, [x0, #80] > + stnp x12, x13, [x0, #-176] > ldp x12, x13, [x1, #80] > - stnp x14, x15, [x0, #96] > + stnp x14, x15, [x0, #-160] > ldp x14, x15, [x1, #96] > - stnp x16, x17, [x0, #112] > + stnp x16, x17, [x0, #-144] > ldp x16, x17, [x1, #112] > > add x0, x0, #128 > add x1, x1, #128 > > - b.gt 1b > + b.ne 1b > > - stnp x2, x3, [x0] > - stnp x4, x5, [x0, #16] > - stnp x6, x7, [x0, #32] > - stnp x8, x9, [x0, #48] > - stnp x10, x11, [x0, #64] > - stnp x12, x13, [x0, #80] > - stnp x14, x15, [x0, #96] > - stnp x16, x17, [x0, #112] > + stnp x2, x3, [x0, #-256] > + stnp x4, x5, [x0, #-240] > + stnp x6, x7, [x0, #-224] > + stnp x8, x9, [x0, #-208] > + stnp x10, x11, [x0, #-192] > + stnp x12, x13, [x0, #-176] > + stnp x14, x15, [x0, #-160] > + stnp x16, x17, [x0, #-144] ... likewise here: stnp xt1, xt2, [x0, #off - 256] I don't see a nicer way to write this sequence without using an additional register, so with those changes: Reviewed-by: Mark Rutland Thanks, Mark. > > ret > ENDPROC(copy_page) > -- > 2.24.0.rc0.303.g954a862665-goog > 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=-8.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 3CF39CA9EBC for ; Fri, 25 Oct 2019 09:41:47 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 0B42F205F4 for ; Fri, 25 Oct 2019 09:41:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Cc7AQRid" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0B42F205F4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-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=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=BmU4XHjOpPN2NSESLlFCN+qEPoRrsOA5aMZ8I3Txy90=; b=Cc7AQRid81HO4A G5/BbEXvCq31NqS9jTtqWEF1zIS1unF4w1kmHUti53iSnxio+nq01Z2oUtaqazy4bo23OGPLn33mF x3jzlWNbSWiwqUBolxQkH4nwp/Qb4R225pfi4qKHEFDB5nEwJZj77JHjguo+rnFr7wKogAZVZcirG IlHA1ktRpDmcwRL4/2G9zuPEN5TLlYy/24W/UOBk2SCJag7ITmWnqLfL3vLBp55iJ1aEPalHg3Hnl s+eoL+j/8GQAJOjKoCsQpQkhYYYY79PtXkWWVTyYycS3YkNYXf3Z7YdpDTmelTVdX8GSqx3q96bq/ DJsNNKQUzmXdP36/uXZw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNw6M-00087J-DR; Fri, 25 Oct 2019 09:41:46 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNw6I-00086R-WC for linux-arm-kernel@lists.infradead.org; Fri, 25 Oct 2019 09:41:44 +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 E8EB228; Fri, 25 Oct 2019 02:41:41 -0700 (PDT) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CA8C73F71F; Fri, 25 Oct 2019 02:41:39 -0700 (PDT) Date: Fri, 25 Oct 2019 10:41:37 +0100 From: Mark Rutland To: samitolvanen@google.com Subject: Re: [PATCH v2 02/17] arm64/lib: copy_page: avoid x18 register in assembler code Message-ID: <20191025094137.GB40270@lakrids.cambridge.arm.com> References: <20191018161033.261971-1-samitolvanen@google.com> <20191024225132.13410-1-samitolvanen@google.com> <20191024225132.13410-3-samitolvanen@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20191024225132.13410-3-samitolvanen@google.com> User-Agent: Mutt/1.11.1+11 (2f07cb52) (2018-12-01) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191025_024143_127636_C80353D2 X-CRM114-Status: GOOD ( 15.65 ) 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: Kees Cook , Ard Biesheuvel , Masahiro Yamada , Catalin Marinas , Jann Horn , Nick Desaulniers , linux-kernel@vger.kernel.org, Steven Rostedt , Miguel Ojeda , Masami Hiramatsu , clang-built-linux@googlegroups.com, kernel-hardening@lists.openwall.com, Laura Abbott , Will Deacon , Dave Martin , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Oct 24, 2019 at 03:51:17PM -0700, samitolvanen@google.com wrote: > From: Ard Biesheuvel > > Register x18 will no longer be used as a caller save register in the > future, so stop using it in the copy_page() code. > > Link: https://patchwork.kernel.org/patch/9836869/ > Signed-off-by: Ard Biesheuvel > Signed-off-by: Sami Tolvanen > --- > arch/arm64/lib/copy_page.S | 38 +++++++++++++++++++------------------- > 1 file changed, 19 insertions(+), 19 deletions(-) > > diff --git a/arch/arm64/lib/copy_page.S b/arch/arm64/lib/copy_page.S > index bbb8562396af..8b562264c165 100644 > --- a/arch/arm64/lib/copy_page.S > +++ b/arch/arm64/lib/copy_page.S > @@ -34,45 +34,45 @@ alternative_else_nop_endif > ldp x14, x15, [x1, #96] > ldp x16, x17, [x1, #112] > > - mov x18, #(PAGE_SIZE - 128) > + add x0, x0, #256 > add x1, x1, #128 > 1: > - subs x18, x18, #128 > + tst x0, #(PAGE_SIZE - 1) > > alternative_if ARM64_HAS_NO_HW_PREFETCH > prfm pldl1strm, [x1, #384] > alternative_else_nop_endif > > - stnp x2, x3, [x0] > + stnp x2, x3, [x0, #-256] > ldp x2, x3, [x1] > - stnp x4, x5, [x0, #16] > + stnp x4, x5, [x0, #-240] > ldp x4, x5, [x1, #16] For legibility, could we make the offset and bias explicit in the STNPs so that these line up? e.g. stnp x4, x5, [x0, #16 - 256] ldp x4, x5, [x1, #16] ... that'd make it much easier to see by eye that this is sound, much as I trust my mental arithmetic. ;) > - stnp x6, x7, [x0, #32] > + stnp x6, x7, [x0, #-224] > ldp x6, x7, [x1, #32] > - stnp x8, x9, [x0, #48] > + stnp x8, x9, [x0, #-208] > ldp x8, x9, [x1, #48] > - stnp x10, x11, [x0, #64] > + stnp x10, x11, [x0, #-192] > ldp x10, x11, [x1, #64] > - stnp x12, x13, [x0, #80] > + stnp x12, x13, [x0, #-176] > ldp x12, x13, [x1, #80] > - stnp x14, x15, [x0, #96] > + stnp x14, x15, [x0, #-160] > ldp x14, x15, [x1, #96] > - stnp x16, x17, [x0, #112] > + stnp x16, x17, [x0, #-144] > ldp x16, x17, [x1, #112] > > add x0, x0, #128 > add x1, x1, #128 > > - b.gt 1b > + b.ne 1b > > - stnp x2, x3, [x0] > - stnp x4, x5, [x0, #16] > - stnp x6, x7, [x0, #32] > - stnp x8, x9, [x0, #48] > - stnp x10, x11, [x0, #64] > - stnp x12, x13, [x0, #80] > - stnp x14, x15, [x0, #96] > - stnp x16, x17, [x0, #112] > + stnp x2, x3, [x0, #-256] > + stnp x4, x5, [x0, #-240] > + stnp x6, x7, [x0, #-224] > + stnp x8, x9, [x0, #-208] > + stnp x10, x11, [x0, #-192] > + stnp x12, x13, [x0, #-176] > + stnp x14, x15, [x0, #-160] > + stnp x16, x17, [x0, #-144] ... likewise here: stnp xt1, xt2, [x0, #off - 256] I don't see a nicer way to write this sequence without using an additional register, so with those changes: Reviewed-by: Mark Rutland Thanks, Mark. > > ret > ENDPROC(copy_page) > -- > 2.24.0.rc0.303.g954a862665-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel