2 files changed, 18 insertions, 0 deletions

diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index 3668a95778ec..063e5f53ca78 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -582,6 +582,10 @@ static int vmbus_match(struct device *device, struct device_driver *driver)
         struct hv_driver *drv = drv_to_hv_drv(driver);
         struct hv_device *hv_dev = device_to_hv_device(device);
 
+        /* The hv_sock driver handles all hv_sock offers. */
+        if (is_hvsock_channel(hv_dev->channel))
+                return drv->hvsock;
+
         if (hv_vmbus_get_id(drv->id_table, &hv_dev->dev_type))
                 return 1;
 
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index 898eac9e8c13..f636f91f104b 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -990,6 +990,20 @@ extern void vmbus_ontimer(unsigned long data);
 struct hv_driver {
         const char *name;
 
+        /*
+         * A hvsock offer, which has a VMBUS_CHANNEL_TLNPI_PROVIDER_OFFER
+         * channel flag, actually doesn't mean a synthetic device because the
+         * offer's if_type/if_instance can change for every new hvsock
+         * connection.
+         *
+         * However, to facilitate the notification of new-offer/rescind-offer
+         * from vmbus driver to hvsock driver, we can handle hvsock offer as
+         * a special vmbus device, and hence we need the below flag to
+         * indicate if the driver is the hvsock driver or not: we need to
+         * specially treat the hvosck offer & driver in vmbus_match().
+         */
+        bool hvsock;
+
         /* the device type supported by this driver */
         uuid_le dev_type;
         const struct hv_vmbus_device_id *id_table;