Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider: - [High] mshv: NULL pointer dereference of vp->vp_register_page in mshv_vp_dispatch() - [Medium] mshv: inconsistent HV_SUPPORTS_SEV_SNP_GUESTS guards in SNP paths --
commit f7de1a4b156916782dca3e11c51b478fa7c24bc8 Author: Wei Liu <[email protected]> mshv: wire SEV-SNP partition ioctls This commit wires the SEV-SNP UAPI into partition creation, memory ownership tracking, isolated-page import, launch completion, PSP guest requests, AP creation, and partition teardown. It tracks per-page host access permissions and ownership state in bitmaps on each pinned memory region and restores host access on failure or teardown. > diff --git a/drivers/hv/mshv_root.h b/drivers/hv/mshv_root.h > index 78508b57b5ad4..40fd775d8d9df 100644 > --- a/drivers/hv/mshv_root.h > +++ b/drivers/hv/mshv_root.h [ ... ] > @@ -376,6 +444,24 @@ extern u8 * __percpu *hv_synic_eventring_tail; > > struct mshv_mem_region *mshv_region_create(u64 guest_pfn, u64 nr_pages, > u64 uaddr, u32 flags); > +int mshv_region_host_access_init(struct mshv_mem_region *region); > +int mshv_region_check_duplicate_pfns(struct mshv_mem_region *region); > +u8 mshv_region_host_access_get(const struct mshv_mem_region *region, u64 > index); > +void mshv_region_host_access_set(struct mshv_mem_region *region, u64 index, > + u8 state); > +u8 mshv_make_host_access_state(u8 old_state, u32 host_access, u32 flags); > +int mshv_apply_region_host_access(struct mshv_mem_region *region, > + u64 index, u64 count, u32 host_access, > + u32 flags, > + struct mshv_host_access_result *result); > +int mshv_apply_host_access(struct mshv_host_access_page *host_pages, > + u64 count, u32 host_access, u32 flags, > + struct mshv_host_access_result *result); > +bool mshv_region_host_access_is_baseline(const struct mshv_mem_region > *region); > +int mshv_validate_modify_gpa_page_count(u64 page_count); > +bool mshv_u64_array_has_duplicates(u64 *values, u64 count); > +int mshv_run_snp_teardown(const struct mshv_snp_teardown_ops *ops, void > *data, > + enum mshv_snp_teardown_phase *failed_phase); > int mshv_region_share(struct mshv_mem_region *region); > int mshv_region_unshare(struct mshv_mem_region *region); > int mshv_region_map(struct mshv_mem_region *region); > @@ -388,6 +474,11 @@ bool mshv_region_handle_gfn_fault(struct mshv_mem_region > *region, u64 gfn); > void mshv_region_movable_fini(struct mshv_mem_region *region); > bool mshv_region_movable_init(struct mshv_mem_region *region); > > +int hv_call_set_partition_property(u64 partition_id, u64 property_code, > + u64 property_value, > + void (*completion_handler)(void *, u64 *), > + void *completion_data); > + > #ifdef HV_SUPPORTS_SEV_SNP_GUESTS > int hv_call_import_isolated_pages(u64 partition_id, u64 *pages, > u64 num_pages, u64 *completed_pages, [ ... ] > diff --git a/drivers/hv/mshv_root_main.c b/drivers/hv/mshv_root_main.c > index 751cbf8d4e824..2bc834767e01f 100644 > --- a/drivers/hv/mshv_root_main.c > +++ b/drivers/hv/mshv_root_main.c [ ... ] > @@ -1297,69 +1362,82 @@ static int mshv_prepare_pinned_region(struct > mshv_mem_region *region) > > ret = mshv_region_pin(region); > if (ret) { > - pt_err(partition, "Failed to pin memory region: %d\n", > - ret); > - goto err_out; > + pt_err(partition, "Failed to pin memory region: %d\n", ret); > + return ret; > } > > - /* > - * For an SNP partition it is a requirement that for every memory region > - * that we are going to map for this partition we should make sure that > - * host access to that region is released. This is ensured by doing an > - * additional hypercall which will update the SLAT to release host > - * access to guest memory regions. > - */ > if (mshv_partition_encrypted(partition)) { > - ret = mshv_region_unshare(region); > + int recovery_ret; > + > + ret = mshv_region_host_access_init(region); > + if (ret) > + goto invalidate_region; > + > + ret = mshv_region_check_duplicate_pfns(region); > if (ret) { > - pt_err(partition, > - "Failed to unshare memory region (guest_pfn: > %llu): %d\n", > - region->start_gfn, ret); > + if (ret == -EEXIST) > + pt_err_ratelimited(partition, > + "Duplicate pinned PFN\n"); > + else > + pt_err_ratelimited(partition, > + "Pinned PFN audit failed: > %d\n", > + ret); > goto invalidate_region; > } > - } > - > - ret = mshv_region_map(region); > - if (ret) { > - int shrc; > - > - /* > - * A partial map must be removed before host access is > - * restored. > - */ > - if (region->mapping_may_exist) { > - int cleanup_ret = mshv_region_unmap(region); > > - if (cleanup_ret || region->mapping_may_exist) { > + ret = mshv_region_unshare(region); [ ... ] > @@ -1940,6 +2730,92 @@ static void destroy_partition(struct mshv_partition > *partition) [ ... ] > +static void destroy_partition(struct mshv_partition *partition) > +{ > + struct mshv_vp *vp; > + struct mshv_mem_region *region; > + struct hlist_node *n; > + bool memory_torn_down = false; > + int ret; > + int i; > + > + if (refcount_read(&partition->pt_ref_count)) { > + pt_err(partition, > + "Attempt to destroy partition but refcount > 0\n"); > + return; > + } > + > + trace_mshv_destroy_partition(partition->pt_id); > + > +#ifdef HV_SUPPORTS_SEV_SNP_GUESTS > + if (mshv_partition_encrypted(partition)) { > + enum mshv_snp_teardown_phase failed_phase; > + > + ret = mshv_run_snp_teardown(&mshv_snp_teardown_ops, partition, > + &failed_phase); > + if (ret) { > + if (failed_phase == MSHV_SNP_TEARDOWN_ISOLATION) > + pt_err(partition, > + "Failed to destroy SNP isolation: %d\n", > + ret); > + mshv_quarantine_partition(partition); > + return; > + } > + memory_torn_down = true; > + } > +#endif [Severity: Medium] Are the HV_SUPPORTS_SEV_SNP_GUESTS guards consistent across the SNP setup, teardown, and helper declarations? In include/hyperv/hvgdk_mini.h, HV_SUPPORTS_SEV_SNP_GUESTS is only defined under CONFIG_X86, whereas CONFIG_MSHV_ROOT is built on both X86_64 and ARM64. When HV_SUPPORTS_SEV_SNP_GUESTS is not defined: 1. mshv_ioctl_process_pt_flags() still accepts MSHV_PT_ISOLATION_SNP and sets HV_PARTITION_ISOLATION_TYPE_SNP, and mshv_prepare_pinned_region() still initializes the host-access bitmaps and unshares pages out of baseline when mshv_partition_encrypted(partition) is true. However, the SNP ioctls and the mshv_run_snp_teardown() path in destroy_partition() are compiled out under #ifdef HV_SUPPORTS_SEV_SNP_GUESTS, leaving no teardown path to restore baseline host access before mshv_region_destroy() checks WARN_ON_ONCE(!mshv_region_host_access_is_baseline(region)). 2. In drivers/hv/mshv_root.h, mshv_validate_modify_gpa_page_count(), mshv_u64_array_has_duplicates(), and hv_call_set_partition_property() are declared outside #ifdef HV_SUPPORTS_SEV_SNP_GUESTS (alongside mshv_run_snp_teardown()), but their definitions in drivers/hv/mshv_root_main.c and drivers/hv/mshv_root_hv_call.c are wrapped inside #ifdef HV_SUPPORTS_SEV_SNP_GUESTS, which will cause link errors on ARM64 if KUnit tests or other callers reference them. Should MSHV_PT_ISOLATION_SNP be rejected in mshv_ioctl_process_pt_flags() when HV_SUPPORTS_SEV_SNP_GUESTS is not defined, and should those helper definitions and declarations share the same guard? [ ... ] > @@ -2167,6 +3045,9 @@ static long mshv_ioctl_process_pt_flags(void __user > *user_arg, u64 *pt_flags, > case MSHV_PT_ISOLATION_NONE: > isol_props->isolation_type = HV_PARTITION_ISOLATION_TYPE_NONE; > break; > + case MSHV_PT_ISOLATION_SNP: > + isol_props->isolation_type = HV_PARTITION_ISOLATION_TYPE_SNP; > + break; > } [Severity: High] With MSHV_PT_ISOLATION_SNP now enabled here, can running a VP on an SEV-SNP partition with the root scheduler dereference a NULL vp->vp_register_page in mshv_vp_dispatch() when trace_mshv_hvcall_dispatch_vp() is enabled on CONFIG_X86_64? When mshv_partition_encrypted(partition) is true, mshv_partition_ioctl_create_vp() skips mapping HV_VP_STATE_PAGE_REGISTERS and leaves vp->vp_register_page as NULL: drivers/hv/mshv_root_main.c:mshv_partition_ioctl_create_vp() { ... if (!mshv_partition_encrypted(partition)) { ret = hv_map_vp_state_page(partition->pt_id, args.vp_index, HV_VP_STATE_PAGE_REGISTERS, input_vtl_zero, ®ister_page); if (ret) goto unmap_intercept_message_page; } ... if (!mshv_partition_encrypted(partition)) vp->vp_register_page = page_to_virt(register_page); ... } The other root-scheduler paths use mshv_vp_interrupt_pending(), which checks for a NULL vp->vp_register_page before reading interrupt_vectors: drivers/hv/mshv_root_main.c:mshv_vp_interrupt_pending() { if (!vp->vp_register_page) return 0; return vp->vp_register_page->interrupt_vectors.as_uint64; } However, in mshv_vp_ioctl_run_vp() -> mshv_run_vp_with_root_scheduler() -> mshv_vp_dispatch(), the tracepoint call dereferences vp->vp_register_page directly with preemption disabled: drivers/hv/mshv_root_main.c:mshv_vp_dispatch() { ... trace_mshv_hvcall_dispatch_vp(vp->vp_partition->pt_id, vp->vp_index, flags, output->dispatch_state, output->dispatch_event, #if defined(CONFIG_X86_64) vp->vp_register_page->interrupt_vectors.as_uint64, #else 0, #endif status); ... } Should mshv_vp_dispatch() pass mshv_vp_interrupt_pending(vp) to trace_mshv_hvcall_dispatch_vp() instead? -- Sashiko AI review ยท https://sashiko.dev/#/patchset/[email protected]?part=6
