From patchwork Wed Nov 16 20:46:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirti Wankhede X-Patchwork-Id: 9432709 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1546460476 for ; Wed, 16 Nov 2016 20:50:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 080CF29143 for ; Wed, 16 Nov 2016 20:50:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F0FDD2915C; Wed, 16 Nov 2016 20:50:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F04E29143 for ; Wed, 16 Nov 2016 20:50:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932393AbcKPUuC (ORCPT ); Wed, 16 Nov 2016 15:50:02 -0500 Received: from hqemgate16.nvidia.com ([216.228.121.65]:3986 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S938861AbcKPUqG (ORCPT ); Wed, 16 Nov 2016 15:46:06 -0500 Received: from hqnvupgp07.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com id ; Wed, 16 Nov 2016 13:10:29 -0800 Received: from HQMAIL101.nvidia.com ([172.20.13.39]) by hqnvupgp07.nvidia.com (PGP Universal service); Wed, 16 Nov 2016 00:45:03 -0800 X-PGP-Universal: processed; by hqnvupgp07.nvidia.com on Wed, 16 Nov 2016 00:45:03 -0800 Received: from HQMAIL102.nvidia.com (172.18.146.10) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Wed, 16 Nov 2016 20:46:05 +0000 Received: from HQMAIL101.nvidia.com (172.20.187.10) by HQMAIL102.nvidia.com (172.18.146.10) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Wed, 16 Nov 2016 20:46:05 +0000 Received: from kwankhede-dev.nvidia.com (172.20.13.39) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Wed, 16 Nov 2016 20:46:01 +0000 From: Kirti Wankhede To: , , , CC: , , , , , , Kirti Wankhede Subject: [PATCH v14 12/22] vfio: Add notifier callback to parent's ops structure of mdev Date: Thu, 17 Nov 2016 02:16:24 +0530 Message-ID: <1479329194-10247-13-git-send-email-kwankhede@nvidia.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1479329194-10247-1-git-send-email-kwankhede@nvidia.com> References: <1479329194-10247-1-git-send-email-kwankhede@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add a notifier calback to parent's ops structure of mdev device so that per device notifer for vfio module is registered through vfio_mdev module. Signed-off-by: Kirti Wankhede Signed-off-by: Neo Jia Change-Id: Iafa6f1721aecdd6e50eb93b153b5621e6d29b637 --- drivers/vfio/mdev/vfio_mdev.c | 34 +++++++++++++++++++++++++++++++++- include/linux/mdev.h | 9 +++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/drivers/vfio/mdev/vfio_mdev.c b/drivers/vfio/mdev/vfio_mdev.c index ffc36758cb84..2f8e06e5f95a 100644 --- a/drivers/vfio/mdev/vfio_mdev.c +++ b/drivers/vfio/mdev/vfio_mdev.c @@ -24,6 +24,15 @@ #define DRIVER_AUTHOR "NVIDIA Corporation" #define DRIVER_DESC "VFIO based driver for Mediated device" +static int vfio_mdev_notifier(struct notifier_block *nb, unsigned long action, + void *data) +{ + struct mdev_device *mdev = container_of(nb, struct mdev_device, nb); + struct parent_device *parent = mdev->parent; + + return parent->ops->notifier(mdev, action, data); +} + static int vfio_mdev_open(void *device_data) { struct mdev_device *mdev = device_data; @@ -36,9 +45,27 @@ static int vfio_mdev_open(void *device_data) if (!try_module_get(THIS_MODULE)) return -ENODEV; + if (likely(parent->ops->notifier)) { + mdev->nb.notifier_call = vfio_mdev_notifier; + ret = vfio_register_notifier(&mdev->dev, &mdev->nb); + + /* + * This should not fail if backend iommu module doesn't support + * register_notifier. + */ + if (ret && (ret != -ENOTTY)) { + pr_err("Failed to register notifier for mdev\n"); + module_put(THIS_MODULE); + return ret; + } + } + ret = parent->ops->open(mdev); - if (ret) + if (ret) { + if (likely(parent->ops->notifier)) + vfio_unregister_notifier(&mdev->dev, &mdev->nb); module_put(THIS_MODULE); + } return ret; } @@ -51,6 +78,11 @@ static void vfio_mdev_release(void *device_data) if (likely(parent->ops->release)) parent->ops->release(mdev); + if (likely(parent->ops->notifier)) { + if (vfio_unregister_notifier(&mdev->dev, &mdev->nb)) + pr_err("Failed to unregister notifier for mdev\n"); + } + module_put(THIS_MODULE); } diff --git a/include/linux/mdev.h b/include/linux/mdev.h index ec819e9a115a..94c43034c297 100644 --- a/include/linux/mdev.h +++ b/include/linux/mdev.h @@ -37,6 +37,7 @@ struct mdev_device { struct kref ref; struct list_head next; struct kobject *type_kobj; + struct notifier_block nb; }; /** @@ -85,6 +86,12 @@ struct mdev_device { * @mmap: mmap callback * @mdev: mediated device structure * @vma: vma structure + * @notifer: Notifier callback, currently only for + * VFIO_IOMMU_NOTIFY_DMA_UNMAP action notified duing + * DMA_UNMAP call on mapped iova range. + * @mdev: mediated device structure + * @action: Action for which notifier is called + * @data: Data associated with the notifier * Parent device that support mediated device should be registered with mdev * module with parent_ops structure. **/ @@ -106,6 +113,8 @@ struct parent_ops { ssize_t (*ioctl)(struct mdev_device *mdev, unsigned int cmd, unsigned long arg); int (*mmap)(struct mdev_device *mdev, struct vm_area_struct *vma); + int (*notifier)(struct mdev_device *mdev, unsigned long action, + void *data); }; /* interface for exporting mdev supported type attributes */