Received-SPF: pass (google.com: domain of linux-kernel+bounces-163376-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Sender: Ingo Molnar <mingo.kernel.org@gmail.com>
Date: Tue, 30 Apr 2024 07:55:35 +0200
From: Ingo Molnar <mingo@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: linux-tip-commits@vger.kernel.org, Adrian Huang <ahuang12@lenovo.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	"Borislav Petkov (AMD)" <bp@alien8.de>, stable@vger.kernel.org,
	x86@kernel.org
Subject: Re: [tip: x86/urgent] x86/apic: Don't access the APIC when disabling
 X2APIC
Message-ID: <ZjCH11Eyo/ko4EDE@gmail.com>
References: <875xw5t6r7.ffs@tglx>
 <171439414186.10875.17224463643261311678.tip-bot2@tip-bot2>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <171439414186.10875.17224463643261311678.tip-bot2@tip-bot2>


* tip-bot2 for Thomas Gleixner <tip-bot2@linutronix.de> wrote:

> -	apic_set_fixmap();
> +	/*
> +	 * Don't reread the APIC ID as it was already done from
> +	 * check_x2apic() and the apic driver still is a x2APIC variant,
> +	 * which fails to do the read after x2APIC was disabled.
> +	 */
> +	apic_set_fixmap(false);

JFYI, I amended the commit with the fixlet below, to avoid the inevitable 
followup trivial patch:

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index b229648b7a18..803dcfb0e346 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1795,7 +1795,7 @@ static __init void x2apic_disable(void)
 	__x2apic_disable();
 	/*
 	 * Don't reread the APIC ID as it was already done from
-	 * check_x2apic() and the apic driver still is a x2APIC variant,
+	 * check_x2apic() and the APIC driver still is a x2APIC variant,
 	 * which fails to do the read after x2APIC was disabled.
 	 */
 	apic_set_fixmap(false);

Thanks,

	Ingo