Commit 86014c1e authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-x86-generic-6.11' of https://github.com/kvm-x86/linux into HEAD 

KVM generic changes for 6.11

 - Enable halt poll shrinking by default, as Intel found it to be a clear win.

 - Setup empty IRQ routing when creating a VM to avoid having to synchronize
   SRCU when creating a split IRQCHIP on x86.

 - Rework the sched_in/out() paths to replace kvm_arch_sched_in() with a flag
   that arch code can use for hooking both sched_in() and sched_out().

 - Take the vCPU @id as an "unsigned long" instead of "u32" to avoid
   truncating a bogus value from userspace, e.g. to help userspace detect bugs.

 - Mark a vCPU as preempted if and only if it's scheduled out while in the
   KVM_RUN loop, e.g. to avoid marking it preempted and thus writing guest
   memory when retrieving guest state during live migration blackout.

 - A few minor cleanups
parents f4501e8b 25bc6af6

Documentation/virt/kvm/api.rst

+4 −4
Original line number Diff line number Diff line
@@ -7969,10 +7969,10 @@ perform a bulk copy of tags to/from the guest. 
7.29 KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM

-------------------------------------



Architectures: x86 SEV enabled

Type: vm

Parameters: args[0] is the fd of the source vm

Returns: 0 on success

:Architectures: x86 SEV enabled

:Type: vm

:Parameters: args[0] is the fd of the source vm

:Returns: 0 on success



This capability enables userspace to migrate the encryption context from the VM

indicated by the fd to the VM this is called on.

Documentation/virt/kvm/halt-polling.rst

+6 −6
Original line number Diff line number Diff line
@@ -79,11 +79,11 @@ adjustment of the polling interval. 
Module Parameters

=================



The kvm module has 3 tuneable module parameters to adjust the global max

polling interval as well as the rate at which the polling interval is grown and

shrunk. These variables are defined in include/linux/kvm_host.h and as module

parameters in virt/kvm/kvm_main.c, or arch/powerpc/kvm/book3s_hv.c in the

powerpc kvm-hv case.

The kvm module has 4 tunable module parameters to adjust the global max polling

interval, the initial value (to grow from 0), and the rate at which the polling

interval is grown and shrunk. These variables are defined in

include/linux/kvm_host.h and as module parameters in virt/kvm/kvm_main.c, or

arch/powerpc/kvm/book3s_hv.c in the powerpc kvm-hv case.



+-----------------------+---------------------------+-------------------------+

|Module Parameter	|   Description		    |	     Default Value    |
@@ -105,7 +105,7 @@ powerpc kvm-hv case. 
|			| grow_halt_poll_ns()	    |			      |

|			| function.		    |			      |

+-----------------------+---------------------------+-------------------------+

|halt_poll_ns_shrink	| The value by which the    | 0			      |

|halt_poll_ns_shrink	| The value by which the    | 2			      |

|			| halt polling interval is  |			      |

|			| divided in the	    |			      |

|			| shrink_halt_poll_ns()	    |			      |

arch/arm64/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -1289,7 +1289,6 @@ static inline bool kvm_system_needs_idmapped_vectors(void) 
}



static inline void kvm_arch_sync_events(struct kvm *kvm) {}

static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {}



void kvm_arm_init_debug(void);

void kvm_arm_vcpu_init_debug(struct kvm_vcpu *vcpu);

arch/arm64/kvm/arm.c

+1 −1
Original line number Diff line number Diff line
@@ -1138,7 +1138,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) 


	vcpu_load(vcpu);



	if (run->immediate_exit) {

	if (!vcpu->wants_to_run) {

		ret = -EINTR;

		goto out;

	}

arch/loongarch/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -274,7 +274,6 @@ static inline bool kvm_is_ifetch_fault(struct kvm_vcpu_arch *arch) 
static inline void kvm_arch_hardware_unsetup(void) {}

static inline void kvm_arch_sync_events(struct kvm *kvm) {}

static inline void kvm_arch_memslots_updated(struct kvm *kvm, u64 gen) {}

static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {}

static inline void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu) {}

static inline void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu) {}

static inline void kvm_arch_vcpu_block_finish(struct kvm_vcpu *vcpu) {}