From patchwork Thu Jan 15 13:18:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 43177 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 323A520D60 for ; Thu, 15 Jan 2015 13:18:49 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id b57sf8125741eek.1 for ; Thu, 15 Jan 2015 05:18:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=3OrLUQ+hTEF3L0zTFsdJF8KP9QDmsUzoTYnHXzZ6LDw=; b=gqtAhlDCf2ejLbgxMR8svhKxE6kmvKkz65Fc0yfGh9dKa8hRoaReROQxTW04iKi1XK W9FPBt3XgyeTwSAaexX4wK4PrlYyFDnfXMF17NU4MgaLMJGw9sFZxwZPgkHxhDFH8Jet j7j9gP5rj+wdsIhzUKb3echtcbH3hWZ/zurNwliZBsWmAVTVGf5xG9g7yQLT7dFPdDJp F6dc3wyK49EXlqyzyOMeyvu3UiMoLmfwPr8iRNZZ4rq2X9o+ILqwQqK8rIWvAbhKmqwZ lmJ6Jj69E/7EDD3uA/iJtNlcCjVtBCPEl8GjoRSL7fJ5bPYARWYIPOZz7fa7futra8xE YHjQ== X-Gm-Message-State: ALoCoQmYlQeKHKGXpxeFe+IvWxQt68OV9ZAYADV9fLYz/rdyPtVkfD1bmL3i2xMUYdaYo1QIVZq+ X-Received: by 10.180.105.97 with SMTP id gl1mr4328081wib.7.1421327928393; Thu, 15 Jan 2015 05:18:48 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.120.132 with SMTP id lc4ls240808lab.1.gmail; Thu, 15 Jan 2015 05:18:48 -0800 (PST) X-Received: by 10.113.11.12 with SMTP id ee12mr9570178lbd.79.1421327928201; Thu, 15 Jan 2015 05:18:48 -0800 (PST) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id c4si1373404lbd.101.2015.01.15.05.18.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 Jan 2015 05:18:48 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by mail-la0-f52.google.com with SMTP id hs14so13518515lab.11 for ; Thu, 15 Jan 2015 05:18:48 -0800 (PST) X-Received: by 10.112.52.229 with SMTP id w5mr9728500lbo.52.1421327928067; Thu, 15 Jan 2015 05:18:48 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.9.200 with SMTP id c8csp2030700lbb; Thu, 15 Jan 2015 05:18:47 -0800 (PST) X-Received: by 10.194.81.104 with SMTP id z8mr17964889wjx.45.1421327926891; Thu, 15 Jan 2015 05:18:46 -0800 (PST) Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com. [74.125.82.48]) by mx.google.com with ESMTPS id ee5si8885160wic.103.2015.01.15.05.18.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 Jan 2015 05:18:46 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.48 as permitted sender) client-ip=74.125.82.48; Received: by mail-wg0-f48.google.com with SMTP id l2so14849152wgh.7 for ; Thu, 15 Jan 2015 05:18:46 -0800 (PST) X-Received: by 10.180.82.137 with SMTP id i9mr19371626wiy.38.1421327926521; Thu, 15 Jan 2015 05:18:46 -0800 (PST) Received: from midway01-04-00.lavalab ([81.128.185.50]) by mx.google.com with ESMTPSA id o2sm7456332wiy.11.2015.01.15.05.18.45 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 Jan 2015 05:18:45 -0800 (PST) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, kim.phillips@freescale.com, alex.williamson@redhat.com, agraf@suse.de, peter.maydell@linaro.org Cc: eric.auger@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, Bharat.Bhushan@freescale.com, b.reynal@virtualopensystems.com, a.rigo@virtualopensystems.com, a.motakis@virtualopensystems.com, pbonzini@redhat.com, afaerber@suse.de Subject: [PATCH v9 3/7] hw/vfio/platform: add irq assignment Date: Thu, 15 Jan 2015 13:18:13 +0000 Message-Id: <1421327897-1698-4-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1421327897-1698-1-git-send-email-eric.auger@linaro.org> References: <1421327897-1698-1-git-send-email-eric.auger@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch adds the code requested to assign interrupts to a guest. The interrupts are mediated through user handled eventfds only. The mechanics to start the IRQ handling is not yet there through. Signed-off-by: Eric Auger --- v8 -> v9: - free irq related resources in case of error in vfio_populate_device --- hw/vfio/platform.c | 319 ++++++++++++++++++++++++++++++++++++++++ include/hw/vfio/vfio-platform.h | 33 +++++ 2 files changed, 352 insertions(+) diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index caadb92..b85ad6c 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -22,10 +22,259 @@ #include "qemu/range.h" #include "sysemu/sysemu.h" #include "exec/memory.h" +#include "qemu/queue.h" #include "hw/sysbus.h" #include "trace.h" #include "hw/platform-bus.h" +static void vfio_intp_interrupt(VFIOINTp *intp); +typedef void (*eventfd_user_side_handler_t)(VFIOINTp *intp); +static int vfio_set_trigger_eventfd(VFIOINTp *intp, + eventfd_user_side_handler_t handler); + +/* + * Functions only used when eventfd are handled on user-side + * ie. without irqfd + */ + +/** + * vfio_platform_eoi - IRQ completion routine + * @vbasedev: the VFIO device + * + * de-asserts the active virtual IRQ and unmask the physical IRQ + * (masked by the VFIO driver). Handle pending IRQs if any. + * eoi function is called on the first access to any MMIO region + * after an IRQ was triggered. It is assumed this access corresponds + * to the IRQ status register reset. With such a mechanism, a single + * IRQ can be handled at a time since there is no way to know which + * IRQ was completed by the guest (we would need additional details + * about the IRQ status register mask) + */ +static void vfio_platform_eoi(VFIODevice *vbasedev) +{ + VFIOINTp *intp; + VFIOPlatformDevice *vdev = + container_of(vbasedev, VFIOPlatformDevice, vbasedev); + + qemu_mutex_lock(&vdev->intp_mutex); + QLIST_FOREACH(intp, &vdev->intp_list, next) { + if (intp->state == VFIO_IRQ_ACTIVE) { + trace_vfio_platform_eoi(intp->pin, + event_notifier_get_fd(&intp->interrupt)); + intp->state = VFIO_IRQ_INACTIVE; + + /* deassert the virtual IRQ and unmask physical one */ + qemu_set_irq(intp->qemuirq, 0); + vfio_unmask_single_irqindex(vbasedev, intp->pin); + + /* a single IRQ can be active at a time */ + break; + } + } + /* in case there are pending IRQs, handle them one at a time */ + if (!QSIMPLEQ_EMPTY(&vdev->pending_intp_queue)) { + intp = QSIMPLEQ_FIRST(&vdev->pending_intp_queue); + trace_vfio_platform_eoi_handle_pending(intp->pin); + qemu_mutex_unlock(&vdev->intp_mutex); + vfio_intp_interrupt(intp); + qemu_mutex_lock(&vdev->intp_mutex); + QSIMPLEQ_REMOVE_HEAD(&vdev->pending_intp_queue, pqnext); + qemu_mutex_unlock(&vdev->intp_mutex); + } else { + qemu_mutex_unlock(&vdev->intp_mutex); + } +} + +/** + * vfio_mmap_set_enabled - enable/disable the fast path mode + * @vdev: the VFIO platform device + * @enabled: the target mmap state + * + * true ~ fast path = MMIO region is mmaped (no KVM TRAP) + * false ~ slow path = MMIO region is trapped and region callbacks + * are called slow path enables to trap the IRQ status register + * guest reset +*/ + +static void vfio_mmap_set_enabled(VFIOPlatformDevice *vdev, bool enabled) +{ + VFIORegion *region; + int i; + + trace_vfio_platform_mmap_set_enabled(enabled); + + for (i = 0; i < vdev->vbasedev.num_regions; i++) { + region = vdev->regions[i]; + + /* register space is unmapped to trap EOI */ + memory_region_set_enabled(®ion->mmap_mem, enabled); + } +} + +/** + * vfio_intp_mmap_enable - timer function, restores the fast path + * if there is no more active IRQ + * @opaque: actually points to the VFIO platform device + * + * Called on mmap timer timout, this function checks whether the + * IRQ is still active and in the negative restores the fast path. + * by construction a single eventfd is handled at a time. + * if the IRQ is still active, the timer is restarted. + */ +static void vfio_intp_mmap_enable(void *opaque) +{ + VFIOINTp *tmp; + VFIOPlatformDevice *vdev = (VFIOPlatformDevice *)opaque; + + qemu_mutex_lock(&vdev->intp_mutex); + QLIST_FOREACH(tmp, &vdev->intp_list, next) { + if (tmp->state == VFIO_IRQ_ACTIVE) { + trace_vfio_platform_intp_mmap_enable(tmp->pin); + /* re-program the timer to check active status later */ + timer_mod(vdev->mmap_timer, + qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + + vdev->mmap_timeout); + qemu_mutex_unlock(&vdev->intp_mutex); + return; + } + } + vfio_mmap_set_enabled(vdev, true); + qemu_mutex_unlock(&vdev->intp_mutex); +} + +/** + * vfio_intp_interrupt - The user-side eventfd handler + * @opaque: opaque pointer which in practice is the VFIOINTp* + * + * the function can be entered + * - in event handler context: this IRQ is inactive + * in that case, the vIRQ is injected into the guest if there + * is no other active or pending IRQ. + * - in IOhandler context: this IRQ is pending. + * there is no ACTIVE IRQ + */ +static void vfio_intp_interrupt(VFIOINTp *intp) +{ + int ret; + VFIOINTp *tmp; + VFIOPlatformDevice *vdev = intp->vdev; + bool delay_handling = false; + + qemu_mutex_lock(&vdev->intp_mutex); + if (intp->state == VFIO_IRQ_INACTIVE) { + QLIST_FOREACH(tmp, &vdev->intp_list, next) { + if (tmp->state == VFIO_IRQ_ACTIVE || + tmp->state == VFIO_IRQ_PENDING) { + delay_handling = true; + break; + } + } + } + if (delay_handling) { + /* + * the new IRQ gets a pending status and is pushed in + * the pending queue + */ + intp->state = VFIO_IRQ_PENDING; + trace_vfio_intp_interrupt_set_pending(intp->pin); + QSIMPLEQ_INSERT_TAIL(&vdev->pending_intp_queue, + intp, pqnext); + ret = event_notifier_test_and_clear(&intp->interrupt); + qemu_mutex_unlock(&vdev->intp_mutex); + return; + } + + /* no active IRQ, the new IRQ can be forwarded to the guest */ + trace_vfio_platform_intp_interrupt(intp->pin, + event_notifier_get_fd(&intp->interrupt)); + + if (intp->state == VFIO_IRQ_INACTIVE) { + ret = event_notifier_test_and_clear(&intp->interrupt); + if (!ret) { + error_report("Error when clearing fd=%d (ret = %d)\n", + event_notifier_get_fd(&intp->interrupt), ret); + } + } /* else this is a pending IRQ that moves to ACTIVE state */ + + intp->state = VFIO_IRQ_ACTIVE; + + /* sets slow path */ + vfio_mmap_set_enabled(vdev, false); + + /* trigger the virtual IRQ */ + qemu_set_irq(intp->qemuirq, 1); + + /* schedule the mmap timer which will restore mmap path after EOI*/ + if (vdev->mmap_timeout) { + timer_mod(vdev->mmap_timer, + qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + + vdev->mmap_timeout); + } + qemu_mutex_unlock(&vdev->intp_mutex); +} + +/** + * vfio_start_eventfd_injection - starts the virtual IRQ injection using + * user-side handled eventfds + * @intp: the IRQ struct pointer + */ + +static int vfio_start_eventfd_injection(VFIOINTp *intp) +{ + int ret; + VFIODevice *vbasedev = &intp->vdev->vbasedev; + + vfio_mask_single_irqindex(vbasedev, intp->pin); + + ret = vfio_set_trigger_eventfd(intp, vfio_intp_interrupt); + if (ret) { + error_report("vfio: Error: Failed to pass IRQ fd to the driver: %m"); + vfio_unmask_single_irqindex(vbasedev, intp->pin); + return ret; + } + vfio_unmask_single_irqindex(vbasedev, intp->pin); + return 0; +} + +/* + * Functions used whatever the injection method + */ + +/** + * vfio_set_trigger_eventfd - set VFIO eventfd handling + * ie. program the VFIO driver to associates a given IRQ index + * with a fd handler + * + * @intp: IRQ struct pointer + * @handler: handler to be called on eventfd trigger + */ +static int vfio_set_trigger_eventfd(VFIOINTp *intp, + eventfd_user_side_handler_t handler) +{ + VFIODevice *vbasedev = &intp->vdev->vbasedev; + struct vfio_irq_set *irq_set; + int argsz, ret; + int32_t *pfd; + + argsz = sizeof(*irq_set) + sizeof(*pfd); + irq_set = g_malloc0(argsz); + irq_set->argsz = argsz; + irq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_TRIGGER; + irq_set->index = intp->pin; + irq_set->start = 0; + irq_set->count = 1; + pfd = (int32_t *)&irq_set->data; + *pfd = event_notifier_get_fd(&intp->interrupt); + qemu_set_fd_handler(*pfd, (IOHandler *)handler, NULL, intp); + ret = ioctl(vbasedev->fd, VFIO_DEVICE_SET_IRQS, irq_set); + g_free(irq_set); + if (ret < 0) { + error_report("vfio: Failed to set trigger eventfd: %m"); + qemu_set_fd_handler(*pfd, NULL, NULL, NULL); + } + return ret; +} + /* not implemented yet */ static void vfio_platform_compute_needs_reset(VFIODevice *vbasedev) { @@ -39,6 +288,40 @@ static int vfio_platform_hot_reset_multi(VFIODevice *vbasedev) } /** + * vfio_init_intp - allocate, initialize the IRQ struct pointer + * and add it into the list of IRQ + * @vbasedev: the VFIO device + * @index: VFIO device IRQ index + */ +static VFIOINTp *vfio_init_intp(VFIODevice *vbasedev, unsigned int index) +{ + int ret; + VFIOPlatformDevice *vdev = + container_of(vbasedev, VFIOPlatformDevice, vbasedev); + SysBusDevice *sbdev = SYS_BUS_DEVICE(vdev); + VFIOINTp *intp; + + /* allocate and populate a new VFIOINTp structure put in a queue list */ + intp = g_malloc0(sizeof(*intp)); + intp->vdev = vdev; + intp->pin = index; + intp->state = VFIO_IRQ_INACTIVE; + sysbus_init_irq(sbdev, &intp->qemuirq); + + /* Get an eventfd for trigger */ + ret = event_notifier_init(&intp->interrupt, 0); + if (ret) { + g_free(intp); + error_report("vfio: Error: trigger event_notifier_init failed "); + return NULL; + } + + /* store the new intp in qlist */ + QLIST_INSERT_HEAD(&vdev->intp_list, intp, next); + return intp; +} + +/** * vfio_populate_device - initialize MMIO region and IRQ * @vbasedev: the VFIO device * @@ -47,7 +330,9 @@ static int vfio_platform_hot_reset_multi(VFIODevice *vbasedev) */ static int vfio_populate_device(VFIODevice *vbasedev) { + struct vfio_irq_info irq = { .argsz = sizeof(irq) }; struct vfio_region_info reg_info = { .argsz = sizeof(reg_info) }; + VFIOINTp *intp, *tmp; int i, ret = -1; VFIOPlatformDevice *vdev = container_of(vbasedev, VFIOPlatformDevice, vbasedev); @@ -80,7 +365,37 @@ static int vfio_populate_device(VFIODevice *vbasedev) (unsigned long)vdev->regions[i]->fd_offset); } + vdev->mmap_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, + vfio_intp_mmap_enable, vdev); + + QSIMPLEQ_INIT(&vdev->pending_intp_queue); + + for (i = 0; i < vbasedev->num_irqs; i++) { + irq.index = i; + + ret = ioctl(vbasedev->fd, VFIO_DEVICE_GET_IRQ_INFO, &irq); + if (ret) { + error_printf("vfio: error getting device %s irq info", + vbasedev->name); + goto irq_err; + } else { + trace_vfio_platform_populate_interrupts(irq.index, + irq.count, + irq.flags); + intp = vfio_init_intp(vbasedev, irq.index); + if (!intp) { + error_report("vfio: Error installing IRQ %d up", i); + goto irq_err; + } + } + } return 0; +irq_err: + timer_del(vdev->mmap_timer); + QLIST_FOREACH_SAFE(intp, &vdev->intp_list, next, tmp) { + QLIST_REMOVE(intp, next); + g_free(intp); + } error: for (i = 0; i < vbasedev->num_regions; i++) { g_free(vdev->regions[i]); @@ -93,6 +408,7 @@ error: static VFIODeviceOps vfio_platform_ops = { .vfio_compute_needs_reset = vfio_platform_compute_needs_reset, .vfio_hot_reset_multi = vfio_platform_hot_reset_multi, + .vfio_eoi = vfio_platform_eoi, .vfio_populate_device = vfio_populate_device, }; @@ -220,6 +536,7 @@ static void vfio_platform_realize(DeviceState *dev, Error **errp) vbasedev->type = VFIO_DEVICE_TYPE_PLATFORM; vbasedev->ops = &vfio_platform_ops; + vdev->start_irq_fn = vfio_start_eventfd_injection; trace_vfio_platform_realize(vbasedev->name, vdev->compat); @@ -243,6 +560,8 @@ static const VMStateDescription vfio_platform_vmstate = { static Property vfio_platform_dev_properties[] = { DEFINE_PROP_STRING("host", VFIOPlatformDevice, vbasedev.name), + DEFINE_PROP_UINT32("mmap-timeout-ms", VFIOPlatformDevice, + mmap_timeout, 1100), DEFINE_PROP_END_OF_LIST(), }; diff --git a/include/hw/vfio/vfio-platform.h b/include/hw/vfio/vfio-platform.h index 338f0c6..e55b711 100644 --- a/include/hw/vfio/vfio-platform.h +++ b/include/hw/vfio/vfio-platform.h @@ -18,16 +18,49 @@ #include "hw/sysbus.h" #include "hw/vfio/vfio-common.h" +#include "qemu/event_notifier.h" +#include "qemu/queue.h" +#include "hw/irq.h" #define TYPE_VFIO_PLATFORM "vfio-platform" +enum { + VFIO_IRQ_INACTIVE = 0, + VFIO_IRQ_PENDING = 1, + VFIO_IRQ_ACTIVE = 2, + /* VFIO_IRQ_ACTIVE_AND_PENDING cannot happen with VFIO */ +}; + +typedef struct VFIOINTp { + QLIST_ENTRY(VFIOINTp) next; /* entry for IRQ list */ + QSIMPLEQ_ENTRY(VFIOINTp) pqnext; /* entry for pending IRQ queue */ + EventNotifier interrupt; /* eventfd triggered on interrupt */ + EventNotifier unmask; /* eventfd for unmask on QEMU bypass */ + qemu_irq qemuirq; + struct VFIOPlatformDevice *vdev; /* back pointer to device */ + int state; /* inactive, pending, active */ + bool kvm_accel; /* set when QEMU bypass through KVM enabled */ + uint8_t pin; /* index */ + uint32_t virtualID; /* virtual IRQ */ +} VFIOINTp; + +typedef int (*start_irq_fn_t)(VFIOINTp *intp); + typedef struct VFIOPlatformDevice { SysBusDevice sbdev; VFIODevice vbasedev; /* not a QOM object */ VFIORegion **regions; + QLIST_HEAD(, VFIOINTp) intp_list; /* list of IRQ */ + /* queue of pending IRQ */ + QSIMPLEQ_HEAD(pending_intp_queue, VFIOINTp) pending_intp_queue; char *compat; /* compatibility string */ + uint32_t mmap_timeout; /* delay to re-enable mmaps after interrupt */ + QEMUTimer *mmap_timer; /* enable mmaps after periods w/o interrupts */ + start_irq_fn_t start_irq_fn; + QemuMutex intp_mutex; } VFIOPlatformDevice; + typedef struct VFIOPlatformDeviceClass { /*< private >*/ SysBusDeviceClass parent_class;