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

Commit 4efdedca 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:
 "Small fixes for x86, slightly larger fixes for PPC, and a forgotten
  s390 patch.  The PPC fixes are important because they fix breakage
  that is new in 3.15"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: s390: announce irqfd capability
  KVM: x86: disable master clock if TSC is reset during suspend
  KVM: vmx: disable APIC virtualization in nested guests
  KVM guest: Make pv trampoline code executable
  KVM: PPC: Book3S: ifdef on CONFIG_KVM_BOOK3S_32_HANDLER for 32bit
  KVM: PPC: Book3S HV: Add missing code for transaction reclaim on guest exit
  KVM: PPC: Book3S: HV: make _PAGE_NUMA take effect
parents 9e3d6331 a4e91d04

Documentation/virtual/kvm/api.txt

+1 −1
Original line number Diff line number Diff line
@@ -2126,7 +2126,7 @@ into the hash PTE second double word). 
4.75 KVM_IRQFD



Capability: KVM_CAP_IRQFD

Architectures: x86

Architectures: x86 s390

Type: vm ioctl

Parameters: struct kvm_irqfd (in)

Returns: 0 on success, -1 on error

arch/powerpc/include/asm/sections.h

+11 −0
Original line number Diff line number Diff line
@@ -39,6 +39,17 @@ static inline int overlaps_kernel_text(unsigned long start, unsigned long end) 
		(unsigned long)_stext < end;

}



static inline int overlaps_kvm_tmp(unsigned long start, unsigned long end)

{

#ifdef CONFIG_KVM_GUEST

	extern char kvm_tmp[];

	return start < (unsigned long)kvm_tmp &&

		(unsigned long)&kvm_tmp[1024 * 1024] < end;

#else

	return 0;

#endif

}



#undef dereference_function_descriptor

static inline void *dereference_function_descriptor(void *ptr)

{

arch/powerpc/kernel/kvm.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
#define KVM_INST_MTSRIN		0x7c0001e4



static bool kvm_patching_worked = true;

static char kvm_tmp[1024 * 1024];

char kvm_tmp[1024 * 1024];

static int kvm_tmp_index;



static inline void kvm_patch_ins(u32 *inst, u32 new_inst)

arch/powerpc/kvm/book3s.c

+3 −3
Original line number Diff line number Diff line
@@ -886,7 +886,7 @@ static int kvmppc_book3s_init(void) 
	r = kvm_init(NULL, sizeof(struct kvm_vcpu), 0, THIS_MODULE);

	if (r)

		return r;

#ifdef CONFIG_KVM_BOOK3S_32

#ifdef CONFIG_KVM_BOOK3S_32_HANDLER

	r = kvmppc_book3s_init_pr();

#endif

	return r;
@@ -895,7 +895,7 @@ static int kvmppc_book3s_init(void) 


static void kvmppc_book3s_exit(void)

{

#ifdef CONFIG_KVM_BOOK3S_32

#ifdef CONFIG_KVM_BOOK3S_32_HANDLER

	kvmppc_book3s_exit_pr();

#endif

	kvm_exit();
@@ -905,7 +905,7 @@ module_init(kvmppc_book3s_init); 
module_exit(kvmppc_book3s_exit);



/* On 32bit this is our one and only kernel module */

#ifdef CONFIG_KVM_BOOK3S_32

#ifdef CONFIG_KVM_BOOK3S_32_HANDLER

MODULE_ALIAS_MISCDEV(KVM_MINOR);

MODULE_ALIAS("devname:kvm");

#endif

arch/powerpc/kvm/book3s_hv_rm_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags, 
		pte_size = psize;

		pte = lookup_linux_pte_and_update(pgdir, hva, writing,

						  &pte_size);

		if (pte_present(pte)) {

		if (pte_present(pte) && !pte_numa(pte)) {

			if (writing && !pte_write(pte))

				/* make the actual HPTE be read-only */

				ptel = hpte_make_readonly(ptel);