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

Commit 8a53e7e5 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge branch 'kvm-ppc-next' of... 

Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD

- Better machine check handling for HV KVM
- Ability to support guests with threads=2, 4 or 8 on POWER9
- Fix for a race that could cause delayed recognition of signals
- Fix for a bug where POWER9 guests could sleep with interrupts
  pending.
parents 00c14757 8b24e69f

Documentation/virtual/kvm/api.txt

+37 −0
Original line number Diff line number Diff line
@@ -4131,6 +4131,34 @@ Parameters: none 
Allow use of adapter-interruption suppression.

Returns: 0 on success; -EBUSY if a VCPU has already been created.



7.11 KVM_CAP_PPC_SMT



Architectures: ppc

Parameters: vsmt_mode, flags



Enabling this capability on a VM provides userspace with a way to set

the desired virtual SMT mode (i.e. the number of virtual CPUs per

virtual core).  The virtual SMT mode, vsmt_mode, must be a power of 2

between 1 and 8.  On POWER8, vsmt_mode must also be no greater than

the number of threads per subcore for the host.  Currently flags must

be 0.  A successful call to enable this capability will result in

vsmt_mode being returned when the KVM_CAP_PPC_SMT capability is

subsequently queried for the VM.  This capability is only supported by

HV KVM, and can only be set before any VCPUs have been created.

The KVM_CAP_PPC_SMT_POSSIBLE capability indicates which virtual SMT

modes are available.



7.12 KVM_CAP_PPC_FWNMI



Architectures: ppc

Parameters: none



With this capability a machine check exception in the guest address

space will cause KVM to exit the guest with NMI exit reason. This

enables QEMU to build error log and branch to guest kernel registered

machine check handling routine. Without this capability KVM will

branch to guests' 0x200 interrupt vector.



8. Other capabilities.

----------------------
@@ -4292,3 +4320,12 @@ Currently the following bits are defined for the device_irq_level bitmap: 
Future versions of kvm may implement additional events. These will get

indicated by returning a higher number from KVM_CHECK_EXTENSION and will be

listed above.



8.10 KVM_CAP_PPC_SMT_POSSIBLE



Architectures: ppc



Querying this capability returns a bitmap indicating the possible

virtual SMT modes that can be set using KVM_CAP_PPC_SMT.  If bit N

(counting from the right) is set, then a virtual SMT mode of 2^N is

available.

arch/powerpc/include/asm/kvm_book3s.h

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ struct kvmppc_vcore { 
	u16 last_cpu;

	u8 vcore_state;

	u8 in_guest;

	struct kvmppc_vcore *master_vcore;

	struct kvm_vcpu *runnable_threads[MAX_SMT_THREADS];

	struct list_head preempt_list;

	spinlock_t lock;

arch/powerpc/include/asm/kvm_book3s_asm.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ struct kvm_split_mode { 
	u8		subcore_size;

	u8		do_nap;

	u8		napped[MAX_SMT_THREADS];

	struct kvmppc_vcore *master_vcs[MAX_SUBCORES];

	struct kvmppc_vcore *vc[MAX_SUBCORES];

};



/*

arch/powerpc/include/asm/kvm_host.h

+8 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <asm/page.h>

#include <asm/cacheflush.h>

#include <asm/hvcall.h>

#include <asm/mce.h>



#define KVM_MAX_VCPUS		NR_CPUS

#define KVM_MAX_VCORES		NR_CPUS
@@ -267,6 +268,8 @@ struct kvm_resize_hpt; 


struct kvm_arch {

	unsigned int lpid;

	unsigned int smt_mode;		/* # vcpus per virtual core */

	unsigned int emul_smt_mode;	/* emualted SMT mode, on P9 */

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

	unsigned int tlb_sets;

	struct kvm_hpt_info hpt;
@@ -285,6 +288,7 @@ struct kvm_arch { 
	cpumask_t need_tlb_flush;

	cpumask_t cpu_in_guest;

	u8 radix;

	u8 fwnmi_enabled;

	pgd_t *pgtable;

	u64 process_table;

	struct dentry *debugfs_dir;
@@ -566,6 +570,7 @@ struct kvm_vcpu_arch { 
	ulong wort;

	ulong tid;

	ulong psscr;

	ulong hfscr;

	ulong shadow_srr1;

#endif

	u32 vrsave; /* also USPRG0 */
@@ -579,7 +584,7 @@ struct kvm_vcpu_arch { 
	ulong mcsrr0;

	ulong mcsrr1;

	ulong mcsr;

	u32 dec;

	ulong dec;

#ifdef CONFIG_BOOKE

	u32 decar;

#endif
@@ -710,6 +715,7 @@ struct kvm_vcpu_arch { 
	unsigned long pending_exceptions;

	u8 ceded;

	u8 prodded;

	u8 doorbell_request;

	u32 last_inst;



	struct swait_queue_head *wqp;
@@ -722,6 +728,7 @@ struct kvm_vcpu_arch { 
	int prev_cpu;

	bool timer_running;

	wait_queue_head_t cpu_run;

	struct machine_check_event mce_evt; /* Valid if trap == 0x200 */



	struct kvm_vcpu_arch_shared *shared;

#if defined(CONFIG_PPC_BOOK3S_64) && defined(CONFIG_KVM_BOOK3S_PR_POSSIBLE)

arch/powerpc/include/asm/kvm_ppc.h

+2 −0
Original line number Diff line number Diff line
@@ -315,6 +315,8 @@ struct kvmppc_ops { 
					struct irq_bypass_producer *);

	int (*configure_mmu)(struct kvm *kvm, struct kvm_ppc_mmuv3_cfg *cfg);

	int (*get_rmmu_info)(struct kvm *kvm, struct kvm_ppc_rmmu_info *info);

	int (*set_smt_mode)(struct kvm *kvm, unsigned long mode,

			    unsigned long flags);

};



extern struct kvmppc_ops *kvmppc_hv_ops;