From patchwork Tue Feb 7 14:28:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Ruoyao X-Patchwork-Id: 53935 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2388:b0:96:219d:e725 with SMTP id i8csp4043608dyf; Tue, 7 Feb 2023 06:32:14 -0800 (PST) X-Google-Smtp-Source: AK7set+0d9QscmHm5veb3gBoBbGrx7Qv456DUSezryTB9aS32REwxdzfOBXOmJJUkP2wxyLrginI X-Received: by 2002:a50:aa9b:0:b0:4aa:c680:c703 with SMTP id q27-20020a50aa9b000000b004aac680c703mr3955411edc.36.1675780334213; Tue, 07 Feb 2023 06:32:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675780334; cv=none; d=google.com; s=arc-20160816; b=L3qxvmIyvnEnV8p93FXSLhNZOs6dYD9CwNT+7Qx32nhmORtWdQLeX8ij6E4SPTNjuQ KxUa3jLN8uKWMvasJthsyt1xPo6+obwXHZqGH4z2zOG9p0t0puW2tKFRqASJxdmhsvTD s8YtgYDMrv24DEnG3NEAnscHglMYMoEbslCPie/7Kvij30bO4e/Y6CJDGJHzPw4LXu1G TNxZDj6CUtDAlsjups+xZeDrczcuJ7m1zuW7xoItCFyG5gKN8SRpws9u9QrLu4oQVM2f nG0a1SO4dzM1hZyll3UNmwPK83X8eJFxbpAJ6TCVgOj1BCWp47VX92Hdj8oK6dePIWSk TDFQ== 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 :dkim-signature; bh=lw7LryyT4KqlU4iEt1of33N218ph7x4pF/sA7UW0f94=; b=ry1YlcxokXT+ijAUu4JAPNXfrzyH5PvlTwsx8J7+x+ZAWFs9XnV0+J/NXsGyJU73BS 4LtapiezzMWOBHl2PSHPQ4oCSSfWv/kfUzVio/NX7U62M0+NWUp7ApVPXAgPRn+QqEM8 VVLh5G5E8jMgreCuXZUsMZL5ycLYCQ55Qq1Y3eMAKWnYMWctaHn9Z6j83PvVc8Oc5Yf7 No6dQc/qKkHJawYAqA8CyqIXE3in03p5vXx9mcxyAA/GPP2oThj1HFglLjTe2gl4cVHB V81ND6SWqjPY4yrSGYIwyU2qqn0nsDOHPuvwRcxJiSazsRLFzYYQL3bsROQblsjglMgI tdkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@xry111.site header.s=default header.b="HVJNsBr/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=xry111.site Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h5-20020a50ed85000000b004aaa3ed634asi10232497edr.19.2023.02.07.06.31.50; Tue, 07 Feb 2023 06:32:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@xry111.site header.s=default header.b="HVJNsBr/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=xry111.site Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232996AbjBGOam (ORCPT + 99 others); Tue, 7 Feb 2023 09:30:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232782AbjBGOaG (ORCPT ); Tue, 7 Feb 2023 09:30:06 -0500 Received: from xry111.site (xry111.site [89.208.246.23]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6190AA260 for ; Tue, 7 Feb 2023 06:29:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xry111.site; s=default; t=1675780177; bh=oMzyttSCKaIX1gPfNc0f7aOnWiUj9GW0I5ny0MzusMc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HVJNsBr/mdPdpYfYD51lhUfOZI7ELx9OI7hsDmCZoR3EOe8j019LXTKpD82OS7sYv gNKnSaZXWuI27czfBah/Rv0SaxYbbOyXR1nZ+e67XjLzbylsIPYgjLzzoFhfyJE0N3 VKOwwaHCskNZfohwMZ9i2rnvf+dbwLc/hN73Br8s= Received: from xry111-x57s1.. (unknown [IPv6:240e:358:11cc:4100:dc73:854d:832e:2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) (Authenticated sender: xry111@xry111.site) by xry111.site (Postfix) with ESMTPSA id 264FA65DC8; Tue, 7 Feb 2023 09:29:30 -0500 (EST) From: Xi Ruoyao To: Youling Tang , Huacai Chen , Jinyang He Cc: Xuerui Wang , loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, Xi Ruoyao Subject: [PATCH v2 1/5] LoongArch: Use la.pcrel instead of la.abs when it's trivially possible Date: Tue, 7 Feb 2023 22:28:18 +0800 Message-Id: <20230207142822.52172-2-xry111@xry111.site> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230207142822.52172-1-xry111@xry111.site> References: <20230207142822.52172-1-xry111@xry111.site> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757183039742745160?= X-GMAIL-MSGID: =?utf-8?q?1757183039742745160?= Let's start to kill la.abs inpreparation for the subsequent support of the PIE kernel. Signed-off-by: Xi Ruoyao --- arch/loongarch/include/asm/stackframe.h | 2 +- arch/loongarch/include/asm/uaccess.h | 1 - arch/loongarch/kernel/entry.S | 2 +- arch/loongarch/kernel/head.S | 2 +- arch/loongarch/mm/tlbex.S | 3 +-- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/loongarch/include/asm/stackframe.h b/arch/loongarch/include/asm/stackframe.h index 4ca953062b5b..7deb043ce387 100644 --- a/arch/loongarch/include/asm/stackframe.h +++ b/arch/loongarch/include/asm/stackframe.h @@ -90,7 +90,7 @@ .endm .macro set_saved_sp stackp temp temp2 - la.abs \temp, kernelsp + la.pcrel \temp, kernelsp #ifdef CONFIG_SMP LONG_ADD \temp, \temp, u0 #endif diff --git a/arch/loongarch/include/asm/uaccess.h b/arch/loongarch/include/asm/uaccess.h index 255899d4a7c3..0d22991ae430 100644 --- a/arch/loongarch/include/asm/uaccess.h +++ b/arch/loongarch/include/asm/uaccess.h @@ -22,7 +22,6 @@ extern u64 __ua_limit; #define __UA_ADDR ".dword" -#define __UA_LA "la.abs" #define __UA_LIMIT __ua_limit /* diff --git a/arch/loongarch/kernel/entry.S b/arch/loongarch/kernel/entry.S index d53b631c9022..2566977f2f68 100644 --- a/arch/loongarch/kernel/entry.S +++ b/arch/loongarch/kernel/entry.S @@ -20,7 +20,7 @@ .align 5 SYM_FUNC_START(handle_syscall) csrrd t0, PERCPU_BASE_KS - la.abs t1, kernelsp + la.pcrel t1, kernelsp add.d t1, t1, t0 move t2, sp ld.d sp, t1, 0 diff --git a/arch/loongarch/kernel/head.S b/arch/loongarch/kernel/head.S index 57bada6b4e93..aa6181714ec3 100644 --- a/arch/loongarch/kernel/head.S +++ b/arch/loongarch/kernel/head.S @@ -117,7 +117,7 @@ SYM_CODE_START(smpboot_entry) li.w t0, 0x00 # FPE=0, SXE=0, ASXE=0, BTE=0 csrwr t0, LOONGARCH_CSR_EUEN - la.abs t0, cpuboot_data + la.pcrel t0, cpuboot_data ld.d sp, t0, CPU_BOOT_STACK ld.d tp, t0, CPU_BOOT_TINFO diff --git a/arch/loongarch/mm/tlbex.S b/arch/loongarch/mm/tlbex.S index 58781c6e4191..3dd2a9615cd9 100644 --- a/arch/loongarch/mm/tlbex.S +++ b/arch/loongarch/mm/tlbex.S @@ -24,8 +24,7 @@ move a0, sp REG_S a2, sp, PT_BVADDR li.w a1, \write - la.abs t0, do_page_fault - jirl ra, t0, 0 + bl do_page_fault RESTORE_ALL_AND_RET SYM_FUNC_END(tlb_do_page_fault_\write) .endm