Commit aedc0650 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:

 - PPC secure guest support

 - small x86 cleanup

 - fix for an x86-specific out-of-bounds write on a ioctl (not guest
   triggerable, data not attacker-controlled)

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  kvm: vmx: Stop wasting a page for guest_msrs
  KVM: x86: fix out-of-bounds write in KVM_GET_EMULATED_CPUID (CVE-2019-19332)
  Documentation: kvm: Fix mention to number of ioctls classes
  powerpc: Ultravisor: Add PPC_UV config option
  KVM: PPC: Book3S HV: Support reset of secure guest
  KVM: PPC: Book3S HV: Handle memory plug/unplug to secure VM
  KVM: PPC: Book3S HV: Radix changes for secure guest
  KVM: PPC: Book3S HV: Shared pages support for secure guests
  KVM: PPC: Book3S HV: Support for running secure guests
  mm: ksm: Export ksm_madvise()
  KVM x86: Move kvm cpuid support out of svm
parents 6cdc7f2e 7d73710d

Documentation/virt/kvm/api.txt

+19 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ The Definitive KVM (Kernel-based Virtual Machine) API Documentation 
----------------------



The kvm API is a set of ioctls that are issued to control various aspects

of a virtual machine.  The ioctls belong to three classes:

of a virtual machine.  The ioctls belong to the following classes:



 - System ioctls: These query and set global attributes which affect the

   whole kvm subsystem.  In addition a system ioctl is used to create
@@ -4149,6 +4149,24 @@ Valid values for 'action': 
#define KVM_PMU_EVENT_ALLOW 0

#define KVM_PMU_EVENT_DENY 1



4.121 KVM_PPC_SVM_OFF



Capability: basic

Architectures: powerpc

Type: vm ioctl

Parameters: none

Returns: 0 on successful completion,

Errors:

  EINVAL:    if ultravisor failed to terminate the secure guest

  ENOMEM:    if hypervisor failed to allocate new radix page tables for guest



This ioctl is used to turn off the secure mode of the guest or transition

the guest from secure mode to normal mode. This is invoked when the guest

is reset. This has no effect if called for a normal guest.



This ioctl issues an ultravisor call to terminate the secure guest,

unpins the VPA pages and releases all the device pages that are used to

track the secure pages by hypervisor.



5. The kvm_run structure

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

arch/powerpc/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -452,6 +452,23 @@ config PPC_TRANSACTIONAL_MEM 
	help

	  Support user-mode Transactional Memory on POWERPC.



config PPC_UV

	bool "Ultravisor support"

	depends on KVM_BOOK3S_HV_POSSIBLE

	select ZONE_DEVICE

	select DEV_PAGEMAP_OPS

	select DEVICE_PRIVATE

	select MEMORY_HOTPLUG

	select MEMORY_HOTREMOVE

	default n

	help

	  This option paravirtualizes the kernel to run in POWER platforms that

	  supports the Protected Execution Facility (PEF). On such platforms,

	  the ultravisor firmware runs at a privilege level above the

	  hypervisor.



	  If unsure, say "N".



config LD_HEAD_STUB_CATCH

	bool "Reserve 256 bytes to cope with linker stubs in HEAD text" if EXPERT

	depends on PPC64

arch/powerpc/include/asm/hvcall.h

+9 −0
Original line number Diff line number Diff line
@@ -342,6 +342,15 @@ 
#define H_TLB_INVALIDATE	0xF808

#define H_COPY_TOFROM_GUEST	0xF80C



/* Flags for H_SVM_PAGE_IN */

#define H_PAGE_IN_SHARED        0x1



/* Platform-specific hcalls used by the Ultravisor */

#define H_SVM_PAGE_IN		0xEF00

#define H_SVM_PAGE_OUT		0xEF04

#define H_SVM_INIT_START	0xEF08

#define H_SVM_INIT_DONE		0xEF0C



/* Values for 2nd argument to H_SET_MODE */

#define H_SET_MODE_RESOURCE_SET_CIABR		1

#define H_SET_MODE_RESOURCE_SET_DAWR		2

arch/powerpc/include/asm/kvm_book3s_uvmem.h

0 → 100644
+74 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __ASM_KVM_BOOK3S_UVMEM_H__

#define __ASM_KVM_BOOK3S_UVMEM_H__



#ifdef CONFIG_PPC_UV

int kvmppc_uvmem_init(void);

void kvmppc_uvmem_free(void);

int kvmppc_uvmem_slot_init(struct kvm *kvm, const struct kvm_memory_slot *slot);

void kvmppc_uvmem_slot_free(struct kvm *kvm,

			    const struct kvm_memory_slot *slot);

unsigned long kvmppc_h_svm_page_in(struct kvm *kvm,

				   unsigned long gra,

				   unsigned long flags,

				   unsigned long page_shift);

unsigned long kvmppc_h_svm_page_out(struct kvm *kvm,

				    unsigned long gra,

				    unsigned long flags,

				    unsigned long page_shift);

unsigned long kvmppc_h_svm_init_start(struct kvm *kvm);

unsigned long kvmppc_h_svm_init_done(struct kvm *kvm);

int kvmppc_send_page_to_uv(struct kvm *kvm, unsigned long gfn);

void kvmppc_uvmem_drop_pages(const struct kvm_memory_slot *free,

			     struct kvm *kvm);

#else

static inline int kvmppc_uvmem_init(void)

{

	return 0;

}



static inline void kvmppc_uvmem_free(void) { }



static inline int

kvmppc_uvmem_slot_init(struct kvm *kvm, const struct kvm_memory_slot *slot)

{

	return 0;

}



static inline void

kvmppc_uvmem_slot_free(struct kvm *kvm, const struct kvm_memory_slot *slot) { }



static inline unsigned long

kvmppc_h_svm_page_in(struct kvm *kvm, unsigned long gra,

		     unsigned long flags, unsigned long page_shift)

{

	return H_UNSUPPORTED;

}



static inline unsigned long

kvmppc_h_svm_page_out(struct kvm *kvm, unsigned long gra,

		      unsigned long flags, unsigned long page_shift)

{

	return H_UNSUPPORTED;

}



static inline unsigned long kvmppc_h_svm_init_start(struct kvm *kvm)

{

	return H_UNSUPPORTED;

}



static inline unsigned long kvmppc_h_svm_init_done(struct kvm *kvm)

{

	return H_UNSUPPORTED;

}



static inline int kvmppc_send_page_to_uv(struct kvm *kvm, unsigned long gfn)

{

	return -EFAULT;

}



static inline void

kvmppc_uvmem_drop_pages(const struct kvm_memory_slot *free,

			struct kvm *kvm) { }

#endif /* CONFIG_PPC_UV */

#endif /* __ASM_KVM_BOOK3S_UVMEM_H__ */

arch/powerpc/include/asm/kvm_host.h

+6 −0
Original line number Diff line number Diff line
@@ -275,6 +275,10 @@ struct kvm_hpt_info { 


struct kvm_resize_hpt;



/* Flag values for kvm_arch.secure_guest */

#define KVMPPC_SECURE_INIT_START 0x1 /* H_SVM_INIT_START has been called */

#define KVMPPC_SECURE_INIT_DONE  0x2 /* H_SVM_INIT_DONE completed */



struct kvm_arch {

	unsigned int lpid;

	unsigned int smt_mode;		/* # vcpus per virtual core */
@@ -330,6 +334,8 @@ struct kvm_arch { 
#endif

	struct kvmppc_ops *kvm_ops;

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

	struct mutex uvmem_lock;

	struct list_head uvmem_pfns;

	struct mutex mmu_setup_lock;	/* nests inside vcpu mutexes */

	u64 l1_ptcr;

	int max_nested_lpid;

CRA Git | Maintained and supported by SUSTech CRA and CCSE