From patchwork Mon Jul 24 13:35:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 124992 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1813239vqg; Mon, 24 Jul 2023 06:51:22 -0700 (PDT) X-Google-Smtp-Source: APBJJlGnj6VzmYoT+xj54GCU+D2MljRM04D/LFc+4Gfmwd8xzuIFLQYQV/EOuolaWThezKxvhdc6 X-Received: by 2002:a17:906:8a43:b0:99b:4bab:2839 with SMTP id gx3-20020a1709068a4300b0099b4bab2839mr10183197ejc.55.1690206682133; Mon, 24 Jul 2023 06:51:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690206682; cv=none; d=google.com; s=arc-20160816; b=aOm/fxJJ6rsH+PDQR75NMK5mD4FP/URGAKEdqYGl7l/Tca9mYvtvd5/iVeW3wqlWOM kU04XlXXtJA7JHpJugYvtmYj8j774sizFwluVEpgjq4Dt2Jf0rLIPR+jbG+ZASWjrJP3 oy+Ebb0dAtnIOf5SXKfbtIRVfGld99gGKuiMJ6yjD5kN6rTPLoR1qBmDDC7k5z7TpB/q iRv9+uSzB1aWtjXxfAAnkZbL45ycqCOBJT/2it6t9QhefErLB2PMZW3iUJqx6ceW2PB+ +FNmM9HR3Dv4Sei3orozwLuk+yxW64sj1yldzNCLnsap/IUVYQmgJpMKdl/PInAqun/d bsYQ== 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=QxJCd5EJ/bsG/9bO98P8hnP2UT09lEdt9hSBI73j59Y=; fh=mE3iieUIZLcDfOLIULj9X6/p0bMDPZGFSVRsnyRUnTc=; b=jvYfJ8FLfJegt9ujZ4EWcCc5rngskigM4a+vbZRlQfxZgvj/msNdGEhiazicK2GM4r iUqIodZ6RMXPzxX6RQLzwTcvhRlHaEwx+zu6IvRJdkAHTexIpFfatzXZlbqqnWT6b39p TdiND9eWZ6Yx0rFYPhYhvF8r21rJCuM4IHsT8qwVhuL7qE3aANsLoFPR0+C71wLeC4WK M3/k0L82Rd690nPQQUKSCAW2nMmiUnzx5HRdJZJdkktCWrodEgwHjFYDxJDUHEJ+wSgl 1f09cJKC9IOLkTomkR/OLfkGZxpz1sxmJ0UP/Ber+RqwBcqOkyyzcfxReUkwjvxne/fe 8mcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=jnht3IlQ; 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 kg6-20020a17090776e600b0098d15f24429si6152106ejc.260.2023.07.24.06.50.57; Mon, 24 Jul 2023 06:51:22 -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=jnht3IlQ; 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 S231743AbjGXNh1 (ORCPT + 99 others); Mon, 24 Jul 2023 09:37:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231377AbjGXNgz (ORCPT ); Mon, 24 Jul 2023 09:36:55 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81E0719B7 for ; Mon, 24 Jul 2023 06:35:46 -0700 (PDT) Message-ID: <20230724132047.321976097@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690205704; 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=QxJCd5EJ/bsG/9bO98P8hnP2UT09lEdt9hSBI73j59Y=; b=jnht3IlQUevCKibeWaI+StPW2K0ERqCZ3clERExc/JIXUbdpCQFx8OBDHoo/DKOqOSS0s/ HhPj/lBlTqE/+bEH736nmA6crF9+IVKNeMjZtG19zxWqGXSSBbRM3V6rwhF/90rbK26FNQ QDQOHwOdegXzQs8sRV8YNGBS024hQxK6bQNpopqnlBWSVHgzHZ96tHWPmw7nlPpD+lm7AC IP+GKIYW+jv71vAH9NKYiJQ8J5GoQIef/x60DPl6uswYMx3Bb4/MwyEOSidCRGiCdwIAVf 43GzCDBJOoTyNaba7Ytw/iTEVtL75hwA3D6hHJknVBldPIMwNcfoSXj4AaB4IQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690205704; 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=QxJCd5EJ/bsG/9bO98P8hnP2UT09lEdt9hSBI73j59Y=; b=AN5F9Gs/MbSCtB5xfB1PETttRPQEgma/7jh/RyUdZ684f2wmsczwfJCzK45hkPmRXLeKb1 Nj5B9y4GAOZdDdCQ== 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 V2 46/58] x86/apic/noop: Tidy up the code References: <20230724131206.500814398@linutronix.de> MIME-Version: 1.0 Date: Mon, 24 Jul 2023 15:35:03 +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,T_SCC_BODY_TEXT_LINE 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: 1772310162095425126 X-GMAIL-MSGID: 1772310162095425126 First of all apic_noop can't be probed because it's not registered. So there is no point for implementing a probe callback. The machine is rightfully to die when that is invoked. Remove the gunk and tidy up the other space consuming dummy callbacks. This gunk should simply die. Nothing should ever invoke APIC callbacks once this is installed, But that's a differrent story for another round of cleanups. The comment on top of this file which was intentionally left in place tells exactly why this is needed: voodoo programming. In fact the kernel of today should just outright refuse to boot on a system with no (functional) local APIC. That would spare tons of #ifdeffery and other nonsense. Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra (Intel) --- arch/x86/kernel/apic/apic_noop.c | 38 ++++++++------------------------------ 1 file changed, 8 insertions(+), 30 deletions(-) --- a/arch/x86/kernel/apic/apic_noop.c +++ b/arch/x86/kernel/apic/apic_noop.c @@ -8,6 +8,10 @@ * Though in case if apic is disabled (for some reason) we try * to not uglify the caller's code and allow to call (some) apic routines * like self-ipi, etc... + * + * FIXME: Remove this gunk. The above argument which was intentionally left + * in place is silly to begin with because none of the callbacks except for + * APIC::read/write() have a WARN_ON_ONCE() in them. Sigh... */ #include #include @@ -21,35 +25,10 @@ static void noop_send_IPI_allbutself(int static void noop_send_IPI_all(int vector) { } static void noop_send_IPI_self(int vector) { } static void noop_apic_icr_write(u32 low, u32 id) { } - -static int noop_wakeup_secondary_cpu(int apicid, unsigned long start_eip) -{ - return -1; -} - -static u64 noop_apic_icr_read(void) -{ - return 0; -} - -static int noop_phys_pkg_id(int cpuid_apic, int index_msb) -{ - return 0; -} - -static unsigned int noop_get_apic_id(unsigned long x) -{ - return 0; -} - -static int noop_probe(void) -{ - /* - * NOOP apic should not ever be - * enabled via probe routine - */ - return 0; -} +static int noop_wakeup_secondary_cpu(int apicid, unsigned long start_eip) { return -1; } +static u64 noop_apic_icr_read(void) { return 0; } +static int noop_phys_pkg_id(int cpuid_apic, int index_msb) { return 0; } +static unsigned int noop_get_apic_id(unsigned long x) { return 0; } static u32 noop_apic_read(u32 reg) { @@ -64,7 +43,6 @@ static void noop_apic_write(u32 reg, u32 struct apic apic_noop __ro_after_init = { .name = "noop", - .probe = noop_probe, .delivery_mode = APIC_DELIVERY_MODE_FIXED, .dest_mode_logical = true,