Commit e1a6d5cf authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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

Common KVM changes for 6.4:

 - Drop unnecessary casts from "void *" throughout kvm_main.c

 - Tweak the layout of "struct kvm_mmu_memory_cache" to shrink the struct
   size by 8 bytes on 64-bit kernels by utilizing a padding hole

 - Fix a documentation format goof that was introduced when the KVM docs
   were converted to ReST

 - Constify MIPS's internal callbacks (a leftover from the hardware enabling
   rework that landed in 6.3)
parents 4f382a79 b0d23708

Documentation/virt/kvm/api.rst

+1 −0
Original line number Diff line number Diff line
@@ -7330,6 +7330,7 @@ and injected exceptions. 
       will clear DR6.RTM.



7.18 KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2

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



:Architectures: x86, arm64, mips

:Parameters: args[0] whether feature should be enabled or not

Documentation/virt/kvm/locking.rst

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ The acquisition orders for mutexes are as follows: 
- kvm->mn_active_invalidate_count ensures that pairs of

  invalidate_range_start() and invalidate_range_end() callbacks

  use the same memslots array.  kvm->slots_lock and kvm->slots_arch_lock

  are taken on the waiting side in install_new_memslots, so MMU notifiers

  are taken on the waiting side when modifying memslots, so MMU notifiers

  must not take either kvm->slots_lock or kvm->slots_arch_lock.



For SRCU:

arch/mips/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -757,7 +757,7 @@ struct kvm_mips_callbacks { 
	int (*vcpu_run)(struct kvm_vcpu *vcpu);

	void (*vcpu_reenter)(struct kvm_vcpu *vcpu);

};

extern struct kvm_mips_callbacks *kvm_mips_callbacks;

extern const struct kvm_mips_callbacks * const kvm_mips_callbacks;

int kvm_mips_emulation_init(void);



/* Debug: dump vcpu state */

arch/mips/kvm/vz.c

+1 −1
Original line number Diff line number Diff line
@@ -3305,7 +3305,7 @@ static struct kvm_mips_callbacks kvm_vz_callbacks = { 
};



/* FIXME: Get rid of the callbacks now that trap-and-emulate is gone. */

struct kvm_mips_callbacks *kvm_mips_callbacks = &kvm_vz_callbacks;

const struct kvm_mips_callbacks * const kvm_mips_callbacks = &kvm_vz_callbacks;



int kvm_mips_emulation_init(void)

{

include/linux/kvm_host.h

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 


/*

 * Bit 63 of the memslot generation number is an "update in-progress flag",

 * e.g. is temporarily set for the duration of install_new_memslots().

 * e.g. is temporarily set for the duration of kvm_swap_active_memslots().

 * This flag effectively creates a unique generation number that is used to

 * mark cached memslot data, e.g. MMIO accesses, as potentially being stale,

 * i.e. may (or may not) have come from the previous memslots generation.
@@ -713,7 +713,7 @@ struct kvm { 
	 * use by the VM. To be used under the slots_lock (above) or in a

	 * kvm->srcu critical section where acquiring the slots_lock would

	 * lead to deadlock with the synchronize_srcu in

	 * install_new_memslots.

	 * kvm_swap_active_memslots().

	 */

	struct mutex slots_arch_lock;

	struct mm_struct *mm; /* userspace tied to this vm */