Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp4039908pxf; Tue, 23 Mar 2021 00:33:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYj2di5IU2hkF1Gdc0ZFnRVRz8aGVjHu88OknNc/Jb7XSFwwM4fbeMVzbt7wO/YHhuK/A7 X-Received: by 2002:a05:6402:4244:: with SMTP id g4mr3272749edb.204.1616484822884; Tue, 23 Mar 2021 00:33:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616484822; cv=none; d=google.com; s=arc-20160816; b=ID4+a8Fp8qKJRxjtgG2bQtHasGL63iGAWeWOC4DoAN16rdSuISSSk6GZorBYE6nnG2 GkShR6+rTlhMdiG4F3miBRceoApk8FZZRRaKt4Vz/80v9POJBLv+IqbK7bu/BtWlTR7+ HzNlr947IZuas0SzPegtopqBX8OV7czsr7Dsx7+2UjTl+82z3d3aN9Z9nCPSaUzt18aA ex7zMtP1Xvw+a+b+S4cNlJUfoMcmivkXs7dxjsOx1nl+bcjBwWLwbHcekoBWAjo9SQqN hFYCYEaDbHvZHiGa4gTOE+boSNvn6UkNDjkcowrAMlJ9xu+wT9MtfMM7HCwzYQd2Lwq4 FWjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=NKFMlxRdmsvRqZ34d1gjVOIQI101XqoarUIH07QKNz8=; b=oqZQMXP/85AhWODQLWeejBldUhWShGw85dZL3g74QF6/fE7OM420THwJk5MMA8RvAJ rmjUTYb7X4cLvj0287kRMTsvzo0/7/5jgZhGb6A1EONZZVnXrC3iXZFqoNHebOvKhNQo 6SHvsNiTMfB1KKlz8sjF803UJnBGD1snOQ7Qu7pejYHLgQTkbUzlhXdlpcvTmj/qHljb hdwPp6WMglGRZ/76XVSCQmViu3ePjtAtWyDblxI+G9+UVmIyqzrLovrD3+Kp26r//mI0 wjZlPe603Bdpb5x6ZGyvDG48d58U/mm980cspFfiptTaVfzIi5Ngped/sJo8CP6mGPod Q1TQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id se19si13157624ejb.119.2021.03.23.00.33.20; Tue, 23 Mar 2021 00:33:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229915AbhCWHcW (ORCPT + 99 others); Tue, 23 Mar 2021 03:32:22 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:14069 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229622AbhCWHb4 (ORCPT ); Tue, 23 Mar 2021 03:31:56 -0400 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 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.103.91] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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" -- 2.25.1