qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Zhenzhong Duan <zhenzhong.duan@intel.com>
To: qemu-devel@nongnu.org
Cc: alex.williamson@redhat.com, clg@redhat.com, jgg@nvidia.com,
	nicolinc@nvidia.com, joao.m.martins@oracle.com,
	eric.auger@redhat.com, peterx@redhat.com, jasowang@redhat.com,
	kevin.tian@intel.com, yi.l.liu@intel.com, yi.y.sun@intel.com,
	chao.p.peng@intel.com, Zhenzhong Duan <zhenzhong.duan@intel.com>
Subject: [PATCH v6 02/21] util/char_dev: Add open_cdev()
Date: Tue, 14 Nov 2023 18:09:36 +0800	[thread overview]
Message-ID: <20231114100955.1961974-3-zhenzhong.duan@intel.com> (raw)
In-Reply-To: <20231114100955.1961974-1-zhenzhong.duan@intel.com>

From: Yi Liu <yi.l.liu@intel.com>

/dev/vfio/devices/vfioX may not exist. In that case it is still possible
to open /dev/char/$major:$minor instead. Add helper function to abstract
the cdev open.

Suggested-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
---
 MAINTAINERS                 |  3 ++
 include/qemu/chardev_open.h | 16 ++++++++
 util/chardev_open.c         | 81 +++++++++++++++++++++++++++++++++++++
 util/meson.build            |  1 +
 4 files changed, 101 insertions(+)
 create mode 100644 include/qemu/chardev_open.h
 create mode 100644 util/chardev_open.c

diff --git a/MAINTAINERS b/MAINTAINERS
index a4891f7bda..869ec3d5af 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2172,6 +2172,9 @@ M: Eric Auger <eric.auger@redhat.com>
 S: Supported
 F: backends/iommufd.c
 F: include/sysemu/iommufd.h
+F: include/qemu/chardev_open.h
+F: util/chardev_open.c
+
 
 vhost
 M: Michael S. Tsirkin <mst@redhat.com>
diff --git a/include/qemu/chardev_open.h b/include/qemu/chardev_open.h
new file mode 100644
index 0000000000..64e8fcfdcb
--- /dev/null
+++ b/include/qemu/chardev_open.h
@@ -0,0 +1,16 @@
+/*
+ * QEMU Chardev Helper
+ *
+ * Copyright (C) 2023 Intel Corporation.
+ *
+ * Authors: Yi Liu <yi.l.liu@intel.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.  See
+ * the COPYING file in the top-level directory.
+ */
+
+#ifndef QEMU_CHARDEV_OPEN_H
+#define QEMU_CHARDEV_OPEN_H
+
+int open_cdev(const char *devpath, dev_t cdev);
+#endif
diff --git a/util/chardev_open.c b/util/chardev_open.c
new file mode 100644
index 0000000000..f776429788
--- /dev/null
+++ b/util/chardev_open.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2019, Mellanox Technologies. All rights reserved.
+ * Copyright (C) 2023 Intel Corporation.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *      Redistribution and use in source and binary forms, with or
+ *      without modification, are permitted provided that the following
+ *      conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Authors: Yi Liu <yi.l.liu@intel.com>
+ *
+ * Copied from
+ * https://github.com/linux-rdma/rdma-core/blob/master/util/open_cdev.c
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "qemu/chardev_open.h"
+
+static int open_cdev_internal(const char *path, dev_t cdev)
+{
+    struct stat st;
+    int fd;
+
+    fd = qemu_open_old(path, O_RDWR);
+    if (fd == -1) {
+        return -1;
+    }
+    if (fstat(fd, &st) || !S_ISCHR(st.st_mode) ||
+        (cdev != 0 && st.st_rdev != cdev)) {
+        close(fd);
+        return -1;
+    }
+    return fd;
+}
+
+static int open_cdev_robust(dev_t cdev)
+{
+    g_autofree char *devpath = NULL;
+
+    /*
+     * This assumes that udev is being used and is creating the /dev/char/
+     * symlinks.
+     */
+    devpath = g_strdup_printf("/dev/char/%u:%u", major(cdev), minor(cdev));
+    return open_cdev_internal(devpath, cdev);
+}
+
+int open_cdev(const char *devpath, dev_t cdev)
+{
+    int fd;
+
+    fd = open_cdev_internal(devpath, cdev);
+    if (fd == -1 && cdev != 0) {
+        return open_cdev_robust(cdev);
+    }
+    return fd;
+}
diff --git a/util/meson.build b/util/meson.build
index c2322ef6e7..174c133368 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -108,6 +108,7 @@ if have_block
     util_ss.add(files('filemonitor-stub.c'))
   endif
   util_ss.add(when: 'CONFIG_LINUX', if_true: files('vfio-helpers.c'))
+  util_ss.add(when: 'CONFIG_LINUX', if_true: files('chardev_open.c'))
 endif
 
 if cpu == 'aarch64'
-- 
2.34.1



  parent reply	other threads:[~2023-11-14 10:30 UTC|newest]

Thread overview: 82+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-14 10:09 [PATCH v6 00/21] vfio: Adopt iommufd Zhenzhong Duan
2023-11-14 10:09 ` [PATCH v6 01/21] backends/iommufd: Introduce the iommufd object Zhenzhong Duan
2023-11-14 13:28   ` Cédric Le Goater
2023-11-15  4:06     ` Duan, Zhenzhong
2023-11-15  8:15       ` Cédric Le Goater
2023-11-15 12:52   ` Eric Auger
2023-11-16  4:04     ` Duan, Zhenzhong
2023-11-16  8:32       ` Eric Auger
2023-11-16  8:47         ` Duan, Zhenzhong
2023-11-17 11:09   ` Cédric Le Goater
2023-11-17 11:39     ` Duan, Zhenzhong
2023-11-17 12:56       ` Cédric Le Goater
2023-11-17 13:29       ` Eric Auger
2023-11-17 13:56         ` Cédric Le Goater
2023-11-20  3:06           ` Duan, Zhenzhong
2023-11-20  8:24             ` Cédric Le Goater
2023-11-20 10:07               ` Duan, Zhenzhong
2023-11-20 17:08                 ` Cédric Le Goater
2023-11-21  3:26                   ` Duan, Zhenzhong
2023-11-21  8:05                     ` Cédric Le Goater
2023-11-21  8:39                       ` Duan, Zhenzhong
2023-11-14 10:09 ` Zhenzhong Duan [this message]
2023-11-14 13:29   ` [PATCH v6 02/21] util/char_dev: Add open_cdev() Cédric Le Goater
2023-11-15 13:23   ` Eric Auger
2023-11-14 10:09 ` [PATCH v6 03/21] vfio/common: return early if space isn't empty Zhenzhong Duan
2023-11-14 13:29   ` Cédric Le Goater
2023-11-15 13:28   ` Eric Auger
2023-11-14 10:09 ` [PATCH v6 04/21] vfio/iommufd: Implement the iommufd backend Zhenzhong Duan
2023-11-14 13:36   ` Cédric Le Goater
2023-11-14 10:09 ` [PATCH v6 05/21] vfio/iommufd: Relax assert check for " Zhenzhong Duan
2023-11-15 13:56   ` Eric Auger
2023-11-14 10:09 ` [PATCH v6 06/21] vfio/iommufd: Add support for iova_ranges and pgsizes Zhenzhong Duan
2023-11-14 13:46   ` Cédric Le Goater
2023-11-15  2:36     ` Duan, Zhenzhong
2023-11-15 16:25     ` Eric Auger
2023-11-14 10:09 ` [PATCH v6 07/21] vfio/pci: Extract out a helper vfio_pci_get_pci_hot_reset_info Zhenzhong Duan
2023-11-15 17:00   ` Eric Auger
2023-11-14 10:09 ` [PATCH v6 08/21] vfio/pci: Introduce a vfio pci hot reset interface Zhenzhong Duan
2023-11-14 13:51   ` Cédric Le Goater
2023-11-15  2:55     ` Duan, Zhenzhong
2023-11-15 17:54   ` Eric Auger
2023-11-14 10:09 ` [PATCH v6 09/21] vfio/iommufd: Enable pci hot reset through iommufd cdev interface Zhenzhong Duan
2023-11-17 13:53   ` Eric Auger
2023-11-20  4:15     ` Duan, Zhenzhong
2023-11-14 10:09 ` [PATCH v6 10/21] vfio/pci: Allow the selection of a given iommu backend Zhenzhong Duan
2023-11-14 13:57   ` Cédric Le Goater
2023-11-14 10:09 ` [PATCH v6 11/21] vfio/pci: Make vfio cdev pre-openable by passing a file handle Zhenzhong Duan
2023-11-14 14:08   ` Cédric Le Goater
2023-11-15 12:09   ` Philippe Mathieu-Daudé
2023-11-15 13:05     ` Cédric Le Goater
2023-11-16  2:15       ` Duan, Zhenzhong
2023-11-16  7:25         ` Cédric Le Goater
2023-11-16  7:43           ` Duan, Zhenzhong
2023-11-14 10:09 ` [PATCH v6 12/21] vfio/platform: Allow the selection of a given iommu backend Zhenzhong Duan
2023-11-14 14:03   ` Cédric Le Goater
2023-11-17 14:55   ` Eric Auger
2023-11-14 10:09 ` [PATCH v6 13/21] vfio/platform: Make vfio cdev pre-openable by passing a file handle Zhenzhong Duan
2023-11-14 14:22   ` Cédric Le Goater
2023-11-14 10:09 ` [PATCH v6 14/21] vfio/ap: Allow the selection of a given iommu backend Zhenzhong Duan
2023-11-14 14:03   ` Cédric Le Goater
2023-11-14 10:09 ` [PATCH v6 15/21] vfio/ap: Make vfio cdev pre-openable by passing a file handle Zhenzhong Duan
2023-11-14 14:04   ` Cédric Le Goater
2023-11-14 10:09 ` [PATCH v6 16/21] vfio/ccw: Allow the selection of a given iommu backend Zhenzhong Duan
2023-11-14 14:04   ` Cédric Le Goater
2023-11-15 18:45   ` Eric Farman
2023-11-14 10:09 ` [PATCH v6 17/21] vfio/ccw: Make vfio cdev pre-openable by passing a file handle Zhenzhong Duan
2023-11-14 14:04   ` Cédric Le Goater
2023-11-15 18:46   ` Eric Farman
2023-11-14 10:09 ` [PATCH v6 18/21] vfio: Make VFIOContainerBase poiner parameter const in VFIOIOMMUOps callbacks Zhenzhong Duan
2023-11-14 14:05   ` Cédric Le Goater
2023-11-17 14:58   ` Eric Auger
2023-11-14 10:09 ` [PATCH v6 19/21] hw/arm: Activate IOMMUFD for virt machines Zhenzhong Duan
2023-11-16  9:17   ` Eric Auger
2023-11-14 10:09 ` [PATCH v6 20/21] kconfig: Activate IOMMUFD for s390x machines Zhenzhong Duan
2023-11-15 18:47   ` Eric Farman
2023-11-14 10:09 ` [PATCH v6 21/21] hw/i386: Activate IOMMUFD for q35 machines Zhenzhong Duan
2023-11-16  9:17   ` Eric Auger
2023-11-14 14:51 ` [PATCH v6 00/21] vfio: Adopt iommufd Cédric Le Goater
2023-11-15  4:16   ` Duan, Zhenzhong
2023-11-20  9:15 ` Eric Auger
2023-11-20 10:09   ` Duan, Zhenzhong
2023-11-20 11:22     ` Eric Auger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231114100955.1961974-3-zhenzhong.duan@intel.com \
    --to=zhenzhong.duan@intel.com \
    --cc=alex.williamson@redhat.com \
    --cc=chao.p.peng@intel.com \
    --cc=clg@redhat.com \
    --cc=eric.auger@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=jgg@nvidia.com \
    --cc=joao.m.martins@oracle.com \
    --cc=kevin.tian@intel.com \
    --cc=nicolinc@nvidia.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=yi.l.liu@intel.com \
    --cc=yi.y.sun@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).