[PATCH RESEND 0/6] Drivers: hv: vmbus: Some miscellaneous bug fixes and cleanup

[PATCH RESEND 0/6] Drivers: hv: vmbus: Some miscellaneous bug fixes and cleanup

[K. Y. Srinivasan]

This is a resend of the patches from Dexuan and Nicholas

Dexuan Cui (3):
  hv: hv_util: move vmbus_open() to a later place
  hv: vmbus_post_msg: retry the hypercall on some transient errors
  hv: vmbus_open(): reset the channel state on ENOMEM

Nicholas Mc Guire (3):
  hv: channel: match var type to return type of wait_for_completion
  hv: channel_mgmt: match var type to return type of
    wait_for_completion
  hv: hv_balloon: match var type to return type of wait_for_completion

 arch/x86/include/uapi/asm/hyperv.h |    2 ++
 drivers/hv/channel.c               |   11 +++++++----
 drivers/hv/channel_mgmt.c          |    3 ++-
 drivers/hv/connection.c            |   11 +++++++++--
 drivers/hv/hv_balloon.c            |    3 ++-
 drivers/hv/hv_util.c               |   11 ++++++-----
 6 files changed, 28 insertions(+), 13 deletions(-)

-- 
1.7.4.1

[PATCH RESEND 1/6] hv: hv_util: move vmbus_open() to a later place

[K. Y. Srinivasan]

From: Dexuan Cui <[mailto:decui@microsoft.com]>

Before the line vmbus_open() returns, srv->util_cb can be already running
and the variables, like util_fw_version, are needed by the srv->util_cb.

So we have to make sure the variables are initialized before the vmbus_open().

CC: "K. Y. Srinivasan" <kys@microsoft.com>
Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Dexuan Cui <decui@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
---
 drivers/hv/hv_util.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/hv/hv_util.c b/drivers/hv/hv_util.c
index 3b9c9ef..c5be773 100644
--- a/drivers/hv/hv_util.c
+++ b/drivers/hv/hv_util.c
@@ -340,12 +340,8 @@ static int util_probe(struct hv_device *dev,
 
 	set_channel_read_state(dev->channel, false);
 
-	ret = vmbus_open(dev->channel, 4 * PAGE_SIZE, 4 * PAGE_SIZE, NULL, 0,
-			srv->util_cb, dev->channel);
-	if (ret)
-		goto error;
-
 	hv_set_drvdata(dev, srv);
+
 	/*
 	 * Based on the host; initialize the framework and
 	 * service version numbers we will negotiate.
@@ -365,6 +361,11 @@ static int util_probe(struct hv_device *dev,
 		hb_srv_version = HB_VERSION;
 	}
 
+	ret = vmbus_open(dev->channel, 4 * PAGE_SIZE, 4 * PAGE_SIZE, NULL, 0,
+			srv->util_cb, dev->channel);
+	if (ret)
+		goto error;
+
 	return 0;
 
 error:
-- 
1.7.4.1

[PATCH RESEND 2/6] hv: vmbus_post_msg: retry the hypercall on some transient errors

[K. Y. Srinivasan]

From: Dexuan Cui <[mailto:decui@microsoft.com]>

I got HV_STATUS_INVALID_CONNECTION_ID on Hyper-V 2008 R2 when keeping running
"rmmod hv_netvsc; modprobe hv_netvsc; rmmod hv_utils; modprobe hv_utils"
in a Linux guest. Looks the host has some kind of throttling mechanism if
some kinds of hypercalls are sent too frequently.
Without the patch, the driver can occasionally fail to load.

Also let's retry HV_STATUS_INSUFFICIENT_MEMORY, though we didn't get it
before.

Removed 'case -ENOMEM', since the hypervisor doesn't return this.

CC: "K. Y. Srinivasan" <kys@microsoft.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Dexuan Cui <decui@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
---
 arch/x86/include/uapi/asm/hyperv.h |    2 ++
 drivers/hv/connection.c            |   11 +++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/arch/x86/include/uapi/asm/hyperv.h b/arch/x86/include/uapi/asm/hyperv.h
index 90c458e..ce6068d 100644
--- a/arch/x86/include/uapi/asm/hyperv.h
+++ b/arch/x86/include/uapi/asm/hyperv.h
@@ -225,6 +225,8 @@
 #define HV_STATUS_INVALID_HYPERCALL_CODE	2
 #define HV_STATUS_INVALID_HYPERCALL_INPUT	3
 #define HV_STATUS_INVALID_ALIGNMENT		4
+#define HV_STATUS_INSUFFICIENT_MEMORY		11
+#define HV_STATUS_INVALID_CONNECTION_ID		18
 #define HV_STATUS_INSUFFICIENT_BUFFERS		19
 
 typedef struct _HV_REFERENCE_TSC_PAGE {
diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c
index c4acd1c..af2388f 100644
--- a/drivers/hv/connection.c
+++ b/drivers/hv/connection.c
@@ -440,9 +440,16 @@ int vmbus_post_msg(void *buffer, size_t buflen)
 		ret = hv_post_message(conn_id, 1, buffer, buflen);
 
 		switch (ret) {
+		case HV_STATUS_INVALID_CONNECTION_ID:
+			/*
+			 * We could get this if we send messages too
+			 * frequently.
+			 */
+			ret = -EAGAIN;
+			break;
+		case HV_STATUS_INSUFFICIENT_MEMORY:
 		case HV_STATUS_INSUFFICIENT_BUFFERS:
 			ret = -ENOMEM;
-		case -ENOMEM:
 			break;
 		case HV_STATUS_SUCCESS:
 			return ret;
@@ -452,7 +459,7 @@ int vmbus_post_msg(void *buffer, size_t buflen)
 		}
 
 		retries++;
-		msleep(100);
+		msleep(1000);
 	}
 	return ret;
 }
-- 
1.7.4.1

[PATCH RESEND 3/6] hv: vmbus_open(): reset the channel state on ENOMEM

[K. Y. Srinivasan]

From: Dexuan Cui <[mailto:decui@microsoft.com]>

Without this patch, the state is put to CHANNEL_OPENING_STATE, and when
the driver is loaded next time, vmbus_open() will fail immediately due to
newchannel->state != CHANNEL_OPEN_STATE.

CC: "K. Y. Srinivasan" <kys@microsoft.com>
Signed-off-by: Dexuan Cui <decui@microsoft.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
---
 drivers/hv/channel.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index 2978f5e..26dcf26 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -89,9 +89,10 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
 	out = (void *)__get_free_pages(GFP_KERNEL|__GFP_ZERO,
 		get_order(send_ringbuffer_size + recv_ringbuffer_size));
 
-	if (!out)
-		return -ENOMEM;
-
+	if (!out) {
+		err = -ENOMEM;
+		goto error0;
+	}
 
 	in = (void *)((unsigned long)out + send_ringbuffer_size);
 
@@ -199,6 +200,7 @@ error0:
 	free_pages((unsigned long)out,
 		get_order(send_ringbuffer_size + recv_ringbuffer_size));
 	kfree(open_info);
+	newchannel->state = CHANNEL_OPEN_STATE;
 	return err;
 }
 EXPORT_SYMBOL_GPL(vmbus_open);
-- 
1.7.4.1

[PATCH RESEND 4/6] hv: channel: match var type to return type of wait_for_completion

[K. Y. Srinivasan]

From: Nicholas Mc Guire <der.herr@hofr.at>

return type of wait_for_completion_timeout is unsigned long not int, this
patch changes the type of t from int to unsigned long.

Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
---
 drivers/hv/channel.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index 26dcf26..f687995 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -71,7 +71,8 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
 	struct vmbus_channel_msginfo *open_info = NULL;
 	void *in, *out;
 	unsigned long flags;
-	int ret, t, err = 0;
+	int ret, err = 0;
+	unsigned long t;
 
 	spin_lock_irqsave(&newchannel->lock, flags);
 	if (newchannel->state == CHANNEL_OPEN_STATE) {
-- 
1.7.4.1

[PATCH RESEND 5/6] hv: channel_mgmt: match var type to return type of wait_for_completion

[K. Y. Srinivasan]

From: Nicholas Mc Guire <der.herr@hofr.at>

return type of wait_for_completion_timeout is unsigned long not int, this
patch changes the type of t from int to unsigned long.

Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
---
 drivers/hv/channel_mgmt.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index 36bacc7..6be93f0 100644
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -789,7 +789,8 @@ int vmbus_request_offers(void)
 {
 	struct vmbus_channel_message_header *msg;
 	struct vmbus_channel_msginfo *msginfo;
-	int ret, t;
+	int ret;
+	unsigned long t;
 
 	msginfo = kmalloc(sizeof(*msginfo) +
 			  sizeof(struct vmbus_channel_message_header),
-- 
1.7.4.1

[PATCH RESEND 6/6] hv: hv_balloon: match var type to return type of wait_for_completion

[K. Y. Srinivasan]

From: Nicholas Mc Guire <der.herr@hofr.at>

return type of wait_for_completion_timeout is unsigned long not int, this
patch changes the type of t from int to unsigned long.

Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
---
 drivers/hv/hv_balloon.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
index ff16938..965c37a 100644
--- a/drivers/hv/hv_balloon.c
+++ b/drivers/hv/hv_balloon.c
@@ -1414,7 +1414,8 @@ static void balloon_onchannelcallback(void *context)
 static int balloon_probe(struct hv_device *dev,
 			const struct hv_vmbus_device_id *dev_id)
 {
-	int ret, t;
+	int ret;
+	unsigned long t;
 	struct dm_version_request version_req;
 	struct dm_capabilities cap_msg;
 
-- 
1.7.4.1

Re: [PATCH RESEND 0/6] Drivers: hv: vmbus: Some miscellaneous bug fixes and cleanup

[Greg KH]

On Tue, Feb 03, 2015 at 07:31:36AM -0800, K. Y. Srinivasan wrote:
> This is a resend of the patches from Dexuan and Nicholas

What do you mean by "resend"?  Did you send them to be before?  I can't
see them in my inbox anywhere.

confused,

greg k-h

RE: [PATCH RESEND 0/6] Drivers: hv: vmbus: Some miscellaneous bug fixes and cleanup

[KY Srinivasan]

> -----Original Message-----
> From: Greg KH [mailto:gregkh@linuxfoundation.org]
> Sent: Tuesday, February 3, 2015 3:45 PM
> To: KY Srinivasan
> Cc: linux-kernel@vger.kernel.org; devel@linuxdriverproject.org;
> olaf@aepfle.de; apw@canonical.com; vkuznets@redhat.com
> Subject: Re: [PATCH RESEND 0/6] Drivers: hv: vmbus: Some miscellaneous
> bug fixes and cleanup
> 
> On Tue, Feb 03, 2015 at 07:31:36AM -0800, K. Y. Srinivasan wrote:
> > This is a resend of the patches from Dexuan and Nicholas
> 
> What do you mean by "resend"?  Did you send them to be before?  I can't
> see them in my inbox anywhere.
> 
> confused,

Greg,

You had asked me to resend patches after reviewing them and making sure they applied cleanly. These patches
were posted on LKML earlier; I resent them.

K. Y 
> 
> greg k-h

Re: [PATCH RESEND 0/6] Drivers: hv: vmbus: Some miscellaneous bug fixes and cleanup

[Greg KH]

On Tue, Feb 03, 2015 at 11:51:53PM +0000, KY Srinivasan wrote:
> 
> 
> > -----Original Message-----
> > From: Greg KH [mailto:gregkh@linuxfoundation.org]
> > Sent: Tuesday, February 3, 2015 3:45 PM
> > To: KY Srinivasan
> > Cc: linux-kernel@vger.kernel.org; devel@linuxdriverproject.org;
> > olaf@aepfle.de; apw@canonical.com; vkuznets@redhat.com
> > Subject: Re: [PATCH RESEND 0/6] Drivers: hv: vmbus: Some miscellaneous
> > bug fixes and cleanup
> > 
> > On Tue, Feb 03, 2015 at 07:31:36AM -0800, K. Y. Srinivasan wrote:
> > > This is a resend of the patches from Dexuan and Nicholas
> > 
> > What do you mean by "resend"?  Did you send them to be before?  I can't
> > see them in my inbox anywhere.
> > 
> > confused,
> 
> Greg,
> 
> You had asked me to resend patches after reviewing them and making sure they applied cleanly. These patches
> were posted on LKML earlier; I resent them.

But I didn't know that, as you hadn't sent them to me before.

Please collect all hyperv patches and send them to me in batches like
other subsystem maintainers do, it makes it easier for me as I'm
obviously easy to get confused here...

thanks,

greg k-h

RE: [PATCH RESEND 0/6] Drivers: hv: vmbus: Some miscellaneous bug fixes and cleanup

[KY Srinivasan]

> -----Original Message-----
> From: Greg KH [mailto:gregkh@linuxfoundation.org]
> Sent: Tuesday, February 3, 2015 4:01 PM
> To: KY Srinivasan
> Cc: apw@canonical.com; devel@linuxdriverproject.org; olaf@aepfle.de;
> linux-kernel@vger.kernel.org
> Subject: Re: [PATCH RESEND 0/6] Drivers: hv: vmbus: Some miscellaneous
> bug fixes and cleanup
> 
> On Tue, Feb 03, 2015 at 11:51:53PM +0000, KY Srinivasan wrote:
> >
> >
> > > -----Original Message-----
> > > From: Greg KH [mailto:gregkh@linuxfoundation.org]
> > > Sent: Tuesday, February 3, 2015 3:45 PM
> > > To: KY Srinivasan
> > > Cc: linux-kernel@vger.kernel.org; devel@linuxdriverproject.org;
> > > olaf@aepfle.de; apw@canonical.com; vkuznets@redhat.com
> > > Subject: Re: [PATCH RESEND 0/6] Drivers: hv: vmbus: Some
> > > miscellaneous bug fixes and cleanup
> > >
> > > On Tue, Feb 03, 2015 at 07:31:36AM -0800, K. Y. Srinivasan wrote:
> > > > This is a resend of the patches from Dexuan and Nicholas
> > >
> > > What do you mean by "resend"?  Did you send them to be before?  I
> > > can't see them in my inbox anywhere.
> > >
> > > confused,
> >
> > Greg,
> >
> > You had asked me to resend patches after reviewing them and making
> > sure they applied cleanly. These patches were posted on LKML earlier; I
> resent them.
> 
> But I didn't know that, as you hadn't sent them to me before.
> 
> Please collect all hyperv patches and send them to me in batches like other
> subsystem maintainers do, it makes it easier for me as I'm obviously easy to
> get confused here...

Will do.

K. Y
> 
> thanks,
> 
> greg k-h