From patchwork Wed Aug 9 20:36:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 133581 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp39157vqi; Wed, 9 Aug 2023 15:14:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHEo6z+1RzQZu4OIJ5imjKR+1mx6NjuJaLgUJzSMs6aT4W45rszrfbyqiOz8rlmZiuYSqrG X-Received: by 2002:a05:6a00:130b:b0:686:2668:796f with SMTP id j11-20020a056a00130b00b006862668796fmr644446pfu.32.1691619256819; Wed, 09 Aug 2023 15:14:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691619256; cv=none; d=google.com; s=arc-20160816; b=fzwNTBcgS+dO4ov6hcOTITTzPFRWTD8Kq6ZqmHGAuV4RUbr/BzXE/41esubVFqh1Qw 8cbvW0y3eLP5JHwp/mHXdyc6WJ0GdGOaEzpCrikoa9XNjtdVSTbD00qlZrjBaT2M3u6o 1G7ok0I8awS+zgRjoliqm+r3iLfQti4ZnVfrd3B6TXyzqoGyxhnNDPpVqtff5vR5wqUS 9XrnsiU9vAmgYVv+BbM3+L2ggRFo5xIu3FpcQRvFOnMXlkgUUu8k60vtPRvNlngwPft6 jILxCBJ9Uyq3J4Asa9BkIs1N0WoefWO6+RcHrMjP6rkYsGOVqer4TZbAcncW2oCjxgSw qRwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=LM/GC0eoFINYQe7juoJWX+q9MxWP0/CZQ+2JmBo1PTI=; fh=jBwjuriIPWA1lnCf5oMMiNAPpgGE0iGPmBzZMsd85oQ=; b=ibIeIf+/XIA6URJUNdTip7YpfUoagiDNekexvk9mpolEk2KRmNsgVLh8sFiPaIGG4O XG/vBmtsb5RCxIF1ALAtBusx8dY1WPOfd0tR/wIdYO4NzMVdn/u95+6u23oHr/LbVvRh byJ+YP+KXSgISTuAwiHUG2rfLjKWH2nmvxLtXvJIQ8p3NVqo2Sg0w99T30JoIZeh1zKn UAi4E3UzvO/OtOiS4jrc3YunqiG9fhNrxlnY3TFaG0po5UakyfIdbTH35NESQJt6/UrG HiZe/3jxRdf7GuwbLFuWvibLgx8ZO7/6yj+sT9YayR99lJtsctddk0LqaRhSn4ptUYz7 y5QQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="dq16Sk/Q"; 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 bu11-20020a056a00410b00b00677eac1cd9dsi140704pfb.329.2023.08.09.15.14.02; Wed, 09 Aug 2023 15:14: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="dq16Sk/Q"; 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 S234614AbjHIUhT (ORCPT + 99 others); Wed, 9 Aug 2023 16:37:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234644AbjHIUg2 (ORCPT ); Wed, 9 Aug 2023 16:36:28 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1128126AC; Wed, 9 Aug 2023 13:36:19 -0700 (PDT) Date: Wed, 09 Aug 2023 20:36:16 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691613377; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LM/GC0eoFINYQe7juoJWX+q9MxWP0/CZQ+2JmBo1PTI=; b=dq16Sk/QZ4FGQy0fWmW2+9hUA8rUTg1GlTIW5eAYnEMDavSgFz6SS9QYKaNTIrIBI6rRm8 TCOS3QDDQiD4cJuVuoP/4svk7ixN4sApRMAac5Rxj1HRPkhyClhZFaqE+MDD9WHv1k3oYd fk6AgnXvYJKpTB5U4h12xKU9G6yMbqGfghWKQd31tMALzlnqKP/9UemLhtKdS//DzUxMGz 3MBuy77W4/KysWm2iVfueWa52xLQT2UCQq4YKUR/tEp5S5RwbjZFS8OytJE36XoQumIhEC 6XGewjyOloYN8ZGS3sUlVJD0CKOG9o/C9WQIBPpvDDDYZj+xUpvHrvSirXjTiQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691613377; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LM/GC0eoFINYQe7juoJWX+q9MxWP0/CZQ+2JmBo1PTI=; b=rtzvv/8rcp7jiSXZ89GG8M+p/+vJv7gAzDtrKmw4PHOaH0QsnqexsdTNcl89YAa5djKxU0 Djb94/Zn1MWeahCA== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/apic] x86/apic/ipi: Tidy up the code and fixup comments Cc: Thomas Gleixner , Dave Hansen , "Peter Zijlstra (Intel)" , Michael Kelley , Sohil Mehta , Juergen Gross , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <169161337698.27769.12014138461981778178.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails 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,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: 1773775560524234643 X-GMAIL-MSGID: 1773791353567337926 The following commit has been merged into the x86/apic branch of tip: Commit-ID: 01363d4f762c3fb7285cc5bb0fdd23356dbacbef Gitweb: https://git.kernel.org/tip/01363d4f762c3fb7285cc5bb0fdd23356dbacbef Author: Thomas Gleixner AuthorDate: Tue, 08 Aug 2023 15:04:03 -07:00 Committer: Dave Hansen CommitterDate: Wed, 09 Aug 2023 11:58:27 -07:00 x86/apic/ipi: Tidy up the code and fixup comments 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 Signed-off-by: Dave Hansen Acked-by: Peter Zijlstra (Intel) Tested-by: Michael Kelley Tested-by: Sohil Mehta Tested-by: Juergen Gross # Xen PV (dom0 and unpriv. guest) --- arch/x86/kernel/apic/ipi.c | 74 +++++++++++++++-------------------- arch/x86/kernel/apic/local.h | 2 +- 2 files changed, 32 insertions(+), 44 deletions(-) diff --git a/arch/x86/kernel/apic/ipi.c b/arch/x86/kernel/apic/ipi.c index 2ff9cf9..614ac55 100644 --- 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(void) 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) diff --git a/arch/x86/kernel/apic/local.h b/arch/x86/kernel/apic/local.h index 0c47711..5b0a0e7 100644 --- a/arch/x86/kernel/apic/local.h +++ b/arch/x86/kernel/apic/local.h @@ -44,8 +44,6 @@ static inline unsigned int __prepare_ICR(unsigned int shortcut, int vector, 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).