From patchwork Mon Aug 14 08:53:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 135292 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp2630233vqi; Mon, 14 Aug 2023 02:48:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFgXZy6oldkO8fDAet7KIIkVtGJOGg4FXaiwO+ArZpmMHXKGtF90So1SK3YrKUFMCXxBO6z X-Received: by 2002:a17:906:31c6:b0:994:3207:cddd with SMTP id f6-20020a17090631c600b009943207cdddmr7273879ejf.34.1692006528880; Mon, 14 Aug 2023 02:48:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692006528; cv=none; d=google.com; s=arc-20160816; b=i+HY0WA/2mhgIZZZojRf4wllIqsb7zJnlc/+RNyJvzYgOm68Y1jPMYaDHgYS5joJCm QQ3vcYheM3Nu48c7Zxv5tbXJmd0ohAeeaP6sCrDN2Q92oWeDm2RqfQ9rbeWBRn2APRZ+ gLVLTnhwf+9UII8y9WA7Ww9NjyqAPZfErpdi8GZuo4sZgHk876+U3wGg9kVXeQ037sK6 z/RgfwSbHIwgIPIM78V2OMwjis++qHZK0kCjfST8U2jFf90gAzCQCqEzbRp4nL504a1E AbjUohxD0V4y3w4C40hPfy3mj28HhIglM8PRcCxTFSp+wPt2p8fgiu0rH+arU4DAFRDW w21g== 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=bd7aVAkdU8hKlGLozvpCQgzrwCUOG24alOTKZ7VboAQ=; fh=vmKIJtcbtoHWhyuxI4oEq8r1SWZ2V9Rrbp1Orw2DxqA=; b=mMQu1OCQGlixnUdj8UW08OgMPfqRfusnA/aY31TjDG8e8xxcqeu3/zD+goZR7BXc9m pQ5tEX62FXlyE0t05lssAw9FL4+njm+N/1Vugn+bNDYsSNzIo8AYB+7K1gZDW4zlsxdv 23IkaNN4ZdfKYxdXDYyXD0nDPKS4hhQYCm+Mxivp+uZALXbYX3OloXQZtYJ4tJGM6p6K RqAtAnucwta8b/44gqnU9W1RtSymzYwBd+8lN5XYhenraZr6sZvZ25fSTg/0HLMknfYv +gRh1Oi+bUnbNPcqRaixu/nF+uR7bg57jMksOJzsjPYAO5tZsVyi71j81ksXHWBrza3/ SZYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=uEjAJG0N; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 ch15-20020a170906c2cf00b0099bcee97a5dsi7275977ejb.761.2023.08.14.02.48.25; Mon, 14 Aug 2023 02:48:48 -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=uEjAJG0N; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 S234740AbjHNIyu (ORCPT + 99 others); Mon, 14 Aug 2023 04:54:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234931AbjHNIx6 (ORCPT ); Mon, 14 Aug 2023 04:53:58 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DDC6D10B for ; Mon, 14 Aug 2023 01:53:57 -0700 (PDT) Message-ID: <20230814085112.862835121@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1692003236; 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=bd7aVAkdU8hKlGLozvpCQgzrwCUOG24alOTKZ7VboAQ=; b=uEjAJG0NkROXgPFtaoyDvfr/S9b5Zl0n217RTuiqSmVgO/EMg3diLngXj0b8P8fRG4MGsm iXJrSutNAbJHpsIwbyjpCNHTWzho1hAn0G9bqKzZF9JJq/eICymxN1OELDw2e4qJ+ZfT6w mAfj9ceY0OQW5sNhnTRDBQcLiJZE4YQr5nvXD52XlSoPamZByc0S52DiEh4NnK+hbrvWik 5/YAGptvLvqMwuv9sQwOl7LyYTL35xhea/GT0dCXF/1VIICpjVGaQFZV0vipJEyWZpoaL9 c2fYuxvpT0rQibKioUDNo8nLOhpzoXiBZorBPUrsPsP/xrIk3HKyhVkDWIy5cw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1692003236; 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=bd7aVAkdU8hKlGLozvpCQgzrwCUOG24alOTKZ7VboAQ=; b=udlUfvpc16LJ43bOLabICosbCFJfGjee0veDKBfD7yFKRAHsf9X2p4evlVVGXQeXo50TND txOELKFFDQIobCDw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Tom Lendacky , Andrew Cooper , Arjan van de Ven , Huang Rui , Juergen Gross , Dimitri Sivanich , Michael Kelley , Wei Liu , Pu Wen , Qiuxu Zhuo , Sohil Mehta Subject: [patch V4 14/41] x86/apic: Use BAD_APICID consistently References: <20230814085006.593997112@linutronix.de> MIME-Version: 1.0 Date: Mon, 14 Aug 2023 10:53:56 +0200 (CEST) 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_BLOCKED, 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: INBOX X-GMAIL-THRID: 1774197437969323050 X-GMAIL-MSGID: 1774197437969323050 APIC ID checks compare with BAD_APICID all over the place, but some initializers and some code which fiddles with global data structure use -1[U] instead. That simply cannot work at all. Fix it up and use BAD_APICID consistently all over the place. Signed-off-by: Thomas Gleixner Tested-by: Juergen Gross Tested-by: Sohil Mehta Tested-by: Michael Kelley --- V3: Fixed changelog typos - Sohil --- arch/x86/kernel/acpi/boot.c | 2 +- arch/x86/kernel/apic/apic.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -852,7 +852,7 @@ int acpi_unmap_cpu(int cpu) set_apicid_to_node(per_cpu(x86_cpu_to_apicid, cpu), NUMA_NO_NODE); #endif - per_cpu(x86_cpu_to_apicid, cpu) = -1; + per_cpu(x86_cpu_to_apicid, cpu) = BAD_APICID; set_cpu_present(cpu, false); num_processors--; --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -72,7 +72,7 @@ unsigned int num_processors; unsigned disabled_cpus; /* Processor that is doing the boot up */ -unsigned int boot_cpu_physical_apicid __ro_after_init = -1U; +unsigned int boot_cpu_physical_apicid __ro_after_init = BAD_APICID; EXPORT_SYMBOL_GPL(boot_cpu_physical_apicid); u8 boot_cpu_apic_version __ro_after_init; @@ -2318,9 +2318,7 @@ static int nr_logical_cpuids = 1; /* * Used to store mapping between logical CPU IDs and APIC IDs. */ -int cpuid_to_apicid[] = { - [0 ... NR_CPUS - 1] = -1, -}; +int cpuid_to_apicid[] = { [0 ... NR_CPUS - 1] = BAD_APICID, }; bool arch_match_cpu_phys_id(int cpu, u64 phys_id) {