mshv: Allocate vp state page for HVCALL_MAP_VP_STATE_PAGE on L1VH

Introduce mshv_use_overlay_gpfn() to check if a page needs to be
allocated and passed to the hypervisor to map VP state pages. This is
only needed on L1VH, and only on some (newer) versions of the
hypervisor, hence the need to check vmm_capabilities.

Introduce functions hv_map/unmap_vp_state_page() to handle the
allocation and freeing.

Signed-off-by: Jinank Jain <jinankjain@linux.microsoft.com>
Signed-off-by: Nuno Das Neves <nunodasneves@linux.microsoft.com>
Reviewed-by: Praveen K Paladugu <prapal@linux.microsoft.com>
Reviewed-by: Easwar Hariharan <easwar.hariharan@linux.microsoft.com>
Reviewed-by: Stanislav Kinsburskii <skinsburskii@linux.microsoft.com>
Reviewed-by: Anirudh Rayabharam <anirudh@anirudhrb.com>
Reviewed-by: Tianyu Lan <tiala@microsoft.com>
Signed-off-by: Wei Liu <wei.liu@kernel.org>

diff --git a/drivers/hv/mshv_root.h b/drivers/hv/mshv_root.h
index f47d36d0c9427c496cdee6d1d024d132248e7a18..5b57d894358a856863ba0f48500e5273704aea1d 100644 (file)
--- a/drivers/hv/mshv_root.h
+++ b/drivers/hv/mshv_root.h
@@ -279,11 +279,12 @@ int hv_call_set_vp_state(u32 vp_index, u64 partition_id,
                         /* Choose between pages and bytes */
                         struct hv_vp_state_data state_data, u64 page_count,
                         struct page **pages, u32 num_bytes, u8 *bytes);
-int hv_call_map_vp_state_page(u64 partition_id, u32 vp_index, u32 type,
-                             union hv_input_vtl input_vtl,
-                             struct page **state_page);
-int hv_call_unmap_vp_state_page(u64 partition_id, u32 vp_index, u32 type,
-                               union hv_input_vtl input_vtl);
+int hv_map_vp_state_page(u64 partition_id, u32 vp_index, u32 type,
+                        union hv_input_vtl input_vtl,
+                        struct page **state_page);
+int hv_unmap_vp_state_page(u64 partition_id, u32 vp_index, u32 type,
+                          struct page *state_page,
+                          union hv_input_vtl input_vtl);
 int hv_call_create_port(u64 port_partition_id, union hv_port_id port_id,
                        u64 connection_partition_id, struct hv_port_info *port_info,
                        u8 port_vtl, u8 min_connection_vtl, int node);

diff --git a/drivers/hv/mshv_root_hv_call.c b/drivers/hv/mshv_root_hv_call.c
index 8049e51c45dcdc0a2831347b37ff954b1e5ed717..6dac9fcc092c43c51e692cee415bb087b5a5c5c4 100644 (file)
--- a/drivers/hv/mshv_root_hv_call.c
+++ b/drivers/hv/mshv_root_hv_call.c
@@ -526,9 +526,9 @@ int hv_call_set_vp_state(u32 vp_index, u64 partition_id,
        return ret;
 }
 
-int hv_call_map_vp_state_page(u64 partition_id, u32 vp_index, u32 type,
-                             union hv_input_vtl input_vtl,
-                             struct page **state_page)
+static int hv_call_map_vp_state_page(u64 partition_id, u32 vp_index, u32 type,
+                                    union hv_input_vtl input_vtl,
+                                    struct page **state_page)
 {
        struct hv_input_map_vp_state_page *input;
        struct hv_output_map_vp_state_page *output;
@@ -542,12 +542,20 @@ int hv_call_map_vp_state_page(u64 partition_id, u32 vp_index, u32 type,
                input = *this_cpu_ptr(hyperv_pcpu_input_arg);
                output = *this_cpu_ptr(hyperv_pcpu_output_arg);
 
+               memset(input, 0, sizeof(*input));
                input->partition_id = partition_id;
                input->vp_index = vp_index;
                input->type = type;
                input->input_vtl = input_vtl;
 
-               status = hv_do_hypercall(HVCALL_MAP_VP_STATE_PAGE, input, output);
+               if (*state_page) {
+                       input->flags.map_location_provided = 1;
+                       input->requested_map_location =
+                               page_to_pfn(*state_page);
+               }
+
+               status = hv_do_hypercall(HVCALL_MAP_VP_STATE_PAGE, input,
+                                        output);
 
                if (hv_result(status) != HV_STATUS_INSUFFICIENT_MEMORY) {
                        if (hv_result_success(status))
@@ -565,8 +573,41 @@ int hv_call_map_vp_state_page(u64 partition_id, u32 vp_index, u32 type,
        return ret;
 }
 
-int hv_call_unmap_vp_state_page(u64 partition_id, u32 vp_index, u32 type,
-                               union hv_input_vtl input_vtl)
+static bool mshv_use_overlay_gpfn(void)
+{
+       return hv_l1vh_partition() &&
+              mshv_root.vmm_caps.vmm_can_provide_overlay_gpfn;
+}
+
+int hv_map_vp_state_page(u64 partition_id, u32 vp_index, u32 type,
+                        union hv_input_vtl input_vtl,
+                        struct page **state_page)
+{
+       int ret = 0;
+       struct page *allocated_page = NULL;
+
+       if (mshv_use_overlay_gpfn()) {
+               allocated_page = alloc_page(GFP_KERNEL);
+               if (!allocated_page)
+                       return -ENOMEM;
+               *state_page = allocated_page;
+       } else {
+               *state_page = NULL;
+       }
+
+       ret = hv_call_map_vp_state_page(partition_id, vp_index, type, input_vtl,
+                                       state_page);
+
+       if (ret && allocated_page) {
+               __free_page(allocated_page);
+               *state_page = NULL;
+       }
+
+       return ret;
+}
+
+static int hv_call_unmap_vp_state_page(u64 partition_id, u32 vp_index, u32 type,
+                                      union hv_input_vtl input_vtl)
 {
        unsigned long flags;
        u64 status;
@@ -590,6 +631,17 @@ int hv_call_unmap_vp_state_page(u64 partition_id, u32 vp_index, u32 type,
        return hv_result_to_errno(status);
 }
 
+int hv_unmap_vp_state_page(u64 partition_id, u32 vp_index, u32 type,
+                          struct page *state_page, union hv_input_vtl input_vtl)
+{
+       int ret = hv_call_unmap_vp_state_page(partition_id, vp_index, type, input_vtl);
+
+       if (mshv_use_overlay_gpfn() && state_page)
+               __free_page(state_page);
+
+       return ret;
+}
+
 int hv_call_get_partition_property_ex(u64 partition_id, u64 property_code,
                                      u64 arg, void *property_value,
                                      size_t property_value_sz)

diff --git a/drivers/hv/mshv_root_main.c b/drivers/hv/mshv_root_main.c
index 33160f6ac02871a1274813a094f080065fe9d16c..288695a859f73e93d6726dd894c9de73e9f321a8 100644 (file)
--- a/drivers/hv/mshv_root_main.c
+++ b/drivers/hv/mshv_root_main.c
@@ -892,7 +892,7 @@ mshv_partition_ioctl_create_vp(struct mshv_partition *partition,
 {
        struct mshv_create_vp args;
        struct mshv_vp *vp;
-       struct page *intercept_message_page, *register_page, *ghcb_page;
+       struct page *intercept_msg_page, *register_page, *ghcb_page;
        void *stats_pages[2];
        long ret;
 
@@ -910,28 +910,25 @@ mshv_partition_ioctl_create_vp(struct mshv_partition *partition,
        if (ret)
                return ret;
 
-       ret = hv_call_map_vp_state_page(partition->pt_id, args.vp_index,
-                                       HV_VP_STATE_PAGE_INTERCEPT_MESSAGE,
-                                       input_vtl_zero,
-                                       &intercept_message_page);
+       ret = hv_map_vp_state_page(partition->pt_id, args.vp_index,
+                                  HV_VP_STATE_PAGE_INTERCEPT_MESSAGE,
+                                  input_vtl_zero, &intercept_msg_page);
        if (ret)
                goto destroy_vp;
 
        if (!mshv_partition_encrypted(partition)) {
-               ret = hv_call_map_vp_state_page(partition->pt_id, args.vp_index,
-                                               HV_VP_STATE_PAGE_REGISTERS,
-                                               input_vtl_zero,
-                                               &register_page);
+               ret = hv_map_vp_state_page(partition->pt_id, args.vp_index,
+                                          HV_VP_STATE_PAGE_REGISTERS,
+                                          input_vtl_zero, &register_page);
                if (ret)
                        goto unmap_intercept_message_page;
        }
 
        if (mshv_partition_encrypted(partition) &&
            is_ghcb_mapping_available()) {
-               ret = hv_call_map_vp_state_page(partition->pt_id, args.vp_index,
-                                               HV_VP_STATE_PAGE_GHCB,
-                                               input_vtl_normal,
-                                               &ghcb_page);
+               ret = hv_map_vp_state_page(partition->pt_id, args.vp_index,
+                                          HV_VP_STATE_PAGE_GHCB,
+                                          input_vtl_normal, &ghcb_page);
                if (ret)
                        goto unmap_register_page;
        }
@@ -962,7 +959,7 @@ mshv_partition_ioctl_create_vp(struct mshv_partition *partition,
        atomic64_set(&vp->run.vp_signaled_count, 0);
 
        vp->vp_index = args.vp_index;
-       vp->vp_intercept_msg_page = page_to_virt(intercept_message_page);
+       vp->vp_intercept_msg_page = page_to_virt(intercept_msg_page);
        if (!mshv_partition_encrypted(partition))
                vp->vp_register_page = page_to_virt(register_page);
 
@@ -995,21 +992,19 @@ unmap_stats_pages:
        if (hv_scheduler_type == HV_SCHEDULER_TYPE_ROOT)
                mshv_vp_stats_unmap(partition->pt_id, args.vp_index);
 unmap_ghcb_page:
-       if (mshv_partition_encrypted(partition) && is_ghcb_mapping_available()) {
-               hv_call_unmap_vp_state_page(partition->pt_id, args.vp_index,
-                                           HV_VP_STATE_PAGE_GHCB,
-                                           input_vtl_normal);
-       }
+       if (mshv_partition_encrypted(partition) && is_ghcb_mapping_available())
+               hv_unmap_vp_state_page(partition->pt_id, args.vp_index,
+                                      HV_VP_STATE_PAGE_GHCB, ghcb_page,
+                                      input_vtl_normal);
 unmap_register_page:
-       if (!mshv_partition_encrypted(partition)) {
-               hv_call_unmap_vp_state_page(partition->pt_id, args.vp_index,
-                                           HV_VP_STATE_PAGE_REGISTERS,
-                                           input_vtl_zero);
-       }
+       if (!mshv_partition_encrypted(partition))
+               hv_unmap_vp_state_page(partition->pt_id, args.vp_index,
+                                      HV_VP_STATE_PAGE_REGISTERS,
+                                      register_page, input_vtl_zero);
 unmap_intercept_message_page:
-       hv_call_unmap_vp_state_page(partition->pt_id, args.vp_index,
-                                   HV_VP_STATE_PAGE_INTERCEPT_MESSAGE,
-                                   input_vtl_zero);
+       hv_unmap_vp_state_page(partition->pt_id, args.vp_index,
+                              HV_VP_STATE_PAGE_INTERCEPT_MESSAGE,
+                              intercept_msg_page, input_vtl_zero);
 destroy_vp:
        hv_call_delete_vp(partition->pt_id, args.vp_index);
        return ret;
@@ -1750,24 +1745,27 @@ static void destroy_partition(struct mshv_partition *partition)
                                mshv_vp_stats_unmap(partition->pt_id, vp->vp_index);
 
                        if (vp->vp_register_page) {
-                               (void)hv_call_unmap_vp_state_page(partition->pt_id,
-                                                                 vp->vp_index,
-                                                                 HV_VP_STATE_PAGE_REGISTERS,
-                                                                 input_vtl_zero);
+                               (void)hv_unmap_vp_state_page(partition->pt_id,
+                                                            vp->vp_index,
+                                                            HV_VP_STATE_PAGE_REGISTERS,
+                                                            virt_to_page(vp->vp_register_page),
+                                                            input_vtl_zero);
                                vp->vp_register_page = NULL;
                        }
 
-                       (void)hv_call_unmap_vp_state_page(partition->pt_id,
-                                                         vp->vp_index,
-                                                         HV_VP_STATE_PAGE_INTERCEPT_MESSAGE,
-                                                         input_vtl_zero);
+                       (void)hv_unmap_vp_state_page(partition->pt_id,
+                                                    vp->vp_index,
+                                                    HV_VP_STATE_PAGE_INTERCEPT_MESSAGE,
+                                                    virt_to_page(vp->vp_intercept_msg_page),
+                                                    input_vtl_zero);
                        vp->vp_intercept_msg_page = NULL;
 
                        if (vp->vp_ghcb_page) {
-                               (void)hv_call_unmap_vp_state_page(partition->pt_id,
-                                                                 vp->vp_index,
-                                                                 HV_VP_STATE_PAGE_GHCB,
-                                                                 input_vtl_normal);
+                               (void)hv_unmap_vp_state_page(partition->pt_id,
+                                                            vp->vp_index,
+                                                            HV_VP_STATE_PAGE_GHCB,
+                                                            virt_to_page(vp->vp_ghcb_page),
+                                                            input_vtl_normal);
                                vp->vp_ghcb_page = NULL;
                        }