svn commit: r319409 - in head/sys/compat/linuxkpi/common: include/linux src
Hans Petter Selasky
hselasky at FreeBSD.org
Thu Jun 1 09:34:53 UTC 2017
Author: hselasky
Date: Thu Jun 1 09:34:51 2017
New Revision: 319409
URL: https://svnweb.freebsd.org/changeset/base/319409
Log:
Add generic kqueue() and kevent() support to the LinuxKPI character
devices. The implementation allows read and write filters to be
created and piggybacks on the poll() file operation to determine when
a filter should trigger. The piggyback mechanism is simply to check
for the EWOULDBLOCK or EAGAIN return code from read(), write() or
ioctl() system calls and then update the kqueue() polling state bits.
The implementation is similar to the one found in the cuse(3) module.
Refer to sys/fs/cuse/*.[ch] for more details.
MFC after: 1 week
Sponsored by: Mellanox Technologies
Modified:
head/sys/compat/linuxkpi/common/include/linux/file.h
head/sys/compat/linuxkpi/common/include/linux/fs.h
head/sys/compat/linuxkpi/common/include/linux/poll.h
head/sys/compat/linuxkpi/common/src/linux_compat.c
Modified: head/sys/compat/linuxkpi/common/include/linux/file.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/file.h Thu Jun 1 09:21:25 2017 (r319408)
+++ head/sys/compat/linuxkpi/common/include/linux/file.h Thu Jun 1 09:34:51 2017 (r319409)
@@ -151,20 +151,18 @@ get_unused_fd_flags(int flags)
return fd;
}
+extern struct linux_file *linux_file_alloc(void);
+
static inline struct linux_file *
alloc_file(int mode, const struct file_operations *fops)
{
struct linux_file *filp;
- filp = kzalloc(sizeof(*filp), GFP_KERNEL);
- if (filp == NULL)
- return (NULL);
-
- filp->f_count = 1;
+ filp = linux_file_alloc();
filp->f_op = fops;
filp->f_mode = mode;
- return filp;
+ return (filp);
}
struct fd {
Modified: head/sys/compat/linuxkpi/common/include/linux/fs.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/fs.h Thu Jun 1 09:21:25 2017 (r319408)
+++ head/sys/compat/linuxkpi/common/include/linux/fs.h Thu Jun 1 09:34:51 2017 (r319409)
@@ -41,6 +41,7 @@
#include <linux/types.h>
#include <linux/wait.h>
#include <linux/semaphore.h>
+#include <linux/spinlock.h>
struct module;
struct kiocb;
@@ -80,6 +81,15 @@ struct linux_file {
struct sigio *f_sigio;
struct vnode *f_vnode;
volatile u_int f_count;
+
+ /* kqfilter support */
+ int f_kqflags;
+#define LINUX_KQ_FLAG_HAS_READ (1 << 0)
+#define LINUX_KQ_FLAG_HAS_WRITE (1 << 1)
+#define LINUX_KQ_FLAG_NEED_READ (1 << 2)
+#define LINUX_KQ_FLAG_NEED_WRITE (1 << 3)
+ /* protects f_selinfo.si_note */
+ spinlock_t f_kqlock;
};
#define file linux_file
Modified: head/sys/compat/linuxkpi/common/include/linux/poll.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/poll.h Thu Jun 1 09:21:25 2017 (r319408)
+++ head/sys/compat/linuxkpi/common/include/linux/poll.h Thu Jun 1 09:34:51 2017 (r319409)
@@ -46,4 +46,6 @@ poll_wait(struct linux_file *filp, wait_queue_head_t *
selrecord(curthread, &filp->f_selinfo);
}
+extern void linux_poll_wakeup(struct linux_file *);
+
#endif /* _LINUX_POLL_H_ */
Modified: head/sys/compat/linuxkpi/common/src/linux_compat.c
==============================================================================
--- head/sys/compat/linuxkpi/common/src/linux_compat.c Thu Jun 1 09:21:25 2017 (r319408)
+++ head/sys/compat/linuxkpi/common/src/linux_compat.c Thu Jun 1 09:34:51 2017 (r319409)
@@ -402,6 +402,63 @@ linux_file_dtor(void *cdp)
kfree(filp);
}
+static void
+linux_kq_lock(void *arg)
+{
+ spinlock_t *s = arg;
+
+ spin_lock(s);
+}
+static void
+linux_kq_unlock(void *arg)
+{
+ spinlock_t *s = arg;
+
+ spin_unlock(s);
+}
+
+static void
+linux_kq_lock_owned(void *arg)
+{
+#ifdef INVARIANTS
+ spinlock_t *s = arg;
+
+ mtx_assert(&s->m, MA_OWNED);
+#endif
+}
+
+static void
+linux_kq_lock_unowned(void *arg)
+{
+#ifdef INVARIANTS
+ spinlock_t *s = arg;
+
+ mtx_assert(&s->m, MA_NOTOWNED);
+#endif
+}
+
+static void
+linux_dev_kqfilter_poll(struct linux_file *);
+
+struct linux_file *
+linux_file_alloc(void)
+{
+ struct linux_file *filp;
+
+ filp = kzalloc(sizeof(*filp), GFP_KERNEL);
+
+ /* set initial refcount */
+ filp->f_count = 1;
+
+ /* setup fields needed by kqueue support */
+ spin_lock_init(&filp->f_kqlock);
+ knlist_init(&filp->f_selinfo.si_note, &filp->f_kqlock,
+ linux_kq_lock, linux_kq_unlock,
+ linux_kq_lock_owned, linux_kq_lock_unowned);
+
+ return (filp);
+}
+
void
linux_file_free(struct linux_file *filp)
{
@@ -592,15 +649,17 @@ linux_dev_open(struct cdev *dev, int oflags, int devty
ldev = dev->si_drv1;
if (ldev == NULL)
return (ENODEV);
- filp = kzalloc(sizeof(*filp), GFP_KERNEL);
+
+ filp = linux_file_alloc();
filp->f_dentry = &filp->f_dentry_store;
filp->f_op = ldev->ops;
filp->f_flags = file->f_flag;
vhold(file->f_vnode);
filp->f_vnode = file->f_vnode;
- linux_set_current(td);
filp->_file = file;
+ linux_set_current(td);
+
if (filp->f_op->open) {
error = -filp->f_op->open(file->f_vnode, filp);
if (error) {
@@ -793,6 +852,8 @@ linux_dev_ioctl(struct cdev *dev, u_long cmd, caddr_t
current->bsd_ioctl_len = 0;
}
+ if (error == EWOULDBLOCK)
+ linux_dev_kqfilter_poll(filp);
return (error);
}
@@ -824,8 +885,11 @@ linux_dev_read(struct cdev *dev, struct uio *uio, int
((uint8_t *)uio->uio_iov->iov_base) + bytes;
uio->uio_iov->iov_len -= bytes;
uio->uio_resid -= bytes;
- } else
+ } else {
error = -bytes;
+ if (error == EWOULDBLOCK)
+ linux_dev_kqfilter_poll(filp);
+ }
} else
error = ENXIO;
@@ -860,8 +924,11 @@ linux_dev_write(struct cdev *dev, struct uio *uio, int
((uint8_t *)uio->uio_iov->iov_base) + bytes;
uio->uio_iov->iov_len -= bytes;
uio->uio_resid -= bytes;
- } else
+ } else {
error = -bytes;
+ if (error == EWOULDBLOCK)
+ linux_dev_kqfilter_poll(filp);
+ }
} else
error = ENXIO;
@@ -893,7 +960,140 @@ error:
return (events & (POLLHUP|POLLIN|POLLRDNORM|POLLOUT|POLLWRNORM));
}
+void
+linux_poll_wakeup(struct linux_file *filp)
+{
+ /* this function should be NULL-safe */
+ if (filp == NULL)
+ return;
+
+ selwakeup(&filp->f_selinfo);
+
+ spin_lock(&filp->f_kqlock);
+ filp->f_kqflags |= LINUX_KQ_FLAG_NEED_READ |
+ LINUX_KQ_FLAG_NEED_WRITE;
+
+ /* make sure the "knote" gets woken up */
+ KNOTE_LOCKED(&filp->f_selinfo.si_note, 1);
+ spin_unlock(&filp->f_kqlock);
+}
+
+static void
+linux_dev_kqfilter_detach(struct knote *kn)
+{
+ struct linux_file *filp = kn->kn_hook;
+
+ spin_lock(&filp->f_kqlock);
+ knlist_remove(&filp->f_selinfo.si_note, kn, 1);
+ spin_unlock(&filp->f_kqlock);
+}
+
static int
+linux_dev_kqfilter_read_event(struct knote *kn, long hint)
+{
+ struct linux_file *filp = kn->kn_hook;
+
+ mtx_assert(&filp->f_kqlock.m, MA_OWNED);
+
+ return ((filp->f_kqflags & LINUX_KQ_FLAG_NEED_READ) ? 1 : 0);
+}
+
+static int
+linux_dev_kqfilter_write_event(struct knote *kn, long hint)
+{
+ struct linux_file *filp = kn->kn_hook;
+
+ mtx_assert(&filp->f_kqlock.m, MA_OWNED);
+
+ return ((filp->f_kqflags & LINUX_KQ_FLAG_NEED_WRITE) ? 1 : 0);
+}
+
+static struct filterops linux_dev_kqfiltops_read = {
+ .f_isfd = 1,
+ .f_detach = linux_dev_kqfilter_detach,
+ .f_event = linux_dev_kqfilter_read_event,
+};
+
+static struct filterops linux_dev_kqfiltops_write = {
+ .f_isfd = 1,
+ .f_detach = linux_dev_kqfilter_detach,
+ .f_event = linux_dev_kqfilter_write_event,
+};
+
+static void
+linux_dev_kqfilter_poll(struct linux_file *filp)
+{
+ int temp;
+
+ spin_lock(&filp->f_kqlock);
+ temp = (filp->f_kqflags & (LINUX_KQ_FLAG_HAS_READ | LINUX_KQ_FLAG_HAS_WRITE));
+ filp->f_kqflags &= ~(LINUX_KQ_FLAG_NEED_READ | LINUX_KQ_FLAG_NEED_WRITE);
+ spin_unlock(&filp->f_kqlock);
+
+ if (temp != 0) {
+ /* get the latest polling state */
+ temp = filp->f_op->poll(filp, NULL);
+
+ if (temp & (POLLIN | POLLOUT)) {
+ spin_lock(&filp->f_kqlock);
+ if (temp & POLLIN)
+ filp->f_kqflags |= LINUX_KQ_FLAG_NEED_READ;
+ if (temp & POLLOUT)
+ filp->f_kqflags |= LINUX_KQ_FLAG_NEED_WRITE;
+
+ /* make sure the "knote" gets woken up */
+ KNOTE_LOCKED(&filp->f_selinfo.si_note, 0);
+ spin_unlock(&filp->f_kqlock);
+ }
+ }
+}
+
+static int
+linux_dev_kqfilter(struct cdev *dev, struct knote *kn)
+{
+ struct linux_file *filp;
+ struct file *file;
+ struct thread *td;
+ int error;
+
+ td = curthread;
+ file = td->td_fpop;
+ if (dev->si_drv1 == NULL)
+ return (ENXIO);
+ if ((error = devfs_get_cdevpriv((void **)&filp)) != 0)
+ return (error);
+ filp->f_flags = file->f_flag;
+ if (filp->f_op->poll == NULL)
+ return (EINVAL);
+
+ spin_lock(&filp->f_kqlock);
+ switch (kn->kn_filter) {
+ case EVFILT_READ:
+ filp->f_kqflags |= LINUX_KQ_FLAG_HAS_READ;
+ kn->kn_fop = &linux_dev_kqfiltops_read;
+ kn->kn_hook = filp;
+ knlist_add(&filp->f_selinfo.si_note, kn, 1);
+ break;
+ case EVFILT_WRITE:
+ filp->f_kqflags |= LINUX_KQ_FLAG_HAS_WRITE;
+ kn->kn_fop = &linux_dev_kqfiltops_write;
+ kn->kn_hook = filp;
+ knlist_add(&filp->f_selinfo.si_note, kn, 1);
+ break;
+ default:
+ error = EINVAL;
+ break;
+ }
+ spin_unlock(&filp->f_kqlock);
+
+ if (error == 0) {
+ linux_set_current(td);
+ linux_dev_kqfilter_poll(filp);
+ }
+ return (error);
+}
+
+static int
linux_dev_mmap_single(struct cdev *dev, vm_ooffset_t *offset,
vm_size_t size, struct vm_object **object, int nprot)
{
@@ -1012,6 +1212,7 @@ struct cdevsw linuxcdevsw = {
.d_ioctl = linux_dev_ioctl,
.d_mmap_single = linux_dev_mmap_single,
.d_poll = linux_dev_poll,
+ .d_kqfilter = linux_dev_kqfilter,
.d_name = "lkpidev",
};
More information about the svn-src-head
mailing list