4 files changed, 27 insertions, 6 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index b66404ff27fa..21ce79908418 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6906,8 +6906,10 @@ Hyper-V CORE AND DRIVERS
 M:      "K. Y. Srinivasan" <kys@microsoft.com>
 M:      Haiyang Zhang <haiyangz@microsoft.com>
 M:      Stephen Hemminger <sthemmin@microsoft.com>
+M:      Sasha Levin <sashal@kernel.org>
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
 L:      devel@linuxdriverproject.org
-S:      Maintained
+S:      Supported
 F:      Documentation/networking/netvsc.txt
 F:      arch/x86/include/asm/mshyperv.h
 F:      arch/x86/include/asm/trace/hyperv.h
diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig
index 97954f575c3f..1c1a2514d6f3 100644
--- a/drivers/hv/Kconfig
+++ b/drivers/hv/Kconfig
@@ -4,7 +4,7 @@ menu "Microsoft Hyper-V guest support"
 
 config HYPERV
         tristate "Microsoft Hyper-V client drivers"
-        depends on X86 && ACPI && PCI && X86_LOCAL_APIC && HYPERVISOR_GUEST
+        depends on X86 && ACPI && X86_LOCAL_APIC && HYPERVISOR_GUEST
         select PARAVIRT
         help
           Select this option to run Linux as a Hyper-V client operating
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index 283d184280af..d0ff65675292 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -316,6 +316,8 @@ static ssize_t out_intr_mask_show(struct device *dev,
 
         if (!hv_dev->channel)
                 return -ENODEV;
+        if (hv_dev->channel->state != CHANNEL_OPENED_STATE)
+                return -EINVAL;
         hv_ringbuffer_get_debuginfo(&hv_dev->channel->outbound, &outbound);
         return sprintf(buf, "%d\n", outbound.current_interrupt_mask);
 }
@@ -329,6 +331,8 @@ static ssize_t out_read_index_show(struct device *dev,
 
         if (!hv_dev->channel)
                 return -ENODEV;
+        if (hv_dev->channel->state != CHANNEL_OPENED_STATE)
+                return -EINVAL;
         hv_ringbuffer_get_debuginfo(&hv_dev->channel->outbound, &outbound);
         return sprintf(buf, "%d\n", outbound.current_read_index);
 }
@@ -343,6 +347,8 @@ static ssize_t out_write_index_show(struct device *dev,
 
         if (!hv_dev->channel)
                 return -ENODEV;
+        if (hv_dev->channel->state != CHANNEL_OPENED_STATE)
+                return -EINVAL;
         hv_ringbuffer_get_debuginfo(&hv_dev->channel->outbound, &outbound);
         return sprintf(buf, "%d\n", outbound.current_write_index);
 }
@@ -357,6 +363,8 @@ static ssize_t out_read_bytes_avail_show(struct device *dev,
 
         if (!hv_dev->channel)
                 return -ENODEV;
+        if (hv_dev->channel->state != CHANNEL_OPENED_STATE)
+                return -EINVAL;
         hv_ringbuffer_get_debuginfo(&hv_dev->channel->outbound, &outbound);
         return sprintf(buf, "%d\n", outbound.bytes_avail_toread);
 }
@@ -371,6 +379,8 @@ static ssize_t out_write_bytes_avail_show(struct device *dev,
 
         if (!hv_dev->channel)
                 return -ENODEV;
+        if (hv_dev->channel->state != CHANNEL_OPENED_STATE)
+                return -EINVAL;
         hv_ringbuffer_get_debuginfo(&hv_dev->channel->outbound, &outbound);
         return sprintf(buf, "%d\n", outbound.bytes_avail_towrite);
 }
@@ -384,6 +394,8 @@ static ssize_t in_intr_mask_show(struct device *dev,
 
         if (!hv_dev->channel)
                 return -ENODEV;
+        if (hv_dev->channel->state != CHANNEL_OPENED_STATE)
+                return -EINVAL;
         hv_ringbuffer_get_debuginfo(&hv_dev->channel->inbound, &inbound);
         return sprintf(buf, "%d\n", inbound.current_interrupt_mask);
 }
@@ -397,6 +409,8 @@ static ssize_t in_read_index_show(struct device *dev,
 
         if (!hv_dev->channel)
                 return -ENODEV;
+        if (hv_dev->channel->state != CHANNEL_OPENED_STATE)
+                return -EINVAL;
         hv_ringbuffer_get_debuginfo(&hv_dev->channel->inbound, &inbound);
         return sprintf(buf, "%d\n", inbound.current_read_index);
 }
@@ -410,6 +424,8 @@ static ssize_t in_write_index_show(struct device *dev,
 
         if (!hv_dev->channel)
                 return -ENODEV;
+        if (hv_dev->channel->state != CHANNEL_OPENED_STATE)
+                return -EINVAL;
         hv_ringbuffer_get_debuginfo(&hv_dev->channel->inbound, &inbound);
         return sprintf(buf, "%d\n", inbound.current_write_index);
 }
@@ -424,6 +440,8 @@ static ssize_t in_read_bytes_avail_show(struct device *dev,
 
         if (!hv_dev->channel)
                 return -ENODEV;
+        if (hv_dev->channel->state != CHANNEL_OPENED_STATE)
+                return -EINVAL;
         hv_ringbuffer_get_debuginfo(&hv_dev->channel->inbound, &inbound);
         return sprintf(buf, "%d\n", inbound.bytes_avail_toread);
 }
@@ -438,6 +456,8 @@ static ssize_t in_write_bytes_avail_show(struct device *dev,
 
         if (!hv_dev->channel)
                 return -ENODEV;
+        if (hv_dev->channel->state != CHANNEL_OPENED_STATE)
+                return -EINVAL;
         hv_ringbuffer_get_debuginfo(&hv_dev->channel->inbound, &inbound);
         return sprintf(buf, "%d\n", inbound.bytes_avail_towrite);
 }
diff --git a/drivers/uio/uio_hv_generic.c b/drivers/uio/uio_hv_generic.c
index c2493d011225..3c5169eb23f5 100644
--- a/drivers/uio/uio_hv_generic.c
+++ b/drivers/uio/uio_hv_generic.c
@@ -204,9 +204,11 @@ hv_uio_open(struct uio_info *info, struct inode *inode)
         if (atomic_inc_return(&pdata->refcnt) != 1)
                 return 0;
 
+        vmbus_set_chn_rescind_callback(dev->channel, hv_uio_rescind);
+        vmbus_set_sc_create_callback(dev->channel, hv_uio_new_channel);
+
         ret = vmbus_connect_ring(dev->channel,
                                  hv_uio_channel_cb, dev->channel);
-
         if (ret == 0)
                 dev->channel->inbound.ring_buffer->interrupt_mask = 1;
         else
@@ -334,9 +336,6 @@ hv_uio_probe(struct hv_device *dev,
                 goto fail_close;
         }
 
-        vmbus_set_chn_rescind_callback(channel, hv_uio_rescind);
-        vmbus_set_sc_create_callback(channel, hv_uio_new_channel);
-
         ret = sysfs_create_bin_file(&channel->kobj, &ring_buffer_bin_attr);
         if (ret)
                 dev_notice(&dev->device,