From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 111DB19C56C for ; Thu, 23 Jan 2025 19:08:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737659292; cv=none; b=RSWgZ/HcB1q/6gqIFQkXqi8jqI1I6wFbE/A+mTCY7gRazmTSYk0SOvZOXNDKO4mq3U07rpmFZyKgaXQ/e904FL/dTL8GMlQsrJAv3YjIgVe3qWV7QuBDgJvBzlznw1qxCpRK8nqoXBhHDTadMzyxtWOssDqHV5GauthW3lnPk/I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737659292; c=relaxed/simple; bh=SPCrGEGzRxozPI8il6Nmrrtf0zQjmbOAljNZ+rmcz/0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZEyfAyJoXA/nR58hRj30Dg9y9/GwVdPzK6xVwVd0+Q1VGqgyejbsZ4yxdb3YmNlLOQYhA/Cskguymi4yVmWRVNXMCcvLDgW8+QObtA2KGRRd3NwKMu70DZZC6CbYbXR1clDauRPlYNpqT86hk0iKvkX4zpHQgPA5VmjVWkqaffg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IejgW5Nk; arc=none smtp.client-ip=209.85.160.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IejgW5Nk" Received: by mail-qt1-f180.google.com with SMTP id d75a77b69052e-4679fc9b5f1so10972631cf.1 for ; Thu, 23 Jan 2025 11:08:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737659289; x=1738264089; darn=vger.kernel.org; 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=NSZsdEiUForqBevZb9/vDiQuDr1gktMsWnWsyuKttGk=; b=IejgW5NkUisQJYJRupqCZm96kEBxL43sA7umpAf8R45IuytnAIHGG8rllP8pGAs/+/ 00+4buDYVW7ONhClR+aUCpcRY9YPHNJiY4T0AVWc1KveFg9SjMUxhK/9cMWvj3aYwYPb hxxwUN629hs89CU4GdXGvVBkjISS3P7cJmm23x/gQoFUDclN1yBMnJrGEUDXhSlO+aUd 4z7xHyIiaNjBspN5qhgtYI4fIGBkdsJb3Xb51BrXWuADGrD0ahiyvWZ2Dh3QsFRvlVAY qzHClRtEqP+snjPFyfse0dvY557f77aE/V6EGENxIbLd8u9wS3R2DPBZyl8HRrP+h845 T7JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737659289; x=1738264089; 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=NSZsdEiUForqBevZb9/vDiQuDr1gktMsWnWsyuKttGk=; b=NB1wqBCK7LoYoU4fhDOTRObwMF6gVf56as7DOahpVwT1NLNW41vgw4wBd+uZNM9kUm tqzxEam8Z1Zs1E7lrWoduIYuNX9Y5K89c0+kffyf7t5QNIAG7Ae1ou0hFrsplKhvuNu6 E2MqGP1zOhs3O8iIgn82gGYCJ7CZM57KZGZtzGi3YYWM+Ajdubb5NenYEBV1VpkT05y7 DQx91YTzX4idlaMfOeGEXdbdRwBrEXH/hk5K6YlFQUywBIMcDLadZwLdgO1QGbyk5Cdr K+Qc96m7RMRLBjaYapoRCYszcTZMeTGt4okXB5uAAoqL21ngSRsNCWCkCF2SPmTVeJd7 Pbzg== X-Gm-Message-State: AOJu0YzOKA0749AKEcWGxDTNif+YZkKcwRcEBiUR0jD7PPwNe1Gq09t4 RGRPa5tIzmKaLaUeLZWwl8iJONZ0Yev9Bjz5ptvuPCgoxzpt69ga5BVr X-Gm-Gg: ASbGncsqEHmpNkPz+mKLxiiS9c7qZw+PAz+3SKKueI63oXgFitHO0GKKEyj37vEBM5M pG+2Wm0fcBucaj7ar9rmaxdtltkvZTpgzzCHEIQck3qcKjdQT0pGmecms1WY0rFqqNBbqGG9y3I UCAXx7JBTBg3T7S+UIkLheEfCP/6Z006MgkjHbXQeZ1d5Lf0LJKZcHSYNbX7LgNSllwkaSHHFns /0uiXdmnE000KOL9orfKQ6seYwwZIaXqtj75pZJN6CmNaTOpkCuXev61FTMNg== X-Google-Smtp-Source: AGHT+IHPcwD5FZNHF+g9QuRD5LRWxT27kxHYKmlOpZePxcVoDids2ycunCzuQ/iLiGb8OxH6noaTRQ== X-Received: by 2002:ac8:7c47:0:b0:467:45b7:c495 with SMTP id d75a77b69052e-46e12a56246mr347921731cf.15.1737659288924; Thu, 23 Jan 2025 11:08:08 -0800 (PST) Received: from citadel.lan ([2600:6c4a:4d3f:6d5c::1019]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-46e66b880b6sm1768021cf.69.2025.01.23.11.08.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2025 11:08:07 -0800 (PST) From: Brian Gerst To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Ingo Molnar , "H . Peter Anvin" , Thomas Gleixner , Borislav Petkov , Ard Biesheuvel , Uros Bizjak , Brian Gerst Subject: [PATCH v6 09/15] x86/percpu/64: Remove fixed_percpu_data Date: Thu, 23 Jan 2025 14:07:41 -0500 Message-ID: <20250123190747.745588-10-brgerst@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250123190747.745588-1-brgerst@gmail.com> References: <20250123190747.745588-1-brgerst@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Now that the stack protector canary value is a normal percpu variable, fixed_percpu_data is unused and can be removed. Signed-off-by: Brian Gerst Reviewed-by: Ard Biesheuvel Reviewed-by: Uros Bizjak --- arch/x86/include/asm/processor.h | 8 -------- arch/x86/kernel/cpu/common.c | 4 ---- arch/x86/kernel/vmlinux.lds.S | 1 - arch/x86/tools/relocs.c | 1 - 4 files changed, 14 deletions(-) diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index b8fee88dac3d..b3d153730f63 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -421,14 +421,6 @@ struct irq_stack { } __aligned(IRQ_STACK_SIZE); #ifdef CONFIG_X86_64 -struct fixed_percpu_data { - char gs_base[40]; - unsigned long reserved; -}; - -DECLARE_PER_CPU_FIRST(struct fixed_percpu_data, fixed_percpu_data) __visible; -DECLARE_INIT_PER_CPU(fixed_percpu_data); - static inline unsigned long cpu_kernelmode_gs_base(int cpu) { #ifdef CONFIG_SMP diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index b71178f0ed6c..8b49b1338f76 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -2023,10 +2023,6 @@ EXPORT_PER_CPU_SYMBOL(pcpu_hot); EXPORT_PER_CPU_SYMBOL(const_pcpu_hot); #ifdef CONFIG_X86_64 -DEFINE_PER_CPU_FIRST(struct fixed_percpu_data, - fixed_percpu_data) __aligned(PAGE_SIZE) __visible; -EXPORT_PER_CPU_SYMBOL_GPL(fixed_percpu_data); - static void wrmsrl_cstar(unsigned long val) { /* diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 8a598515239a..93c2fa8a7522 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -477,7 +477,6 @@ PROVIDE(__ref_stack_chk_guard = __stack_chk_guard); */ #define INIT_PER_CPU(x) init_per_cpu__##x = ABSOLUTE(x) INIT_PER_CPU(gdt_page); -INIT_PER_CPU(fixed_percpu_data); INIT_PER_CPU(irq_stack_backing_store); #ifdef CONFIG_MITIGATION_UNRET_ENTRY diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c index 9aebc3b18d73..a9f8bc6aaafc 100644 --- a/arch/x86/tools/relocs.c +++ b/arch/x86/tools/relocs.c @@ -830,7 +830,6 @@ static void percpu_init(void) * __per_cpu_load * * The "gold" linker incorrectly associates: - * init_per_cpu__fixed_percpu_data * init_per_cpu__gdt_page */ static int is_percpu_sym(ElfW(Sym) *sym, const char *symname) -- 2.47.1