Commit 7e96bf47 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:
 "ARM:

   - Fix MTE shared page detection

   - Enable selftest's use of PMU registers when asked to

  s390:

   - restore 5.13 debugfs names

  x86:

   - fix sizes for vcpu-id indexed arrays

   - fixes for AMD virtualized LAPIC (AVIC)

   - other small bugfixes

  Generic:

   - access tracking performance test

   - dirty_log_perf_test command line parsing fix

   - Fix selftest use of obsolete pthread_yield() in favour of
     sched_yield()

   - use cpu_relax when halt polling

   - fixed missing KVM_CLEAR_DIRTY_LOG compat ioctl"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: add missing compat KVM_CLEAR_DIRTY_LOG
  KVM: use cpu_relax when halt polling
  KVM: SVM: use vmcb01 in svm_refresh_apicv_exec_ctrl
  KVM: SVM: tweak warning about enabled AVIC on nested entry
  KVM: SVM: svm_set_vintr don't warn if AVIC is active but is about to be deactivated
  KVM: s390: restore old debugfs names
  KVM: SVM: delay svm_vcpu_init_msrpm after svm->vmcb is initialized
  KVM: selftests: Introduce access_tracking_perf_test
  KVM: selftests: Fix missing break in dirty_log_perf_test arg parsing
  x86/kvm: fix vcpu-id indexed array sizes
  KVM: x86: Check the right feature bit for MSR_KVM_ASYNC_PF_ACK access
  docs: virt: kvm: api.rst: replace some characters
  KVM: Documentation: Fix KVM_CAP_ENFORCE_PV_FEATURE_CPUID name
  KVM: nSVM: Swap the parameter order for svm_copy_vmrun_state()/svm_copy_vmloadsave_state()
  KVM: nSVM: Rename nested_svm_vmloadsave() to svm_copy_vmloadsave_state()
  KVM: arm64: selftests: get-reg-list: actually enable pmu regs in pmu sublist
  KVM: selftests: change pthread_yield to sched_yield
  KVM: arm64: Fix detection of shared VMAs on guest fault
parents 2b99c470 8750f9bb

Documentation/virt/kvm/api.rst

+15 −15
Original line number Diff line number Diff line
@@ -855,7 +855,7 @@ in-kernel irqchip (GIC), and for in-kernel irqchip can tell the GIC to 
use PPIs designated for specific cpus.  The irq field is interpreted

like this::



  bits:  |  31 ... 28  | 27 ... 24 | 23  ... 16 | 15 ... 0 |

  bits:  |  31 ... 28  | 27 ... 24 | 23  ... 16 | 15 ... 0 |

  field: | vcpu2_index | irq_type  | vcpu_index |  irq_id  |



The irq_type field has the following values:
@@ -2149,10 +2149,10 @@ prior to calling the KVM_RUN ioctl. 
Errors:



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

  ENOENT   no such register

  EINVAL   invalid register ID, or no such register or used with VMs in

  ENOENT   no such register

  EINVAL   invalid register ID, or no such register or used with VMs in

           protected virtualization mode on s390

  EPERM    (arm64) register access not allowed before vcpu finalization

  EPERM    (arm64) register access not allowed before vcpu finalization

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



(These error codes are indicative only: do not rely on a specific error
@@ -2590,10 +2590,10 @@ following id bit patterns:: 
Errors include:



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

  ENOENT   no such register

  EINVAL   invalid register ID, or no such register or used with VMs in

  ENOENT   no such register

  EINVAL   invalid register ID, or no such register or used with VMs in

           protected virtualization mode on s390

  EPERM    (arm64) register access not allowed before vcpu finalization

  EPERM    (arm64) register access not allowed before vcpu finalization

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



(These error codes are indicative only: do not rely on a specific error
@@ -3112,13 +3112,13 @@ current state. "addr" is ignored. 
Errors:



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

  EINVAL     the target is unknown, or the combination of features is invalid.

  ENOENT     a features bit specified is unknown.

  EINVAL     the target is unknown, or the combination of features is invalid.

  ENOENT     a features bit specified is unknown.

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



This tells KVM what type of CPU to present to the guest, and what

optional features it should have.  This will cause a reset of the cpu

registers to their initial values.  If this is not called, KVM_RUN will

optional features it should have.  This will cause a reset of the cpu

registers to their initial values.  If this is not called, KVM_RUN will

return ENOEXEC for that vcpu.



The initial values are defined as:
@@ -3239,8 +3239,8 @@ VCPU matching underlying host. 
Errors:



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

  E2BIG      the reg index list is too big to fit in the array specified by

             the user (the number required will be written into n).

  E2BIG      the reg index list is too big to fit in the array specified by

             the user (the number required will be written into n).

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



::
@@ -3288,7 +3288,7 @@ specific device. 
ARM/arm64 divides the id field into two parts, a device id and an

address type id specific to the individual device::



  bits:  | 63        ...       32 | 31    ...    16 | 15    ...    0 |

  bits:  | 63        ...       32 | 31    ...    16 | 15    ...    0 |

  field: |        0x00000000      |     device id   |  addr type id  |



ARM/arm64 currently only require this when using the in-kernel GIC
@@ -7049,7 +7049,7 @@ In combination with KVM_CAP_X86_USER_SPACE_MSR, this allows user space to 
trap and emulate MSRs that are outside of the scope of KVM as well as

limit the attack surface on KVM's MSR emulation code.



8.28 KVM_CAP_ENFORCE_PV_CPUID

8.28 KVM_CAP_ENFORCE_PV_FEATURE_CPUID

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



Architectures: x86

arch/arm64/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -947,7 +947,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, 
		vma_shift = get_vma_page_shift(vma, hva);

	}



	shared = (vma->vm_flags & VM_PFNMAP);

	shared = (vma->vm_flags & VM_SHARED);



	switch (vma_shift) {

#ifndef __PAGETABLE_PMD_FOLDED

arch/s390/include/asm/kvm_host.h

+9 −9
Original line number Diff line number Diff line
@@ -445,15 +445,15 @@ struct kvm_vcpu_stat { 
	u64 instruction_sigp_init_cpu_reset;

	u64 instruction_sigp_cpu_reset;

	u64 instruction_sigp_unknown;

	u64 diagnose_10;

	u64 diagnose_44;

	u64 diagnose_9c;

	u64 diagnose_9c_ignored;

	u64 diagnose_9c_forward;

	u64 diagnose_258;

	u64 diagnose_308;

	u64 diagnose_500;

	u64 diagnose_other;

	u64 instruction_diagnose_10;

	u64 instruction_diagnose_44;

	u64 instruction_diagnose_9c;

	u64 diag_9c_ignored;

	u64 diag_9c_forward;

	u64 instruction_diagnose_258;

	u64 instruction_diagnose_308;

	u64 instruction_diagnose_500;

	u64 instruction_diagnose_other;

	u64 pfault_sync;

};

arch/s390/kvm/diag.c

+9 −9
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static int diag_release_pages(struct kvm_vcpu *vcpu) 


	start = vcpu->run->s.regs.gprs[(vcpu->arch.sie_block->ipa & 0xf0) >> 4];

	end = vcpu->run->s.regs.gprs[vcpu->arch.sie_block->ipa & 0xf] + PAGE_SIZE;

	vcpu->stat.diagnose_10++;

	vcpu->stat.instruction_diagnose_10++;



	if (start & ~PAGE_MASK || end & ~PAGE_MASK || start >= end

	    || start < 2 * PAGE_SIZE)
@@ -74,7 +74,7 @@ static int __diag_page_ref_service(struct kvm_vcpu *vcpu) 


	VCPU_EVENT(vcpu, 3, "diag page reference parameter block at 0x%llx",

		   vcpu->run->s.regs.gprs[rx]);

	vcpu->stat.diagnose_258++;

	vcpu->stat.instruction_diagnose_258++;

	if (vcpu->run->s.regs.gprs[rx] & 7)

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

	rc = read_guest(vcpu, vcpu->run->s.regs.gprs[rx], rx, &parm, sizeof(parm));
@@ -145,7 +145,7 @@ static int __diag_page_ref_service(struct kvm_vcpu *vcpu) 
static int __diag_time_slice_end(struct kvm_vcpu *vcpu)

{

	VCPU_EVENT(vcpu, 5, "%s", "diag time slice end");

	vcpu->stat.diagnose_44++;

	vcpu->stat.instruction_diagnose_44++;

	kvm_vcpu_on_spin(vcpu, true);

	return 0;

}
@@ -169,7 +169,7 @@ static int __diag_time_slice_end_directed(struct kvm_vcpu *vcpu) 
	int tid;



	tid = vcpu->run->s.regs.gprs[(vcpu->arch.sie_block->ipa & 0xf0) >> 4];

	vcpu->stat.diagnose_9c++;

	vcpu->stat.instruction_diagnose_9c++;



	/* yield to self */

	if (tid == vcpu->vcpu_id)
@@ -192,7 +192,7 @@ static int __diag_time_slice_end_directed(struct kvm_vcpu *vcpu) 
		VCPU_EVENT(vcpu, 5,

			   "diag time slice end directed to %d: yield forwarded",

			   tid);

		vcpu->stat.diagnose_9c_forward++;

		vcpu->stat.diag_9c_forward++;

		return 0;

	}
@@ -203,7 +203,7 @@ static int __diag_time_slice_end_directed(struct kvm_vcpu *vcpu) 
	return 0;

no_yield:

	VCPU_EVENT(vcpu, 5, "diag time slice end directed to %d: ignored", tid);

	vcpu->stat.diagnose_9c_ignored++;

	vcpu->stat.diag_9c_ignored++;

	return 0;

}
@@ -213,7 +213,7 @@ static int __diag_ipl_functions(struct kvm_vcpu *vcpu) 
	unsigned long subcode = vcpu->run->s.regs.gprs[reg] & 0xffff;



	VCPU_EVENT(vcpu, 3, "diag ipl functions, subcode %lx", subcode);

	vcpu->stat.diagnose_308++;

	vcpu->stat.instruction_diagnose_308++;

	switch (subcode) {

	case 3:

		vcpu->run->s390_reset_flags = KVM_S390_RESET_CLEAR;
@@ -245,7 +245,7 @@ static int __diag_virtio_hypercall(struct kvm_vcpu *vcpu) 
{

	int ret;



	vcpu->stat.diagnose_500++;

	vcpu->stat.instruction_diagnose_500++;

	/* No virtio-ccw notification? Get out quickly. */

	if (!vcpu->kvm->arch.css_support ||

	    (vcpu->run->s.regs.gprs[1] != KVM_S390_VIRTIO_CCW_NOTIFY))
@@ -299,7 +299,7 @@ int kvm_s390_handle_diag(struct kvm_vcpu *vcpu) 
	case 0x500:

		return __diag_virtio_hypercall(vcpu);

	default:

		vcpu->stat.diagnose_other++;

		vcpu->stat.instruction_diagnose_other++;

		return -EOPNOTSUPP;

	}

}

arch/s390/kvm/kvm-s390.c

+9 −9
Original line number Diff line number Diff line
@@ -163,15 +163,15 @@ const struct _kvm_stats_desc kvm_vcpu_stats_desc[] = { 
	STATS_DESC_COUNTER(VCPU, instruction_sigp_init_cpu_reset),

	STATS_DESC_COUNTER(VCPU, instruction_sigp_cpu_reset),

	STATS_DESC_COUNTER(VCPU, instruction_sigp_unknown),

	STATS_DESC_COUNTER(VCPU, diagnose_10),

	STATS_DESC_COUNTER(VCPU, diagnose_44),

	STATS_DESC_COUNTER(VCPU, diagnose_9c),

	STATS_DESC_COUNTER(VCPU, diagnose_9c_ignored),

	STATS_DESC_COUNTER(VCPU, diagnose_9c_forward),

	STATS_DESC_COUNTER(VCPU, diagnose_258),

	STATS_DESC_COUNTER(VCPU, diagnose_308),

	STATS_DESC_COUNTER(VCPU, diagnose_500),

	STATS_DESC_COUNTER(VCPU, diagnose_other),

	STATS_DESC_COUNTER(VCPU, instruction_diagnose_10),

	STATS_DESC_COUNTER(VCPU, instruction_diagnose_44),

	STATS_DESC_COUNTER(VCPU, instruction_diagnose_9c),

	STATS_DESC_COUNTER(VCPU, diag_9c_ignored),

	STATS_DESC_COUNTER(VCPU, diag_9c_forward),

	STATS_DESC_COUNTER(VCPU, instruction_diagnose_258),

	STATS_DESC_COUNTER(VCPU, instruction_diagnose_308),

	STATS_DESC_COUNTER(VCPU, instruction_diagnose_500),

	STATS_DESC_COUNTER(VCPU, instruction_diagnose_other),

	STATS_DESC_COUNTER(VCPU, pfault_sync)

};

static_assert(ARRAY_SIZE(kvm_vcpu_stats_desc) ==