diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-10-11 23:34:18 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-10-11 23:34:18 +0200 |
| commit | d947d6848a790616d6d2ca64097b6e818ffe3017 (patch) | |
| tree | 136c1263f3c0794794dbb1332de9f5aa0280de14 /arch/x86 | |
| parent | Merge tag 'io_uring-6.12-20241011' of git://git.kernel.dk/linux (diff) | |
| parent | x86/xen: mark boot CPU of PV guest in MSR_IA32_APICBASE (diff) | |
| download | linux-d947d6848a790616d6d2ca64097b6e818ffe3017.tar.xz linux-d947d6848a790616d6d2ca64097b6e818ffe3017.zip | |
Merge tag 'for-linus-6.12a-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fix from Juergen Gross:
"A fix for topology information of Xen PV guests"
* tag 'for-linus-6.12a-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
x86/xen: mark boot CPU of PV guest in MSR_IA32_APICBASE
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/xen/enlighten_pv.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index 2c12ae42dc8b..d6818c6cafda 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -1032,6 +1032,10 @@ static u64 xen_do_read_msr(unsigned int msr, int *err) switch (msr) { case MSR_IA32_APICBASE: val &= ~X2APIC_ENABLE; + if (smp_processor_id() == 0) + val |= MSR_IA32_APICBASE_BSP; + else + val &= ~MSR_IA32_APICBASE_BSP; break; } return val; |