From patchwork Tue Feb 4 23:05:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 11365331 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7876D112B for ; Tue, 4 Feb 2020 23:05:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 58BE6217F4 for ; Tue, 4 Feb 2020 23:05:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="JJtA95se" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727820AbgBDXF5 (ORCPT ); Tue, 4 Feb 2020 18:05:57 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:37735 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727816AbgBDXFz (ORCPT ); Tue, 4 Feb 2020 18:05:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580857554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IvMgKRo9UcBxsKQ0k8mTNazf7kcSB0yWVPnP1lD/+n4=; b=JJtA95seA6vkuUAIJjc4Hz5rXh+50CBdx1ZoV87/EdMu81nB/uw1558AwTVr/lEkyNJGi9 uEJdx7vmcFJIdrFwp8Yr1BHxA/1OXlLaPKVX9r88RCJfeJaQAMQJLQeh3+pMeSV1uFbsEW XGeE4sQmvlRIJad48kkaTn4rwLUUccY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-58-PYYDho4mMBSpdySKOACwxw-1; Tue, 04 Feb 2020 18:05:50 -0500 X-MC-Unique: PYYDho4mMBSpdySKOACwxw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 90EBDA0CBF; Tue, 4 Feb 2020 23:05:46 +0000 (UTC) Received: from gimli.home (ovpn-116-28.phx2.redhat.com [10.3.116.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 642A660BF3; Tue, 4 Feb 2020 23:05:43 +0000 (UTC) Subject: [RFC PATCH 1/7] vfio: Include optional device match in vfio_device_ops callbacks From: Alex Williamson To: kvm@vger.kernel.org Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, dev@dpdk.org, mtosatti@redhat.com, thomas@monjalon.net, bluca@debian.org, jerinjacobk@gmail.com, bruce.richardson@intel.com, cohuck@redhat.com Date: Tue, 04 Feb 2020 16:05:43 -0700 Message-ID: <158085754299.9445.4389176548645142886.stgit@gimli.home> In-Reply-To: <158085337582.9445.17682266437583505502.stgit@gimli.home> References: <158085337582.9445.17682266437583505502.stgit@gimli.home> User-Agent: StGit/0.19-dirty MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Allow bus drivers to provide their own callback to match a device to the user provided string. Signed-off-by: Alex Williamson --- drivers/vfio/vfio.c | 19 +++++++++++++++---- include/linux/vfio.h | 3 +++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c index 388597930b64..dda1726adda8 100644 --- a/drivers/vfio/vfio.c +++ b/drivers/vfio/vfio.c @@ -875,11 +875,22 @@ EXPORT_SYMBOL_GPL(vfio_device_get_from_dev); static struct vfio_device *vfio_device_get_from_name(struct vfio_group *group, char *buf) { - struct vfio_device *it, *device = NULL; + struct vfio_device *it, *device = ERR_PTR(-ENODEV); mutex_lock(&group->device_lock); list_for_each_entry(it, &group->device_list, group_next) { - if (!strcmp(dev_name(it->dev), buf)) { + int ret; + + if (it->ops->match) { + ret = it->ops->match(it->device_data, buf); + if (ret < 0 && ret != -ENODEV) { + device = ERR_PTR(ret); + break; + } + } else + ret = strcmp(dev_name(it->dev), buf); + + if (!ret) { device = it; vfio_device_get(device); break; @@ -1441,8 +1452,8 @@ static int vfio_group_get_device_fd(struct vfio_group *group, char *buf) return -EPERM; device = vfio_device_get_from_name(group, buf); - if (!device) - return -ENODEV; + if (IS_ERR(device)) + return PTR_ERR(device); ret = device->ops->open(device->device_data); if (ret) { diff --git a/include/linux/vfio.h b/include/linux/vfio.h index e42a711a2800..755e0f0e2900 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -26,6 +26,8 @@ * operations documented below * @mmap: Perform mmap(2) on a region of the device file descriptor * @request: Request for the bus driver to release the device + * @match: Optional device name match callback (return: 0 for match, -ENODEV + * (or >0) for no match and continue, other -errno: no match and stop) */ struct vfio_device_ops { char *name; @@ -39,6 +41,7 @@ struct vfio_device_ops { unsigned long arg); int (*mmap)(void *device_data, struct vm_area_struct *vma); void (*request)(void *device_data, unsigned int count); + int (*match)(void *device_data, char *buf); }; extern struct iommu_group *vfio_iommu_group_get(struct device *dev);