Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b91d9c67 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:
 "Second round of KVM changes for 4.6:

   - build fixes for PPC KVM
   - miscellaneous bugfixes for ARM KVM
   - cleanup of memory barrier and removal of redundant barriers
   - x86 fixes: page tracking oops, support for old buggy KVM nested on 4.5
   - support for protection keys in guests
   - lockdep fix
   - another conversion to simple wait queues and raw spinlocks,
     backported from PREEMPT_RT"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (27 commits)
  KVM: page_track: fix access to NULL slot
  KVM: PPC: do not compile in vfio.o unconditionally
  kvm, rt: change async pagefault code locking for PREEMPT_RT
  KVM/PPC: update the comment of memory barrier in the kvmppc_prepare_to_enter()
  KVM/x86: update the comment of memory barrier in the vcpu_enter_guest()
  KVM: Replace smp_mb() with smp_load_acquire() in the kvm_flush_remote_tlbs()
  KVM/x86: Call smp_wmb() before increasing tlbs_dirty
  KVM: Replace smp_mb() with smp_mb_after_atomic() in the kvm_make_all_cpus_request()
  KVM/x86: Replace smp_mb() with smp_store_mb/release() in the walk_shadow_page_lockless_begin/end()
  KVM: Remove redundant smp_mb() in the kvm_mmu_commit_zap_page()
  KVM, pkeys: expose CPUID/CR4 to guest
  KVM, pkeys: add pkeys support for permission_fault
  KVM, pkeys: introduce pkru_mask to cache conditions
  KVM, pkeys: save/restore PKRU when guest/host switches
  x86: pkey: introduce write_pkru() for KVM
  KVM, pkeys: add pkeys support for xsave state
  KVM, pkeys: disable pkeys for guests in non-paging mode
  KVM: x86: remove magic number with enum cpuid_leafs
  KVM: MMU: return page fault error code from permission_fault
  KVM: fix spin_lock_init order on x86
  ...
parents b8ba4526 a6adb106

arch/arm/kvm/arm.c

+2 −0
Original line number Diff line number Diff line
@@ -373,7 +373,9 @@ static void exit_vm_noop(void *info) 


void force_vm_exit(const cpumask_t *mask)

{

	preempt_disable();

	smp_call_function_many(mask, exit_vm_noop, NULL, true);

	preempt_enable();

}



/**

arch/arm64/include/asm/kvm_asm.h

+7 −1
Original line number Diff line number Diff line
@@ -26,7 +26,13 @@ 
#define KVM_ARM64_DEBUG_DIRTY_SHIFT	0

#define KVM_ARM64_DEBUG_DIRTY		(1 << KVM_ARM64_DEBUG_DIRTY_SHIFT)



#define kvm_ksym_ref(sym)		phys_to_virt((u64)&sym - kimage_voffset)

#define kvm_ksym_ref(sym)						\

	({								\

		void *val = &sym;					\

		if (!is_kernel_in_hyp_mode())				\

			val = phys_to_virt((u64)&sym - kimage_voffset);	\

		val;							\

	 })



#ifndef __ASSEMBLY__

struct kvm;

arch/arm64/kvm/hyp/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -16,3 +16,7 @@ obj-$(CONFIG_KVM_ARM_HOST) += fpsimd.o 
obj-$(CONFIG_KVM_ARM_HOST) += tlb.o

obj-$(CONFIG_KVM_ARM_HOST) += hyp-entry.o

obj-$(CONFIG_KVM_ARM_HOST) += s2-setup.o



GCOV_PROFILE	:= n

KASAN_SANITIZE	:= n

UBSAN_SANITIZE	:= n

arch/powerpc/kvm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ ccflags-y := -Ivirt/kvm -Iarch/powerpc/kvm 
KVM := ../../../virt/kvm



common-objs-y = $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o \

		$(KVM)/eventfd.o $(KVM)/vfio.o

		$(KVM)/eventfd.o

common-objs-$(CONFIG_KVM_VFIO) += $(KVM)/vfio.o



CFLAGS_e500_mmu.o := -I.

CFLAGS_e500_mmu_host.o := -I.

arch/powerpc/kvm/book3s_64_vio.c

+52 −0
Original line number Diff line number Diff line
@@ -209,6 +209,32 @@ long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm, 
	return ret;

}



long kvmppc_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn,

		      unsigned long ioba, unsigned long tce)

{

	struct kvmppc_spapr_tce_table *stt = kvmppc_find_table(vcpu, liobn);

	long ret;



	/* udbg_printf("H_PUT_TCE(): liobn=0x%lx ioba=0x%lx, tce=0x%lx\n", */

	/* 	    liobn, ioba, tce); */



	if (!stt)

		return H_TOO_HARD;



	ret = kvmppc_ioba_validate(stt, ioba, 1);

	if (ret != H_SUCCESS)

		return ret;



	ret = kvmppc_tce_validate(stt, tce);

	if (ret != H_SUCCESS)

		return ret;



	kvmppc_tce_put(stt, ioba >> stt->page_shift, tce);



	return H_SUCCESS;

}

EXPORT_SYMBOL_GPL(kvmppc_h_put_tce);



long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu,

		unsigned long liobn, unsigned long ioba,

		unsigned long tce_list, unsigned long npages)
@@ -264,3 +290,29 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu, 
	return ret;

}

EXPORT_SYMBOL_GPL(kvmppc_h_put_tce_indirect);



long kvmppc_h_stuff_tce(struct kvm_vcpu *vcpu,

		unsigned long liobn, unsigned long ioba,

		unsigned long tce_value, unsigned long npages)

{

	struct kvmppc_spapr_tce_table *stt;

	long i, ret;



	stt = kvmppc_find_table(vcpu, liobn);

	if (!stt)

		return H_TOO_HARD;



	ret = kvmppc_ioba_validate(stt, ioba, npages);

	if (ret != H_SUCCESS)

		return ret;



	/* Check permission bits only to allow userspace poison TCE for debug */

	if (tce_value & (TCE_PCI_WRITE | TCE_PCI_READ))

		return H_PARAMETER;



	for (i = 0; i < npages; ++i, ioba += (1ULL << stt->page_shift))

		kvmppc_tce_put(stt, ioba >> stt->page_shift, tce_value);



	return H_SUCCESS;

}

EXPORT_SYMBOL_GPL(kvmppc_h_stuff_tce);