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

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

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

Pull hyperv updates from Wei Liu:

 - Unify guest entry code for KVM and MSHV (Sean Christopherson)

 - Switch Hyper-V MSI domain to use msi_create_parent_irq_domain()
   (Nam Cao)

 - Add CONFIG_HYPERV_VMBUS and limit the semantics of CONFIG_HYPERV
   (Mukesh Rathor)

 - Add kexec/kdump support on Azure CVMs (Vitaly Kuznetsov)

 - Deprecate hyperv_fb in favor of Hyper-V DRM driver (Prasanna
   Kumar T S M)

 - Miscellaneous enhancements, fixes and cleanups (Abhishek Tiwari,
   Alok Tiwari, Nuno Das Neves, Wei Liu, Roman Kisel, Michael Kelley)

* tag 'hyperv-next-signed-20251006' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
  hyperv: Remove the spurious null directive line
  MAINTAINERS: Mark hyperv_fb driver Obsolete
  fbdev/hyperv_fb: deprecate this in favor of Hyper-V DRM driver
  Drivers: hv: Make CONFIG_HYPERV bool
  Drivers: hv: Add CONFIG_HYPERV_VMBUS option
  Drivers: hv: vmbus: Fix typos in vmbus_drv.c
  Drivers: hv: vmbus: Fix sysfs output format for ring buffer index
  Drivers: hv: vmbus: Clean up sscanf format specifier in target_cpu_store()
  x86/hyperv: Switch to msi_create_parent_irq_domain()
  mshv: Use common "entry virt" APIs to do work in root before running guest
  entry: Rename "kvm" entry code assets to "virt" to genericize APIs
  entry/kvm: KVM: Move KVM details related to signal/-EINTR into KVM proper
  mshv: Handle NEED_RESCHED_LAZY before transferring to guest
  x86/hyperv: Add kexec/kdump support on Azure CVMs
  Drivers: hv: Simplify data structures for VMBus channel close message
  Drivers: hv: util: Cosmetic changes for hv_utils_transport.c
  mshv: Add support for a new parent partition configuration
  clocksource: hyper-v: Skip unnecessary checks for the root partition
  hyperv: Add missing field to hv_output_map_device_interrupt
parents c746c3b5 b595edcb

MAINTAINERS

+11 −2
Original line number Diff line number Diff line
@@ -10390,7 +10390,7 @@ L: linux-kernel@vger.kernel.org 
S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/entry

F:	include/linux/entry-common.h

F:	include/linux/entry-kvm.h

F:	include/linux/entry-virt.h

F:	include/linux/irq-entry-common.h

F:	kernel/entry/








@@ -11604,7 +11604,6 @@ F:	drivers/pci/controller/pci-hyperv-intf.c







F:	drivers/pci/controller/pci-hyperv.c









F:	drivers/scsi/storvsc_drv.c









F:	drivers/uio/uio_hv_generic.c









F:	drivers/video/fbdev/hyperv_fb.c









F:	include/asm-generic/mshyperv.h









F:	include/clocksource/hyperv_timer.h









F:	include/hyperv/hvgdk.h








@@ -11618,6 +11617,16 @@ F:	include/uapi/linux/hyperv.h







F:	net/vmw_vsock/hyperv_transport.c









F:	tools/hv/

















HYPER-V FRAMEBUFFER DRIVER









M:	"K. Y. Srinivasan" <kys@microsoft.com>









M:	Haiyang Zhang <haiyangz@microsoft.com>









M:	Wei Liu <wei.liu@kernel.org>









M:	Dexuan Cui <decui@microsoft.com>









L:	linux-hyperv@vger.kernel.org









S:	Obsolete









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git









F:	drivers/video/fbdev/hyperv_fb.c

















HYPERBUS SUPPORT









M:	Vignesh Raghavendra <vigneshr@ti.com>









R:	Tudor Ambarus <tudor.ambarus@linaro.org>
































arch/arm64/kvm/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -25,7 +25,7 @@ menuconfig KVM







	select HAVE_KVM_CPU_RELAX_INTERCEPT









	select KVM_MMIO









	select KVM_GENERIC_DIRTYLOG_READ_PROTECT









	select KVM_XFER_TO_GUEST_WORK









	select VIRT_XFER_TO_GUEST_WORK









	select KVM_VFIO









	select HAVE_KVM_DIRTY_RING_ACQ_REL









	select NEED_KVM_DIRTY_RING_WITH_BITMAP
































arch/arm64/kvm/arm.c



+1
−2






























Original line number
Diff line number
Diff line







@@ -6,7 +6,6 @@

















#include <linux/bug.h>









#include <linux/cpu_pm.h>









#include <linux/entry-kvm.h>









#include <linux/errno.h>









#include <linux/err.h>









#include <linux/kvm_host.h>








@@ -1183,7 +1182,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)







		/*









		 * Check conditions before entering the guest









		 */









		ret = xfer_to_guest_mode_handle_work(vcpu);









		ret = kvm_xfer_to_guest_mode_handle_work(vcpu);









		if (!ret)









			ret = 1;










































arch/loongarch/kvm/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -31,7 +31,7 @@ config KVM







	select KVM_GENERIC_HARDWARE_ENABLING









	select KVM_GENERIC_MMU_NOTIFIER









	select KVM_MMIO









	select KVM_XFER_TO_GUEST_WORK









	select VIRT_XFER_TO_GUEST_WORK









	select SCHED_INFO









	select GUEST_PERF_EVENTS if PERF_EVENTS









	help
































arch/loongarch/kvm/vcpu.c



+1
−2






























Original line number
Diff line number
Diff line







@@ -4,7 +4,6 @@







 */



















#include <linux/kvm_host.h>









#include <linux/entry-kvm.h>









#include <asm/fpu.h>









#include <asm/lbt.h>









#include <asm/loongarch.h>








@@ -251,7 +250,7 @@ static int kvm_enter_guest_check(struct kvm_vcpu *vcpu)







	/*









	 * Check conditions before entering the guest









	 */









	ret = xfer_to_guest_mode_handle_work(vcpu);









	ret = kvm_xfer_to_guest_mode_handle_work(vcpu);









	if (ret < 0)









		return ret;