Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3654FC388F9 for ; Thu, 12 Nov 2020 02:31:23 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 81521206D9 for ; Thu, 12 Nov 2020 02:31:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 81521206D9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A3BF486BB1; Thu, 12 Nov 2020 02:31:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id r8v9wcYCThHe; Thu, 12 Nov 2020 02:31:20 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 6AD4B86A39; Thu, 12 Nov 2020 02:31:20 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5BFEBC0889; Thu, 12 Nov 2020 02:31:20 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2E25DC016F for ; Thu, 12 Nov 2020 02:31:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 18C3C86AF2 for ; Thu, 12 Nov 2020 02:31:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id P-ql3GMq0AOJ for ; Thu, 12 Nov 2020 02:31:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0D79086A39 for ; Thu, 12 Nov 2020 02:31:17 +0000 (UTC) IronPort-SDR: RmsJuIxx6TE0qDLPT3wiFp9PY62NaP0xIc0MkylZlOACn28FQ+CmX/+6rPJ1o0TsJQbYjwWrtR 8HyZe81ro2tA== X-IronPort-AV: E=McAfee;i="6000,8403,9802"; a="170415105" X-IronPort-AV: E=Sophos;i="5.77,471,1596524400"; d="scan'208";a="170415105" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2020 18:31:14 -0800 IronPort-SDR: RqmfoNvjRlzJ+AZ0ZVwfPxQdbl9++xpGWOTNcFQUqDkXqk2nSnkuemt/WizPYJwrPXhU8GCLmI pSM7JC62A6xg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,471,1596524400"; d="scan'208";a="366450979" Received: from allen-box.sh.intel.com ([10.239.159.28]) by orsmga007.jf.intel.com with ESMTP; 11 Nov 2020 18:31:10 -0800 From: Lu Baolu To: Alex Williamson , Cornelia Huck Subject: [PATCH 1/1] vfio/type1: Add subdev_ioasid callback to vfio_iommu_driver_ops Date: Thu, 12 Nov 2020 10:24:07 +0800 Message-Id: <20201112022407.2063896-1-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Cc: Jean-Philippe Brucker , Kevin Tian , Dave Jiang , Ashok Raj , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, Robin Murphy X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" Add API for getting the ioasid of a subdevice (vfio/mdev). This calls into the backend IOMMU module to get the actual value or error number if ioasid for subdevice is not supported. The physical device driver implementations which rely on the vfio/mdev framework for mediated device user level access could typically consume this interface like below: struct device *dev = mdev_dev(mdev); unsigned int pasid; int ret; ret = vfio_subdev_ioasid(dev, &pasid); if (ret < 0) return ret; /* Program device context with pasid value. */ .... Signed-off-by: Lu Baolu --- drivers/vfio/vfio.c | 34 ++++++++++++++++++++ drivers/vfio/vfio_iommu_type1.c | 57 +++++++++++++++++++++++++++++++++ include/linux/vfio.h | 4 +++ 3 files changed, 95 insertions(+) diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c index 2151bc7f87ab..4931e1492921 100644 --- a/drivers/vfio/vfio.c +++ b/drivers/vfio/vfio.c @@ -2331,6 +2331,40 @@ int vfio_unregister_notifier(struct device *dev, enum vfio_notify_type type, } EXPORT_SYMBOL(vfio_unregister_notifier); +int vfio_subdev_ioasid(struct device *dev, unsigned int *id) +{ + struct vfio_container *container; + struct vfio_iommu_driver *driver; + struct vfio_group *group; + int ret; + + if (!dev || !id) + return -EINVAL; + + group = vfio_group_get_from_dev(dev); + if (!group) + return -ENODEV; + + ret = vfio_group_add_container_user(group); + if (ret) + goto out; + + container = group->container; + driver = container->iommu_driver; + if (likely(driver && driver->ops->subdev_ioasid)) + ret = driver->ops->subdev_ioasid(container->iommu_data, + group->iommu_group, id); + else + ret = -ENOTTY; + + vfio_group_try_dissolve_container(group); + +out: + vfio_group_put(group); + return ret; +} +EXPORT_SYMBOL(vfio_subdev_ioasid); + /** * Module/class support */ diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 67e827638995..f94cc7707d7e 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -2980,6 +2980,62 @@ static int vfio_iommu_type1_dma_rw(void *iommu_data, dma_addr_t user_iova, return ret; } +static int vfio_iommu_type1_subdev_ioasid(void *iommu_data, + struct iommu_group *iommu_group, + unsigned int *id) +{ + struct vfio_iommu *iommu = iommu_data; + struct vfio_domain *domain = NULL, *d; + struct device *iommu_device = NULL; + struct bus_type *bus = NULL; + int ret; + + if (!iommu || !iommu_group || !id) + return -EINVAL; + + mutex_lock(&iommu->lock); + ret = iommu_group_for_each_dev(iommu_group, &bus, vfio_bus_type); + if (ret) + goto out; + + if (!vfio_bus_is_mdev(bus)) { + ret = -EINVAL; + goto out; + } + + ret = iommu_group_for_each_dev(iommu_group, &iommu_device, + vfio_mdev_iommu_device); + if (ret || !iommu_device || + !iommu_dev_feature_enabled(iommu_device, IOMMU_DEV_FEAT_AUX)) { + ret = -ENODEV; + goto out; + } + + list_for_each_entry(d, &iommu->domain_list, next) { + if (find_iommu_group(d, iommu_group)) { + domain = d; + break; + } + } + + if (!domain) { + ret = -ENODEV; + goto out; + } + + ret = iommu_aux_get_pasid(domain->domain, iommu_device); + if (ret > 0) { + *id = ret; + ret = 0; + } else { + ret = -ENOSPC; + } + +out: + mutex_unlock(&iommu->lock); + return ret; +} + static const struct vfio_iommu_driver_ops vfio_iommu_driver_ops_type1 = { .name = "vfio-iommu-type1", .owner = THIS_MODULE, @@ -2993,6 +3049,7 @@ static const struct vfio_iommu_driver_ops vfio_iommu_driver_ops_type1 = { .register_notifier = vfio_iommu_type1_register_notifier, .unregister_notifier = vfio_iommu_type1_unregister_notifier, .dma_rw = vfio_iommu_type1_dma_rw, + .subdev_ioasid = vfio_iommu_type1_subdev_ioasid, }; static int __init vfio_iommu_type1_init(void) diff --git a/include/linux/vfio.h b/include/linux/vfio.h index 38d3c6a8dc7e..6dcf09a2796d 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -90,6 +90,9 @@ struct vfio_iommu_driver_ops { struct notifier_block *nb); int (*dma_rw)(void *iommu_data, dma_addr_t user_iova, void *data, size_t count, bool write); + int (*subdev_ioasid)(void *iommu_data, + struct iommu_group *group, + unsigned int *id); }; extern int vfio_register_iommu_driver(const struct vfio_iommu_driver_ops *ops); @@ -125,6 +128,7 @@ extern int vfio_group_unpin_pages(struct vfio_group *group, extern int vfio_dma_rw(struct vfio_group *group, dma_addr_t user_iova, void *data, size_t len, bool write); +extern int vfio_subdev_ioasid(struct device *dev, unsigned int *id); /* each type has independent events */ enum vfio_notify_type { -- 2.25.1 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu