Commit 3dcf6c1b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'kvm-updates/3.3' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (74 commits)
  KVM: PPC: Whitespace fix for kvm.h
  KVM: Fix whitespace in kvm_para.h
  KVM: PPC: annotate kvm_rma_init as __init
  KVM: x86 emulator: implement RDPMC (0F 33)
  KVM: x86 emulator: fix RDPMC privilege check
  KVM: Expose the architectural performance monitoring CPUID leaf
  KVM: VMX: Intercept RDPMC
  KVM: SVM: Intercept RDPMC
  KVM: Add generic RDPMC support
  KVM: Expose a version 2 architectural PMU to a guests
  KVM: Expose kvm_lapic_local_deliver()
  KVM: x86 emulator: Use opcode::execute for Group 9 instruction
  KVM: x86 emulator: Use opcode::execute for Group 4/5 instructions
  KVM: x86 emulator: Use opcode::execute for Group 1A instruction
  KVM: ensure that debugfs entries have been created
  KVM: drop bsp_vcpu pointer from kvm struct
  KVM: x86: Consolidate PIT legacy test
  KVM: x86: Do not rely on implicit inclusions
  KVM: Make KVM_INTEL depend on CPU_SUP_INTEL
  KVM: Use memdup_user instead of kmalloc/copy_from_user
  ...
parents e4e11180 da69dee0

Documentation/feature-removal-schedule.txt

+0 −9
Original line number Diff line number Diff line
@@ -350,15 +350,6 @@ Who: anybody or Florian Mickler <florian@mickler.org> 


----------------------------



What:	KVM paravirt mmu host support

When:	January 2011

Why:	The paravirt mmu host support is slower than non-paravirt mmu, both

	on newer and older hardware.  It is already not exposed to the guest,

	and kept only for live migration purposes.

Who:	Avi Kivity <avi@redhat.com>



----------------------------



What:	iwlwifi 50XX module parameters

When:	3.0

Why:	The "..50" modules parameters were used to configure 5000 series and

Documentation/kernel-parameters.txt

+0 −3
Original line number Diff line number Diff line
@@ -1178,9 +1178,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	kvm.ignore_msrs=[KVM] Ignore guest accesses to unhandled MSRs.

			Default is 0 (don't ignore, but inject #GP)



	kvm.oos_shadow=	[KVM] Disable out-of-sync shadow paging.

			Default is 1 (enabled)



	kvm.mmu_audit=	[KVM] This is a R/W parameter which allows audit

			KVM MMU at runtime.

			Default is 0 (off)

Documentation/virtual/kvm/api.txt

+25 −0
Original line number Diff line number Diff line
@@ -1466,6 +1466,31 @@ is supported; 2 if the processor requires all virtual machines to have 
an RMA, or 1 if the processor can use an RMA but doesn't require it,

because it supports the Virtual RMA (VRMA) facility.



4.64 KVM_NMI



Capability: KVM_CAP_USER_NMI

Architectures: x86

Type: vcpu ioctl

Parameters: none

Returns: 0 on success, -1 on error



Queues an NMI on the thread's vcpu.  Note this is well defined only

when KVM_CREATE_IRQCHIP has not been called, since this is an interface

between the virtual cpu core and virtual local APIC.  After KVM_CREATE_IRQCHIP

has been called, this interface is completely emulated within the kernel.



To use this to emulate the LINT1 input with KVM_CREATE_IRQCHIP, use the

following algorithm:



  - pause the vpcu

  - read the local APIC's state (KVM_GET_LAPIC)

  - check whether changing LINT1 will queue an NMI (see the LVT entry for LINT1)

  - if so, issue KVM_NMI

  - resume the vcpu



Some guests configure the LINT1 NMI input to cause a panic, aiding in

debugging.



5. The kvm_run structure



Application code obtains a pointer to the kvm_run structure by

arch/ia64/kvm/kvm-ia64.c

+5 −7
Original line number Diff line number Diff line
@@ -774,13 +774,13 @@ struct kvm *kvm_arch_alloc_vm(void) 
	return kvm;

}



struct kvm_io_range {

struct kvm_ia64_io_range {

	unsigned long start;

	unsigned long size;

	unsigned long type;

};



static const struct kvm_io_range io_ranges[] = {

static const struct kvm_ia64_io_range io_ranges[] = {

	{VGA_IO_START, VGA_IO_SIZE, GPFN_FRAME_BUFFER},

	{MMIO_START, MMIO_SIZE, GPFN_LOW_MMIO},

	{LEGACY_IO_START, LEGACY_IO_SIZE, GPFN_LEGACY_IO},
@@ -1366,14 +1366,12 @@ static void kvm_release_vm_pages(struct kvm *kvm) 
{

	struct kvm_memslots *slots;

	struct kvm_memory_slot *memslot;

	int i, j;

	int j;

	unsigned long base_gfn;



	slots = kvm_memslots(kvm);

	for (i = 0; i < slots->nmemslots; i++) {

		memslot = &slots->memslots[i];

	kvm_for_each_memslot(memslot, slots) {

		base_gfn = memslot->base_gfn;



		for (j = 0; j < memslot->npages; j++) {

			if (memslot->rmap[j])

				put_page((struct page *)memslot->rmap[j]);
@@ -1820,7 +1818,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, 
	if (log->slot >= KVM_MEMORY_SLOTS)

		goto out;



	memslot = &kvm->memslots->memslots[log->slot];

	memslot = id_to_memslot(kvm->memslots, log->slot);

	r = -ENOENT;

	if (!memslot->dirty_bitmap)

		goto out;

arch/powerpc/kvm/book3s.c

+1 −1
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, 


	/* If nothing is dirty, don't bother messing with page tables. */

	if (is_dirty) {

		memslot = &kvm->memslots->memslots[log->slot];

		memslot = id_to_memslot(kvm->memslots, log->slot);



		ga = memslot->base_gfn << PAGE_SHIFT;

		ga_end = ga + (memslot->npages << PAGE_SHIFT);

CRA Git | Maintained and supported by SUSTech CRA and CCSE