Drivers: hv: vmbus: Mark vmbus ring buffer visible to host in Isolation VM

Mark vmbus ring buffer visible with set_memory_decrypted() when
establish gpadl handle.

Reviewed-by: Michael Kelley <mikelley@microsoft.com>
Signed-off-by: Tianyu Lan <Tianyu.Lan@microsoft.com>
Link: https://lore.kernel.org/r/20211025122116.264793-5-ltykernel@gmail.com
Signed-off-by: Wei Liu <wei.liu@kernel.org>

diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index f3761c73b074256c69fd5d57389d98830fb83af3..b37ff4a39224024d02dd544d816ad6ade5a130bc 100644 (file)
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -17,6 +17,7 @@
 #include <linux/hyperv.h>
 #include <linux/uio.h>
 #include <linux/interrupt.h>
+#include <linux/set_memory.h>
 #include <asm/page.h>
 #include <asm/mshyperv.h>
 
@@ -456,7 +457,7 @@ nomem:
 static int __vmbus_establish_gpadl(struct vmbus_channel *channel,
                                   enum hv_gpadl_type type, void *kbuffer,
                                   u32 size, u32 send_offset,
-                                  u32 *gpadl_handle)
+                                  struct vmbus_gpadl *gpadl)
 {
        struct vmbus_channel_gpadl_header *gpadlmsg;
        struct vmbus_channel_gpadl_body *gpadl_body;
@@ -474,6 +475,15 @@ static int __vmbus_establish_gpadl(struct vmbus_channel *channel,
        if (ret)
                return ret;
 
+       ret = set_memory_decrypted((unsigned long)kbuffer,
+                                  PFN_UP(size));
+       if (ret) {
+               dev_warn(&channel->device_obj->device,
+                        "Failed to set host visibility for new GPADL %d.\n",
+                        ret);
+               return ret;
+       }
+
        init_completion(&msginfo->waitevent);
        msginfo->waiting_channel = channel;
 
@@ -537,7 +547,10 @@ static int __vmbus_establish_gpadl(struct vmbus_channel *channel,
        }
 
        /* At this point, we received the gpadl created msg */
-       *gpadl_handle = gpadlmsg->gpadl;
+       gpadl->gpadl_handle = gpadlmsg->gpadl;
+       gpadl->buffer = kbuffer;
+       gpadl->size = size;
+
 
 cleanup:
        spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags);
@@ -549,6 +562,11 @@ cleanup:
        }
 
        kfree(msginfo);
+
+       if (ret)
+               set_memory_encrypted((unsigned long)kbuffer,
+                                    PFN_UP(size));
+
        return ret;
 }
 
@@ -561,10 +579,10 @@ cleanup:
  * @gpadl_handle: some funky thing
  */
 int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
-                         u32 size, u32 *gpadl_handle)
+                         u32 size, struct vmbus_gpadl *gpadl)
 {
        return __vmbus_establish_gpadl(channel, HV_GPADL_BUFFER, kbuffer, size,
-                                      0U, gpadl_handle);
+                                      0U, gpadl);
 }
 EXPORT_SYMBOL_GPL(vmbus_establish_gpadl);
 
@@ -675,7 +693,7 @@ static int __vmbus_open(struct vmbus_channel *newchannel,
                goto error_clean_ring;
 
        /* Establish the gpadl for the ring buffer */
-       newchannel->ringbuffer_gpadlhandle = 0;
+       newchannel->ringbuffer_gpadlhandle.gpadl_handle = 0;
 
        err = __vmbus_establish_gpadl(newchannel, HV_GPADL_RING,
                                      page_address(newchannel->ringbuffer_page),
@@ -701,7 +719,8 @@ static int __vmbus_open(struct vmbus_channel *newchannel,
        open_msg->header.msgtype = CHANNELMSG_OPENCHANNEL;
        open_msg->openid = newchannel->offermsg.child_relid;
        open_msg->child_relid = newchannel->offermsg.child_relid;
-       open_msg->ringbuffer_gpadlhandle = newchannel->ringbuffer_gpadlhandle;
+       open_msg->ringbuffer_gpadlhandle
+               = newchannel->ringbuffer_gpadlhandle.gpadl_handle;
        /*
         * The unit of ->downstream_ringbuffer_pageoffset is HV_HYP_PAGE and
         * the unit of ->ringbuffer_send_offset (i.e. send_pages) is PAGE, so
@@ -759,8 +778,7 @@ error_clean_msglist:
 error_free_info:
        kfree(open_info);
 error_free_gpadl:
-       vmbus_teardown_gpadl(newchannel, newchannel->ringbuffer_gpadlhandle);
-       newchannel->ringbuffer_gpadlhandle = 0;
+       vmbus_teardown_gpadl(newchannel, &newchannel->ringbuffer_gpadlhandle);
 error_clean_ring:
        hv_ringbuffer_cleanup(&newchannel->outbound);
        hv_ringbuffer_cleanup(&newchannel->inbound);
@@ -806,7 +824,7 @@ EXPORT_SYMBOL_GPL(vmbus_open);
 /*
  * vmbus_teardown_gpadl -Teardown the specified GPADL handle
  */
-int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle)
+int vmbus_teardown_gpadl(struct vmbus_channel *channel, struct vmbus_gpadl *gpadl)
 {
        struct vmbus_channel_gpadl_teardown *msg;
        struct vmbus_channel_msginfo *info;
@@ -825,7 +843,7 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle)
 
        msg->header.msgtype = CHANNELMSG_GPADL_TEARDOWN;
        msg->child_relid = channel->offermsg.child_relid;
-       msg->gpadl = gpadl_handle;
+       msg->gpadl = gpadl->gpadl_handle;
 
        spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags);
        list_add_tail(&info->msglistentry,
@@ -845,6 +863,8 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle)
 
        wait_for_completion(&info->waitevent);
 
+       gpadl->gpadl_handle = 0;
+
 post_msg_err:
        /*
         * If the channel has been rescinded;
@@ -859,6 +879,12 @@ post_msg_err:
        spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags);
 
        kfree(info);
+
+       ret = set_memory_encrypted((unsigned long)gpadl->buffer,
+                                  PFN_UP(gpadl->size));
+       if (ret)
+               pr_warn("Fail to set mem host visibility in GPADL teardown %d.\n", ret);
+
        return ret;
 }
 EXPORT_SYMBOL_GPL(vmbus_teardown_gpadl);
@@ -933,9 +959,8 @@ static int vmbus_close_internal(struct vmbus_channel *channel)
        }
 
        /* Tear down the gpadl for the channel's ring buffer */
-       else if (channel->ringbuffer_gpadlhandle) {
-               ret = vmbus_teardown_gpadl(channel,
-                                          channel->ringbuffer_gpadlhandle);
+       else if (channel->ringbuffer_gpadlhandle.gpadl_handle) {
+               ret = vmbus_teardown_gpadl(channel, &channel->ringbuffer_gpadlhandle);
                if (ret) {
                        pr_err("Close failed: teardown gpadl return %d\n", ret);
                        /*
@@ -943,8 +968,6 @@ static int vmbus_close_internal(struct vmbus_channel *channel)
                         * it is perhaps better to leak memory.
                         */
                }
-
-               channel->ringbuffer_gpadlhandle = 0;
        }
 
        if (!ret)

diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index bc48855dff10ba135c3573914da6ffc9503f95d2..315278a7cf88e4442258fe82ccf0141e1179b542 100644 (file)
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -1075,14 +1075,15 @@ struct netvsc_device {
        /* Receive buffer allocated by us but manages by NetVSP */
        void *recv_buf;
        u32 recv_buf_size; /* allocated bytes */
-       u32 recv_buf_gpadl_handle;
+       struct vmbus_gpadl recv_buf_gpadl_handle;
        u32 recv_section_cnt;
        u32 recv_section_size;
        u32 recv_completion_cnt;
 
        /* Send buffer allocated by us */
        void *send_buf;
-       u32 send_buf_gpadl_handle;
+       u32 send_buf_size;
+       struct vmbus_gpadl send_buf_gpadl_handle;
        u32 send_section_cnt;
        u32 send_section_size;
        unsigned long *send_section_map;

diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 7bd9354128534e081eeece404d876475d0730a1c..396bc1c204e6e010905538af6772b8a3d21cc276 100644 (file)
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -278,9 +278,9 @@ static void netvsc_teardown_recv_gpadl(struct hv_device *device,
 {
        int ret;
 
-       if (net_device->recv_buf_gpadl_handle) {
+       if (net_device->recv_buf_gpadl_handle.gpadl_handle) {
                ret = vmbus_teardown_gpadl(device->channel,
-                                          net_device->recv_buf_gpadl_handle);
+                                          &net_device->recv_buf_gpadl_handle);
 
                /* If we failed here, we might as well return and have a leak
                 * rather than continue and a bugchk
@@ -290,7 +290,6 @@ static void netvsc_teardown_recv_gpadl(struct hv_device *device,
                                   "unable to teardown receive buffer's gpadl\n");
                        return;
                }
-               net_device->recv_buf_gpadl_handle = 0;
        }
 }
 
@@ -300,9 +299,9 @@ static void netvsc_teardown_send_gpadl(struct hv_device *device,
 {
        int ret;
 
-       if (net_device->send_buf_gpadl_handle) {
+       if (net_device->send_buf_gpadl_handle.gpadl_handle) {
                ret = vmbus_teardown_gpadl(device->channel,
-                                          net_device->send_buf_gpadl_handle);
+                                          &net_device->send_buf_gpadl_handle);
 
                /* If we failed here, we might as well return and have a leak
                 * rather than continue and a bugchk
@@ -312,7 +311,6 @@ static void netvsc_teardown_send_gpadl(struct hv_device *device,
                                   "unable to teardown send buffer's gpadl\n");
                        return;
                }
-               net_device->send_buf_gpadl_handle = 0;
        }
 }
 
@@ -380,7 +378,7 @@ static int netvsc_init_buf(struct hv_device *device,
        memset(init_packet, 0, sizeof(struct nvsp_message));
        init_packet->hdr.msg_type = NVSP_MSG1_TYPE_SEND_RECV_BUF;
        init_packet->msg.v1_msg.send_recv_buf.
-               gpadl_handle = net_device->recv_buf_gpadl_handle;
+               gpadl_handle = net_device->recv_buf_gpadl_handle.gpadl_handle;
        init_packet->msg.v1_msg.
                send_recv_buf.id = NETVSC_RECEIVE_BUFFER_ID;
 
@@ -463,6 +461,7 @@ static int netvsc_init_buf(struct hv_device *device,
                ret = -ENOMEM;
                goto cleanup;
        }
+       net_device->send_buf_size = buf_size;
 
        /* Establish the gpadl handle for this buffer on this
         * channel.  Note: This call uses the vmbus connection rather
@@ -482,7 +481,7 @@ static int netvsc_init_buf(struct hv_device *device,
        memset(init_packet, 0, sizeof(struct nvsp_message));
        init_packet->hdr.msg_type = NVSP_MSG1_TYPE_SEND_SEND_BUF;
        init_packet->msg.v1_msg.send_send_buf.gpadl_handle =
-               net_device->send_buf_gpadl_handle;
+               net_device->send_buf_gpadl_handle.gpadl_handle;
        init_packet->msg.v1_msg.send_send_buf.id = NETVSC_SEND_BUFFER_ID;
 
        trace_nvsp_send(ndev, init_packet);

diff --git a/drivers/uio/uio_hv_generic.c b/drivers/uio/uio_hv_generic.c
index 652fe2547587888d38d1b66c561ea7701586dcd8..c08a6cfd119f2d4030840eea2ee1e02d1360c191 100644 (file)
--- a/drivers/uio/uio_hv_generic.c
+++ b/drivers/uio/uio_hv_generic.c
@@ -58,11 +58,11 @@ struct hv_uio_private_data {
        atomic_t refcnt;
 
        void    *recv_buf;
-       u32     recv_gpadl;
+       struct vmbus_gpadl recv_gpadl;
        char    recv_name[32];  /* "recv_4294967295" */
 
        void    *send_buf;
-       u32     send_gpadl;
+       struct vmbus_gpadl send_gpadl;
        char    send_name[32];
 };
 
@@ -179,15 +179,13 @@ hv_uio_new_channel(struct vmbus_channel *new_sc)
 static void
 hv_uio_cleanup(struct hv_device *dev, struct hv_uio_private_data *pdata)
 {
-       if (pdata->send_gpadl) {
-               vmbus_teardown_gpadl(dev->channel, pdata->send_gpadl);
-               pdata->send_gpadl = 0;
+       if (pdata->send_gpadl.gpadl_handle) {
+               vmbus_teardown_gpadl(dev->channel, &pdata->send_gpadl);
                vfree(pdata->send_buf);
        }
 
-       if (pdata->recv_gpadl) {
-               vmbus_teardown_gpadl(dev->channel, pdata->recv_gpadl);
-               pdata->recv_gpadl = 0;
+       if (pdata->recv_gpadl.gpadl_handle) {
+               vmbus_teardown_gpadl(dev->channel, &pdata->recv_gpadl);
                vfree(pdata->recv_buf);
        }
 }
@@ -303,7 +301,7 @@ hv_uio_probe(struct hv_device *dev,
 
        /* put Global Physical Address Label in name */
        snprintf(pdata->recv_name, sizeof(pdata->recv_name),
-                "recv:%u", pdata->recv_gpadl);
+                "recv:%u", pdata->recv_gpadl.gpadl_handle);
        pdata->info.mem[RECV_BUF_MAP].name = pdata->recv_name;
        pdata->info.mem[RECV_BUF_MAP].addr
                = (uintptr_t)pdata->recv_buf;
@@ -324,7 +322,7 @@ hv_uio_probe(struct hv_device *dev,
        }
 
        snprintf(pdata->send_name, sizeof(pdata->send_name),
-                "send:%u", pdata->send_gpadl);
+                "send:%u", pdata->send_gpadl.gpadl_handle);
        pdata->info.mem[SEND_BUF_MAP].name = pdata->send_name;
        pdata->info.mem[SEND_BUF_MAP].addr
                = (uintptr_t)pdata->send_buf;

diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index ddc8713ce57b725a214fc47eadea86bb2978f8a7..a9e0bc3b1511d75e9172c4d9d9bf52fa1e8a29a4 100644 (file)
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -803,6 +803,12 @@ struct vmbus_device {
 
 #define VMBUS_DEFAULT_MAX_PKT_SIZE 4096
 
+struct vmbus_gpadl {
+       u32 gpadl_handle;
+       u32 size;
+       void *buffer;
+};
+
 struct vmbus_channel {
        struct list_head listentry;
 
@@ -822,7 +828,7 @@ struct vmbus_channel {
        bool rescind_ref; /* got rescind msg, got channel reference */
        struct completion rescind_event;
 
-       u32 ringbuffer_gpadlhandle;
+       struct vmbus_gpadl ringbuffer_gpadlhandle;
 
        /* Allocated memory for ring buffer */
        struct page *ringbuffer_page;
@@ -1192,10 +1198,10 @@ extern int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel,
 extern int vmbus_establish_gpadl(struct vmbus_channel *channel,
                                      void *kbuffer,
                                      u32 size,
-                                     u32 *gpadl_handle);
+                                     struct vmbus_gpadl *gpadl);
 
 extern int vmbus_teardown_gpadl(struct vmbus_channel *channel,
-                                    u32 gpadl_handle);
+                                    struct vmbus_gpadl *gpadl);
 
 void vmbus_reset_channel_cb(struct vmbus_channel *channel);