FAILED: patch "[PATCH] x86/hyperv: Fix APIC ID and VP index confusion in" failed to apply to 6.6-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 86c48271e0d60c82665e9fd61277002391efcef7
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025061757-refusing-outmatch-70b7@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 86c48271e0d60c82665e9fd61277002391efcef7 Mon Sep 17 00:00:00 2001
From: Roman Kisel <[email protected]>
Date: Wed, 7 May 2025 11:22:25 -0700
Subject: [PATCH] x86/hyperv: Fix APIC ID and VP index confusion in
hv_snp_boot_ap()
To start an application processor in SNP-isolated guest, a hypercall is used that takes a virtual processor index. The hv_snp_boot_ap() function uses that START_VP hypercall but passes as VP index to it what it receives as a wakeup_secondary_cpu_64 callback: the APIC ID.
As those two aren't generally interchangeable, that may lead to hung APs if the VP index and the APIC ID don't match up.
Update the parameter names to avoid confusion as to what the parameter is. Use the APIC ID to the VP index conversion to provide the correct input to the hypercall.
Message-ID: <[email protected]>
arch/x86/hyperv/hv_init.c +33 -0
@@ -672,3 +672,36 @@ bool hv_is_hyperv_initialized(void)return hypercall_msr.enable; }EXPORT_SYMBOL_GPL (hv_is_hyperv_initialized); + +int hv_apicid_to_vp_index (u32 apic_id) +{ +u64 control; +u64 status; +unsigned long irq_flags; +struct hv_get_vp_from_apic_id_in *input; +u32 *output, ret; + +local_irq_save (irq_flags); + + input = *this_cpu_ptr (hyperv_pcpu_input_arg); +memset (input,0 ,sizeof (*input)); + input->partition_id =HV_PARTITION_ID_SELF ; + input->apic_ids[0 ] = apic_id; + + output = *this_cpu_ptr (hyperv_pcpu_output_arg); + + control =HV_HYPERCALL_REP_COMP_1 |HVCALL_GET_VP_INDEX_FROM_APIC_ID ; + status =hv_do_hypercall (control, input, output); + ret = output[0 ]; + +local_irq_restore (irq_flags); + +if (!hv_result_success (status)) { +pr_err ("failed to get vp index from apic id %d, status %#llx\n" , + apic_id, status); +return -EINVAL ; + } + +return ret; +} +EXPORT_SYMBOL_GPL (hv_apicid_to_vp_index);
arch/x86/hyperv/hv_vtl.c +6 -38
65 lines not on this page · raw message
arch/x86/hyperv/ivm.c +20 -2
@@ -9,6 +9,7 @@#include <linux/bitfield.h> #include <linux/types.h> #include <linux/slab.h> +#include <linux/cpu.h> #include <asm/svm.h> #include <asm/sev.h> #include <asm/io.h>
@@ -288,7 +289,7 @@ static void snp_cleanup_vmsa(struct sev_es_save_area *vmsa)free_page ((unsigned long )vmsa); } -int hv_snp_boot_ap (u32 cpu,unsigned long start_ip) +int hv_snp_boot_ap (u32 apic_id,unsigned long start_ip) {struct sev_es_save_area *vmsa = (struct sev_es_save_area *)__get_free_page (GFP_KERNEL | __GFP_ZERO);
@@ -297,10 +298,27 @@ int hv_snp_boot_ap(u32 cpu, unsigned long start_ip)u64 ret, retry =5 ;struct hv_enable_vp_vtl *start_vp_input;unsigned long flags; +int cpu, vp_index;if (!vmsa)return -ENOMEM ; +/* Find the Hyper-V VP index which might be not the same as APIC ID */ + vp_index =hv_apicid_to_vp_index (apic_id); +if (vp_index <0 || vp_index > ms_hyperv.max_vp_index) +return -EINVAL ; + +/* +* Find the Linux CPU number for addressing the per-CPU data, and it +* might not be the same as APIC ID. +*/ +for_each_present_cpu (cpu) { +if (arch_match_cpu_phys_id (cpu, apic_id)) +break ; + } +if (cpu >= nr_cpu_ids) +return -EINVAL ; +native_store_gdt (&gdtr); vmsa->gdtr.base = gdtr.address;
@@ -348,7 +366,7 @@ int hv_snp_boot_ap(u32 cpu, unsigned long start_ip) start_vp_input = (struct hv_enable_vp_vtl *)ap_start_input_arg;memset (start_vp_input,0 ,sizeof (*start_vp_input)); start_vp_input->partition_id =-1 ; - start_vp_input->vp_index = cpu; + start_vp_input->vp_index = vp_index; start_vp_input->target_vtl.target_vtl = ms_hyperv.vtl; *(u64 *)&start_vp_input->vp_context =__pa (vmsa) |1 ;
arch/x86/include/asm/mshyperv.h +4 -2
@@ -268,11 +268,11 @@ int hv_unmap_ioapic_interrupt(int ioapic_id, struct hv_interrupt_entry *entry);#ifdef CONFIG_AMD_MEM_ENCRYPT bool hv_ghcb_negotiate_protocol (void );void __noreturn hv_ghcb_terminate (unsigned int set,unsigned int reason); -int hv_snp_boot_ap (u32 cpu,unsigned long start_ip); +int hv_snp_boot_ap (u32 apic_id,unsigned long start_ip);#else static inline bool hv_ghcb_negotiate_protocol (void ) {return false; }static inline void hv_ghcb_terminate (unsigned int set,unsigned int reason) {} -static inline int hv_snp_boot_ap (u32 cpu,unsigned long start_ip) {return 0 ; } +static inline int hv_snp_boot_ap (u32 apic_id,unsigned long start_ip) {return 0 ; }#endif #if defined(CONFIG_AMD_MEM_ENCRYPT ) || defined(CONFIG_INTEL_TDX_GUEST )
@@ -306,6 +306,7 @@ static __always_inline u64 hv_raw_get_msr(unsigned int reg) {return __rdmsr (reg); } +int hv_apicid_to_vp_index (u32 apic_id);#else /* CONFIG_HYPERV */ static inline void hyperv_init (void ) {}
@@ -327,6 +328,7 @@ static inline void hv_set_msr(unsigned int reg, u64 value) { }static inline u64 hv_get_msr (unsigned int reg) {return 0 ; }static inline void hv_set_non_nested_msr (unsigned int reg,u64 value) { }static inline u64 hv_get_non_nested_msr (unsigned int reg) {return 0 ; } +static inline int hv_apicid_to_vp_index (u32 apic_id) {return -EINVAL ; }#endif /* CONFIG_HYPERV */
include/hyperv/hvgdk_mini.h +1 -1
@@ -475,7 +475,7 @@ union hv_vp_assist_msr_contents { /* HV_REGISTER_VP_ASSIST_PAGE */#define HVCALL_CREATE_PORT 0x0095#define HVCALL_CONNECT_PORT 0x0096#define HVCALL_START_VP 0x0099 -#define HVCALL_GET_VP_ID_FROM_APIC_ID 0x009a +#define HVCALL_GET_VP_INDEX_FROM_APIC_ID 0x009a#define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_SPACE 0x00af#define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_LIST 0x00b0#define HVCALL_SIGNAL_EVENT_DIRECT 0x00c0