Received-SPF: pass (google.com: domain of linux-kernel+bounces-98966-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Mon, 11 Mar 2024 15:33:21 +0100
From: Borislav Petkov <bp@alien8.de>
To: Ingo Molnar <mingo@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	linux-kernel@vger.kernel.org,
	the arch/x86 maintainers <x86@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Uros Bizjak <ubizjak@gmail.com>
Subject: Re: [GIT PULL] x86/core changes for v6.9
Message-ID: <20240311143321.GAZe8WMQnVFHAS24NK@fat_crate.local>
References: <Ze8LpCezZ4yHRBnk@gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <Ze8LpCezZ4yHRBnk@gmail.com>

On Mon, Mar 11, 2024 at 02:48:20PM +0100, Ingo Molnar wrote:
> The conflict is contextual only, it's fine to put the new __warn_thunk line 
> anywhere in entry.S, as long as it's outside the other section blocks. 
> Putting it last in the file is the most straightforward resolution.

..and if you encounter another merge conflict in
arch/x86/kernel/process.c, here's how a resolve should look like:

diff --cc arch/x86/kernel/process.c
index 6121c2b42ecf,f0166b31a803..b8441147eb5e
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@@ -933,19 -909,19 +909,19 @@@ static __cpuidle void mwait_idle(void
  	__current_clr_polling();
  }
  
- void select_idle_routine(const struct cpuinfo_x86 *c)
+ void __init select_idle_routine(void)
  {
- #ifdef CONFIG_SMP
- 	if (boot_option_idle_override == IDLE_POLL && __max_threads_per_core > 1)
- 		pr_warn_once("WARNING: polling idle and HT enabled, performance may degrade\n");
- #endif
- 	if (x86_idle_set() || boot_option_idle_override == IDLE_POLL)
+ 	if (boot_option_idle_override == IDLE_POLL) {
 -		if (IS_ENABLED(CONFIG_SMP) && smp_num_siblings > 1)
++		if (IS_ENABLED(CONFIG_SMP) && __max_threads_per_core > 1)
+ 			pr_warn_once("WARNING: polling idle and HT enabled, performance may degrade\n");
+ 		return;
+ 	}
+ 
+ 	/* Required to guard against xen_set_default_idle() */
+ 	if (x86_idle_set())
  		return;
  
- 	if (boot_cpu_has_bug(X86_BUG_AMD_E400)) {
- 		pr_info("using AMD E400 aware idle routine\n");
- 		static_call_update(x86_idle, amd_e400_idle);
- 	} else if (prefer_mwait_c1_over_halt(c)) {
+ 	if (prefer_mwait_c1_over_halt()) {
  		pr_info("using mwait in idle threads\n");
  		static_call_update(x86_idle, mwait_idle);
  	} else if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST)) {

---

Thx.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette