Commit e7011c5d authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-ppc-next-5.5-1' of... 

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

KVM PPC update for 5.5

* Add capability to tell userspace whether we can single-step the guest.

* Improve the allocation of XIVE virtual processor IDs, to reduce the
  risk of running out of IDs when running many VMs on POWER9.

* Rewrite interrupt synthesis code to deliver interrupts in virtual
  mode when appropriate.

* Minor cleanups and improvements.
parents 19308a41 55d70042

Documentation/virt/kvm/api.txt

+3 −0
Original line number Diff line number Diff line
@@ -2982,6 +2982,9 @@ can be determined by querying the KVM_CAP_GUEST_DEBUG_HW_BPS and 
KVM_CAP_GUEST_DEBUG_HW_WPS capabilities which return a positive number

indicating the number of supported registers.



For ppc, the KVM_CAP_PPC_GUEST_DEBUG_SSTEP capability indicates whether

the single-step debug event (KVM_GUESTDBG_SINGLESTEP) is supported.



When debug events exit the main run loop with the reason

KVM_EXIT_DEBUG with the kvm_debug_exit_arch part of the kvm_run

structure containing architecture specific debug information.

Documentation/virt/kvm/devices/xics.txt

+12 −2
Original line number Diff line number Diff line
@@ -3,9 +3,19 @@ XICS interrupt controller 
Device type supported: KVM_DEV_TYPE_XICS



Groups:

  KVM_DEV_XICS_SOURCES

  1. KVM_DEV_XICS_GRP_SOURCES

  Attributes: One per interrupt source, indexed by the source number.



  2. KVM_DEV_XICS_GRP_CTRL

  Attributes:

    2.1 KVM_DEV_XICS_NR_SERVERS (write only)

  The kvm_device_attr.addr points to a __u32 value which is the number of

  interrupt server numbers (ie, highest possible vcpu id plus one).

  Errors:

    -EINVAL: Value greater than KVM_MAX_VCPU_ID.

    -EFAULT: Invalid user pointer for attr->addr.

    -EBUSY:  A vcpu is already connected to the device.



This device emulates the XICS (eXternal Interrupt Controller

Specification) defined in PAPR.  The XICS has a set of interrupt

sources, each identified by a 20-bit source number, and a set of
@@ -38,7 +48,7 @@ least-significant end of the word: 


Each source has 64 bits of state that can be read and written using

the KVM_GET_DEVICE_ATTR and KVM_SET_DEVICE_ATTR ioctls, specifying the

KVM_DEV_XICS_SOURCES attribute group, with the attribute number being

KVM_DEV_XICS_GRP_SOURCES attribute group, with the attribute number being

the interrupt source number.  The 64 bit state word has the following

bitfields, starting from the least-significant end of the word:

Documentation/virt/kvm/devices/xive.txt

+8 −0
Original line number Diff line number Diff line
@@ -78,6 +78,14 @@ the legacy interrupt mode, referred as XICS (POWER7/8). 
    migrating the VM.

    Errors: none



    1.3 KVM_DEV_XIVE_NR_SERVERS (write only)

    The kvm_device_attr.addr points to a __u32 value which is the number of

    interrupt server numbers (ie, highest possible vcpu id plus one).

    Errors:

      -EINVAL: Value greater than KVM_MAX_VCPU_ID.

      -EFAULT: Invalid user pointer for attr->addr.

      -EBUSY:  A vCPU is already connected to the device.



  2. KVM_DEV_XIVE_GRP_SOURCE (write only)

  Initializes a new source in the XIVE device and mask it.

  Attributes:

arch/powerpc/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -401,7 +401,6 @@ struct kvmppc_mmu { 
	u32  (*mfsrin)(struct kvm_vcpu *vcpu, u32 srnum);

	int  (*xlate)(struct kvm_vcpu *vcpu, gva_t eaddr,

		      struct kvmppc_pte *pte, bool data, bool iswrite);

	void (*reset_msr)(struct kvm_vcpu *vcpu);

	void (*tlbie)(struct kvm_vcpu *vcpu, ulong addr, bool large);

	int  (*esid_to_vsid)(struct kvm_vcpu *vcpu, ulong esid, u64 *vsid);

	u64  (*ea_to_vp)(struct kvm_vcpu *vcpu, gva_t eaddr, bool data);

arch/powerpc/include/asm/kvm_ppc.h

+1 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ struct kvmppc_ops { 
			   union kvmppc_one_reg *val);

	void (*vcpu_load)(struct kvm_vcpu *vcpu, int cpu);

	void (*vcpu_put)(struct kvm_vcpu *vcpu);

	void (*inject_interrupt)(struct kvm_vcpu *vcpu, int vec, u64 srr1_flags);

	void (*set_msr)(struct kvm_vcpu *vcpu, u64 msr);

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

	struct kvm_vcpu *(*vcpu_create)(struct kvm *kvm, unsigned int id);