hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Andrea Parri (Microsoft) 2022-04-28 16:51:06 +02:00 committed by Wei Liu
parent dbde6d0c7a
commit da795eb239
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/hv/channel_mgmt.c
View File

@ -976,13 +976,17 @@ find_primary_channel_by_offer(const struct vmbus_channel_offer_channel *offer)
return channel; 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; u16 i;
if (!hv_is_isolation_supported()) if (!hv_is_isolation_supported())
return true; return true;
if (is_hvsock_offer(offer))
return true;
for (i = 0; i < ARRAY_SIZE(vmbus_devs); i++) { for (i = 0; i < ARRAY_SIZE(vmbus_devs); i++) {
if (guid_equal(guid, &vmbus_devs[i].guid)) if (guid_equal(guid, &vmbus_devs[i].guid))
return vmbus_devs[i].allowed_in_isolated; 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); 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", pr_err_ratelimited("Invalid offer %d from the host supporting isolation\n",
offer->child_relid); offer->child_relid);
atomic_dec(&vmbus_connection.offer_in_progress); atomic_dec(&vmbus_connection.offer_in_progress);

8
include/linux/hyperv.h
View File

@ -1064,10 +1064,14 @@ u64 vmbus_request_addr_match(struct vmbus_channel *channel, u64 trans_id,
u64 rqst_addr); u64 rqst_addr);
u64 vmbus_request_addr(struct vmbus_channel *channel, u64 trans_id); 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) static inline bool is_hvsock_channel(const struct vmbus_channel *c)
{ {
return !!(c->offermsg.offer.chn_flags & return is_hvsock_offer(&c->offermsg);
VMBUS_CHANNEL_TLNPI_PROVIDER_OFFER);
} }
static inline bool is_sub_channel(const struct vmbus_channel *c) static inline bool is_sub_channel(const struct vmbus_channel *c)