From: Alex Williamson <alex.williamson@redhat.com> To: Christoph Hellwig <hch@lst.de> Cc: Alexander Viro <viro@zeniv.linux.org.uk>, linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rdma@vger.kernel.org, kvm@vger.kernel.org, linux-fsdevel@vger.kernel.org, io-uring@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org Subject: Re: [PATCH 08/12] vfio: use __anon_inode_getfd Date: Fri, 8 May 2020 09:55:07 -0600 [thread overview] Message-ID: <20200508095507.54051943@w520.home> (raw) In-Reply-To: <20200508153634.249933-9-hch@lst.de> On Fri, 8 May 2020 17:36:30 +0200 Christoph Hellwig <hch@lst.de> wrote: > Use __anon_inode_getfd instead of opencoding the logic using > get_unused_fd_flags + anon_inode_getfile. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > drivers/vfio/vfio.c | 37 ++++++++----------------------------- > 1 file changed, 8 insertions(+), 29 deletions(-) Thanks! Acked-by: Alex Williamson <alex.williamson@redhat.com> > diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c > index 765e0e5d83ed9..33a88103f857f 100644 > --- a/drivers/vfio/vfio.c > +++ b/drivers/vfio/vfio.c > @@ -1451,42 +1451,21 @@ static int vfio_group_get_device_fd(struct vfio_group *group, char *buf) > return ret; > } > > - /* > - * We can't use anon_inode_getfd() because we need to modify > - * the f_mode flags directly to allow more than just ioctls > - */ > - ret = get_unused_fd_flags(O_CLOEXEC); > - if (ret < 0) { > - device->ops->release(device->device_data); > - vfio_device_put(device); > - return ret; > - } > - > - filep = anon_inode_getfile("[vfio-device]", &vfio_device_fops, > - device, O_RDWR); > - if (IS_ERR(filep)) { > - put_unused_fd(ret); > - ret = PTR_ERR(filep); > - device->ops->release(device->device_data); > - vfio_device_put(device); > - return ret; > - } > - > - /* > - * TODO: add an anon_inode interface to do this. > - * Appears to be missing by lack of need rather than > - * explicitly prevented. Now there's need. > - */ > + ret = __anon_inode_getfd("[vfio-device]", &vfio_device_fops, > + device, O_CLOEXEC | O_RDWR, &filep); > + if (ret < 0) > + goto release; > filep->f_mode |= (FMODE_LSEEK | FMODE_PREAD | FMODE_PWRITE); > - > atomic_inc(&group->container_users); > - > fd_install(ret, filep); > > if (group->noiommu) > dev_warn(device->dev, "vfio-noiommu device opened by user " > "(%s:%d)\n", current->comm, task_pid_nr(current)); > - > + return ret; > +release: > + device->ops->release(device->device_data); > + vfio_device_put(device); > return ret; > } >
WARNING: multiple messages have this Message-ID (diff)
From: Alex Williamson <alex.williamson@redhat.com> To: Christoph Hellwig <hch@lst.de> Cc: bpf@vger.kernel.org, kvm@vger.kernel.org, linux-rdma@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-gpio@vger.kernel.org, Alexander Viro <viro@zeniv.linux.org.uk>, linux-fsdevel@vger.kernel.org, linux-integrity@vger.kernel.org, io-uring@vger.kernel.org Subject: Re: [PATCH 08/12] vfio: use __anon_inode_getfd Date: Fri, 8 May 2020 09:55:07 -0600 [thread overview] Message-ID: <20200508095507.54051943@w520.home> (raw) In-Reply-To: <20200508153634.249933-9-hch@lst.de> On Fri, 8 May 2020 17:36:30 +0200 Christoph Hellwig <hch@lst.de> wrote: > Use __anon_inode_getfd instead of opencoding the logic using > get_unused_fd_flags + anon_inode_getfile. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > drivers/vfio/vfio.c | 37 ++++++++----------------------------- > 1 file changed, 8 insertions(+), 29 deletions(-) Thanks! Acked-by: Alex Williamson <alex.williamson@redhat.com> > diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c > index 765e0e5d83ed9..33a88103f857f 100644 > --- a/drivers/vfio/vfio.c > +++ b/drivers/vfio/vfio.c > @@ -1451,42 +1451,21 @@ static int vfio_group_get_device_fd(struct vfio_group *group, char *buf) > return ret; > } > > - /* > - * We can't use anon_inode_getfd() because we need to modify > - * the f_mode flags directly to allow more than just ioctls > - */ > - ret = get_unused_fd_flags(O_CLOEXEC); > - if (ret < 0) { > - device->ops->release(device->device_data); > - vfio_device_put(device); > - return ret; > - } > - > - filep = anon_inode_getfile("[vfio-device]", &vfio_device_fops, > - device, O_RDWR); > - if (IS_ERR(filep)) { > - put_unused_fd(ret); > - ret = PTR_ERR(filep); > - device->ops->release(device->device_data); > - vfio_device_put(device); > - return ret; > - } > - > - /* > - * TODO: add an anon_inode interface to do this. > - * Appears to be missing by lack of need rather than > - * explicitly prevented. Now there's need. > - */ > + ret = __anon_inode_getfd("[vfio-device]", &vfio_device_fops, > + device, O_CLOEXEC | O_RDWR, &filep); > + if (ret < 0) > + goto release; > filep->f_mode |= (FMODE_LSEEK | FMODE_PREAD | FMODE_PWRITE); > - > atomic_inc(&group->container_users); > - > fd_install(ret, filep); > > if (group->noiommu) > dev_warn(device->dev, "vfio-noiommu device opened by user " > "(%s:%d)\n", current->comm, task_pid_nr(current)); > - > + return ret; > +release: > + device->ops->release(device->device_data); > + vfio_device_put(device); > return ret; > } > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-05-08 15:55 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-08 15:36 Add a __anon_inode_getfd helper Christoph Hellwig 2020-05-08 15:36 ` [PATCH 01/12] fd: add a new " Christoph Hellwig 2020-05-08 15:36 ` [PATCH 02/12] kvm: use __anon_inode_getfd Christoph Hellwig 2020-05-08 15:36 ` [PATCH 03/12] pidfd: " Christoph Hellwig 2020-05-08 15:36 ` [PATCH 04/12] bpf: " Christoph Hellwig 2020-05-08 17:32 ` Andrii Nakryiko 2020-05-08 17:32 ` Andrii Nakryiko 2020-05-08 15:36 ` [PATCH 05/12] io_uring: " Christoph Hellwig 2020-05-08 15:36 ` [PATCH 06/12] eventpoll: " Christoph Hellwig 2020-05-08 15:36 ` [PATCH 07/12] eventfd: " Christoph Hellwig 2020-05-08 15:36 ` [PATCH 08/12] vfio: " Christoph Hellwig 2020-05-08 15:55 ` Alex Williamson [this message] 2020-05-08 15:55 ` Alex Williamson 2020-05-08 15:36 ` [PATCH 09/12] rdma: " Christoph Hellwig 2020-05-08 19:52 ` Jason Gunthorpe 2020-05-08 19:52 ` Jason Gunthorpe 2020-05-08 15:36 ` [PATCH 10/12] drm_syncobj: " Christoph Hellwig 2020-05-08 15:36 ` [PATCH 11/12] gpiolib: " Christoph Hellwig 2020-05-08 15:36 ` [PATCH 12/12] vtpm_proxy: " Christoph Hellwig
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=20200508095507.54051943@w520.home \ --to=alex.williamson@redhat.com \ --cc=bpf@vger.kernel.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=hch@lst.de \ --cc=io-uring@vger.kernel.org \ --cc=kvm@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-integrity@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-rdma@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=viro@zeniv.linux.org.uk \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.