1 files changed, 37 insertions, 1 deletions

diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index 476c685ca6f9..5a2ba674795e 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -57,6 +57,18 @@ struct hv_multipage_buffer {
         u64 pfn_array[MAX_MULTIPAGE_BUFFER_COUNT];
 };
 
+/*
+ * Multiple-page buffer array; the pfn array is variable size:
+ * The number of entries in the PFN array is determined by
+ * "len" and "offset".
+ */
+struct hv_mpb_array {
+        /* Length and Offset determines the # of pfns in the array */
+        u32 len;
+        u32 offset;
+        u64 pfn_array[];
+};
+
 /* 0x18 includes the proprietary packet header */
 #define MAX_PAGE_BUFFER_PACKET          (0x18 +                 \
                                         (sizeof(struct hv_page_buffer) * \
@@ -722,7 +734,12 @@ struct vmbus_channel {
          */
         void (*sc_creation_callback)(struct vmbus_channel *new_sc);
 
-        spinlock_t sc_lock;
+        /*
+         * The spinlock to protect the structure. It is being used to protect
+         * test-and-set access to various attributes of the structure as well
+         * as all sc_list operations.
+         */
+        spinlock_t lock;
         /*
          * All Sub-channels of a primary channel are linked here.
          */
@@ -814,6 +831,18 @@ struct vmbus_channel_packet_multipage_buffer {
         struct hv_multipage_buffer range;
 } __packed;
 
+/* The format must be the same as struct vmdata_gpa_direct */
+struct vmbus_packet_mpb_array {
+        u16 type;
+        u16 dataoffset8;
+        u16 length8;
+        u16 flags;
+        u64 transactionid;
+        u32 reserved;
+        u32 rangecount;         /* Always 1 in this case */
+        struct hv_mpb_array range;
+} __packed;
+
 
 extern int vmbus_open(struct vmbus_channel *channel,
                             u32 send_ringbuffersize,
@@ -845,6 +874,13 @@ extern int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel,
                                         u32 bufferlen,
                                         u64 requestid);
 
+extern int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel,
+                                     struct vmbus_packet_mpb_array *mpb,
+                                     u32 desc_size,
+                                     void *buffer,
+                                     u32 bufferlen,
+                                     u64 requestid);
+
 extern int vmbus_establish_gpadl(struct vmbus_channel *channel,
                                       void *kbuffer,
                                       u32 size,