From patchwork Tue Jun 13 12:18: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: 107348 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp505847vqr; Tue, 13 Jun 2023 05:30:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ51p2eYw2Y3qUy1fF1k+M2ROHM7Nd6HL37fco/YhdEwPi4iYWg/v5RvqyfFZiF3gDv2sNCK X-Received: by 2002:a17:906:da85:b0:966:2123:e0ca with SMTP id xh5-20020a170906da8500b009662123e0camr13461306ejb.34.1686659435518; Tue, 13 Jun 2023 05:30:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686659435; cv=none; d=google.com; s=arc-20160816; b=aLw8aoEdWnXJHvIjEbh6Nwn8viSsofMbpRAu73XuyWECJvaefrE21e37I4VAJgZdBm 5ig9N70OxQKR9GSX7tIMYCbfrjNEKNTHWp5b4PbljA3uzjCATIV1MNqO0iNH9UnB0TLE ZfaChFb8JZhqUiJLycKx8JtY/WfwPNaqv8jwChAetDuiaiJWDeacfuqN4ie/DNl8Cp05 4XZH3JejWisMbNZoQju4+hh0P40iwwug4f4d2pMryJxypyutr/R4bpyY6PE6g595+2nH i9dxPKhU9f+AV6qOQqfPdVbn0EXlY7Hjj6aDhmyOs4758e8iz9AqgpC8Lnh6syQkXvpw jqYQ== 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=TBdYSJyouEMeMZNGX8gFG7/P16NsNnlIxKFRjUwkdQA=; b=g8ILzkj+C2ZZI0mROsdS8u3tUoIv4AIGmUUUm136P/VlS/sh/TsJllvTuHynuZf627 w8e5hq0+RYFrNr1ETIXv+bMQVzImsAXr7A+SATkbeIiAQNKlKZpKdM3PwTHQ6skBB25N Q3cbeahERq0M7GuZvh7OTT/obJNsY7l1wKTWA79qbGEyqwS88SFrobd6xiqj/gvgelbW By3M6DyCLU6XZboV9pOfJr/Zgxive7ZWz0fpjxtjnZssviePZ0zKd1G9m94AnWinIlR8 SfPHOiPslK0MjcOt/8G16gHIrbiysPboNzCnO0R9NkDHt/6njrDVXk3VbBhGxcoQ5S1b UyXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=PnXfWGOW; 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 z14-20020a1709067e4e00b009787b15a877si6339784ejr.515.2023.06.13.05.30.10; Tue, 13 Jun 2023 05:30:35 -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=PnXfWGOW; 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 S242381AbjFMMSW (ORCPT + 99 others); Tue, 13 Jun 2023 08:18:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242329AbjFMMSF (ORCPT ); Tue, 13 Jun 2023 08:18:05 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C35A810DA for ; Tue, 13 Jun 2023 05:18:04 -0700 (PDT) Message-ID: <20230613121615.988238767@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686658683; 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=TBdYSJyouEMeMZNGX8gFG7/P16NsNnlIxKFRjUwkdQA=; b=PnXfWGOWNKoX5Y2YOXm/AS72gnZ7FfbtQ7A8gA7wqf0e0pRab16EvmBYn7zoDp82o+Ifeq MvJOfq+KpLw8CFq9Oaj7A0bY81jGhs2usisMwJSC0GiTZSi1vuddo0KNGTFaVIJVvmiGTt 2FfTQXkoTzaIeYrXoWbS3wifYi/5I/6TXnkq2K2yWOTavzkHXfENc0yb2wb17L/OGSBz76 d+Ar9DIbanNwDbVwFPr1+O8GK+3Drj0WAcyCCQURQT88Ko+S3oJDy8v+/f2vSjjMsTvWl1 +UbN65Fs8ZgHyZdFFZ3u5dBoKKFB3qmEzdWHzwWEsfpq5lQF2vTfhyJbeN7z9A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686658683; 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=TBdYSJyouEMeMZNGX8gFG7/P16NsNnlIxKFRjUwkdQA=; b=sQqGJr9gWYQT+uqv1DzEL8yLTUSr7eHXZfptlhAktVNcdTuo/WU8Ml7RAsqYwMrOPrN76a n4do5/hAXULSMxDg== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Mario Limonciello , Tom Lendacky , Tony Battersby , Ashok Raj , Tony Luck , Arjan van de Veen , Eric Biederman , Ashok Raj Subject: [patch V2 7/8] x86/smp: Split sending INIT IPI out into a helper function References: <20230613115353.599087484@linutronix.de> MIME-Version: 1.0 Date: Tue, 13 Jun 2023 14:18:03 +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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768590604043852853?= X-GMAIL-MSGID: =?utf-8?q?1768590604043852853?= Putting CPUs into INIT is a safer place during kexec() to park CPUs. Split the INIT assert/deassert sequence out so it can be reused. Signed-off-by: Thomas Gleixner Reviewed-by: Ashok Raj --- V2: Fix rebase screwup --- arch/x86/kernel/smpboot.c | 49 ++++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 29 deletions(-) --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -853,47 +853,38 @@ wakeup_secondary_cpu_via_nmi(int apicid, return (send_status | accept_status); } -static int -wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip) +static void send_init_sequence(int phys_apicid) { - unsigned long send_status = 0, accept_status = 0; - int maxlvt, num_starts, j; - - maxlvt = lapic_get_maxlvt(); + int maxlvt = lapic_get_maxlvt(); - /* - * Be paranoid about clearing APIC errors. - */ + /* Be paranoid about clearing APIC errors. */ if (APIC_INTEGRATED(boot_cpu_apic_version)) { - if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */ + /* Due to the Pentium erratum 3AP. */ + if (maxlvt > 3) apic_write(APIC_ESR, 0); apic_read(APIC_ESR); } - pr_debug("Asserting INIT\n"); - - /* - * Turn INIT on target chip - */ - /* - * Send IPI - */ - apic_icr_write(APIC_INT_LEVELTRIG | APIC_INT_ASSERT | APIC_DM_INIT, - phys_apicid); - - pr_debug("Waiting for send to finish...\n"); - send_status = safe_apic_wait_icr_idle(); + /* Assert INIT on the target CPU */ + apic_icr_write(APIC_INT_LEVELTRIG | APIC_INT_ASSERT | APIC_DM_INIT, phys_apicid); + safe_apic_wait_icr_idle(); udelay(init_udelay); - pr_debug("Deasserting INIT\n"); - - /* Target chip */ - /* Send IPI */ + /* Deassert INIT on the target CPU */ apic_icr_write(APIC_INT_LEVELTRIG | APIC_DM_INIT, phys_apicid); + safe_apic_wait_icr_idle(); +} + +/* + * Wake up AP by INIT, INIT, STARTUP sequence. + */ +static int wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip) +{ + unsigned long send_status = 0, accept_status = 0; + int num_starts, j, maxlvt = lapic_get_maxlvt(); - pr_debug("Waiting for send to finish...\n"); - send_status = safe_apic_wait_icr_idle(); + send_init_sequence(phys_apicid); mb();