[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 17/18] s390x/kvm: cache the kvm flic in a central
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH v3 17/18] s390x/kvm: cache the kvm flic in a central function |
Date: |
Mon, 29 Jan 2018 13:56:22 +0100 |
This avoids tons of conversions when handling interrupts.
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
hw/intc/s390_flic_kvm.c | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
index d277ffdd2e..3f804ad52e 100644
--- a/hw/intc/s390_flic_kvm.c
+++ b/hw/intc/s390_flic_kvm.c
@@ -35,6 +35,17 @@ typedef struct KVMS390FLICState {
bool clear_io_supported;
} KVMS390FLICState;
+static KVMS390FLICState *s390_get_kvm_flic(S390FLICState *fs)
+{
+ static KVMS390FLICState *flic;
+
+ if (!flic) {
+ /* we only have one flic device, so this is fine to cache */
+ flic = KVM_S390_FLIC(fs);
+ }
+ return flic;
+}
+
/**
* flic_get_all_irqs - store all pending irqs in buffer
* @buf: pointer to buffer which is passed to kernel
@@ -117,7 +128,7 @@ static void kvm_s390_inject_flic(S390FLICState *fs, struct
kvm_s390_irq *irq)
int r;
if (use_flic) {
- r = flic_enqueue_irqs(irq, sizeof(*irq), KVM_S390_FLIC(fs));
+ r = flic_enqueue_irqs(irq, sizeof(*irq), s390_get_kvm_flic(fs));
if (r == -ENOSYS) {
use_flic = false;
}
@@ -174,7 +185,7 @@ static void kvm_s390_inject_crw_mchk(S390FLICState *fs)
static int kvm_s390_clear_io_flic(S390FLICState *fs, uint16_t subchannel_id,
uint16_t subchannel_nr)
{
- KVMS390FLICState *flic = KVM_S390_FLIC(fs);
+ KVMS390FLICState *flic = s390_get_kvm_flic(fs);
int rc;
uint32_t sid = subchannel_id << 16 | subchannel_nr;
struct kvm_device_attr attr = {
@@ -192,7 +203,7 @@ static int kvm_s390_clear_io_flic(S390FLICState *fs,
uint16_t subchannel_id,
static int kvm_s390_modify_ais_mode(S390FLICState *fs, uint8_t isc,
uint16_t mode)
{
- KVMS390FLICState *flic = KVM_S390_FLIC(fs);
+ KVMS390FLICState *flic = s390_get_kvm_flic(fs);
struct kvm_s390_ais_req req = {
.isc = isc,
.mode = mode,
@@ -212,7 +223,7 @@ static int kvm_s390_modify_ais_mode(S390FLICState *fs,
uint8_t isc,
static int kvm_s390_inject_airq(S390FLICState *fs, uint8_t type,
uint8_t isc, uint8_t flags)
{
- KVMS390FLICState *flic = KVM_S390_FLIC(fs);
+ KVMS390FLICState *flic = s390_get_kvm_flic(fs);
uint32_t id = css_get_adapter_id(type, isc);
struct kvm_device_attr attr = {
.group = KVM_DEV_FLIC_AIRQ_INJECT,
@@ -301,7 +312,7 @@ static int kvm_s390_io_adapter_map(S390FLICState *fs,
uint32_t id,
.group = KVM_DEV_FLIC_ADAPTER_MODIFY,
.addr = (uint64_t)&req,
};
- KVMS390FLICState *flic = KVM_S390_FLIC(fs);
+ KVMS390FLICState *flic = s390_get_kvm_flic(fs);
int r;
if (!kvm_gsi_routing_enabled()) {
--
2.14.3
- [Qemu-devel] [PATCH v3 07/18] s390x/tcg: tolerate wrong wakeups due to floating interrupts, (continued)
- [Qemu-devel] [PATCH v3 07/18] s390x/tcg: tolerate wrong wakeups due to floating interrupts, David Hildenbrand, 2018/01/29
- [Qemu-devel] [PATCH v3 08/18] s390x/flic: make floating interrupts on TCG actually floating, David Hildenbrand, 2018/01/29
- [Qemu-devel] [PATCH v3 09/18] s390x/tcg: implement TEST PENDING INTERRUPTION, David Hildenbrand, 2018/01/29
- [Qemu-devel] [PATCH v3 10/18] s390x/flic: implement qemu_s390_clear_io_flic(), David Hildenbrand, 2018/01/29
- [Qemu-devel] [PATCH v3 11/18] s390x/flic: optimize CPU wakeup for TCG, David Hildenbrand, 2018/01/29
- [Qemu-devel] [PATCH v3 12/18] s390x: fix size + content of STSI blocks, David Hildenbrand, 2018/01/29
- [Qemu-devel] [PATCH v3 13/18] s390x/tcg: STSI overhaul, David Hildenbrand, 2018/01/29
- [Qemu-devel] [PATCH v3 14/18] s390x/tcg: remove SMP warning, David Hildenbrand, 2018/01/29
- [Qemu-devel] [PATCH v3 15/18] configure: s390x supports mttcg now, David Hildenbrand, 2018/01/29
- [Qemu-devel] [PATCH v3 16/18] s390x/tcg: cache the qemu flic in a central function, David Hildenbrand, 2018/01/29
- [Qemu-devel] [PATCH v3 17/18] s390x/kvm: cache the kvm flic in a central function,
David Hildenbrand <=
- [Qemu-devel] [PATCH v3 18/18] s390x/flic: cache the common flic class in a central function, David Hildenbrand, 2018/01/29