From patchwork Thu Jun 15 20:33:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 108714 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp904498vqr; Thu, 15 Jun 2023 13:43:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5KtPxwk+8iLwGzjgQsAG2x/N9exQEQGicO0f+DXuYl2vxMYlRceh/ey8zuLsAMNK+IeSTd X-Received: by 2002:a17:907:7d86:b0:966:5730:c3fe with SMTP id oz6-20020a1709077d8600b009665730c3femr126277ejc.52.1686861809337; Thu, 15 Jun 2023 13:43:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686861809; cv=none; d=google.com; s=arc-20160816; b=R3aQ08vslPffsTFRpzxVU08+NEYYHDutXmnUzPdxVt698ZR4CpzoVcjmwPe5oaB8i3 QmoCD6jESgKvb7bG0WjIFFuyNVOrsxf1SBspkKW1KxgdFgafW3prS5yRnSCfrkQpqEn7 NUf6Bo/0QTKbRY4J3gKGJlw2dce+eYGpw7Bi9VvOb2E6qY9rVH6BbSYIyO74SHf96s2/ IBnbIcrwyhw6oWircojcro4iEgt3Wtyfkpf+xmbqtheU0mpMD5gKL37z+T8qSjij+dhU Mdfnfij+yf11n/kTwoaQD2F4t/+3FIdeyTyT5olxVGarpQIXgJYUG+pU6ucSH4GSGy6u zkSw== 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=TjutJQniTPAOmDe9Zowiie7wuwe0S3LdAMwSbmom1QvBd6h6jfo7bScDpqybqRkiOS LLpWULe+w/rAl/nds2ZXhZ2p0DNirBtVD2Sg3lcmtY+/v+7UWjBQoC26shQKRVbPlr3p E3+cbxGPUPwV8h8YQH89HI12cufrK0CVWW6fFpRBSCevZyUbmmVL9INrhuFsJEC9rV41 RcN//Ozky1ExGsfS9TPf5Qep322m/zqc1SRFRSNprGzgW2wO2KwCJOGRrU9hRpEccfZp pmn3jUPzDXeBGP1crzVl87XiUyYEM+mO8oSW+l8Yw0pcBRs8zuIa3GqVK9y4BN5VsqSQ xtMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=j1c6y+H+; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=SHOg7nOY; 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 o13-20020a170906358d00b009745c90c3cbsi9382894ejb.622.2023.06.15.13.43.03; Thu, 15 Jun 2023 13:43:29 -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=j1c6y+H+; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=SHOg7nOY; 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 S232067AbjFOUeR (ORCPT + 99 others); Thu, 15 Jun 2023 16:34:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231320AbjFOUeB (ORCPT ); Thu, 15 Jun 2023 16:34:01 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A90D5271E for ; Thu, 15 Jun 2023 13:34:00 -0700 (PDT) Message-ID: <20230615193330.551157083@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686861239; 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=j1c6y+H+ghd90bqWcOYaeek1KPZwPr4s786lnbW2HLa9/lStXSxPNBQqGR0eEhv/o48TtW wqT2ySFUmcaquU8eMXIhz8tgLomGDQ9JQOQ52Ghn25c3LticxOcEJR/Wv5UAAepZgdTFlN TGd2NoHF6fKAJDer7Tj+kaa28gMim6jnyzPROFw+0E+V3xH3Zp7LEcxLMjxkBMTaw0KjOn hNNYeKGS0f8CrJ1OOwKaE88DuSgFJf+IQlq9WmM2NTG2A/Dind5UQtCBtuoIaHFWFn6G6b HF5UifVUhVl5Suj1M0O0ixJfB5So51YX2PITXHx09CdOkIUEsrTe8MqQjB+yHg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686861239; 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=SHOg7nOYSiQk/qkaMe8xz62FLyXEHmClkNZJcz0GMKAMPhXPe3oCHuJlUg2i5gXFVBRohk ZKM55SH+d+K7WgDw== 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 v3 6/7] x86/smp: Split sending INIT IPI out into a helper function References: <20230615190036.898273129@linutronix.de> MIME-Version: 1.0 Date: Thu, 15 Jun 2023 22:33:58 +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 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?1768802808722206559?= X-GMAIL-MSGID: =?utf-8?q?1768802808722206559?= 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();