From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0730ECCA47B for ; Wed, 8 Jun 2022 18:16:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235297AbiFHSPt (ORCPT ); Wed, 8 Jun 2022 14:15:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234055AbiFHSNU (ORCPT ); Wed, 8 Jun 2022 14:13:20 -0400 Received: from mail-yb1-f181.google.com (mail-yb1-f181.google.com [209.85.219.181]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C812515BC; Wed, 8 Jun 2022 11:13:19 -0700 (PDT) Received: by mail-yb1-f181.google.com with SMTP id g201so10024238ybf.12; Wed, 08 Jun 2022 11:13:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ZQePx5uIM1fUidMEiJVM5nuB6ZzPVeEu38qEpc1UrpE=; b=Y/oeeMQrCREMAWANBtrC3FoGXp50sFBMnvCLxNPWQwAAPNWWQOkGGgixDidmNA78qT clugwm9GcFMfOiHKMFqmPr4YFjITcvy/m+W7TJjdwWIUt0b61YYnS5a5Ja6XU1sgIpKB Pm/Mm9CmG1gnlgOJpnVbJbX07BFJRtxidTRQz2J5crD0Rj39JU06MjPOmWSd+PQegvqs 2NEZnU9t4ZKpAuKBBfq063e/AZvZDsnvsSTKKhA1xtMm69DZdg470FMZT3BMx/iUZMFC fRn+Kh0ynK56XfSD4mP29RmHGjBnrTah7cayY4bS13J74zv/qIlZpzjdh9+r70yRAwFk k7TA== X-Gm-Message-State: AOAM532H0P+P0gEeBUMURTlrmxKFI3cgqxKlR3kTeYkp0afaOZ5IrLRC 4oJnJvc0sE0hIltjXsKSr7cofCI1puZ0V6AEq0A= X-Google-Smtp-Source: ABdhPJyd1CrHem+vVK3IGyX/t5xH0MretwaFF4fsfRB0Td7tNKI/Gb3F1VH58WOF1ULS3yEBVcV2AFovGma6uhuJi5U= X-Received: by 2002:a5b:4a:0:b0:663:7c5b:a5ba with SMTP id e10-20020a5b004a000000b006637c5ba5bamr17352131ybp.81.1654711998678; Wed, 08 Jun 2022 11:13:18 -0700 (PDT) MIME-Version: 1.0 References: <20220608142723.103523089@infradead.org> <20220608144516.047149313@infradead.org> In-Reply-To: <20220608144516.047149313@infradead.org> From: "Rafael J. Wysocki" Date: Wed, 8 Jun 2022 20:13:07 +0200 Message-ID: Subject: Re: [PATCH 02/36] x86/idle: Replace x86_idle with a static_call To: Peter Zijlstra Cc: rth@twiddle.net, ink@jurassic.park.msu.ru, mattst88@gmail.com, vgupta@kernel.org, Russell King - ARM Linux , ulli.kroll@googlemail.com, Linus Walleij , Shawn Guo , Sascha Hauer , Sascha Hauer , Fabio Estevam , dl-linux-imx , Tony Lindgren , Kevin Hilman , Catalin Marinas , Will Deacon , Guo Ren , bcain@quicinc.com, Huacai Chen , kernel@xen0n.name, Geert Uytterhoeven , sammy@sammy.net, Michal Simek , Thomas Bogendoerfer , dinguyen@kernel.org, jonas@southpole.se, stefan.kristiansson@saunalahti.fi, Stafford Horne , James Bottomley , Helge Deller , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Paul Walmsley , Palmer Dabbelt , Albert Ou , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Yoshinori Sato , Rich Felker , David Miller , Richard Weinberger , anton.ivanov@cambridgegreys.com, Johannes Berg , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "the arch/x86 maintainers" , "H. Peter Anvin" , acme@kernel.org, Mark Rutland , Alexander Shishkin , jolsa@kernel.org, namhyung@kernel.org, Juergen Gross , srivatsa@csail.mit.edu, amakhalov@vmware.com, pv-drivers@vmware.com, Boris Ostrovsky , chris@zankel.net, jcmvbkbc@gmail.com, "Rafael J. Wysocki" , Len Brown , Pavel Machek , Greg Kroah-Hartman , Michael Turquette , Stephen Boyd , Daniel Lezcano , lpieralisi@kernel.org, Sudeep Holla , Andy Gross , Bjorn Andersson , Anup Patel , Thierry Reding , Jon Hunter , Jacob Pan , Arnd Bergmann , Yury Norov , Andy Shevchenko , Rasmus Villemoes , Steven Rostedt , Petr Mladek , senozhatsky@chromium.org, John Ogness , "Paul E. McKenney" , Frederic Weisbecker , quic_neeraju@quicinc.com, Josh Triplett , Mathieu Desnoyers , Lai Jiangshan , Joel Fernandes , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Benjamin Segall , Mel Gorman , Daniel Bristot de Oliveira , vschneid@redhat.com, jpoimboe@kernel.org, linux-alpha@vger.kernel.org, Linux Kernel Mailing List , linux-snps-arc@lists.infradead.org, Linux ARM , Linux OMAP Mailing List , linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-m68k , "open list:BROADCOM NVRAM DRIVER" , openrisc@lists.librecores.org, Parisc List , linuxppc-dev , linux-riscv , linux-s390@vger.kernel.org, Linux-sh list , sparclinux@vger.kernel.org, linux-um@lists.infradead.org, linux-perf-users@vger.kernel.org, virtualization@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-xtensa@linux-xtensa.org, ACPI Devel Maling List , Linux PM , linux-clk , linux-arm-msm , linux-tegra , linux-arch , rcu@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org On Wed, Jun 8, 2022 at 4:47 PM Peter Zijlstra wrote: > > Typical boot time setup; no need to suffer an indirect call for that. > > Signed-off-by: Peter Zijlstra (Intel) > Reviewed-by: Frederic Weisbecker Reviewed-by: Rafael J. Wysocki > --- > arch/x86/kernel/process.c | 50 +++++++++++++++++++++++++--------------------- > 1 file changed, 28 insertions(+), 22 deletions(-) > > --- a/arch/x86/kernel/process.c > +++ b/arch/x86/kernel/process.c > @@ -24,6 +24,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -692,7 +693,23 @@ void __switch_to_xtra(struct task_struct > unsigned long boot_option_idle_override = IDLE_NO_OVERRIDE; > EXPORT_SYMBOL(boot_option_idle_override); > > -static void (*x86_idle)(void); > +/* > + * We use this if we don't have any better idle routine.. > + */ > +void __cpuidle default_idle(void) > +{ > + raw_safe_halt(); > +} > +#if defined(CONFIG_APM_MODULE) || defined(CONFIG_HALTPOLL_CPUIDLE_MODULE) > +EXPORT_SYMBOL(default_idle); > +#endif > + > +DEFINE_STATIC_CALL_NULL(x86_idle, default_idle); > + > +static bool x86_idle_set(void) > +{ > + return !!static_call_query(x86_idle); > +} > > #ifndef CONFIG_SMP > static inline void play_dead(void) > @@ -715,28 +732,17 @@ void arch_cpu_idle_dead(void) > /* > * Called from the generic idle code. > */ > -void arch_cpu_idle(void) > -{ > - x86_idle(); > -} > - > -/* > - * We use this if we don't have any better idle routine.. > - */ > -void __cpuidle default_idle(void) > +void __cpuidle arch_cpu_idle(void) > { > - raw_safe_halt(); > + static_call(x86_idle)(); > } > -#if defined(CONFIG_APM_MODULE) || defined(CONFIG_HALTPOLL_CPUIDLE_MODULE) > -EXPORT_SYMBOL(default_idle); > -#endif > > #ifdef CONFIG_XEN > bool xen_set_default_idle(void) > { > - bool ret = !!x86_idle; > + bool ret = x86_idle_set(); > > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > > return ret; > } > @@ -859,20 +865,20 @@ void select_idle_routine(const struct cp > if (boot_option_idle_override == IDLE_POLL && smp_num_siblings > 1) > pr_warn_once("WARNING: polling idle and HT enabled, performance may degrade\n"); > #endif > - if (x86_idle || boot_option_idle_override == IDLE_POLL) > + if (x86_idle_set() || boot_option_idle_override == IDLE_POLL) > return; > > if (boot_cpu_has_bug(X86_BUG_AMD_E400)) { > pr_info("using AMD E400 aware idle routine\n"); > - x86_idle = amd_e400_idle; > + static_call_update(x86_idle, amd_e400_idle); > } else if (prefer_mwait_c1_over_halt(c)) { > pr_info("using mwait in idle threads\n"); > - x86_idle = mwait_idle; > + static_call_update(x86_idle, mwait_idle); > } else if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST)) { > pr_info("using TDX aware idle routine\n"); > - x86_idle = tdx_safe_halt; > + static_call_update(x86_idle, tdx_safe_halt); > } else > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > } > > void amd_e400_c1e_apic_setup(void) > @@ -925,7 +931,7 @@ static int __init idle_setup(char *str) > * To continue to load the CPU idle driver, don't touch > * the boot_option_idle_override. > */ > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > boot_option_idle_override = IDLE_HALT; > } else if (!strcmp(str, "nomwait")) { > /* > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C2E6AC433EF for ; Wed, 8 Jun 2022 18:13:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=p1El/UemT0n1yLV9VNAJDkuNcBmYiQbXs68xVGvdamM=; b=T7he6tcPWZ6/V0 7PHTwnfw0mvQSNcSXAvvwQFMUjPd+29JXKSALqvpYyYdLz990MugSrvjFGAB3tGKr6BXv9eEA7lYN lzL/sJUYCtuWddw/SKVGSLNQEiEbZNITH8uhnsbsXOWA5W/4vXgQXa9Ovm1qvms5tehq8sQgyCyeD ewmZ7oia09ssAnag+tnFIMiimaBImfdE3qc+5ifWCb+Y6aUrKhXafClc6EU7b/ZejS8VdGkJ4Z9aX WR+PvbuUPX30pS5AIAxZ3CJDkH9SVT4RyqZMYvZJQnIyC8VdNsefxGmbiSnRF6v+Pno4SCJRrZtDl DWT49t/DI7Bo+pyM8wEw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nz0BK-00EeHy-Dh; Wed, 08 Jun 2022 18:13:26 +0000 Received: from mail-yb1-f171.google.com ([209.85.219.171]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nz0BG-00EeFF-92; Wed, 08 Jun 2022 18:13:24 +0000 Received: by mail-yb1-f171.google.com with SMTP id a30so19111012ybj.3; Wed, 08 Jun 2022 11:13:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ZQePx5uIM1fUidMEiJVM5nuB6ZzPVeEu38qEpc1UrpE=; b=tg22o8Q/s+6stDEGR8EH0wckuEs22loupRsSsi+4UrJnJG8SpiAcYzGFmxUDsffltA r3wLIVe/kdv1LNcAIOyIrfK21ZUKTdJ+Jz5YqrFn4vTWnTqTEV5nJQgm4ruQYSQgAJtF VKYBkm1WV7+Sv5CYdLY2ieB8qv+LWY5KPK1GBv9xTBMolloUtlJh+oz/dNl3738BRZJM Ba2zfBJh6M+vPpiAYkSAbSOuVKkhjwcijitMsosCq+Nn0lF+1CSQMfq+xFjqncmqdmCt +dgTqem0qnK+nW5IZq+8k133+JdEXWD7PXdYB/IcjCw5AMGYf0CzEMtKuWbAEfDa7kZ1 OB+w== X-Gm-Message-State: AOAM532iGM6MSC+Mb5ORdQIyrQ5YoSoUnXzzpMgrOMvgcAfmuQdA9zla lBWmwjTauPFgEiwcH8UjI9iZbNyWe6zeIfpNzss= X-Google-Smtp-Source: ABdhPJyd1CrHem+vVK3IGyX/t5xH0MretwaFF4fsfRB0Td7tNKI/Gb3F1VH58WOF1ULS3yEBVcV2AFovGma6uhuJi5U= X-Received: by 2002:a5b:4a:0:b0:663:7c5b:a5ba with SMTP id e10-20020a5b004a000000b006637c5ba5bamr17352131ybp.81.1654711998678; Wed, 08 Jun 2022 11:13:18 -0700 (PDT) MIME-Version: 1.0 References: <20220608142723.103523089@infradead.org> <20220608144516.047149313@infradead.org> In-Reply-To: <20220608144516.047149313@infradead.org> From: "Rafael J. Wysocki" Date: Wed, 8 Jun 2022 20:13:07 +0200 Message-ID: Subject: Re: [PATCH 02/36] x86/idle: Replace x86_idle with a static_call To: Peter Zijlstra Cc: rth@twiddle.net, ink@jurassic.park.msu.ru, mattst88@gmail.com, vgupta@kernel.org, Russell King - ARM Linux , ulli.kroll@googlemail.com, Linus Walleij , Shawn Guo , Sascha Hauer , Sascha Hauer , Fabio Estevam , dl-linux-imx , Tony Lindgren , Kevin Hilman , Catalin Marinas , Will Deacon , Guo Ren , bcain@quicinc.com, Huacai Chen , kernel@xen0n.name, Geert Uytterhoeven , sammy@sammy.net, Michal Simek , Thomas Bogendoerfer , dinguyen@kernel.org, jonas@southpole.se, stefan.kristiansson@saunalahti.fi, Stafford Horne , James Bottomley , Helge Deller , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Paul Walmsley , Palmer Dabbelt , Albert Ou , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Yoshinori Sato , Rich Felker , David Miller , Richard Weinberger , anton.ivanov@cambridgegreys.com, Johannes Berg , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "the arch/x86 maintainers" , "H. Peter Anvin" , acme@kernel.org, Mark Rutland , Alexander Shishkin , jolsa@kernel.org, namhyung@kernel.org, Juergen Gross , srivatsa@csail.mit.edu, amakhalov@vmware.com, pv-drivers@vmware.com, Boris Ostrovsky , chris@zankel.net, jcmvbkbc@gmail.com, "Rafael J. Wysocki" , Len Brown , Pavel Machek , Greg Kroah-Hartman , Michael Turquette , Stephen Boyd , Daniel Lezcano , lpieralisi@kernel.org, Sudeep Holla , Andy Gross , Bjorn Andersson , Anup Patel , Thierry Reding , Jon Hunter , Jacob Pan , Arnd Bergmann , Yury Norov , Andy Shevchenko , Rasmus Villemoes , Steven Rostedt , Petr Mladek , senozhatsky@chromium.org, John Ogness , "Paul E. McKenney" , Frederic Weisbecker , quic_neeraju@quicinc.com, Josh Triplett , Mathieu Desnoyers , Lai Jiangshan , Joel Fernandes , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Benjamin Segall , Mel Gorman , Daniel Bristot de Oliveira , vschneid@redhat.com, jpoimboe@kernel.org, linux-alpha@vger.kernel.org, Linux Kernel Mailing List , linux-snps-arc@lists.infradead.org, Linux ARM , Linux OMAP Mailing List , linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-m68k , "open list:BROADCOM NVRAM DRIVER" , openrisc@lists.librecores.org, Parisc List , linuxppc-dev , linux-riscv , linux-s390@vger.kernel.org, Linux-sh list , sparclinux@vger.kernel.org, linux-um@lists.infradead.org, linux-perf-users@vger.kernel.org, virtualization@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-xtensa@linux-xtensa.org, ACPI Devel Maling List , Linux PM , linux-clk , linux-arm-msm , linux-tegra , linux-arch , rcu@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220608_111322_374926_435BA7CB X-CRM114-Status: GOOD ( 25.62 ) X-BeenThere: linux-snps-arc@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux on Synopsys ARC Processors List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-snps-arc" Errors-To: linux-snps-arc-bounces+linux-snps-arc=archiver.kernel.org@lists.infradead.org On Wed, Jun 8, 2022 at 4:47 PM Peter Zijlstra wrote: > > Typical boot time setup; no need to suffer an indirect call for that. > > Signed-off-by: Peter Zijlstra (Intel) > Reviewed-by: Frederic Weisbecker Reviewed-by: Rafael J. Wysocki > --- > arch/x86/kernel/process.c | 50 +++++++++++++++++++++++++--------------------- > 1 file changed, 28 insertions(+), 22 deletions(-) > > --- a/arch/x86/kernel/process.c > +++ b/arch/x86/kernel/process.c > @@ -24,6 +24,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -692,7 +693,23 @@ void __switch_to_xtra(struct task_struct > unsigned long boot_option_idle_override = IDLE_NO_OVERRIDE; > EXPORT_SYMBOL(boot_option_idle_override); > > -static void (*x86_idle)(void); > +/* > + * We use this if we don't have any better idle routine.. > + */ > +void __cpuidle default_idle(void) > +{ > + raw_safe_halt(); > +} > +#if defined(CONFIG_APM_MODULE) || defined(CONFIG_HALTPOLL_CPUIDLE_MODULE) > +EXPORT_SYMBOL(default_idle); > +#endif > + > +DEFINE_STATIC_CALL_NULL(x86_idle, default_idle); > + > +static bool x86_idle_set(void) > +{ > + return !!static_call_query(x86_idle); > +} > > #ifndef CONFIG_SMP > static inline void play_dead(void) > @@ -715,28 +732,17 @@ void arch_cpu_idle_dead(void) > /* > * Called from the generic idle code. > */ > -void arch_cpu_idle(void) > -{ > - x86_idle(); > -} > - > -/* > - * We use this if we don't have any better idle routine.. > - */ > -void __cpuidle default_idle(void) > +void __cpuidle arch_cpu_idle(void) > { > - raw_safe_halt(); > + static_call(x86_idle)(); > } > -#if defined(CONFIG_APM_MODULE) || defined(CONFIG_HALTPOLL_CPUIDLE_MODULE) > -EXPORT_SYMBOL(default_idle); > -#endif > > #ifdef CONFIG_XEN > bool xen_set_default_idle(void) > { > - bool ret = !!x86_idle; > + bool ret = x86_idle_set(); > > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > > return ret; > } > @@ -859,20 +865,20 @@ void select_idle_routine(const struct cp > if (boot_option_idle_override == IDLE_POLL && smp_num_siblings > 1) > pr_warn_once("WARNING: polling idle and HT enabled, performance may degrade\n"); > #endif > - if (x86_idle || boot_option_idle_override == IDLE_POLL) > + if (x86_idle_set() || boot_option_idle_override == IDLE_POLL) > return; > > if (boot_cpu_has_bug(X86_BUG_AMD_E400)) { > pr_info("using AMD E400 aware idle routine\n"); > - x86_idle = amd_e400_idle; > + static_call_update(x86_idle, amd_e400_idle); > } else if (prefer_mwait_c1_over_halt(c)) { > pr_info("using mwait in idle threads\n"); > - x86_idle = mwait_idle; > + static_call_update(x86_idle, mwait_idle); > } else if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST)) { > pr_info("using TDX aware idle routine\n"); > - x86_idle = tdx_safe_halt; > + static_call_update(x86_idle, tdx_safe_halt); > } else > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > } > > void amd_e400_c1e_apic_setup(void) > @@ -925,7 +931,7 @@ static int __init idle_setup(char *str) > * To continue to load the CPU idle driver, don't touch > * the boot_option_idle_override. > */ > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > boot_option_idle_override = IDLE_HALT; > } else if (!strcmp(str, "nomwait")) { > /* > > _______________________________________________ linux-snps-arc mailing list linux-snps-arc@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-snps-arc From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 07082CCA47B for ; Wed, 8 Jun 2022 18:13:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A0DCE40341; Wed, 8 Jun 2022 18:13:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cBWbJ17_9jJX; Wed, 8 Jun 2022 18:13:23 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id 77A1B4034A; Wed, 8 Jun 2022 18:13:22 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3D64CC0039; Wed, 8 Jun 2022 18:13:22 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id B641FC002D for ; Wed, 8 Jun 2022 18:13:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id A262460EA9 for ; Wed, 8 Jun 2022 18:13:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 743Go_y2dsZx for ; Wed, 8 Jun 2022 18:13:20 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-yb1-f169.google.com (mail-yb1-f169.google.com [209.85.219.169]) by smtp3.osuosl.org (Postfix) with ESMTPS id D436160ACE for ; Wed, 8 Jun 2022 18:13:19 +0000 (UTC) Received: by mail-yb1-f169.google.com with SMTP id r1so9277035ybd.4 for ; Wed, 08 Jun 2022 11:13:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ZQePx5uIM1fUidMEiJVM5nuB6ZzPVeEu38qEpc1UrpE=; b=gy2y4uaDQJklZRfaDOfAXxyMuLScxdZbka2Vn1/yk6LqyC1pMTUPsqrAOCbsPdnfa9 5ienuWvaD4mmhzhgCHj276j5VDL8iqpd2mk/aUlQxIF1ctsOfWjb60jO/FLSrZE/N5I6 8L0p4z6Q1Qvsc8Z2Kgk80WbuPxQlaEzxAYJYEfmOw0lQtebDKOIdK/LESrPiPdl536TD KV5bA9aHkdjseTz+aLPunDHvjz9LJzqFuVzDSBdIn1Xk9IjRNHu1TAOJ0FPxOCe8Z1PL ur6WmKL9mdhZPYLm34LidLCiG9mMJYII7bHSFctip48OeLsuXY+FgdRntH7RpdLi+46o 5bHw== X-Gm-Message-State: AOAM531Vje8d7vLqp3HMTtJwenh91JOpkJjqW7M+MdT3UXBhf3Z3oyQp 6XZ/nO8ehiId5Qaua51J5W6oVy3v01xfIooGlp0= X-Google-Smtp-Source: ABdhPJyd1CrHem+vVK3IGyX/t5xH0MretwaFF4fsfRB0Td7tNKI/Gb3F1VH58WOF1ULS3yEBVcV2AFovGma6uhuJi5U= X-Received: by 2002:a5b:4a:0:b0:663:7c5b:a5ba with SMTP id e10-20020a5b004a000000b006637c5ba5bamr17352131ybp.81.1654711998678; Wed, 08 Jun 2022 11:13:18 -0700 (PDT) MIME-Version: 1.0 References: <20220608142723.103523089@infradead.org> <20220608144516.047149313@infradead.org> In-Reply-To: <20220608144516.047149313@infradead.org> From: "Rafael J. Wysocki" Date: Wed, 8 Jun 2022 20:13:07 +0200 Message-ID: Subject: Re: [PATCH 02/36] x86/idle: Replace x86_idle with a static_call To: Peter Zijlstra Cc: Juri Lelli , "Rafael J. Wysocki" , Benjamin Herrenschmidt , Linus Walleij , Benjamin Segall , Guo Ren , Pavel Machek , Alexander Gordeev , linux-arch , Vincent Guittot , Michael Ellerman , Huacai Chen , ACPI Devel Maling List , Andy Gross , Geert Uytterhoeven , dl-linux-imx , Catalin Marinas , xen-devel@lists.xenproject.org, mattst88@gmail.com, Michael Turquette , sammy@sammy.net, Petr Mladek , Linux PM , Lai Jiangshan , Sascha Hauer , linux-um@lists.infradead.org, acme@kernel.org, Thomas Gleixner , Linux OMAP Mailing List , Dietmar Eggemann , rth@twiddle.net, Greg Kroah-Hartman , Linux Kernel Mailing List , linux-perf-users@vger.kernel.org, senozhatsky@chromium.org, Sven Schnelle , jolsa@kernel.org, Paul Mackerras , Mark Rutland , linux-ia64@vger.kernel.org, Dave Hansen , virtualization@lists.linux-foundation.org, James Bottomley , jcmvbkbc@gmail.com, Thierry Reding , kernel@xen0n.name, quic_neeraju@quicinc.com, linux-s390@vger.kernel.org, vschneid@redhat.com, John Ogness , Yoshinori Sato , Linux-sh list , Fabio Estevam , Helge Deller , Daniel Lezcano , Jon Hunter , Mathieu Desnoyers , Frederic Weisbecker , Len Brown , linux-xtensa@linux-xtensa.org, Sascha Hauer , Vasily Gorbik , linux-arm-msm , linux-alpha@vger.kernel.org, linux-m68k , Stafford Horne , Linux ARM , chris@zankel.net, Stephen Boyd , dinguyen@kernel.org, Daniel Bristot de Oliveira , Alexander Shishkin , lpieralisi@kernel.org, Rasmus Villemoes , Joel Fernandes , Will Deacon , Boris Ostrovsky , Kevin Hilman , linux-csky@vger.kernel.org, pv-drivers@vmware.com, linux-snps-arc@lists.infradead.org, Mel Gorman , Jacob Pan , Arnd Bergmann , ulli.kroll@googlemail.com, vgupta@kernel.org, linux-clk , Josh Triplett , Steven Rostedt , rcu@vger.kernel.org, Borislav Petkov , bcain@quicinc.com, Thomas Bogendoerfer , Parisc List , Sudeep Holla , Shawn Guo , David Miller , Rich Felker , Tony Lindgren , amakhalov@vmware.com, Bjorn Andersson , "H. Peter Anvin" , sparclinux@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-riscv , anton.ivanov@cambridgegreys.com, jonas@southpole.se, Yury Norov , Richard Weinberger , the arch/x86 maintainers , Russell King - ARM Linux , Ingo Molnar , Albert Ou , "Paul E. McKenney" , Heiko Carstens , stefan.kristiansson@saunalahti.fi, openrisc@lists.librecores.org, Paul Walmsley , linux-tegra , namhyung@kernel.org, Andy Shevchenko , jpoimboe@kernel.org, Juergen Gross , Michal Simek , "open list:BROADCOM NVRAM DRIVER" , Palmer Dabbelt , Anup Patel , ink@jurassic.park.msu.ru, Johannes Berg , linuxppc-dev X-BeenThere: virtualization@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux virtualization List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: virtualization-bounces@lists.linux-foundation.org Sender: "Virtualization" On Wed, Jun 8, 2022 at 4:47 PM Peter Zijlstra wrote: > > Typical boot time setup; no need to suffer an indirect call for that. > > Signed-off-by: Peter Zijlstra (Intel) > Reviewed-by: Frederic Weisbecker Reviewed-by: Rafael J. Wysocki > --- > arch/x86/kernel/process.c | 50 +++++++++++++++++++++++++--------------------- > 1 file changed, 28 insertions(+), 22 deletions(-) > > --- a/arch/x86/kernel/process.c > +++ b/arch/x86/kernel/process.c > @@ -24,6 +24,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -692,7 +693,23 @@ void __switch_to_xtra(struct task_struct > unsigned long boot_option_idle_override = IDLE_NO_OVERRIDE; > EXPORT_SYMBOL(boot_option_idle_override); > > -static void (*x86_idle)(void); > +/* > + * We use this if we don't have any better idle routine.. > + */ > +void __cpuidle default_idle(void) > +{ > + raw_safe_halt(); > +} > +#if defined(CONFIG_APM_MODULE) || defined(CONFIG_HALTPOLL_CPUIDLE_MODULE) > +EXPORT_SYMBOL(default_idle); > +#endif > + > +DEFINE_STATIC_CALL_NULL(x86_idle, default_idle); > + > +static bool x86_idle_set(void) > +{ > + return !!static_call_query(x86_idle); > +} > > #ifndef CONFIG_SMP > static inline void play_dead(void) > @@ -715,28 +732,17 @@ void arch_cpu_idle_dead(void) > /* > * Called from the generic idle code. > */ > -void arch_cpu_idle(void) > -{ > - x86_idle(); > -} > - > -/* > - * We use this if we don't have any better idle routine.. > - */ > -void __cpuidle default_idle(void) > +void __cpuidle arch_cpu_idle(void) > { > - raw_safe_halt(); > + static_call(x86_idle)(); > } > -#if defined(CONFIG_APM_MODULE) || defined(CONFIG_HALTPOLL_CPUIDLE_MODULE) > -EXPORT_SYMBOL(default_idle); > -#endif > > #ifdef CONFIG_XEN > bool xen_set_default_idle(void) > { > - bool ret = !!x86_idle; > + bool ret = x86_idle_set(); > > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > > return ret; > } > @@ -859,20 +865,20 @@ void select_idle_routine(const struct cp > if (boot_option_idle_override == IDLE_POLL && smp_num_siblings > 1) > pr_warn_once("WARNING: polling idle and HT enabled, performance may degrade\n"); > #endif > - if (x86_idle || boot_option_idle_override == IDLE_POLL) > + if (x86_idle_set() || boot_option_idle_override == IDLE_POLL) > return; > > if (boot_cpu_has_bug(X86_BUG_AMD_E400)) { > pr_info("using AMD E400 aware idle routine\n"); > - x86_idle = amd_e400_idle; > + static_call_update(x86_idle, amd_e400_idle); > } else if (prefer_mwait_c1_over_halt(c)) { > pr_info("using mwait in idle threads\n"); > - x86_idle = mwait_idle; > + static_call_update(x86_idle, mwait_idle); > } else if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST)) { > pr_info("using TDX aware idle routine\n"); > - x86_idle = tdx_safe_halt; > + static_call_update(x86_idle, tdx_safe_halt); > } else > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > } > > void amd_e400_c1e_apic_setup(void) > @@ -925,7 +931,7 @@ static int __init idle_setup(char *str) > * To continue to load the CPU idle driver, don't touch > * the boot_option_idle_override. > */ > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > boot_option_idle_override = IDLE_HALT; > } else if (!strcmp(str, "nomwait")) { > /* > > _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EAFA3C433EF for ; Wed, 8 Jun 2022 22:03:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=aveKzjt4isaxpWjdKstUEwCNZT3mmTB/1/wuiiCOJck=; b=LnxJQjjihTMRFr l+OEXJ3+Gi4oj2+swRIIms6ZLY2fenVVaA1Ocy9GRsw1JWHdXFSw6bi1TpFxn5RyLavN78mOiOQ/w vQqOK2NUVnz9gzuaFQ4lgA/Bqlp6In0jE1ZdtEj/6dTGzqFEdNX4+17bAWKfYlss2gFNDqRAYkrJY lECVPkNTlYsTXLdIdiVBJfgcFIDsIdbGJ3buc2OO32XgwtoaqdmX5FSFMp8z3G2LK+cgND300oLB4 N9QjQC0+Ip4XVCnO68tElRRcT2Ft7p0ItyXL0TCAsRAagwYPOYca7F+A15XAxuuCtNCZEtzM9PSe7 mkCG4kP1iE+n9WFaGwhA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nz3lX-00F6LI-CB; Wed, 08 Jun 2022 22:03:03 +0000 Received: from mail-yb1-f171.google.com ([209.85.219.171]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nz0BG-00EeFF-92; Wed, 08 Jun 2022 18:13:24 +0000 Received: by mail-yb1-f171.google.com with SMTP id a30so19111012ybj.3; Wed, 08 Jun 2022 11:13:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ZQePx5uIM1fUidMEiJVM5nuB6ZzPVeEu38qEpc1UrpE=; b=tg22o8Q/s+6stDEGR8EH0wckuEs22loupRsSsi+4UrJnJG8SpiAcYzGFmxUDsffltA r3wLIVe/kdv1LNcAIOyIrfK21ZUKTdJ+Jz5YqrFn4vTWnTqTEV5nJQgm4ruQYSQgAJtF VKYBkm1WV7+Sv5CYdLY2ieB8qv+LWY5KPK1GBv9xTBMolloUtlJh+oz/dNl3738BRZJM Ba2zfBJh6M+vPpiAYkSAbSOuVKkhjwcijitMsosCq+Nn0lF+1CSQMfq+xFjqncmqdmCt +dgTqem0qnK+nW5IZq+8k133+JdEXWD7PXdYB/IcjCw5AMGYf0CzEMtKuWbAEfDa7kZ1 OB+w== X-Gm-Message-State: AOAM532iGM6MSC+Mb5ORdQIyrQ5YoSoUnXzzpMgrOMvgcAfmuQdA9zla lBWmwjTauPFgEiwcH8UjI9iZbNyWe6zeIfpNzss= X-Google-Smtp-Source: ABdhPJyd1CrHem+vVK3IGyX/t5xH0MretwaFF4fsfRB0Td7tNKI/Gb3F1VH58WOF1ULS3yEBVcV2AFovGma6uhuJi5U= X-Received: by 2002:a5b:4a:0:b0:663:7c5b:a5ba with SMTP id e10-20020a5b004a000000b006637c5ba5bamr17352131ybp.81.1654711998678; Wed, 08 Jun 2022 11:13:18 -0700 (PDT) MIME-Version: 1.0 References: <20220608142723.103523089@infradead.org> <20220608144516.047149313@infradead.org> In-Reply-To: <20220608144516.047149313@infradead.org> From: "Rafael J. Wysocki" Date: Wed, 8 Jun 2022 20:13:07 +0200 Message-ID: Subject: Re: [PATCH 02/36] x86/idle: Replace x86_idle with a static_call To: Peter Zijlstra Cc: rth@twiddle.net, ink@jurassic.park.msu.ru, mattst88@gmail.com, vgupta@kernel.org, Russell King - ARM Linux , ulli.kroll@googlemail.com, Linus Walleij , Shawn Guo , Sascha Hauer , Sascha Hauer , Fabio Estevam , dl-linux-imx , Tony Lindgren , Kevin Hilman , Catalin Marinas , Will Deacon , Guo Ren , bcain@quicinc.com, Huacai Chen , kernel@xen0n.name, Geert Uytterhoeven , sammy@sammy.net, Michal Simek , Thomas Bogendoerfer , dinguyen@kernel.org, jonas@southpole.se, stefan.kristiansson@saunalahti.fi, Stafford Horne , James Bottomley , Helge Deller , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Paul Walmsley , Palmer Dabbelt , Albert Ou , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Yoshinori Sato , Rich Felker , David Miller , Richard Weinberger , anton.ivanov@cambridgegreys.com, Johannes Berg , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "the arch/x86 maintainers" , "H. Peter Anvin" , acme@kernel.org, Mark Rutland , Alexander Shishkin , jolsa@kernel.org, namhyung@kernel.org, Juergen Gross , srivatsa@csail.mit.edu, amakhalov@vmware.com, pv-drivers@vmware.com, Boris Ostrovsky , chris@zankel.net, jcmvbkbc@gmail.com, "Rafael J. Wysocki" , Len Brown , Pavel Machek , Greg Kroah-Hartman , Michael Turquette , Stephen Boyd , Daniel Lezcano , lpieralisi@kernel.org, Sudeep Holla , Andy Gross , Bjorn Andersson , Anup Patel , Thierry Reding , Jon Hunter , Jacob Pan , Arnd Bergmann , Yury Norov , Andy Shevchenko , Rasmus Villemoes , Steven Rostedt , Petr Mladek , senozhatsky@chromium.org, John Ogness , "Paul E. McKenney" , Frederic Weisbecker , quic_neeraju@quicinc.com, Josh Triplett , Mathieu Desnoyers , Lai Jiangshan , Joel Fernandes , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Benjamin Segall , Mel Gorman , Daniel Bristot de Oliveira , vschneid@redhat.com, jpoimboe@kernel.org, linux-alpha@vger.kernel.org, Linux Kernel Mailing List , linux-snps-arc@lists.infradead.org, Linux ARM , Linux OMAP Mailing List , linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-m68k , "open list:BROADCOM NVRAM DRIVER" , openrisc@lists.librecores.org, Parisc List , linuxppc-dev , linux-riscv , linux-s390@vger.kernel.org, Linux-sh list , sparclinux@vger.kernel.org, linux-um@lists.infradead.org, linux-perf-users@vger.kernel.org, virtualization@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-xtensa@linux-xtensa.org, ACPI Devel Maling List , Linux PM , linux-clk , linux-arm-msm , linux-tegra , linux-arch , rcu@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220608_111322_374926_435BA7CB X-CRM114-Status: GOOD ( 25.62 ) X-Mailman-Approved-At: Wed, 08 Jun 2022 15:02:58 -0700 X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org On Wed, Jun 8, 2022 at 4:47 PM Peter Zijlstra wrote: > > Typical boot time setup; no need to suffer an indirect call for that. > > Signed-off-by: Peter Zijlstra (Intel) > Reviewed-by: Frederic Weisbecker Reviewed-by: Rafael J. Wysocki > --- > arch/x86/kernel/process.c | 50 +++++++++++++++++++++++++--------------------- > 1 file changed, 28 insertions(+), 22 deletions(-) > > --- a/arch/x86/kernel/process.c > +++ b/arch/x86/kernel/process.c > @@ -24,6 +24,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -692,7 +693,23 @@ void __switch_to_xtra(struct task_struct > unsigned long boot_option_idle_override = IDLE_NO_OVERRIDE; > EXPORT_SYMBOL(boot_option_idle_override); > > -static void (*x86_idle)(void); > +/* > + * We use this if we don't have any better idle routine.. > + */ > +void __cpuidle default_idle(void) > +{ > + raw_safe_halt(); > +} > +#if defined(CONFIG_APM_MODULE) || defined(CONFIG_HALTPOLL_CPUIDLE_MODULE) > +EXPORT_SYMBOL(default_idle); > +#endif > + > +DEFINE_STATIC_CALL_NULL(x86_idle, default_idle); > + > +static bool x86_idle_set(void) > +{ > + return !!static_call_query(x86_idle); > +} > > #ifndef CONFIG_SMP > static inline void play_dead(void) > @@ -715,28 +732,17 @@ void arch_cpu_idle_dead(void) > /* > * Called from the generic idle code. > */ > -void arch_cpu_idle(void) > -{ > - x86_idle(); > -} > - > -/* > - * We use this if we don't have any better idle routine.. > - */ > -void __cpuidle default_idle(void) > +void __cpuidle arch_cpu_idle(void) > { > - raw_safe_halt(); > + static_call(x86_idle)(); > } > -#if defined(CONFIG_APM_MODULE) || defined(CONFIG_HALTPOLL_CPUIDLE_MODULE) > -EXPORT_SYMBOL(default_idle); > -#endif > > #ifdef CONFIG_XEN > bool xen_set_default_idle(void) > { > - bool ret = !!x86_idle; > + bool ret = x86_idle_set(); > > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > > return ret; > } > @@ -859,20 +865,20 @@ void select_idle_routine(const struct cp > if (boot_option_idle_override == IDLE_POLL && smp_num_siblings > 1) > pr_warn_once("WARNING: polling idle and HT enabled, performance may degrade\n"); > #endif > - if (x86_idle || boot_option_idle_override == IDLE_POLL) > + if (x86_idle_set() || boot_option_idle_override == IDLE_POLL) > return; > > if (boot_cpu_has_bug(X86_BUG_AMD_E400)) { > pr_info("using AMD E400 aware idle routine\n"); > - x86_idle = amd_e400_idle; > + static_call_update(x86_idle, amd_e400_idle); > } else if (prefer_mwait_c1_over_halt(c)) { > pr_info("using mwait in idle threads\n"); > - x86_idle = mwait_idle; > + static_call_update(x86_idle, mwait_idle); > } else if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST)) { > pr_info("using TDX aware idle routine\n"); > - x86_idle = tdx_safe_halt; > + static_call_update(x86_idle, tdx_safe_halt); > } else > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > } > > void amd_e400_c1e_apic_setup(void) > @@ -925,7 +931,7 @@ static int __init idle_setup(char *str) > * To continue to load the CPU idle driver, don't touch > * the boot_option_idle_override. > */ > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > boot_option_idle_override = IDLE_HALT; > } else if (!strcmp(str, "nomwait")) { > /* > > _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.librecores.org (lists.librecores.org [88.198.125.70]) by smtp.lore.kernel.org (Postfix) with ESMTP id B666CCCA47F for ; Wed, 8 Jun 2022 23:00:32 +0000 (UTC) Received: from [172.31.1.100] (localhost.localdomain [127.0.0.1]) by mail.librecores.org (Postfix) with ESMTP id 2835B213FD; Thu, 9 Jun 2022 01:00:32 +0200 (CEST) Received: from mail-yb1-f181.google.com (mail-yb1-f181.google.com [209.85.219.181]) by mail.librecores.org (Postfix) with ESMTPS id D6342247DC for ; Wed, 8 Jun 2022 20:13:19 +0200 (CEST) Received: by mail-yb1-f181.google.com with SMTP id l204so37844023ybf.10 for ; Wed, 08 Jun 2022 11:13:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ZQePx5uIM1fUidMEiJVM5nuB6ZzPVeEu38qEpc1UrpE=; b=n+SgWyG22trknaoRIJ/sdf4fWVhac8xezpO90v53osxKWq0OHJZiHDcLGrIfitbhVe m/ohZdM5bKsIVgo3XRHUDV6ZYKrWPm9sLHgsf+fDyIKJlgO8fnm/84rIixjbVPyHIFH8 mg6Fey+qKw2FKfzY6HvgSNrV2E7l3pK2uw81bigzgYuRLPRTj+72fzAuAALNWPyTOZeL SHHR46MX+YT45/QNKrfWaFtKqi3xOmJev9UeDwHhp8Djb+u0qTQgadywRWTICzf6Kxet 2/tyjkXoXTeriTKjtaE4lPCxlsj51lncY+hcliQEZLP0vLpe2nSGRbbM5d/Z0CsQUXYD Fdlg== X-Gm-Message-State: AOAM532Odk5B42sjS/QEg3lic5DIdelR8dn/eOdYTf5VkbVLhWEp7w7C WiQlhK4fPMsE9ZaCoHE+iw4vPRrPiru2ex9qP5U= X-Google-Smtp-Source: ABdhPJyd1CrHem+vVK3IGyX/t5xH0MretwaFF4fsfRB0Td7tNKI/Gb3F1VH58WOF1ULS3yEBVcV2AFovGma6uhuJi5U= X-Received: by 2002:a5b:4a:0:b0:663:7c5b:a5ba with SMTP id e10-20020a5b004a000000b006637c5ba5bamr17352131ybp.81.1654711998678; Wed, 08 Jun 2022 11:13:18 -0700 (PDT) MIME-Version: 1.0 References: <20220608142723.103523089@infradead.org> <20220608144516.047149313@infradead.org> In-Reply-To: <20220608144516.047149313@infradead.org> From: "Rafael J. Wysocki" Date: Wed, 8 Jun 2022 20:13:07 +0200 Message-ID: Subject: Re: [PATCH 02/36] x86/idle: Replace x86_idle with a static_call To: Peter Zijlstra Content-Type: text/plain; charset="UTF-8" X-Mailman-Approved-At: Thu, 09 Jun 2022 00:59:57 +0200 X-BeenThere: openrisc@lists.librecores.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Discussion around the OpenRISC processor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Juri Lelli , "Rafael J. Wysocki" , Benjamin Herrenschmidt , Linus Walleij , Benjamin Segall , Guo Ren , Pavel Machek , Alexander Gordeev , srivatsa@csail.mit.edu, linux-arch , Vincent Guittot , Michael Ellerman , Huacai Chen , ACPI Devel Maling List , Andy Gross , dl-linux-imx , Catalin Marinas , xen-devel@lists.xenproject.org, mattst88@gmail.com, Christian Borntraeger , Michael Turquette , sammy@sammy.net, Petr Mladek , Linux PM , Lai Jiangshan , Sascha Hauer , linux-um@lists.infradead.org, acme@kernel.org, Thomas Gleixner , Linux OMAP Mailing List , Dietmar Eggemann , rth@twiddle.net, Greg Kroah-Hartman , Linux Kernel Mailing List , linux-perf-users@vger.kernel.org, senozhatsky@chromium.org, Sven Schnelle , jolsa@kernel.org, Paul Mackerras , Mark Rutland , linux-ia64@vger.kernel.org, Dave Hansen , virtualization@lists.linux-foundation.org, James Bottomley , jcmvbkbc@gmail.com, Thierry Reding , kernel@xen0n.name, quic_neeraju@quicinc.com, linux-s390@vger.kernel.org, vschneid@redhat.com, John Ogness , Yoshinori Sato , Linux-sh list , Fabio Estevam , Helge Deller , Daniel Lezcano , Jon Hunter , Mathieu Desnoyers , Frederic Weisbecker , Len Brown , linux-xtensa@linux-xtensa.org, Sascha Hauer , Vasily Gorbik , linux-arm-msm , linux-alpha@vger.kernel.org, linux-m68k , Linux ARM , chris@zankel.net, Stephen Boyd , dinguyen@kernel.org, Daniel Bristot de Oliveira , Alexander Shishkin , lpieralisi@kernel.org, Rasmus Villemoes , Joel Fernandes , Will Deacon , Boris Ostrovsky , Kevin Hilman , linux-csky@vger.kernel.org, pv-drivers@vmware.com, linux-snps-arc@lists.infradead.org, Mel Gorman , Jacob Pan , Arnd Bergmann , ulli.kroll@googlemail.com, vgupta@kernel.org, linux-clk , Josh Triplett , Steven Rostedt , rcu@vger.kernel.org, Borislav Petkov , bcain@quicinc.com, Thomas Bogendoerfer , Parisc List , Sudeep Holla , Shawn Guo , David Miller , Rich Felker , Tony Lindgren , amakhalov@vmware.com, Bjorn Andersson , "H. Peter Anvin" , sparclinux@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-riscv , anton.ivanov@cambridgegreys.com, jonas@southpole.se, Yury Norov , Richard Weinberger , the arch/x86 maintainers , Russell King - ARM Linux , Ingo Molnar , Albert Ou , "Paul E. McKenney" , Heiko Carstens , openrisc@lists.librecores.org, Paul Walmsley , linux-tegra , namhyung@kernel.org, Andy Shevchenko , jpoimboe@kernel.org, Juergen Gross , Michal Simek , "open list:BROADCOM NVRAM DRIVER" , Palmer Dabbelt , Anup Patel , ink@jurassic.park.msu.ru, Johannes Berg , linuxppc-dev Errors-To: openrisc-bounces@lists.librecores.org Sender: "OpenRISC" On Wed, Jun 8, 2022 at 4:47 PM Peter Zijlstra wrote: > > Typical boot time setup; no need to suffer an indirect call for that. > > Signed-off-by: Peter Zijlstra (Intel) > Reviewed-by: Frederic Weisbecker Reviewed-by: Rafael J. Wysocki > --- > arch/x86/kernel/process.c | 50 +++++++++++++++++++++++++--------------------- > 1 file changed, 28 insertions(+), 22 deletions(-) > > --- a/arch/x86/kernel/process.c > +++ b/arch/x86/kernel/process.c > @@ -24,6 +24,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -692,7 +693,23 @@ void __switch_to_xtra(struct task_struct > unsigned long boot_option_idle_override = IDLE_NO_OVERRIDE; > EXPORT_SYMBOL(boot_option_idle_override); > > -static void (*x86_idle)(void); > +/* > + * We use this if we don't have any better idle routine.. > + */ > +void __cpuidle default_idle(void) > +{ > + raw_safe_halt(); > +} > +#if defined(CONFIG_APM_MODULE) || defined(CONFIG_HALTPOLL_CPUIDLE_MODULE) > +EXPORT_SYMBOL(default_idle); > +#endif > + > +DEFINE_STATIC_CALL_NULL(x86_idle, default_idle); > + > +static bool x86_idle_set(void) > +{ > + return !!static_call_query(x86_idle); > +} > > #ifndef CONFIG_SMP > static inline void play_dead(void) > @@ -715,28 +732,17 @@ void arch_cpu_idle_dead(void) > /* > * Called from the generic idle code. > */ > -void arch_cpu_idle(void) > -{ > - x86_idle(); > -} > - > -/* > - * We use this if we don't have any better idle routine.. > - */ > -void __cpuidle default_idle(void) > +void __cpuidle arch_cpu_idle(void) > { > - raw_safe_halt(); > + static_call(x86_idle)(); > } > -#if defined(CONFIG_APM_MODULE) || defined(CONFIG_HALTPOLL_CPUIDLE_MODULE) > -EXPORT_SYMBOL(default_idle); > -#endif > > #ifdef CONFIG_XEN > bool xen_set_default_idle(void) > { > - bool ret = !!x86_idle; > + bool ret = x86_idle_set(); > > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > > return ret; > } > @@ -859,20 +865,20 @@ void select_idle_routine(const struct cp > if (boot_option_idle_override == IDLE_POLL && smp_num_siblings > 1) > pr_warn_once("WARNING: polling idle and HT enabled, performance may degrade\n"); > #endif > - if (x86_idle || boot_option_idle_override == IDLE_POLL) > + if (x86_idle_set() || boot_option_idle_override == IDLE_POLL) > return; > > if (boot_cpu_has_bug(X86_BUG_AMD_E400)) { > pr_info("using AMD E400 aware idle routine\n"); > - x86_idle = amd_e400_idle; > + static_call_update(x86_idle, amd_e400_idle); > } else if (prefer_mwait_c1_over_halt(c)) { > pr_info("using mwait in idle threads\n"); > - x86_idle = mwait_idle; > + static_call_update(x86_idle, mwait_idle); > } else if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST)) { > pr_info("using TDX aware idle routine\n"); > - x86_idle = tdx_safe_halt; > + static_call_update(x86_idle, tdx_safe_halt); > } else > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > } > > void amd_e400_c1e_apic_setup(void) > @@ -925,7 +931,7 @@ static int __init idle_setup(char *str) > * To continue to load the CPU idle driver, don't touch > * the boot_option_idle_override. > */ > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > boot_option_idle_override = IDLE_HALT; > } else if (!strcmp(str, "nomwait")) { > /* > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 270E5C433EF for ; Thu, 9 Jun 2022 00:21:29 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4LJPsM5yCpz3hPX for ; Thu, 9 Jun 2022 10:21:27 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=209.85.219.175; helo=mail-yb1-f175.google.com; envelope-from=rjwysocki@gmail.com; receiver=) Received: from mail-yb1-f175.google.com (mail-yb1-f175.google.com [209.85.219.175]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4LJFhf2y0sz3bdF for ; Thu, 9 Jun 2022 04:13:21 +1000 (AEST) Received: by mail-yb1-f175.google.com with SMTP id i39so9837355ybj.9 for ; Wed, 08 Jun 2022 11:13:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ZQePx5uIM1fUidMEiJVM5nuB6ZzPVeEu38qEpc1UrpE=; b=IdcptieX5xRcmlDo2eYf0ZefoNn6k6CFAjfN/VXKI9uV2WNKIXzI7aLDo03D+ztbnV N+zTzjxwYbA85H+GG28Fi5lVR1aaX9MgwB19ABtTWfDyMbn1oRxttfCet1AKYgOJ5u9Q 9o02/YV0UTCMuQq5ZRLbd/dnGYOTOwjn3t7nZdKiNNkPzs1vZoRY56P8+YhfAlXlLtJc elO8cua7zFYyt3ImK90EUubbSwtgVPgabxM+ogeUzCiefIh5LC8OtwQDMD32f/th1q0e h7JhubAE2eWWi8CskkaHfXrcetjWAPBY7wP4TS2zlBwVUcVnk8qdS2L4TO4sdC38PNaM rOeQ== X-Gm-Message-State: AOAM5309ChLqA3zF0X4B4OB7Hx10FeA8Q0/Mao7I7L8pqaJHRNyhIC1W ZTRJ3CHOcD3HFXVsHHq9TTSAoPkUFh4eae4qoXg= X-Google-Smtp-Source: ABdhPJyd1CrHem+vVK3IGyX/t5xH0MretwaFF4fsfRB0Td7tNKI/Gb3F1VH58WOF1ULS3yEBVcV2AFovGma6uhuJi5U= X-Received: by 2002:a5b:4a:0:b0:663:7c5b:a5ba with SMTP id e10-20020a5b004a000000b006637c5ba5bamr17352131ybp.81.1654711998678; Wed, 08 Jun 2022 11:13:18 -0700 (PDT) MIME-Version: 1.0 References: <20220608142723.103523089@infradead.org> <20220608144516.047149313@infradead.org> In-Reply-To: <20220608144516.047149313@infradead.org> From: "Rafael J. Wysocki" Date: Wed, 8 Jun 2022 20:13:07 +0200 Message-ID: Subject: Re: [PATCH 02/36] x86/idle: Replace x86_idle with a static_call To: Peter Zijlstra Content-Type: text/plain; charset="UTF-8" X-Mailman-Approved-At: Thu, 09 Jun 2022 09:55:19 +1000 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Juri Lelli , "Rafael J. Wysocki" , Linus Walleij , Benjamin Segall , Guo Ren , Pavel Machek , Alexander Gordeev , srivatsa@csail.mit.edu, linux-arch , Vincent Guittot , Huacai Chen , ACPI Devel Maling List , Andy Gross , Geert Uytterhoeven , dl-linux-imx , Catalin Marinas , xen-devel@lists.xenproject.org, mattst88@gmail.com, Christian Borntraeger , Michael Turquette , sammy@sammy.net, Petr Mladek , Linux PM , Lai Jiangshan , Sascha Hauer , linux-um@lists.infradead.org, acme@kernel.org, Thomas Gleixner , Linux OMAP Mailing List , Dietmar Eggemann , rth@twiddle.net, Greg Kroah-Hartman , Linux Kernel Mailing List , linux-perf-users@vger.kernel.org, senozhatsky@chromium.org, Sven Schnelle , jolsa@kernel.org, Paul Mackerras , Mark Rutland , linux-ia64@vger.kernel.org, Dave Hansen , virtualization@lists.linux-foundation.org, James Bottomley , jcmvbkbc@gmail.com, Thierry Reding , kernel@xen0n.name, quic_neeraju@quicinc.com, linux-s390@vger.kernel.org, vschneid@redhat.com, John Ogness , Yoshinori Sato , Linux-sh list , Fabio Estevam , Helge Deller , Daniel Lezcano , Jon H unter , Mathieu Desnoyers , Frederic Weisbecker , Len Brown , linux-xtensa@linux-xtensa.org, Sascha Hauer , Vasily Gorbik , linux-arm-msm , linux-alpha@vger.kernel.org, linux-m68k , Stafford Horne , Linux ARM , chris@zankel.net, Stephen Boyd , dinguyen@kernel.org, Daniel Bristot de Oliveira , Alexander Shishkin , lpieralisi@kernel.org, Rasmus Villemoes , Joel Fernandes , Will Deacon , Boris Ostrovsky , Kevin Hilman , linux-csky@vger.kernel.org, pv-drivers@vmware.com, linux-snps-arc@lists.infradead.org, Mel Gorman , Jacob Pan , Arnd Bergmann , ulli.kroll@googlemail.com, vgupta@kernel.org, linux-clk , Josh Triplett , Steven Rostedt , rcu@vger.kernel.org, Borislav Petkov , bcain@quicinc.com, Thomas Bogendoerfer , Parisc List , Sudeep Holla , Shawn Guo , David Miller , Rich Felker , Tony Lindgren , amakhalov@vmware.com, Bjorn Andersson , "H. Peter Anvin" , sparclinux@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-riscv , anton.ivanov@cambridgegreys.com, jonas@southpole.se, Yury Norov , Richard Weinberger , the arch/x86 maintainers , Russell King - ARM Linux , Ingo Molnar , Albert Ou , "P aul E. McKenney" , Heiko Carstens , stefan.kristiansson@saunalahti.fi, openrisc@lists.librecores.org, Paul Walmsley , linux-tegra , namhyung@kernel.org, Andy Shevchenko , jpoimboe@kernel.org, Juergen Gross , Michal Simek , "open list:BROADCOM NVRAM DRIVER" , Palmer Dabbelt , Anup Patel , ink@jurassic.park.msu.ru, Johannes Berg , linuxppc-dev Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Wed, Jun 8, 2022 at 4:47 PM Peter Zijlstra wrote: > > Typical boot time setup; no need to suffer an indirect call for that. > > Signed-off-by: Peter Zijlstra (Intel) > Reviewed-by: Frederic Weisbecker Reviewed-by: Rafael J. Wysocki > --- > arch/x86/kernel/process.c | 50 +++++++++++++++++++++++++--------------------- > 1 file changed, 28 insertions(+), 22 deletions(-) > > --- a/arch/x86/kernel/process.c > +++ b/arch/x86/kernel/process.c > @@ -24,6 +24,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -692,7 +693,23 @@ void __switch_to_xtra(struct task_struct > unsigned long boot_option_idle_override = IDLE_NO_OVERRIDE; > EXPORT_SYMBOL(boot_option_idle_override); > > -static void (*x86_idle)(void); > +/* > + * We use this if we don't have any better idle routine.. > + */ > +void __cpuidle default_idle(void) > +{ > + raw_safe_halt(); > +} > +#if defined(CONFIG_APM_MODULE) || defined(CONFIG_HALTPOLL_CPUIDLE_MODULE) > +EXPORT_SYMBOL(default_idle); > +#endif > + > +DEFINE_STATIC_CALL_NULL(x86_idle, default_idle); > + > +static bool x86_idle_set(void) > +{ > + return !!static_call_query(x86_idle); > +} > > #ifndef CONFIG_SMP > static inline void play_dead(void) > @@ -715,28 +732,17 @@ void arch_cpu_idle_dead(void) > /* > * Called from the generic idle code. > */ > -void arch_cpu_idle(void) > -{ > - x86_idle(); > -} > - > -/* > - * We use this if we don't have any better idle routine.. > - */ > -void __cpuidle default_idle(void) > +void __cpuidle arch_cpu_idle(void) > { > - raw_safe_halt(); > + static_call(x86_idle)(); > } > -#if defined(CONFIG_APM_MODULE) || defined(CONFIG_HALTPOLL_CPUIDLE_MODULE) > -EXPORT_SYMBOL(default_idle); > -#endif > > #ifdef CONFIG_XEN > bool xen_set_default_idle(void) > { > - bool ret = !!x86_idle; > + bool ret = x86_idle_set(); > > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > > return ret; > } > @@ -859,20 +865,20 @@ void select_idle_routine(const struct cp > if (boot_option_idle_override == IDLE_POLL && smp_num_siblings > 1) > pr_warn_once("WARNING: polling idle and HT enabled, performance may degrade\n"); > #endif > - if (x86_idle || boot_option_idle_override == IDLE_POLL) > + if (x86_idle_set() || boot_option_idle_override == IDLE_POLL) > return; > > if (boot_cpu_has_bug(X86_BUG_AMD_E400)) { > pr_info("using AMD E400 aware idle routine\n"); > - x86_idle = amd_e400_idle; > + static_call_update(x86_idle, amd_e400_idle); > } else if (prefer_mwait_c1_over_halt(c)) { > pr_info("using mwait in idle threads\n"); > - x86_idle = mwait_idle; > + static_call_update(x86_idle, mwait_idle); > } else if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST)) { > pr_info("using TDX aware idle routine\n"); > - x86_idle = tdx_safe_halt; > + static_call_update(x86_idle, tdx_safe_halt); > } else > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > } > > void amd_e400_c1e_apic_setup(void) > @@ -925,7 +931,7 @@ static int __init idle_setup(char *str) > * To continue to load the CPU idle driver, don't touch > * the boot_option_idle_override. > */ > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > boot_option_idle_override = IDLE_HALT; > } else if (!strcmp(str, "nomwait")) { > /* > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rafael J. Wysocki" Date: Wed, 08 Jun 2022 18:13:07 +0000 Subject: Re: [PATCH 02/36] x86/idle: Replace x86_idle with a static_call Message-Id: List-Id: References: <20220608142723.103523089@infradead.org> <20220608144516.047149313@infradead.org> In-Reply-To: <20220608144516.047149313@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Peter Zijlstra Cc: rth@twiddle.net, ink@jurassic.park.msu.ru, mattst88@gmail.com, vgupta@kernel.org, Russell King - ARM Linux , ulli.kroll@googlemail.com, Linus Walleij , Shawn Guo , Sascha Hauer , Sascha Hauer , Fabio Estevam , dl-linux-imx , Tony Lindgren , Kevin Hilman , Catalin Marinas , Will Deacon , Guo Ren , bcain@quicinc.com, Huacai Chen , kernel@xen0n.name, Geert Uytterhoeven , sammy@sammy.net, Michal Simek , Thomas Bogendoerfer , dinguyen@kernel.org, jonas@southpole.se, stefan.kristiansson@saunalahti.fi, Stafford Horne , James Bottomley , Helge Deller , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Paul Walmsley , Palmer Dabbelt , Albert Ou , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Yoshinori Sato , Rich Felker , David Miller , Richard Weinberger , anton.ivanov@cambridgegreys.com, Johannes Berg , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , the arch/x86 maintainers , "H. Peter Anvin" , acme@kernel.org, Mark Rutland , Alexander Shishkin , jolsa@kernel.org, namhyung@kernel.org, Juergen Gross , srivatsa@csail.mit.edu, amakhalov@vmware.com, pv-drivers@vmware.com, Boris Ostrovsky , chris@zankel.net, jcmvbkbc@gmail.com, "Rafael J. Wysocki" , Len Brown , Pavel Machek , Greg Kroah-Hartman , Michael Turquette , Stephen Boyd , Daniel Lezcano , lpieralisi@kernel.org, Sudeep Holla , Andy Gross , Bjorn Andersson , Anup Patel , Thierry Reding , Jon Hunter , Jacob Pan , Arnd Bergmann , Yury Norov , Andy Shevchenko , Rasmus Villemoes , Steven Rostedt , Petr Mladek , senozhatsky@chromium.org, John Ogness , "Paul E. McKenney" , Frederic Weisbecker , quic_neeraju@quicinc.com, Josh Triplett , Mathieu Desnoyers , Lai Jiangshan , Joel Fernandes , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Benjamin Segall , Mel Gorman , Daniel Bristot de Oliveira , vschneid@redhat.com, jpoimboe@kernel.org, linux-alpha@vger.kernel.org, Linux Kernel Mailing List , linux-snps-arc@lists.infradead.org, Linux ARM , Linux OMAP Mailing List , linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-m68k , "open list:BROADCOM NVRAM DRIVER" , openrisc@lists.librecores.org, Parisc List , linuxppc-dev , linux-riscv , linux-s390@vger.kernel.org, Linux-sh list , sparclinux@vger.kernel.org, linux-um@lists.infradead.org, linux-perf-users@vger.kernel.org, virtualization@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-xtensa@linux-xtensa.org, ACPI Devel Maling List , Linux PM , linux-clk , linux-arm-msm , linux-tegra , linux-arch , rcu@vger.kernel.org On Wed, Jun 8, 2022 at 4:47 PM Peter Zijlstra wrote: > > Typical boot time setup; no need to suffer an indirect call for that. > > Signed-off-by: Peter Zijlstra (Intel) > Reviewed-by: Frederic Weisbecker Reviewed-by: Rafael J. Wysocki > --- > arch/x86/kernel/process.c | 50 +++++++++++++++++++++++++--------------------- > 1 file changed, 28 insertions(+), 22 deletions(-) > > --- a/arch/x86/kernel/process.c > +++ b/arch/x86/kernel/process.c > @@ -24,6 +24,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -692,7 +693,23 @@ void __switch_to_xtra(struct task_struct > unsigned long boot_option_idle_override = IDLE_NO_OVERRIDE; > EXPORT_SYMBOL(boot_option_idle_override); > > -static void (*x86_idle)(void); > +/* > + * We use this if we don't have any better idle routine.. > + */ > +void __cpuidle default_idle(void) > +{ > + raw_safe_halt(); > +} > +#if defined(CONFIG_APM_MODULE) || defined(CONFIG_HALTPOLL_CPUIDLE_MODULE) > +EXPORT_SYMBOL(default_idle); > +#endif > + > +DEFINE_STATIC_CALL_NULL(x86_idle, default_idle); > + > +static bool x86_idle_set(void) > +{ > + return !!static_call_query(x86_idle); > +} > > #ifndef CONFIG_SMP > static inline void play_dead(void) > @@ -715,28 +732,17 @@ void arch_cpu_idle_dead(void) > /* > * Called from the generic idle code. > */ > -void arch_cpu_idle(void) > -{ > - x86_idle(); > -} > - > -/* > - * We use this if we don't have any better idle routine.. > - */ > -void __cpuidle default_idle(void) > +void __cpuidle arch_cpu_idle(void) > { > - raw_safe_halt(); > + static_call(x86_idle)(); > } > -#if defined(CONFIG_APM_MODULE) || defined(CONFIG_HALTPOLL_CPUIDLE_MODULE) > -EXPORT_SYMBOL(default_idle); > -#endif > > #ifdef CONFIG_XEN > bool xen_set_default_idle(void) > { > - bool ret = !!x86_idle; > + bool ret = x86_idle_set(); > > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > > return ret; > } > @@ -859,20 +865,20 @@ void select_idle_routine(const struct cp > if (boot_option_idle_override = IDLE_POLL && smp_num_siblings > 1) > pr_warn_once("WARNING: polling idle and HT enabled, performance may degrade\n"); > #endif > - if (x86_idle || boot_option_idle_override = IDLE_POLL) > + if (x86_idle_set() || boot_option_idle_override = IDLE_POLL) > return; > > if (boot_cpu_has_bug(X86_BUG_AMD_E400)) { > pr_info("using AMD E400 aware idle routine\n"); > - x86_idle = amd_e400_idle; > + static_call_update(x86_idle, amd_e400_idle); > } else if (prefer_mwait_c1_over_halt(c)) { > pr_info("using mwait in idle threads\n"); > - x86_idle = mwait_idle; > + static_call_update(x86_idle, mwait_idle); > } else if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST)) { > pr_info("using TDX aware idle routine\n"); > - x86_idle = tdx_safe_halt; > + static_call_update(x86_idle, tdx_safe_halt); > } else > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > } > > void amd_e400_c1e_apic_setup(void) > @@ -925,7 +931,7 @@ static int __init idle_setup(char *str) > * To continue to load the CPU idle driver, don't touch > * the boot_option_idle_override. > */ > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > boot_option_idle_override = IDLE_HALT; > } else if (!strcmp(str, "nomwait")) { > /* > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rafael J. Wysocki" Subject: Re: [PATCH 02/36] x86/idle: Replace x86_idle with a static_call Date: Wed, 8 Jun 2022 20:13:07 +0200 Message-ID: References: <20220608142723.103523089@infradead.org> <20220608144516.047149313@infradead.org> Mime-Version: 1.0 Return-path: In-Reply-To: <20220608144516.047149313@infradead.org> List-ID: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Peter Zijlstra Cc: rth@twiddle.net, ink@jurassic.park.msu.ru, mattst88@gmail.com, vgupta@kernel.org, Russell King - ARM Linux , ulli.kroll@googlemail.com, Linus Walleij , Shawn Guo , Sascha Hauer , Sascha Hauer , Fabio Estevam , dl-linux-imx , Tony Lindgren , Kevin Hilman , Catalin Marinas , Will Deacon , Guo Ren , bcain@quicinc.com, Huacai Chen , kernel@xen0n.name, Geert Uytterhoeven , sammy@sammy.net, Michal Simek , Thomas Bogendoerfer On Wed, Jun 8, 2022 at 4:47 PM Peter Zijlstra wrote: > > Typical boot time setup; no need to suffer an indirect call for that. > > Signed-off-by: Peter Zijlstra (Intel) > Reviewed-by: Frederic Weisbecker Reviewed-by: Rafael J. Wysocki > --- > arch/x86/kernel/process.c | 50 +++++++++++++++++++++++++--------------------- > 1 file changed, 28 insertions(+), 22 deletions(-) > > --- a/arch/x86/kernel/process.c > +++ b/arch/x86/kernel/process.c > @@ -24,6 +24,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -692,7 +693,23 @@ void __switch_to_xtra(struct task_struct > unsigned long boot_option_idle_override = IDLE_NO_OVERRIDE; > EXPORT_SYMBOL(boot_option_idle_override); > > -static void (*x86_idle)(void); > +/* > + * We use this if we don't have any better idle routine.. > + */ > +void __cpuidle default_idle(void) > +{ > + raw_safe_halt(); > +} > +#if defined(CONFIG_APM_MODULE) || defined(CONFIG_HALTPOLL_CPUIDLE_MODULE) > +EXPORT_SYMBOL(default_idle); > +#endif > + > +DEFINE_STATIC_CALL_NULL(x86_idle, default_idle); > + > +static bool x86_idle_set(void) > +{ > + return !!static_call_query(x86_idle); > +} > > #ifndef CONFIG_SMP > static inline void play_dead(void) > @@ -715,28 +732,17 @@ void arch_cpu_idle_dead(void) > /* > * Called from the generic idle code. > */ > -void arch_cpu_idle(void) > -{ > - x86_idle(); > -} > - > -/* > - * We use this if we don't have any better idle routine.. > - */ > -void __cpuidle default_idle(void) > +void __cpuidle arch_cpu_idle(void) > { > - raw_safe_halt(); > + static_call(x86_idle)(); > } > -#if defined(CONFIG_APM_MODULE) || defined(CONFIG_HALTPOLL_CPUIDLE_MODULE) > -EXPORT_SYMBOL(default_idle); > -#endif > > #ifdef CONFIG_XEN > bool xen_set_default_idle(void) > { > - bool ret = !!x86_idle; > + bool ret = x86_idle_set(); > > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > > return ret; > } > @@ -859,20 +865,20 @@ void select_idle_routine(const struct cp > if (boot_option_idle_override == IDLE_POLL && smp_num_siblings > 1) > pr_warn_once("WARNING: polling idle and HT enabled, performance may degrade\n"); > #endif > - if (x86_idle || boot_option_idle_override == IDLE_POLL) > + if (x86_idle_set() || boot_option_idle_override == IDLE_POLL) > return; > > if (boot_cpu_has_bug(X86_BUG_AMD_E400)) { > pr_info("using AMD E400 aware idle routine\n"); > - x86_idle = amd_e400_idle; > + static_call_update(x86_idle, amd_e400_idle); > } else if (prefer_mwait_c1_over_halt(c)) { > pr_info("using mwait in idle threads\n"); > - x86_idle = mwait_idle; > + static_call_update(x86_idle, mwait_idle); > } else if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST)) { > pr_info("using TDX aware idle routine\n"); > - x86_idle = tdx_safe_halt; > + static_call_update(x86_idle, tdx_safe_halt); > } else > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > } > > void amd_e400_c1e_apic_setup(void) > @@ -925,7 +931,7 @@ static int __init idle_setup(char *str) > * To continue to load the CPU idle driver, don't touch > * the boot_option_idle_override. > */ > - x86_idle = default_idle; > + static_call_update(x86_idle, default_idle); > boot_option_idle_override = IDLE_HALT; > } else if (!strcmp(str, "nomwait")) { > /* > >