Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp3030472pxu; Mon, 14 Dec 2020 18:32:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJxgqJ1w32nPh3QBqIZGjzUeNWN0FRQWTG15AwaSm/WieSfFHqcAORkX2KayYU73sggJYmM7 X-Received: by 2002:a17:907:389:: with SMTP id ss9mr25728295ejb.158.1607999526474; Mon, 14 Dec 2020 18:32:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607999526; cv=none; d=google.com; s=arc-20160816; b=QKqr71pkvvOPvFuw/euV7ElGmxvYN15OvSYKzcEBIcElgHb0SIzTp6OHOF1Hy6jvrr ll5SxSHtAMdMmiFGaR4ySdzEb+7kAMMFiz3Bt4Mk5dg8A+o/7ht7gblOTLJja5OJajvN YPsx0422JIViCQUwhX6gjyoWgGJcSAiteDvb+06S3mLm7jo0tNqYiBtv7SKisW5ibj9K Wmnd1rj+rxezbVz0Dib6tACg6PeJ7INzagacOVLUEh3xELj1RKDJAoBXYhZ8m15WhhN9 e+66Dv81d4XluNK6GvIuY1QPlXiTcHSMIbqtAVhHX62DKuzv37cDcjzNu4VG6CnE0bCJ bl9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:mime-version:dkim-signature; bh=86Q04QsLv+Zg/jWgwv+T5/RqBePlgz0jEGNm56StQ1o=; b=sacqbgKDYe8GAcWS7nL1h1epBVyXaYtpBJ3qTJXeM9MMC0wKmnPQFUdOeLywZjA/dc SRWbMVXB21Yqis14UJ3ZZnGbp/qft2+4+ubKNQdakuWcnS/dUHMSwqZgthCVPWTknuZ2 LuhEC12iJOzr9HeiPXfpyKLD6Y1rsIaWMbUklTDkUlyuZ38LcVyPBFC639UNCyIv/ELD JYX/kUIXEJ46Og1kmosnTkjO27TFx8b+DA4aVueouD6Oq3WdcSkQULRnm1mOAeKh3ZbQ a3EFcRvrnF4FVlTx9i2sqkXAK4tSWEyLJHRje85CYClc7qqDNu0ldKNDhW/ZueYtpj3y WXjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@broadcom.com header.s=google header.b="SpEH/WW1"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g25si144684edr.220.2020.12.14.18.31.42; Mon, 14 Dec 2020 18:32:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@broadcom.com header.s=google header.b="SpEH/WW1"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2408664AbgLNRsE (ORCPT + 99 others); Mon, 14 Dec 2020 12:48:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2407764AbgLNRqO (ORCPT ); Mon, 14 Dec 2020 12:46:14 -0500 Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E470C061794 for ; Mon, 14 Dec 2020 09:45:34 -0800 (PST) Received: by mail-pg1-x52b.google.com with SMTP id w4so12933655pgg.13 for ; Mon, 14 Dec 2020 09:45:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references; bh=86Q04QsLv+Zg/jWgwv+T5/RqBePlgz0jEGNm56StQ1o=; b=SpEH/WW1IPnKT2OwocMPPOHHIooXJWETZqgmONUTtKyvp+xeWwiPW1O6cBvnHVBFEs e0mkgvtOIPxpvm8d8gRy0dz9UW4c5r/fDdpcMp4IEiStnJUnF9XSgn4kCGR3HrmbpKZp AeyWxMmErGdBjT39ZNJoSzqOI6WnhGIBvTzf8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references; bh=86Q04QsLv+Zg/jWgwv+T5/RqBePlgz0jEGNm56StQ1o=; b=TatLGp0FTjap4G/S/gYrVw13L6ymPi6hLGK/xXWsX6Yyo8mdPQZDAB8dG6zwA1TxIO cT62HzPOeNfp+QxTEtKpEftE3G46StWI7QTWWd05pJ1em21yZZcFGdpa9PPBok7PnC1c kDtuNocHZOnpE/s9bWWnjShYpcpxg+rgjn0sbokQBvEH4aghniJIbrL1f0OCO1LrB1at eWc6/rfgbI0sWi2XYmp/s4IhLNFgk7I9uBE/O7jQxnyFZBSv28C8eu3NvxbwaHVJ1JBD o0EFrkTexWjWvBfGrI4AA/aWSm6YUaIp1XNyAqDXF8Q7KCrT0jSbUM3sZ39jEDyy9FZ+ Ceig== MIME-Version: 1.0 X-Gm-Message-State: AOAM532UJ+LRG2IK/4pf/SKhOfbGrK6y2O03tUuHqcDVBVSBK9OxS0mZ MHq1aCQEnm1aEpBATigq4OekjOoWt/aU1yXh487dphMnJGnJOd0QkpwK6CtOHqaLuDSvNUfH/rt UxiuT1f6McjKRVZM= X-Received: by 2002:a62:8683:0:b029:1a3:9879:c326 with SMTP id x125-20020a6286830000b02901a39879c326mr10890941pfd.72.1607967933743; Mon, 14 Dec 2020 09:45:33 -0800 (PST) Received: from rahul_yocto_ubuntu18.ibn.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id m8sm6658131pgg.78.2020.12.14.09.45.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Dec 2020 09:45:32 -0800 (PST) From: Vikas Gupta To: eric.auger@redhat.com, alex.williamson@redhat.com, cohuck@redhat.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: vikram.prakash@broadcom.com, srinath.mannam@broadcom.com, ashwin.kamath@broadcom.com, zachary.schroff@broadcom.com, manish.kurup@broadcom.com, Vikas Gupta Subject: [RFC v3 1/2] vfio/platform: add support for msi Date: Mon, 14 Dec 2020 23:15:13 +0530 Message-Id: <20201214174514.22006-2-vikas.gupta@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201214174514.22006-1-vikas.gupta@broadcom.com> References: <20201124161646.41191-1-vikas.gupta@broadcom.com> <20201214174514.22006-1-vikas.gupta@broadcom.com> Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="00000000000089512d05b67035ed" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --00000000000089512d05b67035ed Content-Type: text/plain; charset="US-ASCII" MSI support for platform devices.The MSI block is added as an extended IRQ which exports caps VFIO_IRQ_INFO_CAP_TYPE and VFIO_IRQ_INFO_CAP_MSI_DESCS. Signed-off-by: Vikas Gupta --- drivers/vfio/platform/vfio_platform_common.c | 179 +++++++++++- drivers/vfio/platform/vfio_platform_irq.c | 260 +++++++++++++++++- drivers/vfio/platform/vfio_platform_private.h | 32 +++ include/uapi/linux/vfio.h | 44 +++ 4 files changed, 496 insertions(+), 19 deletions(-) diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c index fb4b385191f2..c936852f35d7 100644 --- a/drivers/vfio/platform/vfio_platform_common.c +++ b/drivers/vfio/platform/vfio_platform_common.c @@ -16,6 +16,7 @@ #include #include #include +#include #include "vfio_platform_private.h" @@ -26,6 +27,8 @@ #define VFIO_PLATFORM_IS_ACPI(vdev) ((vdev)->acpihid != NULL) static LIST_HEAD(reset_list); +/* devices having MSI support */ +static LIST_HEAD(msi_list); static DEFINE_MUTEX(driver_lock); static vfio_platform_reset_fn_t vfio_platform_lookup_reset(const char *compat, @@ -47,6 +50,25 @@ static vfio_platform_reset_fn_t vfio_platform_lookup_reset(const char *compat, return reset_fn; } +static bool vfio_platform_lookup_msi(struct vfio_platform_device *vdev) +{ + bool has_msi = false; + struct vfio_platform_msi_node *iter; + + mutex_lock(&driver_lock); + list_for_each_entry(iter, &msi_list, link) { + if (!strcmp(iter->compat, vdev->compat) && + try_module_get(iter->owner)) { + vdev->msi_module = iter->owner; + vdev->of_get_msi = iter->of_get_msi; + has_msi = true; + break; + } + } + mutex_unlock(&driver_lock); + return has_msi; +} + static int vfio_platform_acpi_probe(struct vfio_platform_device *vdev, struct device *dev) { @@ -126,6 +148,19 @@ static int vfio_platform_get_reset(struct vfio_platform_device *vdev) return vdev->of_reset ? 0 : -ENOENT; } +static int vfio_platform_get_msi(struct vfio_platform_device *vdev) +{ + bool has_msi; + + has_msi = vfio_platform_lookup_msi(vdev); + if (!has_msi) { + request_module("vfio-msi:%s", vdev->compat); + has_msi = vfio_platform_lookup_msi(vdev); + } + + return has_msi ? 0 : -ENOENT; +} + static void vfio_platform_put_reset(struct vfio_platform_device *vdev) { if (VFIO_PLATFORM_IS_ACPI(vdev)) @@ -135,6 +170,12 @@ static void vfio_platform_put_reset(struct vfio_platform_device *vdev) module_put(vdev->reset_module); } +static void vfio_platform_put_msi(struct vfio_platform_device *vdev) +{ + if (vdev->of_get_msi) + module_put(vdev->msi_module); +} + static int vfio_platform_regions_init(struct vfio_platform_device *vdev) { int cnt = 0, i; @@ -343,9 +384,17 @@ static long vfio_platform_ioctl(void *device_data, } else if (cmd == VFIO_DEVICE_GET_IRQ_INFO) { struct vfio_irq_info info; + struct vfio_info_cap caps = { .buf = NULL, .size = 0 }; + struct vfio_irq_info_cap_msi *msi_info = NULL; + int ext_irq_index = vdev->num_irqs - vdev->num_ext_irqs; + unsigned long capsz; + u32 index; minsz = offsetofend(struct vfio_irq_info, count); + /* For backward compatibility, cannot require this */ + capsz = offsetofend(struct vfio_irq_info, cap_offset); + if (copy_from_user(&info, (void __user *)arg, minsz)) return -EFAULT; @@ -355,8 +404,94 @@ static long vfio_platform_ioctl(void *device_data, if (info.index >= vdev->num_irqs) return -EINVAL; - info.flags = vdev->irqs[info.index].flags; - info.count = vdev->irqs[info.index].count; + if (info.argsz >= capsz) + minsz = capsz; + + index = info.index; + + info.flags = vdev->irqs[index].flags; + info.count = vdev->irqs[index].count; + + if (ext_irq_index - index == VFIO_EXT_IRQ_MSI) { + struct vfio_irq_info_cap_type cap_type = { + .header.id = VFIO_IRQ_INFO_CAP_TYPE, + .header.version = 1 }; + struct vfio_platform_irq *irq; + size_t msi_info_size; + int num_msgs; + int ret; + int i; + + index = array_index_nospec(index, + vdev->num_irqs); + irq = &vdev->irqs[index]; + + cap_type.type = irq->type; + cap_type.subtype = irq->subtype; + + ret = vfio_info_add_capability(&caps, + &cap_type.header, + sizeof(cap_type)); + if (ret) + return ret; + + num_msgs = irq->num_ctx; + if (num_msgs) { + msi_info_size = struct_size(msi_info, + msgs, num_msgs); + + msi_info = kzalloc(msi_info_size, GFP_KERNEL); + if (!msi_info) { + kfree(caps.buf); + return -ENOMEM; + } + + msi_info->header.id = + VFIO_IRQ_INFO_CAP_MSI_DESCS; + msi_info->header.version = 1; + msi_info->nr_msgs = num_msgs; + + for (i = 0; i < num_msgs; i++) { + struct vfio_irq_ctx *ctx = &irq->ctx[i]; + + msi_info->msgs[i].addr_lo = + ctx->msg.address_lo; + msi_info->msgs[i].addr_hi = + ctx->msg.address_hi; + msi_info->msgs[i].data = ctx->msg.data; + } + + ret = vfio_info_add_capability(&caps, + &msi_info->header, + msi_info_size); + if (ret) { + kfree(msi_info); + kfree(caps.buf); + return ret; + } + } + } + + if (caps.size) { + info.flags |= VFIO_IRQ_INFO_FLAG_CAPS; + if (info.argsz < sizeof(info) + caps.size) { + info.argsz = sizeof(info) + caps.size; + info.cap_offset = 0; + } else { + vfio_info_cap_shift(&caps, sizeof(info)); + if (copy_to_user((void __user *)arg + + sizeof(info), caps.buf, + caps.size)) { + kfree(msi_info); + kfree(caps.buf); + return -EFAULT; + } + info.cap_offset = sizeof(info); + } + + kfree(msi_info); + kfree(caps.buf); + } return copy_to_user((void __user *)arg, &info, minsz) ? -EFAULT : 0; @@ -365,6 +500,7 @@ static long vfio_platform_ioctl(void *device_data, struct vfio_irq_set hdr; u8 *data = NULL; int ret = 0; + int max; size_t data_size = 0; minsz = offsetofend(struct vfio_irq_set, count); @@ -372,8 +508,14 @@ static long vfio_platform_ioctl(void *device_data, if (copy_from_user(&hdr, (void __user *)arg, minsz)) return -EFAULT; - ret = vfio_set_irqs_validate_and_prepare(&hdr, vdev->num_irqs, - vdev->num_irqs, &data_size); + if (hdr.index >= vdev->num_irqs) + return -EINVAL; + + max = vdev->irqs[hdr.index].count; + + ret = vfio_set_irqs_validate_and_prepare(&hdr, max, + vdev->num_irqs, + &data_size); if (ret) return ret; @@ -678,6 +820,10 @@ int vfio_platform_probe_common(struct vfio_platform_device *vdev, return ret; } + ret = vfio_platform_get_msi(vdev); + if (ret) + dev_info(vdev->device, "msi not supported\n"); + group = vfio_iommu_group_get(dev); if (!group) { dev_err(dev, "No IOMMU group for device %s\n", vdev->name); @@ -697,6 +843,7 @@ int vfio_platform_probe_common(struct vfio_platform_device *vdev, put_iommu: vfio_iommu_group_put(group, dev); put_reset: + vfio_platform_put_msi(vdev); vfio_platform_put_reset(vdev); return ret; } @@ -744,6 +891,30 @@ void vfio_platform_unregister_reset(const char *compat, } EXPORT_SYMBOL_GPL(vfio_platform_unregister_reset); +void __vfio_platform_register_msi(struct vfio_platform_msi_node *node) +{ + mutex_lock(&driver_lock); + list_add(&node->link, &msi_list); + mutex_unlock(&driver_lock); +} +EXPORT_SYMBOL_GPL(__vfio_platform_register_msi); + +void vfio_platform_unregister_msi(const char *compat) +{ + struct vfio_platform_msi_node *iter, *temp; + + mutex_lock(&driver_lock); + list_for_each_entry_safe(iter, temp, &msi_list, link) { + if (!strcmp(iter->compat, compat)) { + list_del(&iter->link); + break; + } + } + + mutex_unlock(&driver_lock); +} +EXPORT_SYMBOL_GPL(vfio_platform_unregister_msi); + MODULE_VERSION(DRIVER_VERSION); MODULE_LICENSE("GPL v2"); MODULE_AUTHOR(DRIVER_AUTHOR); diff --git a/drivers/vfio/platform/vfio_platform_irq.c b/drivers/vfio/platform/vfio_platform_irq.c index c5b09ec0a3c9..e0f4696afedd 100644 --- a/drivers/vfio/platform/vfio_platform_irq.c +++ b/drivers/vfio/platform/vfio_platform_irq.c @@ -8,10 +8,12 @@ #include #include +#include #include #include #include #include +#include #include "vfio_platform_private.h" @@ -253,6 +255,195 @@ static int vfio_platform_set_irq_trigger(struct vfio_platform_device *vdev, return 0; } +/* MSI/MSIX */ +static irqreturn_t vfio_msihandler(int irq, void *arg) +{ + struct eventfd_ctx *trigger = arg; + + eventfd_signal(trigger, 1); + return IRQ_HANDLED; +} + +static void msi_write(struct msi_desc *desc, struct msi_msg *msg) +{ + int i; + struct vfio_platform_irq *irq; + u16 index = desc->platform.msi_index; + struct device *dev = msi_desc_to_dev(desc); + struct vfio_device *device = dev_get_drvdata(dev); + struct vfio_platform_device *vdev = (struct vfio_platform_device *) + vfio_device_data(device); + + for (i = 0; i < vdev->num_irqs; i++) + if (vdev->irqs[i].type == VFIO_IRQ_TYPE_MSI) + irq = &vdev->irqs[i]; + + irq->ctx[index].msg.address_lo = msg->address_lo; + irq->ctx[index].msg.address_hi = msg->address_hi; + irq->ctx[index].msg.data = msg->data; +} + +static int vfio_msi_enable(struct vfio_platform_device *vdev, + struct vfio_platform_irq *irq, int nvec) +{ + int ret; + int msi_idx = 0; + struct msi_desc *desc; + struct device *dev = vdev->device; + + irq->ctx = kcalloc(nvec, sizeof(struct vfio_irq_ctx), GFP_KERNEL); + if (!irq->ctx) + return -ENOMEM; + + /* Allocate platform MSIs */ + ret = platform_msi_domain_alloc_irqs(dev, nvec, msi_write); + if (ret < 0) { + kfree(irq->ctx); + return ret; + } + + for_each_msi_entry(desc, dev) { + irq->ctx[msi_idx].hwirq = desc->irq; + msi_idx++; + } + + irq->num_ctx = nvec; + irq->config_msi = 1; + + return 0; +} + +static int vfio_msi_set_vector_signal(struct vfio_platform_irq *irq, + int vector, int fd) +{ + struct eventfd_ctx *trigger; + int irq_num, ret; + + if (vector < 0 || vector >= irq->num_ctx) + return -EINVAL; + + irq_num = irq->ctx[vector].hwirq; + + if (irq->ctx[vector].trigger) { + free_irq(irq_num, irq->ctx[vector].trigger); + kfree(irq->ctx[vector].name); + eventfd_ctx_put(irq->ctx[vector].trigger); + irq->ctx[vector].trigger = NULL; + } + + if (fd < 0) + return 0; + + irq->ctx[vector].name = kasprintf(GFP_KERNEL, + "vfio-msi[%d]", vector); + if (!irq->ctx[vector].name) + return -ENOMEM; + + trigger = eventfd_ctx_fdget(fd); + if (IS_ERR(trigger)) { + kfree(irq->ctx[vector].name); + return PTR_ERR(trigger); + } + + ret = request_irq(irq_num, vfio_msihandler, 0, + irq->ctx[vector].name, trigger); + if (ret) { + kfree(irq->ctx[vector].name); + eventfd_ctx_put(trigger); + return ret; + } + + irq->ctx[vector].trigger = trigger; + + return 0; +} + +static int vfio_msi_set_block(struct vfio_platform_irq *irq, unsigned int start, + unsigned int count, int32_t *fds) +{ + int i, j, ret = 0; + + if (start >= irq->num_ctx || start + count > irq->num_ctx) + return -EINVAL; + + for (i = 0, j = start; i < count && !ret; i++, j++) { + int fd = fds ? fds[i] : -1; + + ret = vfio_msi_set_vector_signal(irq, j, fd); + } + + if (ret) { + for (--j; j >= (int)start; j--) + vfio_msi_set_vector_signal(irq, j, -1); + } + + return ret; +} + +static void vfio_msi_disable(struct vfio_platform_device *vdev, + struct vfio_platform_irq *irq) +{ + struct device *dev = vdev->device; + + vfio_msi_set_block(irq, 0, irq->num_ctx, NULL); + + platform_msi_domain_free_irqs(dev); + + irq->config_msi = 0; + irq->num_ctx = 0; + + kfree(irq->ctx); +} + +static int vfio_set_msi_trigger(struct vfio_platform_device *vdev, + unsigned int index, unsigned int start, + unsigned int count, uint32_t flags, void *data) +{ + int i; + struct vfio_platform_irq *irq = &vdev->irqs[index]; + + if (start + count > irq->count) + return -EINVAL; + + if (!count && (flags & VFIO_IRQ_SET_DATA_NONE)) { + vfio_msi_disable(vdev, irq); + return 0; + } + + if (flags & VFIO_IRQ_SET_DATA_EVENTFD) { + s32 *fds = data; + int ret; + + if (irq->config_msi) + return vfio_msi_set_block(irq, start, count, + fds); + ret = vfio_msi_enable(vdev, irq, start + count); + if (ret) + return ret; + + ret = vfio_msi_set_block(irq, start, count, fds); + if (ret) + vfio_msi_disable(vdev, irq); + + return ret; + } + + for (i = start; i < start + count; i++) { + if (!irq->ctx[i].trigger) + continue; + if (flags & VFIO_IRQ_SET_DATA_NONE) { + eventfd_signal(irq->ctx[i].trigger, 1); + } else if (flags & VFIO_IRQ_SET_DATA_BOOL) { + u8 *bools = data; + + if (bools[i - start]) + eventfd_signal(irq->ctx[i].trigger, 1); + } + } + + return 0; +} + int vfio_platform_set_irqs_ioctl(struct vfio_platform_device *vdev, uint32_t flags, unsigned index, unsigned start, unsigned count, void *data) @@ -261,16 +452,29 @@ int vfio_platform_set_irqs_ioctl(struct vfio_platform_device *vdev, unsigned start, unsigned count, uint32_t flags, void *data) = NULL; - switch (flags & VFIO_IRQ_SET_ACTION_TYPE_MASK) { - case VFIO_IRQ_SET_ACTION_MASK: - func = vfio_platform_set_irq_mask; - break; - case VFIO_IRQ_SET_ACTION_UNMASK: - func = vfio_platform_set_irq_unmask; - break; - case VFIO_IRQ_SET_ACTION_TRIGGER: - func = vfio_platform_set_irq_trigger; - break; + struct vfio_platform_irq *irq = &vdev->irqs[index]; + + if (irq->type == VFIO_IRQ_TYPE_MSI) { + switch (flags & VFIO_IRQ_SET_ACTION_TYPE_MASK) { + case VFIO_IRQ_SET_ACTION_MASK: + case VFIO_IRQ_SET_ACTION_UNMASK: + break; + case VFIO_IRQ_SET_ACTION_TRIGGER: + func = vfio_set_msi_trigger; + break; + } + } else { + switch (flags & VFIO_IRQ_SET_ACTION_TYPE_MASK) { + case VFIO_IRQ_SET_ACTION_MASK: + func = vfio_platform_set_irq_mask; + break; + case VFIO_IRQ_SET_ACTION_UNMASK: + func = vfio_platform_set_irq_unmask; + break; + case VFIO_IRQ_SET_ACTION_TRIGGER: + func = vfio_platform_set_irq_trigger; + break; + } } if (!func) @@ -281,12 +485,21 @@ int vfio_platform_set_irqs_ioctl(struct vfio_platform_device *vdev, int vfio_platform_irq_init(struct vfio_platform_device *vdev) { - int cnt = 0, i; + int i; + int cnt = 0; + int num_irqs; + int msi_cnt = 0; while (vdev->get_irq(vdev, cnt) >= 0) cnt++; - vdev->irqs = kcalloc(cnt, sizeof(struct vfio_platform_irq), GFP_KERNEL); + if (vdev->of_get_msi) { + msi_cnt = vdev->of_get_msi(vdev); + num_irqs++; + } + + vdev->irqs = kcalloc(num_irqs, sizeof(struct vfio_platform_irq), + GFP_KERNEL); if (!vdev->irqs) return -ENOMEM; @@ -309,7 +522,19 @@ int vfio_platform_irq_init(struct vfio_platform_device *vdev) vdev->irqs[i].masked = false; } - vdev->num_irqs = cnt; + /* + * MSI block is added at last index and it is an ext irq + */ + if (msi_cnt > 0) { + vdev->irqs[i].flags = VFIO_IRQ_INFO_EVENTFD; + vdev->irqs[i].count = msi_cnt; + vdev->irqs[i].hwirq = 0; + vdev->irqs[i].masked = false; + vdev->irqs[i].type = VFIO_IRQ_TYPE_MSI; + vdev->num_ext_irqs = 1; + } + + vdev->num_irqs = num_irqs; return 0; err: @@ -321,8 +546,13 @@ void vfio_platform_irq_cleanup(struct vfio_platform_device *vdev) { int i; - for (i = 0; i < vdev->num_irqs; i++) - vfio_set_trigger(vdev, i, -1, NULL); + for (i = 0; i < vdev->num_irqs; i++) { + if (vdev->irqs[i].type == VFIO_IRQ_TYPE_MSI) + vfio_set_msi_trigger(vdev, i, 0, 0, + VFIO_IRQ_SET_DATA_NONE, NULL); + else + vfio_set_trigger(vdev, i, -1, NULL); + } vdev->num_irqs = 0; kfree(vdev->irqs); diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h index 289089910643..1307feddda21 100644 --- a/drivers/vfio/platform/vfio_platform_private.h +++ b/drivers/vfio/platform/vfio_platform_private.h @@ -9,6 +9,7 @@ #include #include +#include #define VFIO_PLATFORM_OFFSET_SHIFT 40 #define VFIO_PLATFORM_OFFSET_MASK (((u64)(1) << VFIO_PLATFORM_OFFSET_SHIFT) - 1) @@ -19,9 +20,21 @@ #define VFIO_PLATFORM_INDEX_TO_OFFSET(index) \ ((u64)(index) << VFIO_PLATFORM_OFFSET_SHIFT) +/* IRQ index for MSI in ext IRQs */ +#define VFIO_EXT_IRQ_MSI 0 + +struct vfio_irq_ctx { + int hwirq; + char *name; + struct msi_msg msg; + struct eventfd_ctx *trigger; +}; + struct vfio_platform_irq { u32 flags; u32 count; + int num_ctx; + struct vfio_irq_ctx *ctx; int hwirq; char *name; struct eventfd_ctx *trigger; @@ -29,6 +42,11 @@ struct vfio_platform_irq { spinlock_t lock; struct virqfd *unmask; struct virqfd *mask; + + /* for extended irqs */ + u32 type; + u32 subtype; + int config_msi; }; struct vfio_platform_region { @@ -46,12 +64,14 @@ struct vfio_platform_device { u32 num_regions; struct vfio_platform_irq *irqs; u32 num_irqs; + int num_ext_irqs; int refcnt; struct mutex igate; struct module *parent_module; const char *compat; const char *acpihid; struct module *reset_module; + struct module *msi_module; struct device *device; /* @@ -65,11 +85,13 @@ struct vfio_platform_device { (*get_resource)(struct vfio_platform_device *vdev, int i); int (*get_irq)(struct vfio_platform_device *vdev, int i); int (*of_reset)(struct vfio_platform_device *vdev); + u32 (*of_get_msi)(struct vfio_platform_device *vdev); bool reset_required; }; typedef int (*vfio_platform_reset_fn_t)(struct vfio_platform_device *vdev); +typedef u32 (*vfio_platform_get_msi_fn_t)(struct vfio_platform_device *vdev); struct vfio_platform_reset_node { struct list_head link; @@ -78,6 +100,13 @@ struct vfio_platform_reset_node { vfio_platform_reset_fn_t of_reset; }; +struct vfio_platform_msi_node { + struct list_head link; + char *compat; + struct module *owner; + vfio_platform_get_msi_fn_t of_get_msi; +}; + extern int vfio_platform_probe_common(struct vfio_platform_device *vdev, struct device *dev); extern struct vfio_platform_device *vfio_platform_remove_common @@ -94,6 +123,9 @@ extern int vfio_platform_set_irqs_ioctl(struct vfio_platform_device *vdev, extern void __vfio_platform_register_reset(struct vfio_platform_reset_node *n); extern void vfio_platform_unregister_reset(const char *compat, vfio_platform_reset_fn_t fn); +void __vfio_platform_register_msi(struct vfio_platform_msi_node *n); +void vfio_platform_unregister_msi(const char *compat); + #define vfio_platform_register_reset(__compat, __reset) \ static struct vfio_platform_reset_node __reset ## _node = { \ .owner = THIS_MODULE, \ diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index d1812777139f..53a7ff2b524e 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -697,11 +697,55 @@ struct vfio_irq_info { #define VFIO_IRQ_INFO_MASKABLE (1 << 1) #define VFIO_IRQ_INFO_AUTOMASKED (1 << 2) #define VFIO_IRQ_INFO_NORESIZE (1 << 3) +#define VFIO_IRQ_INFO_FLAG_CAPS (1 << 4) /* Info supports caps */ __u32 index; /* IRQ index */ __u32 count; /* Number of IRQs within this index */ + __u32 cap_offset; /* Offset within info struct of first cap */ }; #define VFIO_DEVICE_GET_IRQ_INFO _IO(VFIO_TYPE, VFIO_BASE + 9) +/* + * The irq type capability allows IRQs unique to a specific device or + * class of devices to be exposed. + * + * The structures below define version 1 of this capability. + */ +#define VFIO_IRQ_INFO_CAP_TYPE 3 + +struct vfio_irq_info_cap_type { + struct vfio_info_cap_header header; + __u32 type; /* global per bus driver */ + __u32 subtype; /* type specific */ +}; + +/* + * List of IRQ types, global per bus driver. + * If you introduce a new type, please add it here. + */ + +/* Non PCI devices having MSI(s) support */ +#define VFIO_IRQ_TYPE_MSI (1) + +/* + * The msi capability allows the user to use the msi msg to + * configure the iova for the msi configuration. + * The structures below define version 1 of this capability. + */ +#define VFIO_IRQ_INFO_CAP_MSI_DESCS 4 + +struct vfio_irq_msi_msg { + __u32 addr_lo; + __u32 addr_hi; + __u32 data; +}; + +struct vfio_irq_info_cap_msi { + struct vfio_info_cap_header header; + __u32 nr_msgs; + __u32 reserved; + struct vfio_irq_msi_msg msgs[]; +}; + /** * VFIO_DEVICE_SET_IRQS - _IOW(VFIO_TYPE, VFIO_BASE + 10, struct vfio_irq_set) * -- 2.17.1 -- This electronic communication and the information and any files transmitted with it, or attached to it, are confidential and are intended solely for the use of the individual or entity to whom it is addressed and may contain information that is confidential, legally privileged, protected by privacy laws, or otherwise restricted from disclosure to anyone else. If you are not the intended recipient or the person responsible for delivering the e-mail to the intended recipient, you are hereby notified that any use, copying, distributing, dissemination, forwarding, printing, or copying of this e-mail is strictly prohibited. If you received this e-mail in error, please return the e-mail to the sender, delete it from your computer, and destroy any printed copy of it. --00000000000089512d05b67035ed Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature 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 2lQ6rFUP408r38ha7ieLj9GoHHitwSmKYwUIGObe2Y57xYNj855BF4wx44Z80uM2ugKCZwIDAQAB o4IBzzCCAcswDgYDVR0PAQH/BAQDAgWgMIGeBggrBgEFBQcBAQSBkTCBjjBNBggrBgEFBQcwAoZB aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3NwZXJzb25hbHNpZ24yc2hhMmcz b2NzcC5jcnQwPQYIKwYBBQUHMAGGMWh0dHA6Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9nc3BlcnNv bmFsc2lnbjJzaGEyZzMwTQYDVR0gBEYwRDBCBgorBgEEAaAyASgKMDQwMgYIKwYBBQUHAgEWJmh0 dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMAkGA1UdEwQCMAAwRAYDVR0fBD0w OzA5oDegNYYzaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9nc3BlcnNvbmFsc2lnbjJzaGEyZzMu Y3JsMCMGA1UdEQQcMBqBGHZpa2FzLmd1cHRhQGJyb2FkY29tLmNvbTATBgNVHSUEDDAKBggrBgEF BQcDBDAfBgNVHSMEGDAWgBRpcoJiMWeVRIV3kYDEBDZJnXsLYTAdBgNVHQ4EFgQUnmgVV8btvFtO FD3kFjPWxD/aB8MwDQYJKoZIhvcNAQELBQADggEBAGCcuBN7G3mbQ7xMF8g8Lpz6WE+UFmkSSqU3 FZLC2I92SA5lRIthcdz4AEgte6ywnef3+2mG7HWMoQ1wriSG5qLppAD02Uku6yRD52Sn67DB2Ozk yhBJayurzUxN1+R5E/YZtj2fkNajS5+i85e83PZPvVJ8/WnseIADGvDoouWqK7mxU/p8hELdb3PW JH2nMg39SpVAwmRqfs6mYtenpMwKtQd9goGkIFXqdSvOPATkbS1YIGtU2byLK+/1rIWPoKNmRddj WOu/loxldI1sJa1tOHgtb93YpIe0HEmgxLGS0KEnbM+rn9vXNKCe+9n0PhxJIfqcf6rAtK0prRwr Y2MxggJvMIICawIBATBtMF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNh MTMwMQYDVQQDEypHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAyIENBIC0gU0hBMjU2IC0gRzMCDDTZ lyNZkGMqSi5xbzANBglghkgBZQMEAgEFAKCB1DAvBgkqhkiG9w0BCQQxIgQgKwzvUmUM6QTyu8TJ 86v+aEMee4yGqqrx8V4bzb0OW34wGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0B CQUxDxcNMjAxMjE0MTc0NTM0WjBpBgkqhkiG9w0BCQ8xXDBaMAsGCWCGSAFlAwQBKjALBglghkgB ZQMEARYwCwYJYIZIAWUDBAECMAoGCCqGSIb3DQMHMAsGCSqGSIb3DQEBCjALBgkqhkiG9w0BAQcw CwYJYIZIAWUDBAIBMA0GCSqGSIb3DQEBAQUABIIBADTLrhGEwzofogH8D4r4CdjoKnq+UAn4UWF+ ST+eI7Knw3f5bDKpTr86X6jjUquYDRBt4YMJdnPLC+/ChaAcr3dyCTuCnG/GcOIniwpMNc74BSzW W356I7LyuI72Je05cs1iRREQWfTZcjVvlPRmN+7/XZTB/CE7nw+XUwNtKp0sXqFiDEwjCfA8VtV/ FmyZbbBXI8DuluSJaf/Kl3EbcxjSnJdY9nn7vGRo12AfzGOT6tKfSGDAZ5V+HYyP4Fg3RJmVECi3 ICDBvrhXZTnvtFOo1dK0Y4p9/bYHMEb2IOKuH/XSdvh1oIYeUabWdYBXUCh8PiFcYtTGt6CMntPL NII= --00000000000089512d05b67035ed--