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

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm fixes from Paolo Bonzini:
 "Tools:
   - kvm_stat: do not show halt_wait_ns since it is not a cumulative statistic

  x86:
   - clean ups and fixes for bus lock vmexit and lazy allocation of rmaps
   - two fixes for SEV-ES (one more coming as soon as I get reviews)
   - fix for static_key underflow

  ARM:
   - Properly refcount pages used as a concatenated stage-2 PGD
   - Fix missing unlock when detecting the use of MTE+VM_SHARED"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: SEV-ES: reduce ghcb_sa_len to 32 bits
  KVM: VMX: Remove redundant handling of bus lock vmexit
  KVM: kvm_stat: do not show halt_wait_ns
  KVM: x86: WARN if APIC HW/SW disable static keys are non-zero on unload
  Revert "KVM: x86: Open code necessary bits of kvm_lapic_set_base() at vCPU RESET"
  KVM: SEV-ES: Set guest_state_protected after VMSA update
  KVM: X86: fix lazy allocation of rmaps
  KVM: SEV-ES: fix length of string I/O
  KVM: arm64: Release mmap_lock when using VM_SHARED with MTE
  KVM: arm64: Report corrupted refcount at EL2
  KVM: arm64: Fix host stage-2 PGD refcount
  KVM: s390: Function documentation fixes
parents d9abdee5 9f1ee7b1

arch/arm64/kvm/hyp/include/nvhe/gfp.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ struct hyp_pool { 


/* Allocation */

void *hyp_alloc_pages(struct hyp_pool *pool, unsigned short order);

void hyp_split_page(struct hyp_page *page);

void hyp_get_page(struct hyp_pool *pool, void *addr);

void hyp_put_page(struct hyp_pool *pool, void *addr);

arch/arm64/kvm/hyp/nvhe/mem_protect.c

+12 −1
Original line number Diff line number Diff line
@@ -35,7 +35,18 @@ const u8 pkvm_hyp_id = 1; 


static void *host_s2_zalloc_pages_exact(size_t size)

{

	return hyp_alloc_pages(&host_s2_pool, get_order(size));

	void *addr = hyp_alloc_pages(&host_s2_pool, get_order(size));



	hyp_split_page(hyp_virt_to_page(addr));



	/*

	 * The size of concatenated PGDs is always a power of two of PAGE_SIZE,

	 * so there should be no need to free any of the tail pages to make the

	 * allocation exact.

	 */

	WARN_ON(size != (PAGE_SIZE << get_order(size)));



	return addr;

}



static void *host_s2_zalloc_page(void *pool)

arch/arm64/kvm/hyp/nvhe/page_alloc.c

+15 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ static inline void hyp_page_ref_inc(struct hyp_page *p) 


static inline int hyp_page_ref_dec_and_test(struct hyp_page *p)

{

	BUG_ON(!p->refcount);

	p->refcount--;

	return (p->refcount == 0);

}
@@ -193,6 +194,20 @@ void hyp_get_page(struct hyp_pool *pool, void *addr) 
	hyp_spin_unlock(&pool->lock);

}



void hyp_split_page(struct hyp_page *p)

{

	unsigned short order = p->order;

	unsigned int i;



	p->order = 0;

	for (i = 1; i < (1 << order); i++) {

		struct hyp_page *tail = p + i;



		tail->order = 0;

		hyp_set_page_refcounted(tail);

	}

}



void *hyp_alloc_pages(struct hyp_pool *pool, unsigned short order)

{

	unsigned short i = order;

arch/arm64/kvm/mmu.c

+4 −2
Original line number Diff line number Diff line
@@ -1529,8 +1529,10 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
		 * when updating the PG_mte_tagged page flag, see

		 * sanitise_mte_tags for more details.

		 */

		if (kvm_has_mte(kvm) && vma->vm_flags & VM_SHARED)

			return -EINVAL;

		if (kvm_has_mte(kvm) && vma->vm_flags & VM_SHARED) {

			ret = -EINVAL;

			break;

		}



		if (vma->vm_flags & VM_PFNMAP) {

			/* IO region dirty page logging not allowed */

arch/s390/kvm/gaccess.c

+12 −0
Original line number Diff line number Diff line
@@ -894,6 +894,11 @@ int access_guest_real(struct kvm_vcpu *vcpu, unsigned long gra, 


/**

 * guest_translate_address - translate guest logical into guest absolute address

 * @vcpu: virtual cpu

 * @gva: Guest virtual address

 * @ar: Access register

 * @gpa: Guest physical address

 * @mode: Translation access mode

 *

 * Parameter semantics are the same as the ones from guest_translate.

 * The memory contents at the guest address are not changed.
@@ -934,6 +939,11 @@ int guest_translate_address(struct kvm_vcpu *vcpu, unsigned long gva, u8 ar, 


/**

 * check_gva_range - test a range of guest virtual addresses for accessibility

 * @vcpu: virtual cpu

 * @gva: Guest virtual address

 * @ar: Access register

 * @length: Length of test range

 * @mode: Translation access mode

 */

int check_gva_range(struct kvm_vcpu *vcpu, unsigned long gva, u8 ar,

		    unsigned long length, enum gacc_mode mode)
@@ -956,6 +966,7 @@ int check_gva_range(struct kvm_vcpu *vcpu, unsigned long gva, u8 ar, 


/**

 * kvm_s390_check_low_addr_prot_real - check for low-address protection

 * @vcpu: virtual cpu

 * @gra: Guest real address

 *

 * Checks whether an address is subject to low-address protection and set
@@ -979,6 +990,7 @@ int kvm_s390_check_low_addr_prot_real(struct kvm_vcpu *vcpu, unsigned long gra) 
 * @pgt: pointer to the beginning of the page table for the given address if

 *	 successful (return value 0), or to the first invalid DAT entry in

 *	 case of exceptions (return value > 0)

 * @dat_protection: referenced memory is write protected

 * @fake: pgt references contiguous guest memory block, not a pgtable

 */

static int kvm_s390_shadow_tables(struct gmap *sg, unsigned long saddr,