From patchwork Tue Aug 1 10:47:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 129187 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2594538vqg; Tue, 1 Aug 2023 04:15:17 -0700 (PDT) X-Google-Smtp-Source: APBJJlE1mzQ2i9EoGdKWB2jNFuiIMKRMIR9tXgYTU2RMw7rq3BoltVetw1tRXosFZLe9kh/7b+Wf X-Received: by 2002:aa7:88cb:0:b0:682:713e:e510 with SMTP id k11-20020aa788cb000000b00682713ee510mr15403299pff.27.1690888516801; Tue, 01 Aug 2023 04:15:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690888516; cv=none; d=google.com; s=arc-20160816; b=O8VgWCB5xMHIhTazRcTgoX3GRzXlNpfgXayH929vbfeGVRYWnSNEgQke5J/ur8mTU6 Qi53W8hhDeyvKADX88RiBl8NpaJMdFzWy2A1sLMATHgYl5k6ZlQEzP7gkmHFEmL4tWbZ 0trCQz2zOWwoYlnLhApDjGSPdw09L/GJSD7Bqfwc6li3rFphAFHJNjIFKCWWjgjfUwA5 xKWU34AL5oSgpfxk/tZxliHcGZwhPiVoStFPAYfRWsLQJYv5oItZj4OFLU81mTTLt1KA LglnzsFsAcN2fIy/cYlb+l0RbrOlMIf4cUxHf7w8W1ezYd3caDlekVtR8OpE7FBJFL13 ZpRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=c71eHbYg+VP7OJhjZCVHVzp0AtRxO5V4C+TDLxCJHes=; fh=mE3iieUIZLcDfOLIULj9X6/p0bMDPZGFSVRsnyRUnTc=; b=L8HSwgDN6jwf5XNa2LyCPyQa1uaBF+4Ylr9x0iwLaoh5H8tSOzX4XLS50bHF579OTa lBuXTstapyRO2OJ1xnMZAxnjt/KrNHhF7Cly+N1EBCNPjjwH+tTdMVepQo3Xmy6N841Y 79+++VEzjzjaZFxtseO2WXmgAOKsP3tcV04bb7PNiMxeN46PUsuzx2pyxXnIS9zdyclc 4cc0TdCzMdPZoc+xL6+YF46rsEAo4b4EHeeQ/7An4qJQdqAH3l4FEe1Wivib+lqWkIQY vIkvx1c8G9vj1dWyinsULaiIRE8x2Oj5wYW6wqL8wYbWi1xCSi1HimMNdiSWcQAWKBfr dqYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=idVBIXa4; dkim=neutral (no key) header.i=@linutronix.de header.b=EeGtBu9Y; 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 x7-20020a056a00270700b00665e0165510si8775113pfv.252.2023.08.01.04.15.03; Tue, 01 Aug 2023 04:15:16 -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; dkim=pass header.i=@linutronix.de header.s=2020 header.b=idVBIXa4; dkim=neutral (no key) header.i=@linutronix.de header.b=EeGtBu9Y; 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 S233792AbjHAKsQ (ORCPT + 99 others); Tue, 1 Aug 2023 06:48:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233871AbjHAKrU (ORCPT ); Tue, 1 Aug 2023 06:47:20 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA5E1212C for ; Tue, 1 Aug 2023 03:47:04 -0700 (PDT) Message-ID: <20230801103816.091409557@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690886822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=c71eHbYg+VP7OJhjZCVHVzp0AtRxO5V4C+TDLxCJHes=; b=idVBIXa4Fs2lwoQiWdD2Q4snEnHt3iM1K45yty2QV/5k8sfilQ0ShuvFIn8DOSVzpCnKVl 4TPnUTeHLqCH0FrPYBVZK4bTnZQqSYpdAg0eMCXcnDD9EMfoCeEfJ/Ml8em7Hc4RWUVtbP WSqaWy8YKTYaqxS1yvrqRPeIbqOyIm81YHCdKCYcvMmBotbgJgOYNCIayT6dyHkKcoBknC wEvmPGUwrHF4paGtIc84iE5CtUFnfqE6BCNQlvsHBcdvg44zGSdMpY2+U8gQ2i6wlIxVG+ pZx5DpTsPL9koa17rVrOgCBht7tt/3+1UFTrTOREetf20TB9gAYeYy+maxi67w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690886822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=c71eHbYg+VP7OJhjZCVHVzp0AtRxO5V4C+TDLxCJHes=; b=EeGtBu9YgOxpSzJ2uqnnp2vOhXDDQeDWcUacJGPIzeuSw1yRkoysZb0wiX2dtFW21G9naf aZH+1bl+fBunWfAA== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Andrew Cooper , Tom Lendacky , Paolo Bonzini , Wei Liu , Arjan van de Ven , Juergen Gross , Michael Kelley , Peter Keresztes Schmidt , "Peter Zijlstra (Intel)" Subject: [patch V3 17/60] x86/apic: Sanitize num_processors handling References: <20230801103042.936020332@linutronix.de> MIME-Version: 1.0 Date: Tue, 1 Aug 2023 12:47:02 +0200 (CEST) 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,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: INBOX X-GMAIL-THRID: 1773025117651223548 X-GMAIL-MSGID: 1773025117651223548 num_processors is 0 by default and only gets incremented when local APICs are registered. Make init_apic_mappings(), which tries to enable the local APIC in the case that no SMP configuration was found set num_processors to 1. This allows to remove yet another check for the local APIC and yet another place which registers the boot CPUs local APIC ID. Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra (Intel) --- arch/x86/kernel/apic/apic.c | 9 ++++++--- arch/x86/kernel/smpboot.c | 18 ------------------ 2 files changed, 6 insertions(+), 21 deletions(-) --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -2130,9 +2130,12 @@ void __init init_apic_mappings(void) if (x2apic_mode) return; - if (!smp_found_config && !detect_init_APIC()) { - pr_info("APIC: disable apic facility\n"); - apic_disable(); + if (!smp_found_config) { + if (!detect_init_APIC()) { + pr_info("APIC: disable apic facility\n"); + apic_disable(); + } + num_processors = 1; } } --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1397,24 +1397,6 @@ early_param("possible_cpus", _setup_poss { int i, possible; - /* No processor was found in mptable or ACPI MADT */ - if (!num_processors) { - if (boot_cpu_has(X86_FEATURE_APIC)) { - int apicid = boot_cpu_physical_apicid; - int cpu = read_apic_id(); - - pr_warn("Boot CPU (id %d) not listed by BIOS\n", cpu); - - /* Make sure boot cpu is enumerated */ - if (apic->cpu_present_to_apicid(0) == BAD_APICID && - apic->apic_id_valid(apicid)) - generic_processor_info(apicid); - } - - if (!num_processors) - num_processors = 1; - } - i = setup_max_cpus ?: 1; if (setup_possible_cpus == -1) { possible = num_processors;