From patchwork Fri Mar 21 12:52:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 3873971 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7F998BF540 for ; Fri, 21 Mar 2014 12:53:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7EDA520212 for ; Fri, 21 Mar 2014 12:53:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5841B20279 for ; Fri, 21 Mar 2014 12:53:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965598AbaCUMw6 (ORCPT ); Fri, 21 Mar 2014 08:52:58 -0400 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:56745 "EHLO e06smtp13.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965450AbaCUMwr (ORCPT ); Fri, 21 Mar 2014 08:52:47 -0400 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 21 Mar 2014 12:52:45 -0000 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 21 Mar 2014 12:52:43 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 6115C17D8047; Fri, 21 Mar 2014 12:53:26 +0000 (GMT) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps3075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s2LCqUmh1900904; Fri, 21 Mar 2014 12:52:30 GMT Received: from d06av05.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s2LCqfW4016344; Fri, 21 Mar 2014 06:52:42 -0600 Received: from gondolin.boeblingen.de.ibm.com (dyn-9-152-224-49.boeblingen.de.ibm.com [9.152.224.49]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s2LCqcvi016219; Fri, 21 Mar 2014 06:52:41 -0600 From: Cornelia Huck To: kvm@vger.kernel.org, linux-s390@vger.kernel.org, qemu-devel@nongnu.org Cc: borntraeger@de.ibm.com, agraf@suse.de, pbonzini@redhat.com, gleb@kernel.org, Cornelia Huck Subject: [PATCH v3 3/5] s390x: Add I/O adapter registration. Date: Fri, 21 Mar 2014 13:52:35 +0100 Message-Id: <1395406357-14766-4-git-send-email-cornelia.huck@de.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1395406357-14766-1-git-send-email-cornelia.huck@de.ibm.com> References: <1395406357-14766-1-git-send-email-cornelia.huck@de.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14032112-2966-0000-0000-00000AA83829 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Register an I/O adapter interrupt source for when virtio-ccw devices start using adapter interrupts. Reviewed-by: Thomas Huth Signed-off-by: Cornelia Huck --- hw/intc/s390_flic.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ hw/s390x/css.c | 51 ++++++++++++++++++++++++++++++++++++++++++ hw/s390x/css.h | 4 ++++ hw/s390x/virtio-ccw.c | 4 ++++ hw/s390x/virtio-ccw.h | 1 + target-s390x/cpu.h | 33 +++++++++++++++++++++++++++ 6 files changed, 152 insertions(+) diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c index b2ef3e3..c033c8a 100644 --- a/hw/intc/s390_flic.c +++ b/hw/intc/s390_flic.c @@ -21,6 +21,11 @@ #define FLIC_FAILED (-1UL) #define FLIC_SAVEVM_VERSION 1 +static KVMS390FLICState *s390_get_flic(void) +{ + return KVM_S390_FLIC(object_resolve_path("/machine/s390-flic", NULL)); +} + void s390_flic_init(void) { DeviceState *dev; @@ -148,6 +153,60 @@ static int __get_all_irqs(KVMS390FLICState *flic, return r; } +int kvm_s390_register_io_adapter(uint32_t id, uint8_t isc, bool swap, + bool is_maskable) +{ + struct kvm_s390_io_adapter adapter = { + .id = id, + .isc = isc, + .maskable = is_maskable, + .swap = swap, + }; + KVMS390FLICState *flic = s390_get_flic(); + int r, ret; + struct kvm_device_attr attr = { + .group = KVM_DEV_FLIC_ADAPTER_REGISTER, + .addr = (uint64_t)&adapter, + }; + + if (!flic) { + return -ENOSYS; + } + if (!kvm_check_extension(kvm_state, KVM_CAP_IRQ_ROUTING)) { + return -ENOSYS; + } + + r = ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr); + + ret = r ? -errno : 0; + return ret; +} + +int kvm_s390_io_adapter_map(uint32_t id, uint64_t map_addr, bool do_map) +{ + struct kvm_s390_io_adapter_req req = { + .id = id, + .type = do_map ? KVM_S390_IO_ADAPTER_MAP : KVM_S390_IO_ADAPTER_UNMAP, + .addr = map_addr, + }; + KVMS390FLICState *flic = s390_get_flic(); + struct kvm_device_attr attr = { + .group = KVM_DEV_FLIC_ADAPTER_MODIFY, + .addr = (uint64_t)&req, + }; + int r; + + if (!flic) { + return -ENOSYS; + } + if (!kvm_check_extension(kvm_state, KVM_CAP_IRQ_ROUTING)) { + return -ENOSYS; + } + + r = ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr); + return r ? -errno : 0; +} + /** * kvm_flic_save - Save pending floating interrupts * @f: QEMUFile containing migration state diff --git a/hw/s390x/css.c b/hw/s390x/css.c index 7074d2b..a6d173f 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -39,6 +39,13 @@ typedef struct CssImage { ChpInfo chpids[MAX_CHPID + 1]; } CssImage; +typedef struct IoAdapter { + uint32_t id; + uint8_t type; + uint8_t isc; + QTAILQ_ENTRY(IoAdapter) sibling; +} IoAdapter; + typedef struct ChannelSubSys { QTAILQ_HEAD(, CrwContainer) pending_crws; bool do_crw_mchk; @@ -49,6 +56,7 @@ typedef struct ChannelSubSys { uint64_t chnmon_area; CssImage *css[MAX_CSSID + 1]; uint8_t default_cssid; + QTAILQ_HEAD(, IoAdapter) io_adapters; } ChannelSubSys; static ChannelSubSys *channel_subsys; @@ -69,6 +77,48 @@ int css_create_css_image(uint8_t cssid, bool default_image) return 0; } +int css_register_io_adapter(uint8_t type, uint8_t isc, bool swap, + bool maskable, uint32_t *id) +{ + IoAdapter *adapter; + bool found = false; + int ret; + + *id = 0; + QTAILQ_FOREACH(adapter, &channel_subsys->io_adapters, sibling) { + if ((adapter->type == type) && (adapter->isc == isc)) { + *id = adapter->id; + found = true; + ret = 0; + break; + } + if (adapter->id >= *id) { + *id = adapter->id + 1; + } + } + if (found) { + goto out; + } + adapter = g_new0(IoAdapter, 1); + ret = s390_register_io_adapter(*id, isc, swap, maskable); + if (ret == -ENOSYS) { + /* Keep adapter even if we didn't register it anywhere. */ + ret = 0; + } + if (ret == 0) { + adapter->id = *id; + adapter->isc = isc; + adapter->type = type; + QTAILQ_INSERT_TAIL(&channel_subsys->io_adapters, adapter, sibling); + } else { + g_free(adapter); + fprintf(stderr, "Unexpected error %d when registering adapter %d\n", + ret, *id); + } +out: + return ret; +} + uint16_t css_build_subchannel_id(SubchDev *sch) { if (channel_subsys->max_cssid > 0) { @@ -1239,6 +1289,7 @@ static void css_init(void) channel_subsys->do_crw_mchk = true; channel_subsys->crws_lost = false; channel_subsys->chnmon_active = false; + QTAILQ_INIT(&channel_subsys->io_adapters); } machine_init(css_init); diff --git a/hw/s390x/css.h b/hw/s390x/css.h index e9b4405..380e8e7 100644 --- a/hw/s390x/css.h +++ b/hw/s390x/css.h @@ -99,4 +99,8 @@ void css_generate_sch_crws(uint8_t cssid, uint8_t ssid, uint16_t schid, int hotplugged, int add); void css_generate_chp_crws(uint8_t cssid, uint8_t chpid); void css_adapter_interrupt(uint8_t isc); + +#define CSS_IO_ADAPTER_VIRTIO 1 +int css_register_io_adapter(uint8_t type, uint8_t isc, bool swap, + bool maskable, uint32_t *id); #endif diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 2bf0af8..1193682 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -522,6 +522,10 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) dev->thinint_isc = thinint->isc; dev->ind_bit = thinint->ind_bit; cpu_physical_memory_unmap(thinint, hw_len, 0, hw_len); + ret = css_register_io_adapter(CSS_IO_ADAPTER_VIRTIO, + dev->thinint_isc, true, false, + &dev->adapter_id); + assert(ret == 0); sch->thinint_active = ((dev->indicators != 0) && (dev->summary_indicator != 0)); sch->curr_status.scsw.count = ccw.count - len; diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index 4393e44..0b70b91 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -85,6 +85,7 @@ struct VirtioCcwDevice { bool ioeventfd_disabled; uint32_t flags; uint8_t thinint_isc; + uint32_t adapter_id; /* Guest provided values: */ hwaddr indicators; hwaddr indicators2; diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index f332d41..53391fd 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -1062,6 +1062,9 @@ void kvm_s390_enable_css_support(S390CPU *cpu); int kvm_s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch, int vq, bool assign); int kvm_s390_cpu_restart(S390CPU *cpu); +int kvm_s390_register_io_adapter(uint32_t id, uint8_t isc, bool swap, + bool maskable); +int kvm_s390_io_adapter_map(uint32_t id, uint64_t map_addr, bool do_map); #else static inline void kvm_s390_io_interrupt(S390CPU *cpu, uint16_t subchannel_id, @@ -1086,6 +1089,16 @@ static inline int kvm_s390_cpu_restart(S390CPU *cpu) { return -ENOSYS; } +static inline int kvm_s390_register_io_adapter(uint32_t id, uint8_t isc, + bool swap, bool maskable) +{ + return -ENOSYS; +} +static inline int kvm_s390_io_adapter_map(uint32_t id, uint64_t map_addr, + bool do_map) +{ + return -ENOSYS; +} #endif static inline int s390_cpu_restart(S390CPU *cpu) @@ -1131,4 +1144,24 @@ static inline int s390_assign_subch_ioeventfd(EventNotifier *notifier, } } +static inline int s390_register_io_adapter(uint32_t id, uint8_t isc, bool swap, + bool is_maskable) +{ + if (kvm_enabled()) { + return kvm_s390_register_io_adapter(id, isc, swap, is_maskable); + } else { + return -ENOSYS; + } +} + +static inline int s390_io_adapter_map(uint32_t id, uint64_t map_addr, + bool do_map) +{ + if (kvm_enabled()) { + return kvm_s390_io_adapter_map(id, map_addr, do_map); + } else { + return -ENOSYS; + } +} + #endif