Commit da795eb2 authored by Andrea Parri (Microsoft)'s avatar Andrea Parri (Microsoft) Committed by Wei Liu
Browse files

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: default avatarAndrea Parri (Microsoft) <parri.andrea@gmail.com>
Reviewed-by: default avatarMichael Kelley <mikelley@microsoft.com>
Link: https://lore.kernel.org/r/20220428145107.7878-5-parri.andrea@gmail.com


Signed-off-by: default avatarWei Liu <wei.liu@kernel.org>
parent dbde6d0c

drivers/hv/channel_mgmt.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -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);

include/linux/hyperv.h

+6 −2
Original line number Original line Diff line number Diff line
@@ -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)