From patchwork Thu Feb 23 19:11:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usama Arif X-Patchwork-Id: 61068 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp488327wrd; Thu, 23 Feb 2023 11:22:02 -0800 (PST) X-Google-Smtp-Source: AK7set87MRVek/jlXMrURCx7zKcXtQWDb15RtjnutBPQMgcOb2EMqZ9zCV7JH0dksEjuL/FnJXom X-Received: by 2002:a05:6a20:3d24:b0:be:cd93:66cd with SMTP id y36-20020a056a203d2400b000becd9366cdmr15667844pzi.2.1677180122100; Thu, 23 Feb 2023 11:22:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677180122; cv=none; d=google.com; s=arc-20160816; b=1Gcb//gfbdzBiHni83zBnMMUJhRe2I1RdmPE+/O+dXlduYn7ZuEglQGzLFQxmBm3pz A7osvQbZv2a6eSkXZ4nUj3cfjLRbLTHSTjlEWn4H8peqQWwkbfF7qYt99bRAodKLoEP6 08TfErpSEW08spcUCxv2jHBZVPHhXVIyOkkQ1WZVHhxnLAcJSSZpWfX/ypU0GVAAwZvF AyaLFKNIsqLxz7wdl9lAlBlPaSaJgi6F034OxFgSLWr+kQ33qVo/mi8eHSWSXh7H0zSU 5UkJSj10rdWyOS/JGw1yk6DNDz/x8HdY8BPqtogooyVyCJk17EFbafraEt8F6zUiMtCW qvNw== 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=Ef9SnPny8CPfpZmm6N0jiCHwpvy9x8nd/PRiLPI7xag=; b=g83gqwgKqPn0KUHiIKdimXJZfY+A0r8MwLN6pfChG61tkM1CeUysGS0DC8Elhndn2Q O3yppbp2nZPnCTnrde1bLU1O8LLN7OAOW0FJBvAaF3joTd3CMOnyuOmitC4nADpW9xxB ktQ86457kjuCabTsAvU0W9gm5kww9V29+Q2+UDkafH4+/mqHKvNPXwJ/kvrrJm3eSW+E fMbphOMGv0Y3+HygYcQlgP5QmKh5PPSTk28KSrhn/OR96hZIsGevQb6vHaCrx4/W527R 1bxaOTitapfrd1DFRzqoTqf8T9l/v9jjAh+AuOb6wU4okpAY41ZsPcrjDtgv2CntkC6U XUSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=XrQnR2cf; 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=NONE sp=NONE dis=NONE) header.from=bytedance.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t140-20020a635f92000000b00502effd3bb9si4163467pgb.521.2023.02.23.11.21.48; Thu, 23 Feb 2023 11:22:02 -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=@bytedance.com header.s=google header.b=XrQnR2cf; 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=NONE sp=NONE dis=NONE) header.from=bytedance.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232728AbjBWTOJ (ORCPT + 99 others); Thu, 23 Feb 2023 14:14:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232389AbjBWTNR (ORCPT ); Thu, 23 Feb 2023 14:13:17 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 769945D44D for ; Thu, 23 Feb 2023 11:12:28 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id h14so2893343wru.4 for ; Thu, 23 Feb 2023 11:12:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ef9SnPny8CPfpZmm6N0jiCHwpvy9x8nd/PRiLPI7xag=; b=XrQnR2cfEdgLwqJ0o6NE4oQo94jXmalIs45LryMzC+zupXpNrQFyQaJDH9RhoY4NO/ X/U5UAZk9WIGO8WHqPCfOQy+GntieRIMVjX2CQO+K+o5U5aUtGC7UKKBzKuMbm21D8lp u0cZi//QcFT5PIFqhoirDUIPE4UgvBV1nDVlTma2g2xOeU/86sFo7mb1nakDRvdHP19X b6Hy4TfrowFaRJqrFtRTUHv3cCDJZXsk3yJr4KG4iRmgLGfdgrVmlvq6hEmItm3DhhlW um39DZUjO4+pDqLuLxhSJqXCoyrzn21aC2w8ZXkjEK+FWBK2QkpLgcwgQVEbVKEkuKEt bN/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ef9SnPny8CPfpZmm6N0jiCHwpvy9x8nd/PRiLPI7xag=; b=yBCh51JoQwQyFOv7v8GFtrc4DQpZByIkRm5wGU84nRHGx757LXBzFsNBeo0vkIISxP 7djnurvwM1+00WUkyTl03QV1LFZ6RY3kZQwu88Fdnx/cLGwxXcSdJugmSeSIYVNKOpAU LRCSq2UkYwasiymw8/1nyTsbTkNO2pxvHffNZwI78zK4avdf+WGTmnjgR2TMA5Q5oX/6 I4fQK/PMEgskbvBQjnIxiJx7EaEm8s/NDfG1v1n+BTA7NtcjhW9R1DruGOuh48m7IEwp YCrXHmjeYy3q8lzc2iOjJPWJknVsgFypYGN555vG2YUQ2EjtyRcP67Je7XWGLlbdPNok ANPw== X-Gm-Message-State: AO0yUKVDZm2q7MHeh4KkY+MjHh3yDGlbCyD1fH7lWOUQBy2LoXBwBZhf jXBQRw7aXEW5OIIh4lR5dELZ+A== X-Received: by 2002:a5d:410b:0:b0:2c5:58f5:3c40 with SMTP id l11-20020a5d410b000000b002c558f53c40mr9571433wrp.47.1677179513058; Thu, 23 Feb 2023 11:11:53 -0800 (PST) Received: from usaari01.cust.communityfibre.co.uk ([2a02:6b6a:b566:0:5ee0:5af0:64bd:6198]) by smtp.gmail.com with ESMTPSA id b15-20020a5d4b8f000000b002c561805a4csm12957286wrt.45.2023.02.23.11.11.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 11:11:52 -0800 (PST) From: Usama Arif To: dwmw2@infradead.org, tglx@linutronix.de, kim.phillips@amd.com, brgerst@gmail.com Cc: piotrgorski@cachyos.org, oleksandr@natalenko.name, arjan@linux.intel.com, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, x86@kernel.org, pbonzini@redhat.com, paulmck@kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, rcu@vger.kernel.org, mimoja@mimoja.de, hewenliang4@huawei.com, thomas.lendacky@amd.com, seanjc@google.com, pmenzel@molgen.mpg.de, fam.zheng@bytedance.com, punit.agrawal@bytedance.com, simon.evans@bytedance.com, liangma@liangbit.com, David Woodhouse , Usama Arif Subject: [PATCH v11 11/12] x86/smpboot: Remove initial_gs Date: Thu, 23 Feb 2023 19:11:39 +0000 Message-Id: <20230223191140.4155012-12-usama.arif@bytedance.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230223191140.4155012-1-usama.arif@bytedance.com> References: <20230223191140.4155012-1-usama.arif@bytedance.com> 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,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1758650823338113910?= X-GMAIL-MSGID: =?utf-8?q?1758650823338113910?= From: Brian Gerst Use the percpu offset directly to set GSBASE. Signed-off-by: Brian Gerst Reviewed-by: David Woodhouse Signed-off-by: David Woodhouse Tested-by: Usama Arif Signed-off-by: Usama Arif --- arch/x86/include/asm/realmode.h | 1 - arch/x86/kernel/acpi/sleep.c | 1 - arch/x86/kernel/head_64.S | 34 ++++++++++----------------------- 3 files changed, 10 insertions(+), 26 deletions(-) diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h index f0357cfe2fb0..87e5482acd0d 100644 --- a/arch/x86/include/asm/realmode.h +++ b/arch/x86/include/asm/realmode.h @@ -60,7 +60,6 @@ extern struct real_mode_header *real_mode_header; extern unsigned char real_mode_blob_end[]; extern unsigned long initial_code; -extern unsigned long initial_gs; extern unsigned long initial_stack; #ifdef CONFIG_AMD_MEM_ENCRYPT extern unsigned long initial_vc_handler; diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index 6538ddb55f28..214dd4a79860 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c @@ -114,7 +114,6 @@ int x86_acpi_suspend_lowlevel(void) #else /* CONFIG_64BIT */ #ifdef CONFIG_SMP current->thread.sp = (unsigned long)temp_stack + sizeof(temp_stack); - initial_gs = per_cpu_offset(smp_processor_id()); /* Force the startup into boot mode */ saved_smpboot_ctrl = xchg(&smpboot_control, 0); #endif diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index 0dd57d573a0e..9ed87ba0609f 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -67,18 +67,10 @@ SYM_CODE_START_NOALIGN(startup_64) leaq _text(%rip), %rdi - /* - * initial_gs points to initial fixed_percpu_data struct with storage for - * the stack protector canary. Global pointer fixups are needed at this - * stage, so apply them as is done in fixup_pointer(), and initialize %gs - * such that the canary can be accessed at %gs:40 for subsequent C calls. - */ + /* Setup GSBASE to allow stack canary access for C code */ movl $MSR_GS_BASE, %ecx - movq initial_gs(%rip), %rax - movq $_text, %rdx - subq %rdx, %rax - addq %rdi, %rax - movq %rax, %rdx + leaq INIT_PER_CPU_VAR(fixed_percpu_data)(%rip), %rdx + movl %edx, %eax shrq $32, %rdx wrmsr @@ -243,10 +235,7 @@ SYM_INNER_LABEL(secondary_startup_64_no_verify, SYM_L_GLOBAL) ANNOTATE_NOENDBR // above #ifdef CONFIG_SMP - /* - * Is this the boot CPU coming up? If so everything is available - * in initial_gs. - */ + /* Is this the boot CPU coming up? */ movl smpboot_control(%rip), %edx testl $STARTUP_SECONDARY, %edx jz .Linit_cpu0_data @@ -308,12 +297,7 @@ SYM_INNER_LABEL(secondary_startup_64_no_verify, SYM_L_GLOBAL) .Linit_cpu_data: /* Get the per cpu offset for the given CPU# which is in ECX */ - leaq __per_cpu_offset(%rip), %rbx - movq (%rbx,%rcx,8), %rbx - /* Save it for GS BASE setup */ - movq %rbx, initial_gs(%rip) - - movq %rbx, %rdx + movq __per_cpu_offset(,%rcx,8), %rdx #else xorl %edx, %edx #endif /* CONFIG_SMP */ @@ -363,8 +347,11 @@ SYM_INNER_LABEL(secondary_startup_64_no_verify, SYM_L_GLOBAL) * the per cpu areas are set up. */ movl $MSR_GS_BASE,%ecx - movl initial_gs(%rip),%eax - movl initial_gs+4(%rip),%edx +#ifndef CONFIG_SMP + leaq INIT_PER_CPU_VAR(fixed_percpu_data)(%rip), %rdx +#endif + movl %edx, %eax + shrq $32, %rdx wrmsr /* Drop the realmode protection. For the boot CPU the pointer is NULL! */ @@ -514,7 +501,6 @@ SYM_CODE_END(vc_boot_ghcb) __REFDATA .balign 8 SYM_DATA(initial_code, .quad x86_64_start_kernel) -SYM_DATA(initial_gs, .quad INIT_PER_CPU_VAR(fixed_percpu_data)) #ifdef CONFIG_AMD_MEM_ENCRYPT SYM_DATA(initial_vc_handler, .quad handle_vc_boot_ghcb) #endif