[GIT PULLv2] KVM: s390: Features and fixes for 4.1 (kvm/next)

[GIT PULLv2] KVM: s390: Features and fixes for 4.1 (kvm/next)

[Christian Borntraeger]

Paolo, Marcelo,

here is the updated pull request for s390 (tag was updated)

The changes reflect the comments from Heiko Carstens and Paolo Bonzini,
(diff as followup mail)

The following changes since commit 18280d8b4bcd4a2b174ee3cd748166c6190acacb:

  KVM: s390: represent SIMD cap in kvm facility (2015-03-17 16:33:14 +0100)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git  tags/kvm-s390-next-20150331

for you to fetch changes up to 816c7667ea97c61884e014cfeedaede5b67b0e58:

  KVM: s390: migrate vcpu interrupt state (2015-03-31 21:07:31 +0200)

----------------------------------------------------------------
Features and fixes for 4.1 (kvm/next)

1. Assorted changes
1.1 allow more feature bits for the guest
1.2 Store breaking event address on program interrupts

2. Interrupt handling rework
2.1 Fix copy_to_user while holding a spinlock (cc stable)
2.2 Rework floating interrupts to follow the priorities
2.3 Allow to inject all local interrupts via new ioctl
2.4 allow to get/set the full local irq state, e.g. for migration
    and introspection

----------------------------------------------------------------
Christian Borntraeger (1):
      KVM: s390: enable more features that need no hypervisor changes

David Hildenbrand (2):
      KVM: s390: store the breaking-event address on pgm interrupts
      KVM: s390: cpu timer irq priority

Jens Freimann (5):
      KVM: s390: fix get_all_floating_irqs
      KVM: s390: deliver floating interrupts in order of priority
      KVM: s390: add ioctl to inject local interrupts
      KVM: s390: refactor vcpu injection function
      KVM: s390: migrate vcpu interrupt state

 Documentation/virtual/kvm/api.txt               |  117 +++
 Documentation/virtual/kvm/devices/s390_flic.txt |    3 +
 arch/s390/include/asm/kvm_host.h                |   30 +-
 arch/s390/kvm/interrupt.c                       | 1073 ++++++++++++++---------
 arch/s390/kvm/kvm-s390.c                        |   54 +-
 arch/s390/kvm/kvm-s390.h                        |    6 +-
 arch/s390/kvm/priv.c                            |    9 +-
 include/uapi/linux/kvm.h                        |   14 +
 virt/kvm/kvm_main.c                             |    2 +-
 9 files changed, 906 insertions(+), 402 deletions(-)

[PULL diff] diff to previous pull request

[Christian Borntraeger]

From: Jens Freimann <jfrei@linux.vnet.ibm.com>

- change "__user u8" to u8 "__user"
- avoid unnecessary casts
- use capability numbers 113 and 114

diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index ee2dfdc..9de4726 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -1613,7 +1613,7 @@ void kvm_s390_clear_float_irqs(struct kvm *kvm)
 	spin_unlock(&fi->lock);
 };
 
-static int get_all_floating_irqs(struct kvm *kvm, __user __u8 *usrbuf, __u64 len)
+static int get_all_floating_irqs(struct kvm *kvm, u8 __user *usrbuf, u64 len)
 {
 	struct kvm_s390_interrupt_info *inti;
 	struct kvm_s390_float_interrupt *fi;
@@ -1677,9 +1677,7 @@ static int get_all_floating_irqs(struct kvm *kvm, __user __u8 *usrbuf, __u64 len
 out:
 	spin_unlock(&fi->lock);
 	if (!ret && n > 0) {
-		if (copy_to_user((void __user *) usrbuf,
-				 (void *) buf,
-				 sizeof(struct kvm_s390_irq) * n))
+		if (copy_to_user(usrbuf, buf, sizeof(struct kvm_s390_irq) * n))
 			ret = -EFAULT;
 	}
 	vfree(buf);
@@ -1693,7 +1691,7 @@ static int flic_get_attr(struct kvm_device *dev, struct kvm_device_attr *attr)
 
 	switch (attr->group) {
 	case KVM_DEV_FLIC_GET_ALL_IRQS:
-		r = get_all_floating_irqs(dev->kvm, (__user u8 *) attr->addr,
+		r = get_all_floating_irqs(dev->kvm, (u8 __user *) attr->addr,
 					  attr->attr);
 		break;
 	default:
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index 7437ce9..c045c72 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -809,8 +809,8 @@ struct kvm_ppc_smmu_info {
 #define KVM_CAP_S390_MEM_OP 108
 #define KVM_CAP_S390_USER_STSI 109
 #define KVM_CAP_S390_SKEYS 110
-#define KVM_CAP_S390_INJECT_IRQ 111
-#define KVM_CAP_S390_IRQ_STATE 112
+#define KVM_CAP_S390_INJECT_IRQ 113
+#define KVM_CAP_S390_IRQ_STATE 114
 
 #ifdef KVM_CAP_IRQ_ROUTING
 

Re: [GIT PULLv2] KVM: s390: Features and fixes for 4.1 (kvm/next)

[Paolo Bonzini]

On 31/03/2015 21:36, Christian Borntraeger wrote:
> Paolo, Marcelo,
> 
> here is the updated pull request for s390 (tag was updated)
> 
> The changes reflect the comments from Heiko Carstens and Paolo Bonzini,
> (diff as followup mail)
> 
> The following changes since commit 18280d8b4bcd4a2b174ee3cd748166c6190acacb:
> 
>   KVM: s390: represent SIMD cap in kvm facility (2015-03-17 16:33:14 +0100)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git  tags/kvm-s390-next-20150331
> 
> for you to fetch changes up to 816c7667ea97c61884e014cfeedaede5b67b0e58:
> 
>   KVM: s390: migrate vcpu interrupt state (2015-03-31 21:07:31 +0200)
> 
> ----------------------------------------------------------------
> Features and fixes for 4.1 (kvm/next)
> 
> 1. Assorted changes
> 1.1 allow more feature bits for the guest
> 1.2 Store breaking event address on program interrupts
> 
> 2. Interrupt handling rework
> 2.1 Fix copy_to_user while holding a spinlock (cc stable)
> 2.2 Rework floating interrupts to follow the priorities
> 2.3 Allow to inject all local interrupts via new ioctl
> 2.4 allow to get/set the full local irq state, e.g. for migration
>     and introspection
> 
> ----------------------------------------------------------------
> Christian Borntraeger (1):
>       KVM: s390: enable more features that need no hypervisor changes
> 
> David Hildenbrand (2):
>       KVM: s390: store the breaking-event address on pgm interrupts
>       KVM: s390: cpu timer irq priority
> 
> Jens Freimann (5):
>       KVM: s390: fix get_all_floating_irqs
>       KVM: s390: deliver floating interrupts in order of priority
>       KVM: s390: add ioctl to inject local interrupts
>       KVM: s390: refactor vcpu injection function
>       KVM: s390: migrate vcpu interrupt state
> 
>  Documentation/virtual/kvm/api.txt               |  117 +++
>  Documentation/virtual/kvm/devices/s390_flic.txt |    3 +
>  arch/s390/include/asm/kvm_host.h                |   30 +-
>  arch/s390/kvm/interrupt.c                       | 1073 ++++++++++++++---------
>  arch/s390/kvm/kvm-s390.c                        |   54 +-
>  arch/s390/kvm/kvm-s390.h                        |    6 +-
>  arch/s390/kvm/priv.c                            |    9 +-
>  include/uapi/linux/kvm.h                        |   14 +
>  virt/kvm/kvm_main.c                             |    2 +-
>  9 files changed, 906 insertions(+), 402 deletions(-)
> 
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Pulled, thanks.

Paolo