1 files changed, 14 insertions, 3 deletions

diff --git a/drivers/hv/hv_kvp.c b/drivers/hv/hv_kvp.c
index ea852537307e..521c14625b3a 100644
--- a/drivers/hv/hv_kvp.c
+++ b/drivers/hv/hv_kvp.c
@@ -127,6 +127,17 @@ kvp_work_func(struct work_struct *dummy)
         kvp_respond_to_host(NULL, HV_E_FAIL);
 }
 
+static void poll_channel(struct vmbus_channel *channel)
+{
+        if (channel->target_cpu != smp_processor_id())
+                smp_call_function_single(channel->target_cpu,
+                                         hv_kvp_onchannelcallback,
+                                         channel, true);
+        else
+                hv_kvp_onchannelcallback(channel);
+}
+
+
 static int kvp_handle_handshake(struct hv_kvp_msg *msg)
 {
         int ret = 1;
@@ -155,7 +166,7 @@ static int kvp_handle_handshake(struct hv_kvp_msg *msg)
                 kvp_register(dm_reg_value);
                 kvp_transaction.active = false;
                 if (kvp_transaction.kvp_context)
-                        hv_kvp_onchannelcallback(kvp_transaction.kvp_context);
+                        poll_channel(kvp_transaction.kvp_context);
         }
         return ret;
 }
@@ -568,7 +579,7 @@ response_done:
 
         vmbus_sendpacket(channel, recv_buffer, buf_len, req_id,
                                 VM_PKT_DATA_INBAND, 0);
-
+        poll_channel(channel);
 }
 
 /*
@@ -603,7 +614,7 @@ void hv_kvp_onchannelcallback(void *context)
                 return;
         }
 
-        vmbus_recvpacket(channel, recv_buffer, PAGE_SIZE * 2, &recvlen,
+        vmbus_recvpacket(channel, recv_buffer, PAGE_SIZE * 4, &recvlen,
                          &requestid);
 
         if (recvlen > 0) {