Commit c46e8ece authored Nov 18, 2021 by Linus Torvalds

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

Pull KVM fixes from Paolo Bonzini:
 "Selftest changes:

   - Cleanups for the perf test infrastructure and mapping hugepages

   - Avoid contention on mmap_sem when the guests start to run

   - Add event channel upcall support to xen_shinfo_test

  x86 changes:

   - Fixes for Xen emulation

   - Kill kvm_map_gfn() / kvm_unmap_gfn() and broken gfn_to_pfn_cache

   - Fixes for migration of 32-bit nested guests on 64-bit hypervisor

   - Compilation fixes

   - More SEV cleanups

  Generic:

   - Cap the return value of KVM_CAP_NR_VCPUS to both KVM_CAP_MAX_VCPUS
     and num_online_cpus(). Most architectures were only using one of
     the two"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (42 commits)
  KVM: x86: Cap KVM_CAP_NR_VCPUS by KVM_CAP_MAX_VCPUS
  KVM: s390: Cap KVM_CAP_NR_VCPUS by num_online_cpus()
  KVM: RISC-V: Cap KVM_CAP_NR_VCPUS by KVM_CAP_MAX_VCPUS
  KVM: PPC: Cap KVM_CAP_NR_VCPUS by KVM_CAP_MAX_VCPUS
  KVM: MIPS: Cap KVM_CAP_NR_VCPUS by KVM_CAP_MAX_VCPUS
  KVM: arm64: Cap KVM_CAP_NR_VCPUS by kvm_arm_default_max_vcpus()
  KVM: x86: Assume a 64-bit hypercall for guests with protected state
  selftests: KVM: Add /x86_64/sev_migrate_tests to .gitignore
  riscv: kvm: fix non-kernel-doc comment block
  KVM: SEV: Fix typo in and tweak name of cmd_allowed_from_miror()
  KVM: SEV: Drop a redundant setting of sev->asid during initialization
  KVM: SEV: WARN if SEV-ES is marked active but SEV is not
  KVM: SEV: Set sev_info.active after initial checks in sev_guest_init()
  KVM: SEV: Disallow COPY_ENC_CONTEXT_FROM if target has created vCPUs
  KVM: Kill kvm_map_gfn() / kvm_unmap_gfn() and gfn_to_pfn_cache
  KVM: nVMX: Use a gfn_to_hva_cache for vmptrld
  KVM: nVMX: Use kvm_read_guest_offset_cached() for nested VMCS check
  KVM: x86/xen: Use sizeof_field() instead of open-coding it
  KVM: nVMX: Use kvm_{read,write}_guest_cached() for shadow_vmcs12
  KVM: x86/xen: Fix get_attr of KVM_XEN_ATTR_TYPE_SHARED_INFO
  ...

parents 4ae275bc 2845e735

arch/arm64/kvm/arm.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -223,7 +223,14 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
		r = 1;
		break;
		case KVM_CAP_NR_VCPUS:
		r = num_online_cpus();
		/*
		* ARM64 treats KVM_CAP_NR_CPUS differently from all other
		* architectures, as it does not always bound it to
		* KVM_CAP_MAX_VCPUS. It should not matter much because
		* this is just an advisory value.
		*/
		r = min_t(unsigned int, num_online_cpus(),
		kvm_arm_default_max_vcpus());
		break;
		case KVM_CAP_MAX_VCPUS:
		case KVM_CAP_MAX_VCPU_ID:

arch/mips/kvm/mips.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1067,7 +1067,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
		r = 1;
		break;
		case KVM_CAP_NR_VCPUS:
		r = num_online_cpus();
		r = min_t(unsigned int, num_online_cpus(), KVM_MAX_VCPUS);
		break;
		case KVM_CAP_MAX_VCPUS:
		r = KVM_MAX_VCPUS;

arch/powerpc/kvm/powerpc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -641,9 +641,9 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
		* implementations just count online CPUs.
		*/
		if (hv_enabled)
		r = num_present_cpus();
		r = min_t(unsigned int, num_present_cpus(), KVM_MAX_VCPUS);
		else
		r = num_online_cpus();
		r = min_t(unsigned int, num_online_cpus(), KVM_MAX_VCPUS);
		break;
		case KVM_CAP_MAX_VCPUS:
		r = KVM_MAX_VCPUS;

arch/riscv/kvm/vcpu_sbi.c

+1 −1

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/**
		/*
		* Copyright (c) 2019 Western Digital Corporation or its affiliates.
		*
		* Authors:

arch/riscv/kvm/vm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
		r = 1;
		break;
		case KVM_CAP_NR_VCPUS:
		r = num_online_cpus();
		r = min_t(unsigned int, num_online_cpus(), KVM_MAX_VCPUS);
		break;
		case KVM_CAP_MAX_VCPUS:
		r = KVM_MAX_VCPUS;