Commit 8d8bd2a5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-urgent-2026-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Ingo Molnar:

 - Improve Qemu MCE-injection behavior by only using AMD SMCA MSRs if
   the feature bit is set

 - Fix the relative path of gettimeofday.c inclusion in vclock_gettime.c

 - Fix a boot crash on UV clusters when a socket is marked as
   'deconfigured' which are mapped to the SOCK_EMPTY node ID by
   the UV firmware, while Linux APIs expect NUMA_NO_NODE.

   The difference being (0xffff [unsigned short ~0]) vs [int -1]

* tag 'x86-urgent-2026-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/platform/uv: Handle deconfigured sockets
  x86/entry/vdso: Fix path of included gettimeofday.c
  x86/mce/amd: Check SMCA feature bit before accessing SMCA MSRs
parents ebfd9b7a 1f6aa5bb

arch/x86/entry/vdso/common/vclock_gettime.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/types.h>

#include <vdso/gettime.h>



#include "../../../../lib/vdso/gettimeofday.c"

#include "lib/vdso/gettimeofday.c"



int __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz)

{

arch/x86/kernel/apic/x2apic_uv_x.c

+16 −2
Original line number Diff line number Diff line
@@ -1708,8 +1708,22 @@ static void __init uv_system_init_hub(void) 
		struct uv_hub_info_s *new_hub;



		/* Allocate & fill new per hub info list */

		new_hub = (bid == 0) ?  &uv_hub_info_node0

			: kzalloc_node(bytes, GFP_KERNEL, uv_blade_to_node(bid));

		if (bid == 0) {

			new_hub = &uv_hub_info_node0;

		} else {

			int nid;



			/*

			 * Deconfigured sockets are mapped to SOCK_EMPTY. Use

			 * NUMA_NO_NODE to allocate on a valid node.

			 */

			nid = uv_blade_to_node(bid);

			if (nid == SOCK_EMPTY)

				nid = NUMA_NO_NODE;



			new_hub = kzalloc_node(bytes, GFP_KERNEL, nid);

		}



		if (WARN_ON_ONCE(!new_hub)) {

			/* do not kfree() bid 0, which is statically allocated */

			while (--bid > 0)

arch/x86/kernel/cpu/mce/amd.c

+11 −6
Original line number Diff line number Diff line
@@ -875,13 +875,18 @@ void amd_clear_bank(struct mce *m) 
{

	amd_reset_thr_limit(m->bank);



	/* Clear MCA_DESTAT for all deferred errors even those logged in MCA_STATUS. */

	if (mce_flags.smca) {

		/*

		 * Clear MCA_DESTAT for all deferred errors even those

		 * logged in MCA_STATUS.

		 */

		if (m->status & MCI_STATUS_DEFERRED)

			mce_wrmsrq(MSR_AMD64_SMCA_MCx_DESTAT(m->bank), 0);



		/* Don't clear MCA_STATUS if MCA_DESTAT was used exclusively. */

		if (m->kflags & MCE_CHECK_DFR_REGS)

			return;

	}



	mce_wrmsrq(mca_msr_reg(m->bank, MCA_STATUS), 0);

}