From patchwork Fri Feb 9 09:25:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 871285 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zd9DS3BzZz9sPk for ; Fri, 9 Feb 2018 20:46:00 +1100 (AEDT) Received: from localhost ([::1]:53556 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ek5Fl-0002sx-Ht for incoming@patchwork.ozlabs.org; Fri, 09 Feb 2018 04:45:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43621) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ek4wY-0002GD-4Q for qemu-devel@nongnu.org; Fri, 09 Feb 2018 04:26:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ek4wW-0006BU-W0 for qemu-devel@nongnu.org; Fri, 09 Feb 2018 04:26:06 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:42584 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ek4wW-0006B7-Qh; Fri, 09 Feb 2018 04:26:04 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6208740FB62F; Fri, 9 Feb 2018 09:26:04 +0000 (UTC) Received: from localhost (dhcp-192-222.str.redhat.com [10.33.192.222]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1C6382166BAE; Fri, 9 Feb 2018 09:26:03 +0000 (UTC) From: Cornelia Huck To: peter.maydell@linaro.org Date: Fri, 9 Feb 2018 10:25:12 +0100 Message-Id: <20180209092524.31348-18-cohuck@redhat.com> In-Reply-To: <20180209092524.31348-1-cohuck@redhat.com> References: <20180209092524.31348-1-cohuck@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 09 Feb 2018 09:26:04 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 09 Feb 2018 09:26:04 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'cohuck@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 17/29] s390x/tcg: cache the qemu flic in a central function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, david@redhat.com, Cornelia Huck , qemu-devel@nongnu.org, agraf@suse.de, borntraeger@de.ibm.com, qemu-s390x@nongnu.org, rth@twiddle.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: David Hildenbrand This avoids tons of conversions when handling interrupts. Signed-off-by: David Hildenbrand Message-Id: <20180129125623.21729-17-david@redhat.com> Signed-off-by: Cornelia Huck --- hw/intc/s390_flic.c | 23 +++++++++++++++++------ include/hw/s390x/s390_flic.h | 1 + target/s390x/interrupt.c | 6 +++--- target/s390x/misc_helper.c | 2 +- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c index 5febde2d65..b46c0f1bb4 100644 --- a/hw/intc/s390_flic.c +++ b/hw/intc/s390_flic.c @@ -22,6 +22,17 @@ #include "qapi/error.h" #include "hw/s390x/s390-virtio-ccw.h" +QEMUS390FLICState *s390_get_qemu_flic(S390FLICState *fs) +{ + static QEMUS390FLICState *flic; + + if (!flic) { + /* we only have one flic device, so this is fine to cache */ + flic = QEMU_S390_FLIC(fs); + } + return flic; +} + S390FLICState *s390_get_flic(void) { static S390FLICState *fs; @@ -79,7 +90,7 @@ static void qemu_s390_release_adapter_routes(S390FLICState *fs, static int qemu_s390_clear_io_flic(S390FLICState *fs, uint16_t subchannel_id, uint16_t subchannel_nr) { - QEMUS390FLICState *flic = QEMU_S390_FLIC(fs); + QEMUS390FLICState *flic = s390_get_qemu_flic(fs); QEMUS390FlicIO *cur, *next; uint8_t isc; @@ -113,7 +124,7 @@ static int qemu_s390_clear_io_flic(S390FLICState *fs, uint16_t subchannel_id, static int qemu_s390_modify_ais_mode(S390FLICState *fs, uint8_t isc, uint16_t mode) { - QEMUS390FLICState *flic = QEMU_S390_FLIC(fs); + QEMUS390FLICState *flic = s390_get_qemu_flic(fs); switch (mode) { case SIC_IRQ_MODE_ALL: @@ -134,7 +145,7 @@ static int qemu_s390_modify_ais_mode(S390FLICState *fs, uint8_t isc, static int qemu_s390_inject_airq(S390FLICState *fs, uint8_t type, uint8_t isc, uint8_t flags) { - QEMUS390FLICState *flic = QEMU_S390_FLIC(fs); + QEMUS390FLICState *flic = s390_get_qemu_flic(fs); S390FLICStateClass *fsc = S390_FLIC_COMMON_GET_CLASS(fs); bool flag = flags & S390_ADAPTER_SUPPRESSIBLE; uint32_t io_int_word = (isc << 27) | IO_INT_WORD_AI; @@ -246,7 +257,7 @@ void qemu_s390_flic_dequeue_crw_mchk(QEMUS390FLICState *flic) static void qemu_s390_inject_service(S390FLICState *fs, uint32_t parm) { - QEMUS390FLICState *flic = QEMU_S390_FLIC(fs); + QEMUS390FLICState *flic = s390_get_qemu_flic(fs); g_assert(qemu_mutex_iothread_locked()); /* multiplexing is good enough for sclp - kvm does it internally as well */ @@ -261,7 +272,7 @@ static void qemu_s390_inject_io(S390FLICState *fs, uint16_t subchannel_id, uint32_t io_int_word) { const uint8_t isc = IO_INT_WORD_ISC(io_int_word); - QEMUS390FLICState *flic = QEMU_S390_FLIC(fs); + QEMUS390FLICState *flic = s390_get_qemu_flic(fs); QEMUS390FlicIO *io; g_assert(qemu_mutex_iothread_locked()); @@ -279,7 +290,7 @@ static void qemu_s390_inject_io(S390FLICState *fs, uint16_t subchannel_id, static void qemu_s390_inject_crw_mchk(S390FLICState *fs) { - QEMUS390FLICState *flic = QEMU_S390_FLIC(fs); + QEMUS390FLICState *flic = s390_get_qemu_flic(fs); g_assert(qemu_mutex_iothread_locked()); flic->pending |= FLIC_PENDING_MCHK_CR; diff --git a/include/hw/s390x/s390_flic.h b/include/hw/s390x/s390_flic.h index 566d153371..a636afce42 100644 --- a/include/hw/s390x/s390_flic.h +++ b/include/hw/s390x/s390_flic.h @@ -135,6 +135,7 @@ bool qemu_s390_flic_has_any(QEMUS390FLICState *flic); void s390_flic_init(void); S390FLICState *s390_get_flic(void); +QEMUS390FLICState *s390_get_qemu_flic(S390FLICState *fs); bool ais_needed(void *opaque); #endif /* HW_S390_FLIC_H */ diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c index 61691aa3a4..1947012b25 100644 --- a/target/s390x/interrupt.c +++ b/target/s390x/interrupt.c @@ -158,7 +158,7 @@ void s390_crw_mchk(void) bool s390_cpu_has_mcck_int(S390CPU *cpu) { - QEMUS390FLICState *flic = QEMU_S390_FLIC(s390_get_flic()); + QEMUS390FLICState *flic = s390_get_qemu_flic(s390_get_flic()); CPUS390XState *env = &cpu->env; if (!(env->psw.mask & PSW_MASK_MCHECK)) { @@ -176,7 +176,7 @@ bool s390_cpu_has_mcck_int(S390CPU *cpu) bool s390_cpu_has_ext_int(S390CPU *cpu) { - QEMUS390FLICState *flic = QEMU_S390_FLIC(s390_get_flic()); + QEMUS390FLICState *flic = s390_get_qemu_flic(s390_get_flic()); CPUS390XState *env = &cpu->env; if (!(env->psw.mask & PSW_MASK_EXT)) { @@ -218,7 +218,7 @@ bool s390_cpu_has_ext_int(S390CPU *cpu) bool s390_cpu_has_io_int(S390CPU *cpu) { - QEMUS390FLICState *flic = QEMU_S390_FLIC(s390_get_flic()); + QEMUS390FLICState *flic = s390_get_qemu_flic(s390_get_flic()); CPUS390XState *env = &cpu->env; if (!(env->psw.mask & PSW_MASK_IO)) { diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c index c1ff152571..45cab8c463 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -452,7 +452,7 @@ uint32_t HELPER(tpi)(CPUS390XState *env, uint64_t addr) { const uintptr_t ra = GETPC(); S390CPU *cpu = s390_env_get_cpu(env); - QEMUS390FLICState *flic = QEMU_S390_FLIC(s390_get_flic()); + QEMUS390FLICState *flic = s390_get_qemu_flic(s390_get_flic()); QEMUS390FlicIO *io = NULL; LowCore *lowcore;