From patchwork Thu Mar 16 22:21:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usama Arif X-Patchwork-Id: 71000 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp28089wrt; Thu, 16 Mar 2023 15:30:25 -0700 (PDT) X-Google-Smtp-Source: AK7set9nTfIwCePnZrk7fSthpQgL8ZlspDUYkYN1l30VpisYn6kSXG4zDcmzd+qrLWWgzVAzxjAN X-Received: by 2002:a17:90b:4a87:b0:23a:6be8:9446 with SMTP id lp7-20020a17090b4a8700b0023a6be89446mr5117071pjb.48.1679005825676; Thu, 16 Mar 2023 15:30:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679005825; cv=none; d=google.com; s=arc-20160816; b=jBif/n9ac9nBA+hmj4Gr9kF5hwRbElMxDJPfeuL1lm/xF4sxF+zmExwOuiVEgRdklr Xj1FtgM8GKuc7mHFuYa3v/V2GwU2Em6KG3G2iVolaODKm9kAzvR2VIlkfM1B451HNKYb ITchlPdklwp/MzGS5Snkz8YjleouEaSGpwuuhMJpAcCv5RCasowDuCcsSD1JM23U4KpZ popKQHq7NRJqXP5/mgRgsJYcebo1Oy1ZeMpTiRXlfRLSV7sQAIPWjawqCdP1OVCuIVkp X15FYJWyclPLjSMq2qU8FEuqijeDRGueDRNCjq+G1CAX0eK9h+zdbT4zSX+YpjT7biS2 FT2g== 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=ySNFLglM8SJEJlQ1FHHmy3ZddsPF9igYAJti/ai7CSk=; b=ZxyQelvXchTvpvmZBQBdna8kOqKiX1u8SqdJhZLGsdQrwDz3qTM2zQrlmPFEOnLhE9 jiOj2rJDDA6p8KfajCp6fetwl70fN0AGl/tsui7uFakI/4o4iZmNAyUwMHdUgAP2X/7v 2qf9fFfz4Zz0tdkq6g12Y2OSL0YqP2cVgnS5Y85kUlhbXsQ/UiJsrxU+LyJNbmQ8uLMi ewRvTuB8kdC7/9PjnQBgIfnHeAAu75hE/BfX3RzpZXLukk5rmTh23Hq+1PWUBXBw+kN3 aPRf6Zc0NIuFefWd9fkWXUSQRQpQY7652klz5TgCnsdcHAHe0o+H/brIsUaDyVIbgF8a ElGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=E8lXhN7x; 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 ds19-20020a17090b08d300b0023750b695e1si5860552pjb.156.2023.03.16.15.30.10; Thu, 16 Mar 2023 15:30:25 -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=@bytedance.com header.s=google header.b=E8lXhN7x; 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 S229948AbjCPWWE (ORCPT + 99 others); Thu, 16 Mar 2023 18:22:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230197AbjCPWVo (ORCPT ); Thu, 16 Mar 2023 18:21:44 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78461B0BA5 for ; Thu, 16 Mar 2023 15:21:16 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id v16so2892529wrn.0 for ; Thu, 16 Mar 2023 15:21:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1679005275; 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=ySNFLglM8SJEJlQ1FHHmy3ZddsPF9igYAJti/ai7CSk=; b=E8lXhN7xCG0/Utl/fWZI1ZNtGqI9EJIVGD+gymWMWoRdPZAPfvFi+5QKhLol1oOGHn BpYddX/YMFiEjf0YMIdZHef4jpIdVZzFrtXEM+6qB29huW2jgbb2mnXjVF3wKR8EhvD9 Xzixo1CR0PuIHdZiKI/ReOwtirzLrxUlWuGfc73YebJwwIICs7XRmdiUi5G1JO+Bs55z 84uOF5NsaJ9x8USZRZHm+RPpwK9gX9dCuqASSP+NT8+etsVloO37LzZ8ldj+/Mz5yzrj MFnCA11jiCSq0o8Cb0RjIg0Ds/3zIiecSY6GeEgKiOPQXAUuOB0lKRPtRBXgejW4EsAX kz+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679005275; 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=ySNFLglM8SJEJlQ1FHHmy3ZddsPF9igYAJti/ai7CSk=; b=QQTaflMAdZHAv2WrzOb/r1JyjyLgDvfBQc0ZCd2ws6FcXDmSQC4RqyzYECzHyo6DrV sfXrGPG8O+fd2SJSBJx12VO36PIOpoHWnnlEl8NNDR2jnYr8Jeqe1Ob9QZhVxxGh7c6e kB1pghnPu1qSaIPYK6FbBdBoqOCrbYhNrG+0zrfBSIbrQvi9eHjXXppFiJgo6qP/NPBL nnmIEo2DRRYHW/67Xni5Na1CWTxZPN+x58X+4kNpN63tZIJSQp7KvY6j3K+uPocsgY4Y yMRwitSyaA3prWxiYUXt12v2S95DkIYks/IvL0KH1zuHizYF3Uljv4GiPpRuXri7hsRk 1R+w== X-Gm-Message-State: AO0yUKXpciIslNM0BBmPrIJ9hbF5N8xk7j9hqFrvSgKfsWaPpm3jPouf Lp2nUpsEmBA5CpRzXwyZvDu3eQ== X-Received: by 2002:adf:dcc2:0:b0:2ce:aa2d:c625 with SMTP id x2-20020adfdcc2000000b002ceaa2dc625mr5869244wrm.22.1679005274770; Thu, 16 Mar 2023 15:21:14 -0700 (PDT) Received: from usaari01.cust.communityfibre.co.uk ([2a02:6b6a:b566:0:4b87:78c3:3abe:7b0d]) by smtp.gmail.com with ESMTPSA id f9-20020adff989000000b002cea392f000sm439256wrr.69.2023.03.16.15.21.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 15:21:14 -0700 (PDT) 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, gpiccoli@igalia.com, David Woodhouse , Usama Arif Subject: [PATCH v15 03/12] cpu/hotplug: Add dynamic parallel bringup states before CPUHP_BRINGUP_CPU Date: Thu, 16 Mar 2023 22:21:00 +0000 Message-Id: <20230316222109.1940300-4-usama.arif@bytedance.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230316222109.1940300-1-usama.arif@bytedance.com> References: <20230316222109.1940300-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?1760565212606506315?= X-GMAIL-MSGID: =?utf-8?q?1760565212606506315?= From: David Woodhouse There is often significant latency in the early stages of CPU bringup, and time is wasted by waking each CPU (e.g. with SIPI/INIT/INIT on x86) and then waiting for it to respond before moving on to the next. Allow a platform to register a set of pre-bringup CPUHP states to which each CPU can be stepped in parallel, thus absorbing some of that latency. There is a subtlety here: even with an empty CPUHP_BP_PARALLEL_DYN step, this means that *all* CPUs are brought through the prepare states and to CPUHP_BP_PREPARE_DYN before any of them are taken to CPUHP_BRINGUP_CPU and then are allowed to run for themselves to CPUHP_ONLINE. So any combination of prepare/start calls which depend on A-B ordering for each CPU in turn, such as the X2APIC code which used to allocate a cluster mask 'just in case' and store it in a global variable in the prep stage, then potentially consume that preallocated structure from the AP and set the global pointer to NULL to be reallocated in CPUHP_X2APIC_PREPARE for the next CPU... would explode horribly. Any platform enabling the CPUHP_BP_PARALLEL_DYN steps must be reviewed and tested to ensure that such issues do not exist, and the existing behaviour of bringing CPUs to CPUHP_BP_PREPARE_DYN and then immediately to CPUHP_BRINGUP_CPU and CPUHP_ONLINE only one at a time does not change unless such a state is registered. Note that the new parallel stages do *not* yet bring each AP to the CPUHP_BRINGUP_CPU state at the same time, only to the new states which exist before it. The final loop in bringup_nonboot_cpus() is untouched, bringing each AP in turn from the final PARALLEL_DYN state (or all the way from CPUHP_OFFLINE) to CPUHP_BRINGUP_CPU and then waiting for that AP to do its own processing and reach CPUHP_ONLINE before releasing the next. Parallelising that part by bringing them all to CPUHP_BRINGUP_CPU and then waiting for them all is an exercise for the future. 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 --- include/linux/cpuhotplug.h | 2 ++ kernel/cpu.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 6c6859bfc454..e5a73ae6ccc0 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -133,6 +133,8 @@ enum cpuhp_state { CPUHP_MIPS_SOC_PREPARE, CPUHP_BP_PREPARE_DYN, CPUHP_BP_PREPARE_DYN_END = CPUHP_BP_PREPARE_DYN + 20, + CPUHP_BP_PARALLEL_DYN, + CPUHP_BP_PARALLEL_DYN_END = CPUHP_BP_PARALLEL_DYN + 4, CPUHP_BRINGUP_CPU, /* diff --git a/kernel/cpu.c b/kernel/cpu.c index 6b3dccb4a888..6ccc64defd47 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -1497,8 +1497,30 @@ int bringup_hibernate_cpu(unsigned int sleep_cpu) void bringup_nonboot_cpus(unsigned int setup_max_cpus) { + unsigned int n = setup_max_cpus - num_online_cpus(); unsigned int cpu; + /* + * An architecture may have registered parallel pre-bringup states to + * which each CPU may be brought in parallel. For each such state, + * bring N CPUs to it in turn before the final round of bringing them + * online. + */ + if (n > 0) { + enum cpuhp_state st = CPUHP_BP_PARALLEL_DYN; + + while (st <= CPUHP_BP_PARALLEL_DYN_END && cpuhp_hp_states[st].name) { + int i = n; + + for_each_present_cpu(cpu) { + cpu_up(cpu, st); + if (!--i) + break; + } + st++; + } + } + for_each_present_cpu(cpu) { if (num_online_cpus() >= setup_max_cpus) break; @@ -1875,6 +1897,10 @@ static int cpuhp_reserve_state(enum cpuhp_state state) step = cpuhp_hp_states + CPUHP_BP_PREPARE_DYN; end = CPUHP_BP_PREPARE_DYN_END; break; + case CPUHP_BP_PARALLEL_DYN: + step = cpuhp_hp_states + CPUHP_BP_PARALLEL_DYN; + end = CPUHP_BP_PARALLEL_DYN_END; + break; default: return -EINVAL; } @@ -1899,14 +1925,15 @@ static int cpuhp_store_callbacks(enum cpuhp_state state, const char *name, /* * If name is NULL, then the state gets removed. * - * CPUHP_AP_ONLINE_DYN and CPUHP_BP_PREPARE_DYN are handed out on + * CPUHP_AP_ONLINE_DYN and CPUHP_BP_P*_DYN are handed out on * the first allocation from these dynamic ranges, so the removal * would trigger a new allocation and clear the wrong (already * empty) state, leaving the callbacks of the to be cleared state * dangling, which causes wreckage on the next hotplug operation. */ if (name && (state == CPUHP_AP_ONLINE_DYN || - state == CPUHP_BP_PREPARE_DYN)) { + state == CPUHP_BP_PREPARE_DYN || + state == CPUHP_BP_PARALLEL_DYN)) { ret = cpuhp_reserve_state(state); if (ret < 0) return ret;