Commit 0e0073eb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull hyperv updates from Wei Liu:

 - Remove unnecessary delay while probing for VMBus (Stanislav
   Kinsburskiy)

 - Optimize vmbus_on_event (Saurabh Sengar)

 - Fix a race in Hyper-V DRM driver (Saurabh Sengar)

 - Miscellaneous clean-up patches from various people

* tag 'hyperv-next-signed-20221009' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
  x86/hyperv: Replace kmap() with kmap_local_page()
  drm/hyperv: Add ratelimit on error message
  hyperv: simplify and rename generate_guest_id
  Drivers: hv: vmbus: Split memcpy of flex-array
  scsi: storvsc: remove an extraneous "to" in a comment
  Drivers: hv: vmbus: Don't wait for the ACPI device upon initialization
  Drivers: hv: vmbus: Use PCI_VENDOR_ID_MICROSOFT for better discoverability
  Drivers: hv: vmbus: Fix kernel-doc
  drm/hyperv: Don't overwrite dirt_needed value set by host
  Drivers: hv: vmbus: Optimize vmbus_on_event
parents aa512c11 154fb14d

arch/arm64/hyperv/mshyperv.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static int __init hyperv_init(void) 
		return 0;



	/* Setup the guest ID */

	guest_id = generate_guest_id(0, LINUX_VERSION_CODE, 0);

	guest_id = hv_generate_guest_id(LINUX_VERSION_CODE);

	hv_set_vpreg(HV_REGISTER_GUEST_OSID, guest_id);



	/* Get the features and hints from Hyper-V */

arch/x86/hyperv/hv_init.c

+3 −3
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ void __init hyperv_init(void) 
	 * 1. Register the guest ID

	 * 2. Enable the hypercall and register the hypercall page

	 */

	guest_id = generate_guest_id(0, LINUX_VERSION_CODE, 0);

	guest_id = hv_generate_guest_id(LINUX_VERSION_CODE);

	wrmsrl(HV_X64_MSR_GUEST_OS_ID, guest_id);



	/* Hyper-V requires to write guest os id via ghcb in SNP IVM. */
@@ -459,13 +459,13 @@ void __init hyperv_init(void) 
		wrmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);



		pg = vmalloc_to_page(hv_hypercall_pg);

		dst = kmap(pg);

		dst = kmap_local_page(pg);

		src = memremap(hypercall_msr.guest_physical_address << PAGE_SHIFT, PAGE_SIZE,

				MEMREMAP_WB);

		BUG_ON(!(src && dst));

		memcpy(dst, src, HV_HYP_PAGE_SIZE);

		memunmap(src);

		kunmap(pg);

		kunmap_local(dst);

	} else {

		hypercall_msr.guest_physical_address = vmalloc_to_pfn(hv_hypercall_pg);

		wrmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);

drivers/gpu/drm/hyperv/hyperv_drm_drv.c

+0 −2
Original line number Diff line number Diff line
@@ -142,8 +142,6 @@ static int hyperv_vmbus_probe(struct hv_device *hdev, 
	if (ret)

		drm_warn(dev, "Failed to update vram location.\n");



	hv->dirt_needed = true;



	ret = hyperv_mode_config_init(hv);

	if (ret)

		goto err_free_mmio;

drivers/gpu/drm/hyperv/hyperv_drm_proto.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static inline int hyperv_sendpacket(struct hv_device *hdev, struct synthvid_msg 
			       VM_PKT_DATA_INBAND, 0);



	if (ret)

		drm_err(&hv->dev, "Unable to send packet via vmbus\n");

		drm_err_ratelimited(&hv->dev, "Unable to send packet via vmbus; error %d\n", ret);



	return ret;

}

drivers/hv/connection.c

+14 −19
Original line number Diff line number Diff line
@@ -431,20 +431,18 @@ struct vmbus_channel *relid2channel(u32 relid) 
void vmbus_on_event(unsigned long data)

{

	struct vmbus_channel *channel = (void *) data;

	unsigned long time_limit = jiffies + 2;

	void (*callback_fn)(void *context);



	trace_vmbus_on_event(channel);



	hv_debug_delay_test(channel, INTERRUPT_DELAY);

	do {

		void (*callback_fn)(void *);



	/* A channel once created is persistent even when

	 * there is no driver handling the device. An

	 * unloading driver sets the onchannel_callback to NULL.

	 */

	callback_fn = READ_ONCE(channel->onchannel_callback);

		if (unlikely(callback_fn == NULL))

	if (unlikely(!callback_fn))

		return;



	(*callback_fn)(channel->channel_callback_context);
@@ -456,9 +454,6 @@ void vmbus_on_event(unsigned long data) 
		return;



	hv_begin_read(&channel->inbound);

	} while (likely(time_before(jiffies, time_limit)));



	/* The time limit (2 jiffies) has been reached */

	tasklet_schedule(&channel->callback_event);

}