From patchwork Mon Mar 4 12:15:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 209517 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp1379125dyc; Mon, 4 Mar 2024 04:16:19 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVoEOR0t+RbVlhNh2MwJqaztuFvCiEafNh2Up4cS4ITKpIZSBPtAJXMvZM1xeEEizScPoeNZ1ynGrXFgv5IQQIr+DF5xQ== X-Google-Smtp-Source: AGHT+IGLCvtsa695T/QbU3Qry+FcVnRamRtAleTrhiS0m9S86zkbDTotKpn1T3VSnneL8B7vqhgc X-Received: by 2002:a67:e910:0:b0:472:b803:9a62 with SMTP id c16-20020a67e910000000b00472b8039a62mr2367209vso.10.1709554579268; Mon, 04 Mar 2024 04:16:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709554579; cv=pass; d=google.com; s=arc-20160816; b=YjtV0vmQrOkKwZjlu8XN/s8YfF9twF0p2+xzlBNf3EFlfP1HPM1M5vM1/5y06NsXVo AigKgRHcnfUAIokDEvUbnaxjxByWGQyx/P1iE2EnrT9qCXFaiudv4YyHheXUohj7acrn /DunvvpxAazZ93Ufysu+r08aidoWNPS36oRZ42giOix9pOJh2ciIdJXb44Vbrp1vBVIT Orf0MuHeHTC4/DFkkgX2DP5uEgVsI5h4MQaybuUg7Fy3DQe8xLFMIo4eqkMOu5/MT/il LZ/dJh0OAuEa9/ayTei6UjJuTKQS6vlREQGhXcJ9eoURDtVKNF8GmcUzAgMhZgqrroah GdgQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:precedence:robot-unsubscribe:robot-id :message-id:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:in-reply-to:cc:subject:to:reply-to:sender :from:dkim-signature:dkim-signature:date; bh=jPB03qgATnER+7v2wvNlHF8c2kP3oWpO0j3I9PhKWSY=; fh=ug+vbjx3hYEyfsB5aHBhxI+u027oSYAUfnsAoBvj5oA=; b=r8JxwVYRaoxJ9FdCW10bo0GibLV1nuHowAQj6Y89JYhSAjB/zTy427fTpFB3Be5m+I A9bnyPiHOYS75og5Cn43iA3qGIM+uOmFJcOa8aU1FcSH12ZcGD8c85i2WCe2TajSWmTx GADnsTYbb7lakKKXhL90AUmOFjodqSMWdA0TSsImq7nBw6xR8RFa7nFJpbhX1ckbGiZD 0ycFetcrYET2hAx669Xnbvcd2dZP6I/HTf4Z0PL7kwCb8VW8JSzFvOsNcHx68h/LUjqb ZOhKgKUFwpOXtvWuBqop9hzBqbg11rVg5cjN9qV780dxl2y82eX5y2tJYBT99y3pb3ak QlUA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=SbkVbUiP; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-90553-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90553-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id m18-20020a67fe52000000b00472557c2339si1013863vsr.448.2024.03.04.04.16.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 04:16:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-90553-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=SbkVbUiP; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-90553-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90553-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id F0F8F1C21739 for ; Mon, 4 Mar 2024 12:16:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 08C753D98D; Mon, 4 Mar 2024 12:15:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="SbkVbUiP"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="U2Jz5T6i" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 24D5A3C06A; Mon, 4 Mar 2024 12:15:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709554509; cv=none; b=K0JNJ7lK0hz1rjRB0OVG1tlVtiqde8uuGMKncJL/w854lLdfvf9mD2RpVdHvMUGDNZ/Mtjd94mwIApOy5g7ObS1IffpSVD9yrfsPizTaGqZHD4/kqUe6ia/X4FqZz1wMusy3jiJLk1uvPgc0cU56KE3efqmqisL1NKT20ydViVU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709554509; c=relaxed/simple; bh=Y8jSKzYrsHvHsrq8Z73jN78bF54fwGh81JDZw9uOdLQ=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=JAw8xOcjN75aXVtwFalPDosTc7pt4oKaQ0HDOJzUH0vmR1NF9ORs7PQCiRKLhuTAW2F+gvP0YJJH+WT8TsyrmzuqdvaO7QqP/Q9FBD42iEjjo375L5FU6B5DOhuuZ46s0/H10/tJIMhb0fITxUal4NZo3+2+W1Oyz85XBo8PicA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=SbkVbUiP; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=U2Jz5T6i; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Date: Mon, 04 Mar 2024 12:15:05 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1709554506; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jPB03qgATnER+7v2wvNlHF8c2kP3oWpO0j3I9PhKWSY=; b=SbkVbUiPTRXSAB3nWE9MPH4gBBUcTZb/5c/0rS/TX5gZCOWitnho0mX7cgBN6WKDRk+/Xp Bq8Jc5pMxFUoznw3h06Z2kueNtMWRdTqrcmyFfVnzuzg+bfkWvmjMdV4FdRSNUMYNpR0fy /Uuv8CIg7pEpc4tjaUUYlYzHWn6jt9+9rnng/NtyQPzHlN/QJXzrzpOYWPuN+Pvcnz3c9i DD1OPh45QdNgVwXaPKs76guDiHvgdT+A0b86YFxPX5MtFUPZKlotRX1usbK8qLTb0aq8nP 8F1dOO0xc3znsfqqBodGvHhftraxwY12FHIalm3qMvJOPExCcPDUKqHOlM/EDA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1709554506; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jPB03qgATnER+7v2wvNlHF8c2kP3oWpO0j3I9PhKWSY=; b=U2Jz5T6iGNslPDcyCv7tIBtcXeWGPKoukm1Hz2Mxsud7YXEwzAdDzjtqeYIU75GrgTpCuR BIyYZlouO/oh56AA== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cleanups] x86/percpu: Cure per CPU madness on UP Cc: Thomas Gleixner , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20240304005104.622511517@linutronix.de> References: <20240304005104.622511517@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <170955450572.398.4892526222769670917.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792597902339378994 X-GMAIL-MSGID: 1792597902339378994 The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 71eb4893cfaf37f8884515c8f71717044b97bf44 Gitweb: https://git.kernel.org/tip/71eb4893cfaf37f8884515c8f71717044b97bf44 Author: Thomas Gleixner AuthorDate: Mon, 04 Mar 2024 11:12:23 +01:00 Committer: Ingo Molnar CommitterDate: Mon, 04 Mar 2024 12:09:07 +01:00 x86/percpu: Cure per CPU madness on UP On UP builds Sparse complains rightfully about accesses to cpu_info with per CPU accessors: cacheinfo.c:282:30: sparse: warning: incorrect type in initializer (different address spaces) cacheinfo.c:282:30: sparse: expected void const [noderef] __percpu *__vpp_verify cacheinfo.c:282:30: sparse: got unsigned int * The reason is that on UP builds cpu_info which is a per CPU variable on SMP is mapped to boot_cpu_info which is a regular variable. There is a hideous accessor cpu_data() which tries to hide this, but it's not sufficient as some places require raw accessors and generates worse code than the regular per CPU accessors. Waste sizeof(struct x86_cpuinfo) memory on UP and provide the per CPU cpu_info unconditionally. This requires to update the CPU info on the boot CPU as SMP does. (Ab)use the weakly defined smp_prepare_boot_cpu() function and implement exactly that. This allows to use regular per CPU accessors uncoditionally and paves the way to remove the cpu_data() hackery. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20240304005104.622511517@linutronix.de --- arch/x86/include/asm/processor.h | 5 ----- arch/x86/kernel/cpu/common.c | 3 +++ arch/x86/kernel/setup.c | 10 ++++++++++ arch/x86/kernel/smpboot.c | 4 ---- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index a61f769..e2262ac 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -185,13 +185,8 @@ extern struct cpuinfo_x86 new_cpu_data; extern __u32 cpu_caps_cleared[NCAPINTS + NBUGINTS]; extern __u32 cpu_caps_set[NCAPINTS + NBUGINTS]; -#ifdef CONFIG_SMP DECLARE_PER_CPU_READ_MOSTLY(struct cpuinfo_x86, cpu_info); #define cpu_data(cpu) per_cpu(cpu_info, cpu) -#else -#define cpu_info boot_cpu_data -#define cpu_data(cpu) boot_cpu_data -#endif extern const struct seq_operations cpuinfo_op; diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index fbc4e60..6057a9e 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -70,6 +70,9 @@ #include "cpu.h" +DEFINE_PER_CPU_READ_MOSTLY(struct cpuinfo_x86, cpu_info); +EXPORT_PER_CPU_SYMBOL(cpu_info); + u32 elf_hwcap2 __read_mostly; /* Number of siblings per CPU package */ diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 8420107..8f669d3 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1211,6 +1211,16 @@ void __init i386_reserve_resources(void) #endif /* CONFIG_X86_32 */ +#ifndef CONFIG_SMP +void __init smp_prepare_boot_cpu(void) +{ + struct cpuinfo_x86 *c = &cpu_data(0); + + *c = boot_cpu_data; + c->initialized = true; +} +#endif + static struct notifier_block kernel_offset_notifier = { .notifier_call = dump_kernel_offset }; diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 980782b..37ea8c8 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -101,10 +101,6 @@ EXPORT_PER_CPU_SYMBOL(cpu_core_map); DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_die_map); EXPORT_PER_CPU_SYMBOL(cpu_die_map); -/* Per CPU bogomips and other parameters */ -DEFINE_PER_CPU_READ_MOSTLY(struct cpuinfo_x86, cpu_info); -EXPORT_PER_CPU_SYMBOL(cpu_info); - /* CPUs which are the primary SMT threads */ struct cpumask __cpu_primary_thread_mask __read_mostly;