* [GIT PULL 0/3] KVM: s390: Fixups for kvm/next (3.19)
@ 2014-12-04 16:14 Christian Borntraeger
2014-12-04 16:14 ` [GIT PULL 1/3] KVM: s390: some ext irqs have to clear the ext cpu addr Christian Borntraeger
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Christian Borntraeger @ 2014-12-04 16:14 UTC (permalink / raw)
To: Paolo Bonzini
Cc: KVM, Alexander Graf, Cornelia Huck, Jens Freimann, linux-s390,
Christian Borntraeger
Paolo,
some last minute changes for 3.19 as followup for the latest interrupt
rework + a small architectural compliance fix.
Christian
The following changes since commit be06b6bece19be5b167d863fd6c5271e4ec8f1fa:
Merge tag 'kvm-s390-next-20141128' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD (2014-12-03 15:20:11 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git tags/kvm-s390-next-20141204
for you to fetch changes up to 99e20009aeee47049900ac152d7a88d4f68697d3:
KVM: s390: clean up return code handling in irq delivery code (2014-12-04 16:39:00 +0100)
----------------------------------------------------------------
KVM: s390: Fixups for kvm/next (3.19)
Here we have two fixups of the latest interrupt rework and
one architectural fixup.
----------------------------------------------------------------
David Hildenbrand (1):
KVM: s390: some ext irqs have to clear the ext cpu addr
Jens Freimann (2):
KVM: s390: use atomic bitops to access pending_irqs bitmap
KVM: s390: clean up return code handling in irq delivery code
arch/s390/kvm/interrupt.c | 33 ++++++++++++++++++---------------
1 file changed, 18 insertions(+), 15 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL 1/3] KVM: s390: some ext irqs have to clear the ext cpu addr
2014-12-04 16:14 [GIT PULL 0/3] KVM: s390: Fixups for kvm/next (3.19) Christian Borntraeger
@ 2014-12-04 16:14 ` Christian Borntraeger
2014-12-04 16:14 ` [GIT PULL 2/3] KVM: s390: use atomic bitops to access pending_irqs bitmap Christian Borntraeger
2014-12-04 16:14 ` [GIT PULL 3/3] KVM: s390: clean up return code handling in irq delivery code Christian Borntraeger
2 siblings, 0 replies; 4+ messages in thread
From: Christian Borntraeger @ 2014-12-04 16:14 UTC (permalink / raw)
To: Paolo Bonzini
Cc: KVM, Alexander Graf, Cornelia Huck, Jens Freimann, linux-s390,
David Hildenbrand, Christian Borntraeger
From: David Hildenbrand <dahi@linux.vnet.ibm.com>
The cpu address of a source cpu (responsible for an external irq) is only to
be stored if bit 6 of the ext irq code is set.
If bit 6 is not set, it is to be zeroed out.
The special external irq code used for virtio and pfault uses the cpu addr as a
parameter field. As bit 6 is set, this implementation is correct.
Reviewed-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
arch/s390/kvm/interrupt.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index b3d4409..6c0d14b 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -281,6 +281,7 @@ static int __must_check __deliver_cpu_timer(struct kvm_vcpu *vcpu)
rc = put_guest_lc(vcpu, EXT_IRQ_CPU_TIMER,
(u16 *)__LC_EXT_INT_CODE);
+ rc |= put_guest_lc(vcpu, 0, (u16 *)__LC_EXT_CPU_ADDR);
rc |= write_guest_lc(vcpu, __LC_EXT_OLD_PSW,
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
rc |= read_guest_lc(vcpu, __LC_EXT_NEW_PSW,
@@ -299,6 +300,7 @@ static int __must_check __deliver_ckc(struct kvm_vcpu *vcpu)
rc = put_guest_lc(vcpu, EXT_IRQ_CLK_COMP,
(u16 __user *)__LC_EXT_INT_CODE);
+ rc |= put_guest_lc(vcpu, 0, (u16 *)__LC_EXT_CPU_ADDR);
rc |= write_guest_lc(vcpu, __LC_EXT_OLD_PSW,
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
rc |= read_guest_lc(vcpu, __LC_EXT_NEW_PSW,
@@ -585,6 +587,7 @@ static int __must_check __deliver_service(struct kvm_vcpu *vcpu,
inti->ext.ext_params, 0);
rc = put_guest_lc(vcpu, EXT_IRQ_SERVICE_SIG, (u16 *)__LC_EXT_INT_CODE);
+ rc |= put_guest_lc(vcpu, 0, (u16 *)__LC_EXT_CPU_ADDR);
rc |= write_guest_lc(vcpu, __LC_EXT_OLD_PSW,
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
rc |= read_guest_lc(vcpu, __LC_EXT_NEW_PSW,
--
1.9.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [GIT PULL 2/3] KVM: s390: use atomic bitops to access pending_irqs bitmap
2014-12-04 16:14 [GIT PULL 0/3] KVM: s390: Fixups for kvm/next (3.19) Christian Borntraeger
2014-12-04 16:14 ` [GIT PULL 1/3] KVM: s390: some ext irqs have to clear the ext cpu addr Christian Borntraeger
@ 2014-12-04 16:14 ` Christian Borntraeger
2014-12-04 16:14 ` [GIT PULL 3/3] KVM: s390: clean up return code handling in irq delivery code Christian Borntraeger
2 siblings, 0 replies; 4+ messages in thread
From: Christian Borntraeger @ 2014-12-04 16:14 UTC (permalink / raw)
To: Paolo Bonzini
Cc: KVM, Alexander Graf, Cornelia Huck, Jens Freimann, linux-s390,
Christian Borntraeger
From: Jens Freimann <jfrei@linux.vnet.ibm.com>
Currently we use a mixture of atomic/non-atomic bitops
and the local_int spin lock to protect the pending_irqs bitmap
and interrupt payload data.
We need to use atomic bitops for the pending_irqs bitmap everywhere
and in addition acquire the local_int lock where interrupt data needs
to be protected.
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
arch/s390/kvm/interrupt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index 6c0d14b..86bc89a 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -929,7 +929,7 @@ static int __inject_prog(struct kvm_vcpu *vcpu, struct kvm_s390_irq *irq)
struct kvm_s390_local_interrupt *li = &vcpu->arch.local_int;
li->irq.pgm = irq->u.pgm;
- __set_bit(IRQ_PEND_PROG, &li->pending_irqs);
+ set_bit(IRQ_PEND_PROG, &li->pending_irqs);
return 0;
}
@@ -995,7 +995,7 @@ int __inject_extcall(struct kvm_vcpu *vcpu, struct kvm_s390_irq *irq)
irq->u.extcall.code, 0, 2);
*extcall = irq->u.extcall;
- __set_bit(IRQ_PEND_EXT_EXTERNAL, &li->pending_irqs);
+ set_bit(IRQ_PEND_EXT_EXTERNAL, &li->pending_irqs);
atomic_set_mask(CPUSTAT_EXT_INT, li->cpuflags);
return 0;
}
--
1.9.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [GIT PULL 3/3] KVM: s390: clean up return code handling in irq delivery code
2014-12-04 16:14 [GIT PULL 0/3] KVM: s390: Fixups for kvm/next (3.19) Christian Borntraeger
2014-12-04 16:14 ` [GIT PULL 1/3] KVM: s390: some ext irqs have to clear the ext cpu addr Christian Borntraeger
2014-12-04 16:14 ` [GIT PULL 2/3] KVM: s390: use atomic bitops to access pending_irqs bitmap Christian Borntraeger
@ 2014-12-04 16:14 ` Christian Borntraeger
2 siblings, 0 replies; 4+ messages in thread
From: Christian Borntraeger @ 2014-12-04 16:14 UTC (permalink / raw)
To: Paolo Bonzini
Cc: KVM, Alexander Graf, Cornelia Huck, Jens Freimann, linux-s390,
Christian Borntraeger
From: Jens Freimann <jfrei@linux.vnet.ibm.com>
Instead of returning a possibly random or'ed together value, let's
always return -EFAULT if rc is set.
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
arch/s390/kvm/interrupt.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index 86bc89a..f00f31e 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -287,7 +287,7 @@ static int __must_check __deliver_cpu_timer(struct kvm_vcpu *vcpu)
rc |= read_guest_lc(vcpu, __LC_EXT_NEW_PSW,
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
clear_bit(IRQ_PEND_EXT_CPU_TIMER, &li->pending_irqs);
- return rc;
+ return rc ? -EFAULT : 0;
}
static int __must_check __deliver_ckc(struct kvm_vcpu *vcpu)
@@ -306,7 +306,7 @@ static int __must_check __deliver_ckc(struct kvm_vcpu *vcpu)
rc |= read_guest_lc(vcpu, __LC_EXT_NEW_PSW,
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
clear_bit(IRQ_PEND_EXT_CLOCK_COMP, &li->pending_irqs);
- return rc;
+ return rc ? -EFAULT : 0;
}
static int __must_check __deliver_pfault_init(struct kvm_vcpu *vcpu)
@@ -334,7 +334,7 @@ static int __must_check __deliver_pfault_init(struct kvm_vcpu *vcpu)
rc |= read_guest_lc(vcpu, __LC_EXT_NEW_PSW,
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
rc |= put_guest_lc(vcpu, ext.ext_params2, (u64 *) __LC_EXT_PARAMS2);
- return rc;
+ return rc ? -EFAULT : 0;
}
static int __must_check __deliver_machine_check(struct kvm_vcpu *vcpu)
@@ -371,7 +371,7 @@ static int __must_check __deliver_machine_check(struct kvm_vcpu *vcpu)
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
rc |= read_guest_lc(vcpu, __LC_MCK_NEW_PSW,
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
- return rc;
+ return rc ? -EFAULT : 0;
}
static int __must_check __deliver_restart(struct kvm_vcpu *vcpu)
@@ -389,7 +389,7 @@ static int __must_check __deliver_restart(struct kvm_vcpu *vcpu)
rc |= read_guest_lc(vcpu, offsetof(struct _lowcore, restart_psw),
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
clear_bit(IRQ_PEND_RESTART, &li->pending_irqs);
- return rc;
+ return rc ? -EFAULT : 0;
}
static int __must_check __deliver_stop(struct kvm_vcpu *vcpu)
@@ -450,7 +450,7 @@ static int __must_check __deliver_emergency_signal(struct kvm_vcpu *vcpu)
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
rc |= read_guest_lc(vcpu, __LC_EXT_NEW_PSW,
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
- return rc;
+ return rc ? -EFAULT : 0;
}
static int __must_check __deliver_external_call(struct kvm_vcpu *vcpu)
@@ -478,7 +478,7 @@ static int __must_check __deliver_external_call(struct kvm_vcpu *vcpu)
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
rc |= read_guest_lc(vcpu, __LC_EXT_NEW_PSW, &vcpu->arch.sie_block->gpsw,
sizeof(psw_t));
- return rc;
+ return rc ? -EFAULT : 0;
}
static int __must_check __deliver_prog(struct kvm_vcpu *vcpu)
@@ -572,7 +572,7 @@ static int __must_check __deliver_prog(struct kvm_vcpu *vcpu)
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
rc |= read_guest_lc(vcpu, __LC_PGM_NEW_PSW,
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
- return rc;
+ return rc ? -EFAULT : 0;
}
static int __must_check __deliver_service(struct kvm_vcpu *vcpu,
@@ -594,7 +594,7 @@ static int __must_check __deliver_service(struct kvm_vcpu *vcpu,
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
rc |= put_guest_lc(vcpu, inti->ext.ext_params,
(u32 *)__LC_EXT_PARAMS);
- return rc;
+ return rc ? -EFAULT : 0;
}
static int __must_check __deliver_pfault_done(struct kvm_vcpu *vcpu,
@@ -614,7 +614,7 @@ static int __must_check __deliver_pfault_done(struct kvm_vcpu *vcpu,
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
rc |= put_guest_lc(vcpu, inti->ext.ext_params2,
(u64 *)__LC_EXT_PARAMS2);
- return rc;
+ return rc ? -EFAULT : 0;
}
static int __must_check __deliver_virtio(struct kvm_vcpu *vcpu,
@@ -639,7 +639,7 @@ static int __must_check __deliver_virtio(struct kvm_vcpu *vcpu,
(u32 *)__LC_EXT_PARAMS);
rc |= put_guest_lc(vcpu, inti->ext.ext_params2,
(u64 *)__LC_EXT_PARAMS2);
- return rc;
+ return rc ? -EFAULT : 0;
}
static int __must_check __deliver_io(struct kvm_vcpu *vcpu,
@@ -667,7 +667,7 @@ static int __must_check __deliver_io(struct kvm_vcpu *vcpu,
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
rc |= read_guest_lc(vcpu, __LC_IO_NEW_PSW,
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
- return rc;
+ return rc ? -EFAULT : 0;
}
static int __must_check __deliver_mchk_floating(struct kvm_vcpu *vcpu,
@@ -692,7 +692,7 @@ static int __must_check __deliver_mchk_floating(struct kvm_vcpu *vcpu,
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
rc |= read_guest_lc(vcpu, __LC_MCK_NEW_PSW,
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
- return rc;
+ return rc ? -EFAULT : 0;
}
typedef int (*deliver_irq_t)(struct kvm_vcpu *vcpu);
--
1.9.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-12-04 16:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-04 16:14 [GIT PULL 0/3] KVM: s390: Fixups for kvm/next (3.19) Christian Borntraeger
2014-12-04 16:14 ` [GIT PULL 1/3] KVM: s390: some ext irqs have to clear the ext cpu addr Christian Borntraeger
2014-12-04 16:14 ` [GIT PULL 2/3] KVM: s390: use atomic bitops to access pending_irqs bitmap Christian Borntraeger
2014-12-04 16:14 ` [GIT PULL 3/3] KVM: s390: clean up return code handling in irq delivery code Christian Borntraeger
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.