Received: by 2002:ab2:1c04:0:b0:1f7:53ba:1ebe with SMTP id f4csp137959lqg; Fri, 26 Apr 2024 10:50:08 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVBPnGD+Mg2pODtiT843Tcr+1Ui11YQxaG3CkPKjTB3wmP8pta3WMkyApjsj4Nn0DgV6aHVbnwyNoFsBe2ZEyBarz1Eb3pYEI0j8zNEcw== X-Google-Smtp-Source: AGHT+IHP7uToGDArQNuI/JzDOOcSk/qTKylSCYQH8x23wpN2OUzMER1tLbkD/MZ4F5N3KnOy1CNb X-Received: by 2002:a50:d6c9:0:b0:572:3b3c:754f with SMTP id l9-20020a50d6c9000000b005723b3c754fmr2983201edj.4.1714153808058; Fri, 26 Apr 2024 10:50:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714153808; cv=pass; d=google.com; s=arc-20160816; b=BApjgG8cGly5DlUXrXHEfUXCj0tgypwm7AQW2m/uQ82sTB2DjOUEkanQMEhNnaVeRR Ok8Js5/sxPnU5CJTRj3SUwML2oLXBfi2LPgpTh69BIPQZ76qjHkkzkoQuTpN9grRIlai 1QxStm9r2LQ5Z73J7zo4imWjFCMOXXmNdQagwLLWXAJb/B1kh1iBCOz4dsvdlKxMNSyw MTdffnVFCn18KUJHDXyJitlwHGXyRql/6wEMlMJRJG77E78SeSBTfDM56n0fNrBpoGpE W/w3yxKvqolAAq8zZjB/5vY/zVnwQ71/xiAsT4djEh9loNt6MMBFM1xNoIybd7FcjywM LMKg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:organization:references :in-reply-to:message-id:subject:cc:to:from:date; bh=7LQz1gEu9fk6RonVf+4P16gIOAD4EmyE95ed3y6bvt8=; fh=zKteNxjX8kORKv3dpqwp/TaJY/e3eb9grl/AdX8vmLQ=; b=YBDKHzmQhXfPLh/yjZ3LwlPaHFpmcjwvBCrsghkxDFqieL2lq22Cx3EPh8C1gI9psT /3lJK+0JtsDjpI1BmNUsYAOciabdta5Q/Im0/Pi2QUpkmg/1gtPXRb3aWTTxI70SaDHZ rZdlet1ACxKkE2pvmRM3HygJSm6oUgEyUTClSKzRFz7ESnzUhDyqmiMlL+0sJ8NbLmHt N6PZVwZM6XXAqBX9AQ3s5NP60XYrZ3kz+LCWT5EVB0IlF72qD0+4GbvCASYOmI0e7XTx 8D7wbVlGkaan20UibAOIWh5u8R2R+ujaq3rhWy/3x4Zsjh7LmpT5/PjPZ0sNg1koacO3 zhaw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-160514-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-160514-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id z8-20020a50eb48000000b0057252d647cfsi1179808edp.679.2024.04.26.10.50.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Apr 2024 10:50:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-160514-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-160514-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-160514-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 9D4691F22CCF for ; Fri, 26 Apr 2024 17:50:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E27B716ABC6; Fri, 26 Apr 2024 17:49:58 +0000 (UTC) Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6542214EC4C; Fri, 26 Apr 2024 17:49:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.176.79.56 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714153798; cv=none; b=awyRfxCOWdxsMXHv/T/mHje/T5/5snki4q0e9Sb9Tk01h8n+B4Vb6FKzZhWUoCvQmjKaXfKH9uR2imUP+LGp2xBxYeHYj6Mje2ifpkH3Wr27VgYoZrDM5BiZlRuZhXf+IZ0W4ZOJ8LjIVL5qS9MgUDJVppe8oq8LUUZateoBw8Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714153798; c=relaxed/simple; bh=erZZi9wDZX0ZOYNS/RLIvpcm6ff+QRDxGu84IpUs1F4=; h=Date:From:To:CC:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mpLKZGcSd5BEVQ+clX5o+JPwEgpxef6iJTlVkBWvcbXK5soj12sGzfJbXnDVEBxjsmqVb2lAKqOqamNnINt2zGI3pUzTqBGj3xCy4Ab3qZ6WIP8YTG09LR8anUC3FGJpIJQbS+aesoDmWPEXv1QZWUuqwAsmue/w+DY8ezRwTy8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=Huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=185.176.79.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=Huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.18.186.231]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4VR0Y95yrxz6JBFj; Sat, 27 Apr 2024 01:47:25 +0800 (CST) Received: from lhrpeml500005.china.huawei.com (unknown [7.191.163.240]) by mail.maildlp.com (Postfix) with ESMTPS id 8E2B51408F9; Sat, 27 Apr 2024 01:49:51 +0800 (CST) Received: from localhost (10.202.227.76) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Fri, 26 Apr 2024 18:49:50 +0100 Date: Fri, 26 Apr 2024 18:49:49 +0100 From: Jonathan Cameron To: Miguel Luis CC: Thomas Gleixner , Peter Zijlstra , "linux-pm@vger.kernel.org" , "loongarch@lists.linux.dev" , "linux-acpi@vger.kernel.org" , "linux-arch@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "kvmarm@lists.linux.dev" , "x86@kernel.org" , Russell King , "Rafael J . Wysocki" , "James Morse" , Salil Mehta , Jean-Philippe Brucker , Catalin Marinas , Will Deacon , Marc Zyngier , Hanjun Guo , Ingo Molnar , Borislav Petkov , Dave Hansen , "linuxarm@huawei.com" , "justin.he@arm.com" , "jianyong.wu@arm.com" , Lorenzo Pieralisi , "Sudeep Holla" Subject: Re: [PATCH v8 01/16] ACPI: processor: Simplify initial onlining to use same path for cold and hotplug Message-ID: <20240426184949.0000506d@Huawei.com> In-Reply-To: <2E688E98-F57F-444F-B326-5206FB6F5C1E@oracle.com> References: <20240426135126.12802-1-Jonathan.Cameron@huawei.com> <20240426135126.12802-2-Jonathan.Cameron@huawei.com> <6347020E-CB49-44ED-87B2-3BB2AA2F59E0@oracle.com> <2E688E98-F57F-444F-B326-5206FB6F5C1E@oracle.com> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 4.1.0 (GTK 3.24.33; x86_64-w64-mingw32) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-ClientProxiedBy: lhrpeml500003.china.huawei.com (7.191.162.67) To lhrpeml500005.china.huawei.com (7.191.163.240) On Fri, 26 Apr 2024 17:21:41 +0000 Miguel Luis wrote: > Hi Jonathan, > > > On 26 Apr 2024, at 16:05, Miguel Luis wrote: > > > > > > > >> On 26 Apr 2024, at 13:51, Jonathan Cameron wrote: > >> > >> Separate code paths, combined with a flag set in acpi_processor.c to > >> indicate a struct acpi_processor was for a hotplugged CPU ensured that > >> per CPU data was only set up the first time that a CPU was initialized. > >> This appears to be unnecessary as the paths can be combined by letting > >> the online logic also handle any CPUs online at the time of driver load. > >> > >> Motivation for this change, beyond simplification, is that ARM64 > >> virtual CPU HP uses the same code paths for hotplug and cold path in > >> acpi_processor.c so had no easy way to set the flag for hotplug only. > >> Removing this necessity will enable ARM64 vCPU HP to reuse the existing > >> code paths. > >> > >> Leave noisy pr_info() in place but update it to not state the CPU > >> was hotplugged. > > On a second thought, do we want to keep it? Can't we just assume that no > news is good news while keeping the warn right after __acpi_processor_start ? Good question - my inclination was to keep this in place for now as removing it would remove a source of information people may expect on x86 hotplug. Then maybe propose dropping it as overly noisy kernel as a follow up patch after this series is merged. Felt like a potential rat hole I didn't want to go down if I could avoid it. If any x86 experts want to shout that no one cares then I'll happily drop the print. We've carefully made it so that on arm64 we have no way to tell if this is hotplug or normal cpu bring up so we can't just print it on hotplug. Jonathan > > Miguel > > >> > >> Acked-by: Rafael J. Wysocki > >> Reviewed-by: Hanjun Guo > >> Tested-by: Miguel Luis > >> Reviewed-by: Gavin Shan > >> Signed-off-by: Jonathan Cameron > >> > >> --- > >> v8: No change > >> --- > >> drivers/acpi/acpi_processor.c | 1 - > >> drivers/acpi/processor_driver.c | 44 ++++++++++----------------------- > >> include/acpi/processor.h | 2 +- > >> 3 files changed, 14 insertions(+), 33 deletions(-) > >> > >> diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c > >> index 7a0dd35d62c9..7fc924aeeed0 100644 > >> --- a/drivers/acpi/acpi_processor.c > >> +++ b/drivers/acpi/acpi_processor.c > >> @@ -216,7 +216,6 @@ static int acpi_processor_hotadd_init(struct acpi_processor *pr) > >> * gets online for the first time. > >> */ > >> pr_info("CPU%d has been hot-added\n", pr->id); > >> - pr->flags.need_hotplug_init = 1; > >> > >> out: > >> cpus_write_unlock(); > >> diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c > >> index 67db60eda370..55782eac3ff1 100644 > >> --- a/drivers/acpi/processor_driver.c > >> +++ b/drivers/acpi/processor_driver.c > >> @@ -33,7 +33,6 @@ MODULE_AUTHOR("Paul Diefenbaugh"); > >> MODULE_DESCRIPTION("ACPI Processor Driver"); > >> MODULE_LICENSE("GPL"); > >> > >> -static int acpi_processor_start(struct device *dev); > >> static int acpi_processor_stop(struct device *dev); > >> > >> static const struct acpi_device_id processor_device_ids[] = { > >> @@ -47,7 +46,6 @@ static struct device_driver acpi_processor_driver = { > >> .name = "processor", > >> .bus = &cpu_subsys, > >> .acpi_match_table = processor_device_ids, > >> - .probe = acpi_processor_start, > >> .remove = acpi_processor_stop, > >> }; > >> > >> @@ -115,12 +113,10 @@ static int acpi_soft_cpu_online(unsigned int cpu) > >> * CPU got physically hotplugged and onlined for the first time: > >> * Initialize missing things. > >> */ > >> - if (pr->flags.need_hotplug_init) { > >> + if (!pr->flags.previously_online) { > >> int ret; > >> > >> - pr_info("Will online and init hotplugged CPU: %d\n", > >> - pr->id); > >> - pr->flags.need_hotplug_init = 0; > >> + pr_info("Will online and init CPU: %d\n", pr->id); > >> ret = __acpi_processor_start(device); > >> WARN(ret, "Failed to start CPU: %d\n", pr->id); > >> } else { > >> @@ -167,9 +163,6 @@ static int __acpi_processor_start(struct acpi_device *device) > >> if (!pr) > >> return -ENODEV; > >> > >> - if (pr->flags.need_hotplug_init) > >> - return 0; > >> - > >> result = acpi_cppc_processor_probe(pr); > >> if (result && !IS_ENABLED(CONFIG_ACPI_CPU_FREQ_PSS)) > >> dev_dbg(&device->dev, "CPPC data invalid or not present\n"); > >> @@ -185,32 +178,21 @@ static int __acpi_processor_start(struct acpi_device *device) > >> > >> status = acpi_install_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, > >> acpi_processor_notify, device); > >> - if (ACPI_SUCCESS(status)) > >> - return 0; > >> + if (!ACPI_SUCCESS(status)) { > >> + result = -ENODEV; > >> + goto err_thermal_exit; > >> + } > >> + pr->flags.previously_online = 1; > >> > >> - result = -ENODEV; > >> - acpi_processor_thermal_exit(pr, device); > >> + return 0; > >> > >> +err_thermal_exit: > >> + acpi_processor_thermal_exit(pr, device); > >> err_power_exit: > >> acpi_processor_power_exit(pr); > >> return result; > >> } > >> > >> -static int acpi_processor_start(struct device *dev) > >> -{ > >> - struct acpi_device *device = ACPI_COMPANION(dev); > >> - int ret; > >> - > >> - if (!device) > >> - return -ENODEV; > >> - > >> - /* Protect against concurrent CPU hotplug operations */ > >> - cpu_hotplug_disable(); > >> - ret = __acpi_processor_start(device); > >> - cpu_hotplug_enable(); > >> - return ret; > >> -} > >> - > >> static int acpi_processor_stop(struct device *dev) > >> { > >> struct acpi_device *device = ACPI_COMPANION(dev); > >> @@ -279,9 +261,9 @@ static int __init acpi_processor_driver_init(void) > >> if (result < 0) > >> return result; > >> > >> - result = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, > >> - "acpi/cpu-drv:online", > >> - acpi_soft_cpu_online, NULL); > >> + result = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, > >> + "acpi/cpu-drv:online", > >> + acpi_soft_cpu_online, NULL); > >> if (result < 0) > >> goto err; > >> hp_online = result; > >> diff --git a/include/acpi/processor.h b/include/acpi/processor.h > >> index 3f34ebb27525..e6f6074eadbf 100644 > >> --- a/include/acpi/processor.h > >> +++ b/include/acpi/processor.h > >> @@ -217,7 +217,7 @@ struct acpi_processor_flags { > >> u8 has_lpi:1; > >> u8 power_setup_done:1; > >> u8 bm_rld_set:1; > >> - u8 need_hotplug_init:1; > >> + u8 previously_online:1; > > > > Reviewed-by: Miguel Luis > > > > Miguel > > > >> }; > >> > >> struct acpi_processor { > >> -- > >> 2.39.2 > >> > > >