From patchwork Tue Mar 23 07:34:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 12157075 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 A67E3C433DB for ; Tue, 23 Mar 2021 07:34:15 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 25D3060231 for ; Tue, 23 Mar 2021 07:34:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 25D3060231 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=L2HScvDB+eGQmrYlkJk9gnhkTemjFKF6pLK1yg3cQQo=; b=dZDz9EgInXY2u/JGjoV0wB/h+ euWCT/pgWO912LTbZuTrHFJWlusCt2iPblqJ7wxXRPiR8DLfQPs/WajDc4wqZE0wqJYPkP46WLjae 8KfYsXD0ge819jZbbw3n8v2H8rSgem/kb5s1twkO2RfwSBlhPbYpQDgWmrBHz22qA6+rzlE7v979s +ppDrYU1D2uhfw3EmS2VQpEiCXjuUu4cZhrdgY6ENGrNvCKv9bb1ofv4l6FOjJVaxE8y610MQqyiQ 5BgtS1KrCYxFSrEGeDbhVQDeXIpjcGeEwn/qF6sWE2lCHC7a4Y3mcAl62rEl7dbHuQXXbVA/KapKs k07ZHGw0Q==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lObWi-00E988-NV; Tue, 23 Mar 2021 07:32:32 +0000 Received: from szxga05-in.huawei.com ([45.249.212.191]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lObWB-00E90Q-4Y for linux-arm-kernel@lists.infradead.org; Tue, 23 Mar 2021 07:32:02 +0000 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4F4NKW5BxVzNqX2; Tue, 23 Mar 2021 15:29:19 +0800 (CST) Received: from huawei.com (10.175.103.91) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.498.0; Tue, 23 Mar 2021 15:31:40 +0800 From: Yang Yingliang To: , CC: , , , Subject: [PATCH 1/3] arm64: lib: introduce ldp2/stp2 macro Date: Tue, 23 Mar 2021 15:34:30 +0800 Message-ID: <20210323073432.3422227-2-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210323073432.3422227-1-yangyingliang@huawei.com> References: <20210323073432.3422227-1-yangyingliang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.103.91] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210323_073159_813488_708FE4F8 X-CRM114-Status: UNSURE ( 6.92 ) X-CRM114-Notice: Please train this message. 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 Introduce ldp2/stp2 to load/store without add src/dst. Signed-off-by: Yang Yingliang --- arch/arm64/include/asm/asm-uaccess.h | 16 ++++++++++++++++ arch/arm64/lib/copy_from_user.S | 8 ++++++++ arch/arm64/lib/copy_in_user.S | 8 ++++++++ arch/arm64/lib/copy_to_user.S | 8 ++++++++ arch/arm64/lib/memcpy.S | 8 ++++++++ 5 files changed, 48 insertions(+) diff --git a/arch/arm64/include/asm/asm-uaccess.h b/arch/arm64/include/asm/asm-uaccess.h index ccedf548dac9..129c08621df1 100644 --- a/arch/arm64/include/asm/asm-uaccess.h +++ b/arch/arm64/include/asm/asm-uaccess.h @@ -72,6 +72,14 @@ alternative_else_nop_endif _asm_extable 8889b,\l; .endm + .macro user_ldp2 l, reg1, reg2, addr, post_inc1, post_inc2 +8888: ldtr \reg1, [\addr, \post_inc1]; +8889: ldtr \reg2, [\addr, \post_inc2]; + + _asm_extable 8888b,\l; + _asm_extable 8889b,\l; + .endm + .macro user_stp l, reg1, reg2, addr, post_inc 8888: sttr \reg1, [\addr]; 8889: sttr \reg2, [\addr, #8]; @@ -81,6 +89,14 @@ alternative_else_nop_endif _asm_extable 8889b,\l; .endm + .macro user_stp2 l, reg1, reg2, addr, post_inc1, post_inc2 +8888: sttr \reg1, [\addr, \post_inc1]; +8889: sttr \reg2, [\addr, \post_inc2]; + + _asm_extable 8888b,\l; + _asm_extable 8889b,\l; + .endm + .macro user_ldst l, inst, reg, addr, post_inc 8888: \inst \reg, [\addr]; add \addr, \addr, \post_inc; diff --git a/arch/arm64/lib/copy_from_user.S b/arch/arm64/lib/copy_from_user.S index 95cd62d67371..37308bcb338e 100644 --- a/arch/arm64/lib/copy_from_user.S +++ b/arch/arm64/lib/copy_from_user.S @@ -48,10 +48,18 @@ user_ldp 9998f, \reg1, \reg2, \ptr, \val .endm + .macro ldp2 reg1, reg2, ptr, val1, val2 + user_ldp2 9998f, \reg1, \reg2, \ptr, \val1, \val2 + .endm + .macro stp1 reg1, reg2, ptr, val stp \reg1, \reg2, [\ptr], \val .endm + .macro stp2 reg1, reg2, ptr, val1, val2 + stp \reg1, \reg2, [\ptr, \val1] + .endm + end .req x5 SYM_FUNC_START(__arch_copy_from_user) add end, x0, x2 diff --git a/arch/arm64/lib/copy_in_user.S b/arch/arm64/lib/copy_in_user.S index 1f61cd0df062..5654f7098102 100644 --- a/arch/arm64/lib/copy_in_user.S +++ b/arch/arm64/lib/copy_in_user.S @@ -49,10 +49,18 @@ user_ldp 9998f, \reg1, \reg2, \ptr, \val .endm + .macro ldp2 reg1, reg2, ptr, val1, val2 + user_ldp2 9998f, \reg1, \reg2, \ptr, \val1, \val2 + .endm + .macro stp1 reg1, reg2, ptr, val user_stp 9998f, \reg1, \reg2, \ptr, \val .endm + .macro stp2 reg1, reg2, ptr, val1, val2 + user_stp2 9998f, \reg1, \reg2, \ptr, \val1, \val2 + .endm + end .req x5 SYM_FUNC_START(__arch_copy_in_user) diff --git a/arch/arm64/lib/copy_to_user.S b/arch/arm64/lib/copy_to_user.S index 043da90f5dd7..a1f95169ce04 100644 --- a/arch/arm64/lib/copy_to_user.S +++ b/arch/arm64/lib/copy_to_user.S @@ -47,10 +47,18 @@ ldp \reg1, \reg2, [\ptr], \val .endm + .macro ldp2 reg1, reg2, ptr, val1, val2 + ldp \reg1, \reg2, [\ptr, \val1] + .endm + .macro stp1 reg1, reg2, ptr, val user_stp 9998f, \reg1, \reg2, \ptr, \val .endm + .macro stp2 reg1, reg2, ptr, val1, val2 + user_stp2 9998f, \reg1, \reg2, \ptr, \val1, \val2 + .endm + end .req x5 SYM_FUNC_START(__arch_copy_to_user) add end, x0, x2 diff --git a/arch/arm64/lib/memcpy.S b/arch/arm64/lib/memcpy.S index dc8d2a216a6e..9e0bfefd2673 100644 --- a/arch/arm64/lib/memcpy.S +++ b/arch/arm64/lib/memcpy.S @@ -52,10 +52,18 @@ ldp \reg1, \reg2, [\ptr], \val .endm + .macro ldp2 reg1, reg2, ptr, val1, val2 + ldp \reg1, \reg2, [\ptr, \val1] + .endm + .macro stp1 reg1, reg2, ptr, val stp \reg1, \reg2, [\ptr], \val .endm + .macro stp2 reg1, reg2, ptr, val1, val2 + stp \reg1, \reg2, [\ptr, \val1] + .endm + SYM_FUNC_START_ALIAS(__memcpy) SYM_FUNC_START_WEAK_PI(memcpy) #include "copy_template.S"