Drivers: hv: vmbus: Accept hv_sock offers in isolated guests

So that isolated guests can communicate with the host via hv_sock
channels.

Signed-off-by: Andrea Parri (Microsoft) <parri.andrea@gmail.com>
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
Link: https://lore.kernel.org/r/20220428145107.7878-5-parri.andrea@gmail.com
Signed-off-by: Wei Liu <wei.liu@kernel.org>

diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index 50fea31f019f62d3ea928195eae58d2c4785fe83..0db1b775e01397bd14b46529e77fb6f003f5a7db 100644 (file)
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -976,13 +976,17 @@ find_primary_channel_by_offer(const struct vmbus_channel_offer_channel *offer)
        return channel;
 }
 
-static bool vmbus_is_valid_device(const guid_t *guid)
+static bool vmbus_is_valid_offer(const struct vmbus_channel_offer_channel *offer)
 {
+       const guid_t *guid = &offer->offer.if_type;
        u16 i;
 
        if (!hv_is_isolation_supported())
                return true;
 
+       if (is_hvsock_offer(offer))
+               return true;
+
        for (i = 0; i < ARRAY_SIZE(vmbus_devs); i++) {
                if (guid_equal(guid, &vmbus_devs[i].guid))
                        return vmbus_devs[i].allowed_in_isolated;
@@ -1004,7 +1008,7 @@ static void vmbus_onoffer(struct vmbus_channel_message_header *hdr)
 
        trace_vmbus_onoffer(offer);
 
-       if (!vmbus_is_valid_device(&offer->offer.if_type)) {
+       if (!vmbus_is_valid_offer(offer)) {
                pr_err_ratelimited("Invalid offer %d from the host supporting isolation\n",
                                   offer->child_relid);
                atomic_dec(&vmbus_connection.offer_in_progress);

diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index a01c9fd0a3348ed4559f3924055ef58e3b22026f..b028905d8334ee70672819f849467efe11bba366 100644 (file)
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -1064,10 +1064,14 @@ u64 vmbus_request_addr_match(struct vmbus_channel *channel, u64 trans_id,
                             u64 rqst_addr);
 u64 vmbus_request_addr(struct vmbus_channel *channel, u64 trans_id);
 
+static inline bool is_hvsock_offer(const struct vmbus_channel_offer_channel *o)
+{
+       return !!(o->offer.chn_flags & VMBUS_CHANNEL_TLNPI_PROVIDER_OFFER);
+}
+
 static inline bool is_hvsock_channel(const struct vmbus_channel *c)
 {
-       return !!(c->offermsg.offer.chn_flags &
-                 VMBUS_CHANNEL_TLNPI_PROVIDER_OFFER);
+       return is_hvsock_offer(&c->offermsg);
 }
 
 static inline bool is_sub_channel(const struct vmbus_channel *c)