Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp1859087rwr; Fri, 28 Apr 2023 02:53:15 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5KK427Tm3xro+KJy2q6HaE7QdhZsnONWHDKZNQFufpaNLtzpqxxV7Yrqq7lBwsTrdHADWt X-Received: by 2002:a17:902:e849:b0:1a2:19c1:a974 with SMTP id t9-20020a170902e84900b001a219c1a974mr4860139plg.68.1682675594995; Fri, 28 Apr 2023 02:53:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682675594; cv=none; d=google.com; s=arc-20160816; b=XRGwmmAn1qFsTPQTXmue2rm26kJB7dmxpDjnUbNiwkMS7eDPcyTGcEc4Un18Vl9VGd K+r/++T7rULu/D7fi8TgpmUv0vIhTv572+YBat+3glk2LXAjDX6B3KmfGhYOufsv1CpZ oP8QfetvdToro0Ud2jkbKz3UYq+HijKQWPhkQImFTLwBxQISXfXUINE4p5c3c9o1DZd0 RbVBPBiN6/QlbC9oRDYkh4ACeAYgnqhoKp9sVRyD8Nw9VnAtxp5TnnJPNGZFbAD/rAHK r5Kf6/qiBeWUk+qICYWLf23TAQSS4urIYDloT/tXz0tz5Fi5qUhLtGoQqIQcwD7CWJD1 WlaA== 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=SuGEPPR0BEZ6H4/WwAPmBpJv/32hD1Vv44O7qBAYt3g=; b=PuarJO4QbfLSbxgITsRNKNK33IKGh7MebCyIwvnf2quk4/lutDc14c+hwNsRMvOnuD TuVfuLq3sgyexTXX2Lh4kynWxhFrobTwRi6UqEafFa42y13EcTxJdfJg45Wr5EzNe0lK M2OT6U+5+RnSjvKidwnzypTGjfJHV6vtQxRTo+TqCGmaMj7uG0RVXacpK3mLpJ7otLzZ /HsEJOVAZYIVS0P6A/MpSbmc/tmWAsrz8B9FzWv5EFBuqB1xJtnUct64yaWAiKRzr+Em RArHBp774T3NAhyc5Qs7U3OwOcONreT0YJ8YR0UpzjlWhRca7M5e9zFg1mhCukho4uQD QVBg== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=antgroup.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k18-20020a170902c41200b001a66a0f12b7si9380068plk.236.2023.04.28.02.53.01; Fri, 28 Apr 2023 02:53:14 -0700 (PDT) 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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=antgroup.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345739AbjD1JwN (ORCPT + 99 others); Fri, 28 Apr 2023 05:52:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345704AbjD1JwB (ORCPT ); Fri, 28 Apr 2023 05:52:01 -0400 Received: from out0-201.mail.aliyun.com (out0-201.mail.aliyun.com [140.205.0.201]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DF244699 for ; Fri, 28 Apr 2023 02:51:56 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R511e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018047202;MF=houwenlong.hwl@antgroup.com;NM=1;PH=DS;RN=15;SR=0;TI=SMTPD_---.STFQG9j_1682675508; Received: from localhost(mailfrom:houwenlong.hwl@antgroup.com fp:SMTPD_---.STFQG9j_1682675508) by smtp.aliyun-inc.com; Fri, 28 Apr 2023 17:51:49 +0800 From: "Hou Wenlong" To: linux-kernel@vger.kernel.org Cc: "Thomas Garnier" , "Lai Jiangshan" , "Kees Cook" , "Hou Wenlong" , "Thomas Gleixner" , "Ingo Molnar" , "Borislav Petkov" , "Dave Hansen" , , "H. Peter Anvin" , "=?UTF-8?B?UGV0ZXIgWmlqbHN0cmEgKEludGVsKQ==?=" , "Alexandre Chartre" , "Josh Poimboeuf" , "Konrad Rzeszutek Wilk" Subject: [PATCH RFC 03/43] x86: relocate_kernel - Adapt assembly for PIE support Date: Fri, 28 Apr 2023 17:50:43 +0800 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY 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 From: Thomas Garnier From: Thomas Garnier Change the assembly code to use only absolute references of symbols for the kernel to be PIE compatible. Signed-off-by: Thomas Garnier Signed-off-by: Hou Wenlong Cc: Lai Jiangshan Cc: Kees Cook --- arch/x86/kernel/relocate_kernel_64.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S index 56cab1bb25f5..05d916e9df47 100644 --- a/arch/x86/kernel/relocate_kernel_64.S +++ b/arch/x86/kernel/relocate_kernel_64.S @@ -223,7 +223,7 @@ SYM_CODE_START_LOCAL_NOALIGN(identity_mapped) movq %rax, %cr3 lea PAGE_SIZE(%r8), %rsp call swap_pages - movq $virtual_mapped, %rax + movabsq $virtual_mapped, %rax pushq %rax ANNOTATE_UNRET_SAFE ret -- 2.31.1