From patchwork Tue Aug 1 10:47:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 129243 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2618943vqg; Tue, 1 Aug 2023 05:04:49 -0700 (PDT) X-Google-Smtp-Source: APBJJlGGfV+FahE9mWs7YYw56XqWge2z8Tb0QDl+zevf2P/eDKJStuRr8Gr0iu521AMlsNcODOG8 X-Received: by 2002:a05:6a21:6da1:b0:13d:697a:c31c with SMTP id wl33-20020a056a216da100b0013d697ac31cmr8476930pzb.27.1690891489379; Tue, 01 Aug 2023 05:04:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690891489; cv=none; d=google.com; s=arc-20160816; b=X1nAgpMHd5TdCWFokLbG3xhRxoE4NTr3df9J+V72EPRXJIdXt8ManqCoNGSMf0XwKk 8JKLaoyjarjj06aXPCNhDJxEGWljsQ+7yxDp8yGify8B2X8Kro/tY6eqToPQz631FVuq 6+X0ZFMdU+vIHGH2Akvz4LeyDGLwLr3ywG5Wwhuy8G7vE7A+1HIKmVSNAhuj3/xf3XCi RVf9XzR6uloXA/RysKLqaggWUitOJTFozoWs7SIeOwBmHTEau/7IkDzEQGHP8RglFO+Z uJSs0yuxpD2hOiHMaFlj87/sBDmvOe+d4ONvfdGKpOpqGuA4xKRlkpE7eIq3ZWrhlPlM +iAA== 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=XhABCxwHPGY7DF2UNzN4o5WpsX1JegdIqFCLm4OuXKU=; fh=mE3iieUIZLcDfOLIULj9X6/p0bMDPZGFSVRsnyRUnTc=; b=W8rih3xHIwwaLst7tZKng27MlXrRBDnwPyjlhX3/7xvYciGy+G5GYP3nGWUNxb/L6V 1HfcsWCTuDQX5LgPnamYtwJ3ZsYrDp0Rnm0FCi+xWWjH0l8FAOkm8cWBgiqmSZxbqlN7 huv3q+OyzlkmJYsn2xjijezIW88WEwYEEcQME2eq0ud5blsu8QQWdRjBlz60ogPc4NQT 0x6xv5bdlSckC+0IFp3FUXXGuUtMDt8qu20qAsAxXQ8xqUSA/GZKfYgIFvD8joDJ4ena h9Fw++pqqZQ/ryHfupEbYLW1JHhLOUagpd6ERGOl/5oQleV18WLyzlKRdLk+B48HgvQM wbzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ZLJEXzsJ; dkim=neutral (no key) header.i=@linutronix.de; 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 k11-20020a056a00134b00b0067e5edde6eesi9316367pfu.302.2023.08.01.05.04.35; Tue, 01 Aug 2023 05:04:49 -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=ZLJEXzsJ; dkim=neutral (no key) header.i=@linutronix.de; 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 S233291AbjHAKtI (ORCPT + 99 others); Tue, 1 Aug 2023 06:49:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234234AbjHAKsL (ORCPT ); Tue, 1 Aug 2023 06:48:11 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A75332113 for ; Tue, 1 Aug 2023 03:47:20 -0700 (PDT) Message-ID: <20230801103816.638137038@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690886834; 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=XhABCxwHPGY7DF2UNzN4o5WpsX1JegdIqFCLm4OuXKU=; b=ZLJEXzsJtJYGRrxFytcloiCsPbo6DqPVeh8GFOjdTD/P9EvePOxkscKnA6aOO9mvH1unrL Y5NLH2mAfWlBpAGsoWlacrOyInhzSmDcL1G9jravJrzZ0G8HR0Vjhn1LNETu3HM3l/IeC2 zjHqfO8nUHHhMi/6zsEwlAQV9pYRncra/NONW2RwLgxCpbAjnqCn7seCryVh2nI5FwcqNY /HKORR4B6yTSpzikvN6OLlu8u768Kh9bCbD81+SmQGYRwb593+V81ERkdQWBhKkhExgTER btvfRgyPUP+nsKov9XAGpyWCBza8QlujwuGrJH6KUdQLgWxF5MYHjt0DsL6smw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690886834; 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=XhABCxwHPGY7DF2UNzN4o5WpsX1JegdIqFCLm4OuXKU=; b=Up0KUSj8J7MVjxiRALiNOwtofePybPN5BfjmopOobB8WDGZKPQm8PksdLK/zwX1Yutw08L qE5gagXEVSw4clBg== 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 27/60] x86/apic/32: Remove bigsmp_cpu_present_to_apicid() References: <20230801103042.936020332@linutronix.de> MIME-Version: 1.0 Date: Tue, 1 Aug 2023 12:47:14 +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: 1773028234708600230 X-GMAIL-MSGID: 1773028234708600230 It's a copy of default_cpu_present_to_apicid() with the omission of the actual check whether the CPU is present. This APIC callback should die completely, but the XEN APIC implementation does something different which needs to be addressed first. Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra (Intel) --- arch/x86/kernel/apic/bigsmp_32.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) --- a/arch/x86/kernel/apic/bigsmp_32.c +++ b/arch/x86/kernel/apic/bigsmp_32.c @@ -43,14 +43,6 @@ static void bigsmp_setup_apic_routing(vo nr_ioapics); } -static int bigsmp_cpu_present_to_apicid(int mps_cpu) -{ - if (mps_cpu < nr_cpu_ids) - return (int) per_cpu(x86_cpu_to_apicid, mps_cpu); - - return BAD_APICID; -} - static void bigsmp_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask_t *retmap) { /* For clustered we don't have a good way to do this yet - hack */ @@ -119,7 +111,7 @@ static struct apic apic_bigsmp __ro_afte .init_apic_ldr = bigsmp_init_apic_ldr, .ioapic_phys_id_map = bigsmp_ioapic_phys_id_map, .setup_apic_routing = bigsmp_setup_apic_routing, - .cpu_present_to_apicid = bigsmp_cpu_present_to_apicid, + .cpu_present_to_apicid = default_cpu_present_to_apicid, .apicid_to_cpu_present = physid_set_mask_of_physid, .phys_pkg_id = bigsmp_phys_pkg_id,