Commit b694011a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hyperv-next-signed-20210629' of... 

Merge tag 'hyperv-next-signed-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux

Pull hyperv updates from Wei Liu:
 "Just a few minor enhancement patches and bug fixes"

* tag 'hyperv-next-signed-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
  PCI: hv: Add check for hyperv_initialized in init_hv_pci_drv()
  Drivers: hv: Move Hyper-V extended capability check to arch neutral code
  drivers: hv: Fix missing error code in vmbus_connect()
  x86/hyperv: fix logical processor creation
  hv_utils: Fix passing zero to 'PTR_ERR' warning
  scsi: storvsc: Use blk_mq_unique_tag() to generate requestIDs
  Drivers: hv: vmbus: Copy packets sent by Hyper-V out of the ring buffer
  hv_balloon: Remove redundant assignment to region_start
parents c54b245d 7d815f4a

arch/x86/hyperv/hv_init.c

+0 −47
Original line number Diff line number Diff line
@@ -614,50 +614,3 @@ bool hv_is_isolation_supported(void) 
	return hv_get_isolation_type() != HV_ISOLATION_TYPE_NONE;

}

EXPORT_SYMBOL_GPL(hv_is_isolation_supported);
 


/* Bit mask of the extended capability to query: see HV_EXT_CAPABILITY_xxx */

bool hv_query_ext_cap(u64 cap_query)

{

	/*

	 * The address of the 'hv_extended_cap' variable will be used as an

	 * output parameter to the hypercall below and so it should be

	 * compatible with 'virt_to_phys'. Which means, it's address should be

	 * directly mapped. Use 'static' to keep it compatible; stack variables

	 * can be virtually mapped, making them incompatible with

	 * 'virt_to_phys'.

	 * Hypercall input/output addresses should also be 8-byte aligned.

	 */

	static u64 hv_extended_cap __aligned(8);

	static bool hv_extended_cap_queried;

	u64 status;



	/*

	 * Querying extended capabilities is an extended hypercall. Check if the

	 * partition supports extended hypercall, first.

	 */

	if (!(ms_hyperv.priv_high & HV_ENABLE_EXTENDED_HYPERCALLS))

		return false;



	/* Extended capabilities do not change at runtime. */

	if (hv_extended_cap_queried)

		return hv_extended_cap & cap_query;



	status = hv_do_hypercall(HV_EXT_CALL_QUERY_CAPABILITIES, NULL,

				 &hv_extended_cap);



	/*

	 * The query extended capabilities hypercall should not fail under

	 * any normal circumstances. Avoid repeatedly making the hypercall, on

	 * error.

	 */

	hv_extended_cap_queried = true;

	status &= HV_HYPERCALL_RESULT_MASK;

	if (status != HV_STATUS_SUCCESS) {

		pr_err("Hyper-V: Extended query capabilities hypercall failed 0x%llx\n",

		       status);

		return false;

	}



	return hv_extended_cap & cap_query;

}

EXPORT_SYMBOL_GPL(hv_query_ext_cap);

arch/x86/kernel/cpu/mshyperv.c

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static void __init hv_smp_prepare_cpus(unsigned int max_cpus) 
	for_each_present_cpu(i) {

		if (i == 0)

			continue;

		ret = hv_call_add_logical_proc(numa_cpu_node(i), i, cpu_physical_id(i));

		ret = hv_call_add_logical_proc(numa_cpu_node(i), i, i);

		BUG_ON(ret);

	}

drivers/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ obj-$(CONFIG_SOUNDWIRE) += soundwire/ 


# Virtualization drivers

obj-$(CONFIG_VIRT_DRIVERS)	+= virt/

obj-$(CONFIG_HYPERV)		+= hv/

obj-$(subst m,y,$(CONFIG_HYPERV))	+= hv/



obj-$(CONFIG_PM_DEVFREQ)	+= devfreq/

obj-$(CONFIG_EXTCON)		+= extcon/

drivers/hv/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -11,3 +11,6 @@ hv_vmbus-y := vmbus_drv.o \ 
		 channel_mgmt.o ring_buffer.o hv_trace.o

hv_vmbus-$(CONFIG_HYPERV_TESTING)	+= hv_debugfs.o

hv_utils-y := hv_util.o hv_kvp.o hv_snapshot.o hv_fcopy.o hv_utils_transport.o



# Code that must be built-in

obj-$(subst m,y,$(CONFIG_HYPERV)) += hv_common.o

drivers/hv/channel.c

+12 −11
Original line number Diff line number Diff line
@@ -662,12 +662,15 @@ static int __vmbus_open(struct vmbus_channel *newchannel, 
	newchannel->onchannel_callback = onchannelcallback;

	newchannel->channel_callback_context = context;



	err = hv_ringbuffer_init(&newchannel->outbound, page, send_pages);

	if (!newchannel->max_pkt_size)

		newchannel->max_pkt_size = VMBUS_DEFAULT_MAX_PKT_SIZE;



	err = hv_ringbuffer_init(&newchannel->outbound, page, send_pages, 0);

	if (err)

		goto error_clean_ring;



	err = hv_ringbuffer_init(&newchannel->inbound,

				 &page[send_pages], recv_pages);

	err = hv_ringbuffer_init(&newchannel->inbound, &page[send_pages],

				 recv_pages, newchannel->max_pkt_size);

	if (err)

		goto error_clean_ring;
@@ -1186,15 +1189,14 @@ EXPORT_SYMBOL_GPL(vmbus_recvpacket_raw); 
 * vmbus_next_request_id - Returns a new request id. It is also

 * the index at which the guest memory address is stored.

 * Uses a spin lock to avoid race conditions.

 * @rqstor: Pointer to the requestor struct

 * @channel: Pointer to the VMbus channel struct

 * @rqst_add: Guest memory address to be stored in the array

 */

u64 vmbus_next_request_id(struct vmbus_requestor *rqstor, u64 rqst_addr)

u64 vmbus_next_request_id(struct vmbus_channel *channel, u64 rqst_addr)

{

	struct vmbus_requestor *rqstor = &channel->requestor;

	unsigned long flags;

	u64 current_id;

	const struct vmbus_channel *channel =

		container_of(rqstor, const struct vmbus_channel, requestor);



	/* Check rqstor has been initialized */

	if (!channel->rqstor_size)
@@ -1228,16 +1230,15 @@ EXPORT_SYMBOL_GPL(vmbus_next_request_id); 
/*

 * vmbus_request_addr - Returns the memory address stored at @trans_id

 * in @rqstor. Uses a spin lock to avoid race conditions.

 * @rqstor: Pointer to the requestor struct

 * @channel: Pointer to the VMbus channel struct

 * @trans_id: Request id sent back from Hyper-V. Becomes the requestor's

 * next request id.

 */

u64 vmbus_request_addr(struct vmbus_requestor *rqstor, u64 trans_id)

u64 vmbus_request_addr(struct vmbus_channel *channel, u64 trans_id)

{

	struct vmbus_requestor *rqstor = &channel->requestor;

	unsigned long flags;

	u64 req_addr;

	const struct vmbus_channel *channel =

		container_of(rqstor, const struct vmbus_channel, requestor);



	/* Check rqstor has been initialized */

	if (!channel->rqstor_size)