From patchwork Thu Mar 2 11:12:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usama Arif X-Patchwork-Id: 63358 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp4175038wrd; Thu, 2 Mar 2023 03:17:37 -0800 (PST) X-Google-Smtp-Source: AK7set8d2ZNis9WkaQeIFQGT4YX2UcMRYBDOV0sVlgBeOBkyGcQBJ9zyKZnu1dTBv3osTl9wR4lG X-Received: by 2002:a17:907:1692:b0:8b1:387b:c0c8 with SMTP id hc18-20020a170907169200b008b1387bc0c8mr12258366ejc.15.1677755857279; Thu, 02 Mar 2023 03:17:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677755857; cv=none; d=google.com; s=arc-20160816; b=IVDI8Z028sAdzTZYInUq/3UxlmEki3f9W34kAqjr1sQSnKiQpWUXODqkGcRsOr+icP HdDfJqtSBEtBl0XydSOpz0e1qLJRP08fvSudDSw+YglIalovNKmIPOwysJfd2mUMYa4e 7UKRrlrukG3OaqsVgliOrmi8lBEhr8yhxFV3Ij9BkOBxBGkEa6f/E7667IezeGIvtOWc rJeZMoHiK+iJ7mzNS+KpBeFzgeVVlwwbxmyP26taqZ3GMoQr7HiSyGgl/noGKhMWs6zR 4K2BQiUuHPOq8EM6HmRNZ1g9zvlEkyO9qQ4VbYoBUfUPntIjRKD1CwLWMS/+209gPeW+ kMJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=QbZumu4dMY0Za38bxLjojwYOtrQ4rJ/sJrcRrt0N9M0=; b=FwISMcFgramIjdwcjgmzta1p4+uP6UuUCIaaoLodHyaRD6SmfoJba1ej+2qY7v0RRo r6l+d+rtYWA2R+LOSs3iIP6xmBJs7uwv5708h5q7arl8C+pZHGcA08JzAX8qqoqPSrd8 meNCEvWkHMt+Mu6ZYKq8GWF974GgS1JiQplRlcrtCBNEMX769kJr8oh1JlxACzvcIv1w zigydogLxXHVpwPb8fuJvW5u46ZnkzyuYpLljT0+u431URToVZqYBDoeHMDQn8qNRFP1 VAh5FCIfAt/WhV+5JoSaAzqJ1yjIVuUZp+LKytQEoe8JkN8uDSkBf1VxITntNsE+mccY aMmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b="R//11aKp"; 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=NONE dis=NONE) header.from=bytedance.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qq18-20020a17090720d200b008f93ea0272bsi14100516ejb.104.2023.03.02.03.17.14; Thu, 02 Mar 2023 03:17:37 -0800 (PST) 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=@bytedance.com header.s=google header.b="R//11aKp"; 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=NONE dis=NONE) header.from=bytedance.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230231AbjCBLNf (ORCPT + 99 others); Thu, 2 Mar 2023 06:13:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230226AbjCBLNE (ORCPT ); Thu, 2 Mar 2023 06:13:04 -0500 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F0D24617F for ; Thu, 2 Mar 2023 03:12:36 -0800 (PST) Received: by mail-wr1-x432.google.com with SMTP id l1so13087510wry.12 for ; Thu, 02 Mar 2023 03:12:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QbZumu4dMY0Za38bxLjojwYOtrQ4rJ/sJrcRrt0N9M0=; b=R//11aKpZxnJ84W5/jenLPaya5L5StTTSawCO+Bk212Vh0tzmmd1+lfRpTKu5+Oi2/ 0rumVOeOGSHNkPUdqqOUH1xBQm76RTYcUXJJVzEVhJVx916BpgR5hfHTmP1ZA+8XvVO5 +LSUV3OcKuiODkbZ2oYfKXThWspnmHR4j27clCJWcdthy154eGZwGkrHyQcPnTKLL/ZM HMnaDPzv/OkRJnaelUOiUyt3OLurJ4jIfnVUaBGSCwhqGQ2G36yI6+o+O2Glda0lHhGE vCTndLLfjb8sO5VYWDbARKmF82Iq3o3hgpjcZKWch0mvh6q+9Nd09pZ6JtLWzXbenUi6 GlpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QbZumu4dMY0Za38bxLjojwYOtrQ4rJ/sJrcRrt0N9M0=; b=fyN8plNBSskht6CljXNGNcQFxiQMXi7NTormCtjFro97Ewgom5fo8OYtezGcqyRhj5 U5uj8Fzq6o7G1AMxoG8itzZSjpCcHbBi6EZln/U7v6NpCAkSKLRkA0zublH8QsbSQw0k MxTkdpjDFvZ8f1RTJpmCggOQW5h7bwA6JUKcRBbqaBN3XqS26+8sKKyZ6t7qy0umcnty GcdQX834NR49L7GfMj+ioL70QEttziHCSzFq7dA0yofYQgld4WVPqPVRncieM+HmI1gh r5s6K/uh4umGSnvgIB9I16YmHkpUOQG7MFeFrOQ60LSaFGNpa9TolZyvJs6tBVZg8uVm BsGg== X-Gm-Message-State: AO0yUKWTyViyZbLsH3UHtH0kieCOM3BWDrszPBEVYAjvOMhBMoRtYyx6 UaSOUa5FzLSbnBnwJiKk0oBqxQ== X-Received: by 2002:a05:6000:108c:b0:2c7:760:2539 with SMTP id y12-20020a056000108c00b002c707602539mr7182126wrw.50.1677755554593; Thu, 02 Mar 2023 03:12:34 -0800 (PST) Received: from usaari01.cust.communityfibre.co.uk ([2a02:6b6a:b566:0:11aa:3c13:d3e:eb29]) by smtp.gmail.com with ESMTPSA id a5-20020a5d4565000000b002c3f81c51b6sm14724830wrc.90.2023.03.02.03.12.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 03:12:34 -0800 (PST) From: Usama Arif To: dwmw2@infradead.org, tglx@linutronix.de, kim.phillips@amd.com, brgerst@gmail.com Cc: piotrgorski@cachyos.org, oleksandr@natalenko.name, arjan@linux.intel.com, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, x86@kernel.org, pbonzini@redhat.com, paulmck@kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, rcu@vger.kernel.org, mimoja@mimoja.de, hewenliang4@huawei.com, thomas.lendacky@amd.com, seanjc@google.com, pmenzel@molgen.mpg.de, fam.zheng@bytedance.com, punit.agrawal@bytedance.com, simon.evans@bytedance.com, liangma@liangbit.com, David Woodhouse , Usama Arif , "Guilherme G . Piccoli" Subject: [PATCH v13 04/11] x86/smpboot: Reference count on smpboot_setup_warm_reset_vector() Date: Thu, 2 Mar 2023 11:12:20 +0000 Message-Id: <20230302111227.2102545-5-usama.arif@bytedance.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230302111227.2102545-1-usama.arif@bytedance.com> References: <20230302111227.2102545-1-usama.arif@bytedance.com> MIME-Version: 1.0 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_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1759254525738664096?= X-GMAIL-MSGID: =?utf-8?q?1759254525738664096?= From: David Woodhouse When bringing up a secondary CPU from do_boot_cpu(), the warm reset flag is set in CMOS and the starting IP for the trampoline written inside the BDA at 0x467. Once the CPU is running, the CMOS flag is unset and the value in the BDA cleared. To allow for parallel bringup of CPUs, add a reference count to track the number of CPUs currently bring brought up, and clear the state only when the count reaches zero. Since the RTC spinlock is required to write to the CMOS, it can be used for mutual exclusion on the refcount too. Signed-off-by: David Woodhouse Signed-off-by: Usama Arif Tested-by: Paul E. McKenney Tested-by: Kim Phillips Tested-by: Oleksandr Natalenko Tested-by: Guilherme G. Piccoli --- arch/x86/kernel/smpboot.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 55cad72715d9..3a793772a2aa 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -121,17 +121,20 @@ int arch_update_cpu_topology(void) return retval; } + +static unsigned int smpboot_warm_reset_vector_count; + static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip) { unsigned long flags; spin_lock_irqsave(&rtc_lock, flags); - CMOS_WRITE(0xa, 0xf); + if (!smpboot_warm_reset_vector_count++) { + CMOS_WRITE(0xa, 0xf); + *((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_HIGH)) = start_eip >> 4; + *((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_LOW)) = start_eip & 0xf; + } spin_unlock_irqrestore(&rtc_lock, flags); - *((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_HIGH)) = - start_eip >> 4; - *((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_LOW)) = - start_eip & 0xf; } static inline void smpboot_restore_warm_reset_vector(void) @@ -143,10 +146,12 @@ static inline void smpboot_restore_warm_reset_vector(void) * to default values. */ spin_lock_irqsave(&rtc_lock, flags); - CMOS_WRITE(0, 0xf); + if (!--smpboot_warm_reset_vector_count) { + CMOS_WRITE(0, 0xf); + *((volatile u32 *)phys_to_virt(TRAMPOLINE_PHYS_LOW)) = 0; + } spin_unlock_irqrestore(&rtc_lock, flags); - *((volatile u32 *)phys_to_virt(TRAMPOLINE_PHYS_LOW)) = 0; } /*