From patchwork Mon Jul 17 23:15:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 121681 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1407116vqt; Mon, 17 Jul 2023 16:40:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlHdIrv3aP4Enwib6VheOQZBrYTbN+808VQO9XUQA/FtJvTIwYlhcbSFIQcV0Xxjd9ZB87vS X-Received: by 2002:a05:6a20:430a:b0:f0:50c4:4c43 with SMTP id h10-20020a056a20430a00b000f050c44c43mr14186066pzk.5.1689637219886; Mon, 17 Jul 2023 16:40:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689637219; cv=none; d=google.com; s=arc-20160816; b=ChgWQWVjNKNqoVUTQVlPjOhHd1LPgb6RO6pH0iCJKODwZcUtIGZNYK/8bj/oUXKi1r zP5KYFsVbof5JAfxCkf4IP6oiOIzcuROo3QfCYkjLYEiFOq8re/Z3FNrSGc9u86YXKha phX4yEgqi+aK8ETt4e7C6scq7BymMmW1mTwQ/OzghYnqyZM+U+h4S58DWePhDTFJBGav Q0eQUBYy54YyUZ0Udx/FrOyhIfesthWnEhc60hFEM6uKleO0RvfbQoAIX0FvBhAMD1Nx GzXsQ+X7GKj5GOb2FVKwFn1O2g8HI3KMLYemcP57vMEA54GOno4ffWtVB18ZM+oyd8MC GAiw== 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=Wo3JBTvCQoJQW2SUExSVUktNUCEvCHCZ3yixiHATHeQ=; fh=MJzvnywV9/WrN/ASipmGkNx/7jKFHnq83nsgXe/obdc=; b=CTfucf3S2sZyOdxnpMv3PDho5JEwZgJ+iVpfWbSr2AkDhJ27mTAJoxeju+GnwV646z etDXfCcVVyiUuRyLpK131RoIii154lil6RqGoB62e/x4avWl2w7/TLLiUxkayHZrXlU9 HdgS0PYHvYsLhiRdzlIMixE5zpyfEx5rK7jBC2dS1xKfvFDnZVlOglVvFsN9PExV+HHU lILzr6ofG3X3yhgEQq3UEGBExQOlR+R+jWsgDh4KRilmfAJPinxm6JU4f/+85Hq0uA+x s75IBon4439acnuHz4YiuzlQ61QFuiuouSE6+Nx2hA0SFP/P1wJ0HMQJhYY/5zSX59EL j90Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=kN5D1+kp; 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 185-20020a6300c2000000b005347c4d09ddsi538054pga.678.2023.07.17.16.40.07; Mon, 17 Jul 2023 16:40:19 -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=kN5D1+kp; 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 S231485AbjGQXRe (ORCPT + 99 others); Mon, 17 Jul 2023 19:17:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231476AbjGQXRd (ORCPT ); Mon, 17 Jul 2023 19:17:33 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3746219BD for ; Mon, 17 Jul 2023 16:16:47 -0700 (PDT) Message-ID: <20230717223224.979781880@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1689635724; 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=Wo3JBTvCQoJQW2SUExSVUktNUCEvCHCZ3yixiHATHeQ=; b=kN5D1+kpe82x5535R+8MyScBmHvOwIfhwiRY786PEZkMcCkCfmvxMhmrhrNL/wIhq9A/w8 sxMc2aLDqmFRTf6KGyBSI3iEOb6lZcgHpkmd6XHREin9xRYcZcCwOhUKcpsXm+cvrLQhSV O4s2LzxAAuaF+G9mEGOy6MHQHQNqN2Egde0OxWwWiCXzwov0iYBqUE9e86v/pmuBoGg534 +YBWXCRADo7zNUT2YFNMGDBFWw6k57F8AG8GMPLco3/2FYgNVMaMwRCxarsTbw1EoGpLCt ItHgfa4eHj1zwK/EVMpfHzGObP6SldEdJ/Jc8Zb5+o1DHpwuRBPhC/nRITHs3Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1689635724; 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=Wo3JBTvCQoJQW2SUExSVUktNUCEvCHCZ3yixiHATHeQ=; b=NiGBPNwoOpOk9xZPiJabG49K3ip5AkKaUYnzDrYFQgfCraB9Dk3FmtMJ08POqhhSYmIsJ2 vbxa40csLOvoQpBQ== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Linus Torvalds , Andrew Cooper , Tom Lendacky , Paolo Bonzini , Wei Liu , Arjan van de Ven , Juergen Gross Subject: [patch 32/58] x86/apic/ipi: Tidy up the code and fixup comments References: <20230717223049.327865981@linutronix.de> MIME-Version: 1.0 Date: Tue, 18 Jul 2023 01:15:24 +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: 1771713037713677719 X-GMAIL-MSGID: 1771713037713677719 Replace the undecodable comment on top of the function, replace the space consuming zero content comments with useful ones and tidy up the implementation to prevent further eye bleed. Make __default_send_IPI_shortcut() static as it has no other users. Signed-off-by: Thomas Gleixner --- arch/x86/kernel/apic/ipi.c | 74 ++++++++++++++++++------------------------- arch/x86/kernel/apic/local.h | 2 - 2 files changed, 32 insertions(+), 44 deletions(-) --- a/arch/x86/kernel/apic/ipi.c +++ b/arch/x86/kernel/apic/ipi.c @@ -108,68 +108,58 @@ static inline void __xapic_wait_icr_idle cpu_relax(); } -void __default_send_IPI_shortcut(unsigned int shortcut, int vector) +/* + * This is safe against interruption because it only writes the lower 32 + * bits of the APIC_ICR register. The destination field is ignored for + * short hand IPIs. + * + * wait_icr_idle() + * write(ICR2, dest) + * NMI + * wait_icr_idle() + * write(ICR) + * wait_icr_idle() + * write(ICR) + * + * This function does not need to disable interrupts as there is no ICR2 + * interaction. The memory write is direct except when the machine is + * affected by the 11AP Pentium erratum, which turns the plain write into + * an XCHG operation. + */ +static void __default_send_IPI_shortcut(unsigned int shortcut, int vector) { /* - * Subtle. In the case of the 'never do double writes' workaround - * we have to lock out interrupts to be safe. As we don't care - * of the value read we use an atomic rmw access to avoid costly - * cli/sti. Otherwise we use an even cheaper single atomic write - * to the APIC. - */ - unsigned int cfg; - - /* - * Wait for idle. + * Wait for the previous ICR command to complete. Use + * safe_apic_wait_icr_idle() for the NMI vector as there have been + * issues where otherwise the system hangs when the panic CPU tries + * to stop the others before launching the kdump kernel. */ if (unlikely(vector == NMI_VECTOR)) safe_apic_wait_icr_idle(); else __xapic_wait_icr_idle(); - /* - * No need to touch the target chip field. Also the destination - * mode is ignored when a shorthand is used. - */ - cfg = __prepare_ICR(shortcut, vector, 0); - - /* - * Send the IPI. The write to APIC_ICR fires this off. - */ - native_apic_mem_write(APIC_ICR, cfg); + /* Destination field (ICR2) and the destination mode are ignored */ + native_apic_mem_write(APIC_ICR, __prepare_ICR(shortcut, vector, 0)); } /* * This is used to send an IPI with no shorthand notation (the destination is * specified in bits 56 to 63 of the ICR). */ -void __default_send_IPI_dest_field(unsigned int mask, int vector, unsigned int dest) +void __default_send_IPI_dest_field(unsigned int dest_mask, int vector, + unsigned int dest_mode) { - unsigned long cfg; - - /* - * Wait for idle. - */ + /* See comment in __default_send_IPI_shortcut() */ if (unlikely(vector == NMI_VECTOR)) safe_apic_wait_icr_idle(); else __xapic_wait_icr_idle(); - /* - * prepare target chip field - */ - cfg = __prepare_ICR2(mask); - native_apic_mem_write(APIC_ICR2, cfg); - - /* - * program the ICR - */ - cfg = __prepare_ICR(0, vector, dest); - - /* - * Send the IPI. The write to APIC_ICR fires this off. - */ - native_apic_mem_write(APIC_ICR, cfg); + /* Set the IPI destination field in the ICR */ + native_apic_mem_write(APIC_ICR2, __prepare_ICR2(dest_mask)); + /* Send it with the proper destination mode */ + native_apic_mem_write(APIC_ICR, __prepare_ICR(0, vector, dest_mode)); } void default_send_IPI_single_phys(int cpu, int vector) --- a/arch/x86/kernel/apic/local.h +++ b/arch/x86/kernel/apic/local.h @@ -44,8 +44,6 @@ static inline unsigned int __prepare_ICR void default_init_apic_ldr(void); -void __default_send_IPI_shortcut(unsigned int shortcut, int vector); - /* * This is used to send an IPI with no shorthand notation (the destination is * specified in bits 56 to 63 of the ICR).