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

Commit 486d35e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

* 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: Fix leak of free lapic date in kvm_arch_vcpu_init()
  KVM: x86: Fix probable memory leak of vcpu->arch.mce_banks
  KVM: S390: fix potential array overrun in intercept handling
  KVM: fix spurious interrupt with irqfd
  eventfd - allow atomic read and waitqueue remove
  KVM: MMU: bail out pagewalk on kvm_read_guest error
  KVM: properly check max PIC pin in irq route setup
  KVM: only allow one gsi per fd
  KVM: x86: Fix host_mapping_level()
  KVM: powerpc: Show timing option only on embedded
  KVM: Fix race between APIC TMR and IRR
parents a8d0b666 443c39bc

arch/powerpc/kvm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ config KVM_440 


config KVM_EXIT_TIMING

	bool "Detailed exit timing"

	depends on KVM

	depends on KVM_440 || KVM_E500

	---help---

	  Calculate elapsed time for every exit/enter cycle. A per-vcpu

	  report is available in debugfs kvm/vm#_vcpu#_timing.

arch/s390/kvm/intercept.c

+2 −2
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static int handle_instruction_and_prog(struct kvm_vcpu *vcpu) 
	return rc2;

}



static const intercept_handler_t intercept_funcs[0x48 >> 2] = {

static const intercept_handler_t intercept_funcs[] = {

	[0x00 >> 2] = handle_noop,

	[0x04 >> 2] = handle_instruction,

	[0x08 >> 2] = handle_prog,
@@ -230,7 +230,7 @@ int kvm_handle_sie_intercept(struct kvm_vcpu *vcpu) 
	intercept_handler_t func;

	u8 code = vcpu->arch.sie_block->icptcode;



	if (code & 3 || code > 0x48)

	if (code & 3 || (code >> 2) >= ARRAY_SIZE(intercept_funcs))

		return -ENOTSUPP;

	func = intercept_funcs[code >> 2];

	if (func)

arch/x86/kvm/lapic.c

+6 −5
Original line number Diff line number Diff line
@@ -373,6 +373,12 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode, 
		if (unlikely(!apic_enabled(apic)))

			break;



		if (trig_mode) {

			apic_debug("level trig mode for vector %d", vector);

			apic_set_vector(vector, apic->regs + APIC_TMR);

		} else

			apic_clear_vector(vector, apic->regs + APIC_TMR);



		result = !apic_test_and_set_irr(vector, apic);

		trace_kvm_apic_accept_irq(vcpu->vcpu_id, delivery_mode,

					  trig_mode, vector, !result);
@@ -383,11 +389,6 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode, 
			break;

		}



		if (trig_mode) {

			apic_debug("level trig mode for vector %d", vector);

			apic_set_vector(vector, apic->regs + APIC_TMR);

		} else

			apic_clear_vector(vector, apic->regs + APIC_TMR);

		kvm_vcpu_kick(vcpu);

		break;

arch/x86/kvm/mmu.c

+2 −4
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ static int host_mapping_level(struct kvm *kvm, gfn_t gfn) 


	addr = gfn_to_hva(kvm, gfn);

	if (kvm_is_error_hva(addr))

		return page_size;

		return PT_PAGE_TABLE_LEVEL;



	down_read(&current->mm->mmap_sem);

	vma = find_vma(current->mm, addr);
@@ -515,11 +515,9 @@ static int mapping_level(struct kvm_vcpu *vcpu, gfn_t large_gfn) 
	if (host_level == PT_PAGE_TABLE_LEVEL)

		return host_level;



	for (level = PT_DIRECTORY_LEVEL; level <= host_level; ++level) {



	for (level = PT_DIRECTORY_LEVEL; level <= host_level; ++level)

		if (has_wrprotected_page(vcpu->kvm, large_gfn, level))

			break;

	}



	return level - 1;

}

arch/x86/kvm/paging_tmpl.h

+3 −1
Original line number Diff line number Diff line
@@ -150,7 +150,9 @@ walk: 
		walker->table_gfn[walker->level - 1] = table_gfn;

		walker->pte_gpa[walker->level - 1] = pte_gpa;



		kvm_read_guest(vcpu->kvm, pte_gpa, &pte, sizeof(pte));

		if (kvm_read_guest(vcpu->kvm, pte_gpa, &pte, sizeof(pte)))

			goto not_present;



		trace_kvm_mmu_paging_element(pte, walker->level);



		if (!is_present_gpte(pte))