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

Commit e28e909c 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 second batch of KVM updates from Radim Krčmář:
 "General:

   - move kvm_stat tool from QEMU repo into tools/kvm/kvm_stat (kvm_stat
     had nothing to do with QEMU in the first place -- the tool only
     interprets debugfs)

   - expose per-vm statistics in debugfs and support them in kvm_stat
     (KVM always collected per-vm statistics, but they were summarised
     into global statistics)

  x86:

   - fix dynamic APICv (VMX was improperly configured and a guest could
     access host's APIC MSRs, CVE-2016-4440)

   - minor fixes

  ARM changes from Christoffer Dall:

   - new vgic reimplementation of our horribly broken legacy vgic
     implementation.  The two implementations will live side-by-side
     (with the new being the configured default) for one kernel release
     and then we'll remove the legacy one.

   - fix for a non-critical issue with virtual abort injection to guests"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (70 commits)
  tools: kvm_stat: Add comments
  tools: kvm_stat: Introduce pid monitoring
  KVM: Create debugfs dir and stat files for each VM
  MAINTAINERS: Add kvm tools
  tools: kvm_stat: Powerpc related fixes
  tools: Add kvm_stat man page
  tools: Add kvm_stat vm monitor script
  kvm:vmx: more complete state update on APICv on/off
  KVM: SVM: Add more SVM_EXIT_REASONS
  KVM: Unify traced vector format
  svm: bitwise vs logical op typo
  KVM: arm/arm64: vgic-new: Synchronize changes to active state
  KVM: arm/arm64: vgic-new: enable build
  KVM: arm/arm64: vgic-new: implement mapped IRQ handling
  KVM: arm/arm64: vgic-new: Wire up irqfd injection
  KVM: arm/arm64: vgic-new: Add vgic_v2/v3_enable
  KVM: arm/arm64: vgic-new: vgic_init: implement map_resources
  KVM: arm/arm64: vgic-new: vgic_init: implement vgic_init
  KVM: arm/arm64: vgic-new: vgic_init: implement vgic_create
  KVM: arm/arm64: vgic-new: vgic_init: implement kvm_vgic_hyp_init
  ...
parents dc03c0f9 fabc7128

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -6491,6 +6491,7 @@ F: arch/*/include/asm/kvm* 
F:	include/linux/kvm*

F:	include/uapi/linux/kvm*

F:	virt/kvm/

F:	tools/kvm/



KERNEL VIRTUAL MACHINE (KVM) FOR AMD-V

M:	Joerg Roedel <joro@8bytes.org>

arch/arm/include/asm/kvm_host.h

+6 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ 


#define KVM_MAX_VCPUS VGIC_V2_MAX_CPUS



#define KVM_REQ_VCPU_EXIT	8



u32 *kvm_vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num, u32 mode);

int __attribute_const__ kvm_target_cpu(void);

int kvm_reset_vcpu(struct kvm_vcpu *vcpu);
@@ -226,6 +228,10 @@ static inline void kvm_arch_mmu_notifier_invalidate_page(struct kvm *kvm, 


struct kvm_vcpu *kvm_arm_get_running_vcpu(void);

struct kvm_vcpu __percpu **kvm_get_running_vcpus(void);

void kvm_arm_halt_guest(struct kvm *kvm);

void kvm_arm_resume_guest(struct kvm *kvm);

void kvm_arm_halt_vcpu(struct kvm_vcpu *vcpu);

void kvm_arm_resume_vcpu(struct kvm_vcpu *vcpu);



int kvm_arm_copy_coproc_indices(struct kvm_vcpu *vcpu, u64 __user *uindices);

unsigned long kvm_arm_num_coproc_regs(struct kvm_vcpu *vcpu);

arch/arm/include/asm/kvm_mmio.h

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ struct kvm_decode { 
	bool sign_extend;

};



void kvm_mmio_write_buf(void *buf, unsigned int len, unsigned long data);

unsigned long kvm_mmio_read_buf(const void *buf, unsigned int len);



int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run);

int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,

		 phys_addr_t fault_ipa);

arch/arm/kvm/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -46,6 +46,13 @@ config KVM_ARM_HOST 
	---help---

	  Provides host support for ARM processors.



config KVM_NEW_VGIC

	bool "New VGIC implementation"

	depends on KVM

	default y

	---help---

	  uses the new VGIC implementation



source drivers/vhost/Kconfig



endif # VIRTUALIZATION

arch/arm/kvm/Makefile

+11 −0
Original line number Diff line number Diff line
@@ -21,7 +21,18 @@ obj-$(CONFIG_KVM_ARM_HOST) += hyp/ 
obj-y += kvm-arm.o init.o interrupts.o

obj-y += arm.o handle_exit.o guest.o mmu.o emulate.o reset.o

obj-y += coproc.o coproc_a15.o coproc_a7.o mmio.o psci.o perf.o



ifeq ($(CONFIG_KVM_NEW_VGIC),y)

obj-y += $(KVM)/arm/vgic/vgic.o

obj-y += $(KVM)/arm/vgic/vgic-init.o

obj-y += $(KVM)/arm/vgic/vgic-irqfd.o

obj-y += $(KVM)/arm/vgic/vgic-v2.o

obj-y += $(KVM)/arm/vgic/vgic-mmio.o

obj-y += $(KVM)/arm/vgic/vgic-mmio-v2.o

obj-y += $(KVM)/arm/vgic/vgic-kvm-device.o

else

obj-y += $(KVM)/arm/vgic.o

obj-y += $(KVM)/arm/vgic-v2.o

obj-y += $(KVM)/arm/vgic-v2-emul.o

endif

obj-y += $(KVM)/arm/arch_timer.o