From patchwork Fri Nov 25 09:42:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 25897 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3887385wrr; Fri, 25 Nov 2022 01:45:01 -0800 (PST) X-Google-Smtp-Source: AA0mqf714yPy56/PgVJceamu6bMIvr9qCiyyUyH+H5CWEOi462OfOEbWOQwBB7whA94zXZOCQg7X X-Received: by 2002:a17:90a:7304:b0:20a:9810:86ab with SMTP id m4-20020a17090a730400b0020a981086abmr44694420pjk.10.1669369501212; Fri, 25 Nov 2022 01:45:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669369501; cv=none; d=google.com; s=arc-20160816; b=ZOjYKBWduuNRyuIMVsw6Ksg3K6DpCkr2YNYeHWFGISMEIuIuu2WZ5PQpilk8zFG5NZ dONiyqNQjnBfIpOmx+9FmqTcMyDDbj8rYnfUbOGV0whURas25QG0Mo2BNac3cgyLChcv T9TU6tQcStsUyrDhOyEHfXE5m0ObDPWL53nmCAse1ntPwcnBeEI1ducMOZifjW0Ppp5W WWfirdmTBNGCpgnyXt9Iv/StS+kwFDjk9x2awb8/2Kz+502naEz/6JleoHezoIhO4s73 gigt9hqo8QvDS8tOzfrmfk/UO+GgqbWqoIFXXNcJJVCBDuPVrZf0M0fveBWer6GVufLA 9EBQ== 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:dkim-signature :dkim-signature:from; bh=SYtDKXEAvjEf1YJAc3x9GyPrR/5UvNDnbCTQFLZPR1w=; b=CB8p3PTCJn7XDs+HoucLkbLnuPPJbotQgpABoQMyg3u4PEHh3cHCRGRoL+2JSP11YO S7v2dVH9IyCI48ajRGkU2bI1F43JIfMPVdn/bJfPNvo8ORh5ifQIyF62c0sjXibI7GnR gKQT2FKeqTL7iTPDS4d37DaFgDrT1HRGNT2q7+LQmFSXnScXa33MYVNDQCDn+dMqispZ QdR6g8ZJ4PEs08AnHeCENSzHPti1shZVDfcZjMsZQGv+U+KcDIKc3m2EwFBVkKmLfZWF iF6TYzpOI8qfOhXgN1EXwqqa+YPqcJD6jdHRNDFf9b+4qPIqYCRH0QjJTdGQVGSnv6FQ X8tA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=JPV14Mvt; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=ZJrOcsZX; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d6-20020a17090ab30600b00213566a9fa9si6265311pjr.25.2022.11.25.01.44.48; Fri, 25 Nov 2022 01:45:01 -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=@linutronix.de header.s=2020 header.b=JPV14Mvt; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=ZJrOcsZX; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229767AbiKYJmz (ORCPT + 99 others); Fri, 25 Nov 2022 04:42:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229770AbiKYJmo (ORCPT ); Fri, 25 Nov 2022 04:42:44 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08D061A830 for ; Fri, 25 Nov 2022 01:42:38 -0800 (PST) From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1669369357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SYtDKXEAvjEf1YJAc3x9GyPrR/5UvNDnbCTQFLZPR1w=; b=JPV14MvtFeNQp++zT40Gqm8cARU4bfG1isYMsoAiY1/WXq385FYLd5KVgD+uhAhEduV7+I 3BtKsCL85s+p2MsSjLeMIAOvX2eeX5zSYJxvQ0UPRqKVhGOVoQ9PykSJt583Z0Ng7fWAJR JAtZlCwKakltdLb8YhYyzKZnsT/sLaorNW9qJeTzwhU9Ftvwkx1yglWnCi0SrsTGvzzzCk FLOYri3OJzFJWDHT64mHZpecz/Sxm/2quSGXl0jqPjMQKmJWW3G/trbwIqSABjauBA6wZH +feookW5xemzgdB6E4xZtS1FJ06AespFxKvlVRJZ/+h4aduc06DCdMCmuhmWXA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1669369357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SYtDKXEAvjEf1YJAc3x9GyPrR/5UvNDnbCTQFLZPR1w=; b=ZJrOcsZXlB3YdtykG4rliywnUljEYGheHx6C02eBpywX2uS5WzsXsWv+L2J327+YyJPnYD yKGYZo+bYQc4o4BQ== To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Roland Mainz , "H. Peter Anvin" , Borislav Petkov , Dave Hansen , Ingo Molnar , Thomas Gleixner , Sebastian Andrzej Siewior Subject: [PATCH 1/3] x86: Provide a full setup for getcpu on x86-32. Date: Fri, 25 Nov 2022 10:42:14 +0100 Message-Id: <20221125094216.3663444-2-bigeasy@linutronix.de> In-Reply-To: <20221125094216.3663444-1-bigeasy@linutronix.de> References: <20221125094216.3663444-1-bigeasy@linutronix.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, 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?1750460794242625564?= X-GMAIL-MSGID: =?utf-8?q?1750460794242625564?= setup_getcpu() configures two things: - writes the current CPU & node information into the MSR_TSC_AUX. - writes the same information as a GDT entry. By using the "full" setup_getcpu() on i386 it is possible to read the CPU information in userland via rdtscp. Provide an GDT_ENTRY_CPUNODE for x86-32. Move the CONFIG_X86_64 so the x86-64 implementation becomes also available for x86-32. Reviewed-By: Roland Mainz Signed-off-by: Sebastian Andrzej Siewior --- arch/x86/include/asm/segment.h | 8 ++++---- arch/x86/kernel/cpu/common.c | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h index 2e7890dd58a47..662281c2a907c 100644 --- a/arch/x86/include/asm/segment.h +++ b/arch/x86/include/asm/segment.h @@ -96,7 +96,7 @@ * * 26 - ESPFIX small SS * 27 - per-cpu [ offset to per-cpu data area ] - * 28 - unused + * 28 - VDSO getcpu * 29 - unused * 30 - unused * 31 - TSS for double fault handler @@ -119,6 +119,7 @@ #define GDT_ENTRY_ESPFIX_SS 26 #define GDT_ENTRY_PERCPU 27 +#define GDT_ENTRY_CPUNODE 28 #define GDT_ENTRY_DOUBLEFAULT_TSS 31 @@ -158,6 +159,8 @@ # define __KERNEL_PERCPU 0 #endif +#define __CPUNODE_SEG (GDT_ENTRY_CPUNODE*8 + 3) + #else /* 64-bit: */ #include @@ -226,8 +229,6 @@ #define GDT_ENTRY_TLS_ENTRIES 3 #define TLS_SIZE (GDT_ENTRY_TLS_ENTRIES* 8) -#ifdef CONFIG_X86_64 - /* Bit size and mask of CPU number stored in the per CPU data (and TSC_AUX) */ #define VDSO_CPUNODE_BITS 12 #define VDSO_CPUNODE_MASK 0xfff @@ -265,7 +266,6 @@ static inline void vdso_read_cpunode(unsigned *cpu, unsigned *node) } #endif /* !__ASSEMBLY__ */ -#endif /* CONFIG_X86_64 */ #ifdef __KERNEL__ diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 3e508f2390983..520a0a2e765d3 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -2128,7 +2128,6 @@ static void wait_for_master_cpu(int cpu) #endif } -#ifdef CONFIG_X86_64 static inline void setup_getcpu(int cpu) { unsigned long cpudata = vdso_encode_cpunode(cpu, early_cpu_to_node(cpu)); @@ -2150,6 +2149,7 @@ static inline void setup_getcpu(int cpu) write_gdt_entry(get_cpu_gdt_rw(cpu), GDT_ENTRY_CPUNODE, &d, DESCTYPE_S); } +#ifdef CONFIG_X86_64 static inline void ucode_cpu_init(int cpu) { if (cpu) @@ -2169,8 +2169,6 @@ static inline void tss_setup_ist(struct tss_struct *tss) #else /* CONFIG_X86_64 */ -static inline void setup_getcpu(int cpu) { } - static inline void ucode_cpu_init(int cpu) { show_ucode_info_early();