Commit 4d6fe79f 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 more kvm updates from Paolo Bonzini:
 "New x86 features:

   - Guest API and guest kernel support for SEV live migration

   - SEV and SEV-ES intra-host migration

  Bugfixes and cleanups for x86:

   - Fix misuse of gfn-to-pfn cache when recording guest steal time /
     preempted status

   - Fix selftests on APICv machines

   - Fix sparse warnings

   - Fix detection of KVM features in CPUID

   - Cleanups for bogus writes to MSR_KVM_PV_EOI_EN

   - Fixes and cleanups for MSR bitmap handling

   - Cleanups for INVPCID

   - Make x86 KVM_SOFT_MAX_VCPUS consistent with other architectures

  Bugfixes for ARM:

   - Fix finalization of host stage2 mappings

   - Tighten the return value of kvm_vcpu_preferred_target()

   - Make sure the extraction of ESR_ELx.EC is limited to architected
     bits"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (34 commits)
  KVM: SEV: unify cgroup cleanup code for svm_vm_migrate_from
  KVM: x86: move guest_pv_has out of user_access section
  KVM: x86: Drop arbitrary KVM_SOFT_MAX_VCPUS
  KVM: Move INVPCID type check from vmx and svm to the common kvm_handle_invpcid()
  KVM: VMX: Add a helper function to retrieve the GPR index for INVPCID, INVVPID, and INVEPT
  KVM: nVMX: Clean up x2APIC MSR handling for L2
  KVM: VMX: Macrofy the MSR bitmap getters and setters
  KVM: nVMX: Handle dynamic MSR intercept toggling
  KVM: nVMX: Query current VMCS when determining if MSR bitmaps are in use
  KVM: x86: Don't update vcpu->arch.pv_eoi.msr_val when a bogus value was written to MSR_KVM_PV_EOI_EN
  KVM: x86: Rename kvm_lapic_enable_pv_eoi()
  KVM: x86: Make sure KVM_CPUID_FEATURES really are KVM_CPUID_FEATURES
  KVM: x86: Add helper to consolidate core logic of SET_CPUID{2} flows
  kvm: mmu: Use fast PF path for access tracking of huge pages when possible
  KVM: x86/mmu: Properly dereference rcu-protected TDP MMU sptep iterator
  KVM: x86: inhibit APICv when KVM_GUESTDBG_BLOCKIRQ active
  kvm: x86: Convert return type of *is_valid_rdpmc_ecx() to bool
  KVM: x86: Fix recording of guest steal time / preempted status
  selftest: KVM: Add intra host migration tests
  selftest: KVM: Add open sev dev helper
  ...
parents d4fa09e5 84886c26

Documentation/virt/kvm/api.rst

+14 −0
Original line number Diff line number Diff line
@@ -6911,6 +6911,20 @@ MAP_SHARED mmap will result in an -EINVAL return. 
When enabled the VMM may make use of the ``KVM_ARM_MTE_COPY_TAGS`` ioctl to

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



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

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



This is intended to support intra-host migration of VMs between userspace VMMs,

upgrading the VMM process without interrupting the guest.



8. Other capabilities.

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

arch/arm64/include/asm/esr.h

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 
#define ESR_ELx_EC_MAX		(0x3F)



#define ESR_ELx_EC_SHIFT	(26)

#define ESR_ELx_EC_WIDTH	(6)

#define ESR_ELx_EC_MASK		(UL(0x3F) << ESR_ELx_EC_SHIFT)

#define ESR_ELx_EC(esr)		(((esr) & ESR_ELx_EC_MASK) >> ESR_ELx_EC_SHIFT)

arch/arm64/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ struct kvm_vcpu_stat { 
	u64 exits;

};



int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init);

void kvm_vcpu_preferred_target(struct kvm_vcpu_init *init);

unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu);

int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *indices);

int kvm_arm_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg);

arch/arm64/kvm/arm.c

+1 −4
Original line number Diff line number Diff line
@@ -1389,12 +1389,9 @@ long kvm_arch_vm_ioctl(struct file *filp, 
		return kvm_vm_ioctl_set_device_addr(kvm, &dev_addr);

	}

	case KVM_ARM_PREFERRED_TARGET: {

		int err;

		struct kvm_vcpu_init init;



		err = kvm_vcpu_preferred_target(&init);

		if (err)

			return err;

		kvm_vcpu_preferred_target(&init);



		if (copy_to_user(argp, &init, sizeof(init)))

			return -EFAULT;

arch/arm64/kvm/guest.c

+1 −6
Original line number Diff line number Diff line
@@ -869,13 +869,10 @@ u32 __attribute_const__ kvm_target_cpu(void) 
	return KVM_ARM_TARGET_GENERIC_V8;

}



int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init)

void kvm_vcpu_preferred_target(struct kvm_vcpu_init *init)

{

	u32 target = kvm_target_cpu();



	if (target < 0)

		return -ENODEV;



	memset(init, 0, sizeof(*init));



	/*
@@ -885,8 +882,6 @@ int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init) 
	 * target type.

	 */

	init->target = (__u32)target;



	return 0;

}



int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)