On Mon, Aug 14, 2006 at 10:21:36AM +0400, Evgeniy Polyakov wrote:
>
> poll/select() notifications. Timer notifications.
>
> This patch includes generic poll/select and timer notifications.
>
> kevent_poll works simialr to epoll and has the same issues (callback
> is invoked not from internal state machine of the caller, but through
> process awake).
I'm not a big fan of duplicating code over and over. kevent is a candidate
for a generic event devlivery mechanisms which is a _very_ good thing. But
starting that system by duplicating existing functionality is not very nice.
What speaks against a patch the recplaces the epoll core by something that
build on kevent while still supporting the epoll interface as a compatibility
shim?
> Timer notifications can be used for fine grained per-process time
> management, since interval timers are very inconvenient to use,
> and they are limited.
I have similar reservations about this one. Having timers as part of a
generic events system is very nice, but having so much duplicated functionality
is not. Cc'ed Thomas on behalf of the Timer cabal if there's a point in
integrating this into a larger framework of timer code.
Also it would be nice if you could submit each of the notifications as a patch
on it's own.
> diff --git a/kernel/kevent/kevent_poll.c b/kernel/kevent/kevent_poll.c
> new file mode 100644
> index 0000000..8a4f863
> --- /dev/null
> +++ b/kernel/kevent/kevent_poll.c
> @@ -0,0 +1,220 @@
> +/*
> + * kevent_poll.c
> + *
> + * 2006 Copyright (c) Evgeniy Polyakov <[email protected]>
> + * All rights reserved.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/types.h>
> +#include <linux/list.h>
> +#include <linux/slab.h>
> +#include <linux/spinlock.h>
> +#include <linux/timer.h>
> +#include <linux/file.h>
> +#include <linux/kevent.h>
> +#include <linux/poll.h>
> +#include <linux/fs.h>
> +
> +static kmem_cache_t *kevent_poll_container_cache;
> +static kmem_cache_t *kevent_poll_priv_cache;
> +
> +struct kevent_poll_ctl
> +{
> + struct poll_table_struct pt;
> + struct kevent *k;
> +};
> +
> +struct kevent_poll_wait_container
> +{
> + struct list_head container_entry;
> + wait_queue_head_t *whead;
> + wait_queue_t wait;
> + struct kevent *k;
> +};
> +
> +struct kevent_poll_private
> +{
> + struct list_head container_list;
> + spinlock_t container_lock;
> +};
> +
> +static int kevent_poll_enqueue(struct kevent *k);
> +static int kevent_poll_dequeue(struct kevent *k);
> +static int kevent_poll_callback(struct kevent *k);
> +
> +static int kevent_poll_wait_callback(wait_queue_t *wait,
> + unsigned mode, int sync, void *key)
> +{
> + struct kevent_poll_wait_container *cont =
> + container_of(wait, struct kevent_poll_wait_container, wait);
> + struct kevent *k = cont->k;
> + struct file *file = k->st->origin;
> + u32 revents;
> +
> + revents = file->f_op->poll(file, NULL);
> +
> + kevent_storage_ready(k->st, NULL, revents);
> +
> + return 0;
> +}
> +
> +static void kevent_poll_qproc(struct file *file, wait_queue_head_t *whead,
> + struct poll_table_struct *poll_table)
> +{
> + struct kevent *k =
> + container_of(poll_table, struct kevent_poll_ctl, pt)->k;
> + struct kevent_poll_private *priv = k->priv;
> + struct kevent_poll_wait_container *cont;
> + unsigned long flags;
> +
> + cont = kmem_cache_alloc(kevent_poll_container_cache, SLAB_KERNEL);
> + if (!cont) {
> + kevent_break(k);
> + return;
> + }
> +
> + cont->k = k;
> + init_waitqueue_func_entry(&cont->wait, kevent_poll_wait_callback);
> + cont->whead = whead;
> +
> + spin_lock_irqsave(&priv->container_lock, flags);
> + list_add_tail(&cont->container_entry, &priv->container_list);
> + spin_unlock_irqrestore(&priv->container_lock, flags);
> +
> + add_wait_queue(whead, &cont->wait);
> +}
> +
> +static int kevent_poll_enqueue(struct kevent *k)
> +{
> + struct file *file;
> + int err, ready = 0;
> + unsigned int revents;
> + struct kevent_poll_ctl ctl;
> + struct kevent_poll_private *priv;
> +
> + file = fget(k->event.id.raw[0]);
> + if (!file)
> + return -ENODEV;
> +
> + err = -EINVAL;
> + if (!file->f_op || !file->f_op->poll)
> + goto err_out_fput;
> +
> + err = -ENOMEM;
> + priv = kmem_cache_alloc(kevent_poll_priv_cache, SLAB_KERNEL);
> + if (!priv)
> + goto err_out_fput;
> +
> + spin_lock_init(&priv->container_lock);
> + INIT_LIST_HEAD(&priv->container_list);
> +
> + k->priv = priv;
> +
> + ctl.k = k;
> + init_poll_funcptr(&ctl.pt, &kevent_poll_qproc);
> +
> + err = kevent_storage_enqueue(&file->st, k);
> + if (err)
> + goto err_out_free;
> +
> + revents = file->f_op->poll(file, &ctl.pt);
> + if (revents & k->event.event) {
> + ready = 1;
> + kevent_poll_dequeue(k);
> + }
> +
> + return ready;
> +
> +err_out_free:
> + kmem_cache_free(kevent_poll_priv_cache, priv);
> +err_out_fput:
> + fput(file);
> + return err;
> +}
> +
> +static int kevent_poll_dequeue(struct kevent *k)
> +{
> + struct file *file = k->st->origin;
> + struct kevent_poll_private *priv = k->priv;
> + struct kevent_poll_wait_container *w, *n;
> + unsigned long flags;
> +
> + kevent_storage_dequeue(k->st, k);
> +
> + spin_lock_irqsave(&priv->container_lock, flags);
> + list_for_each_entry_safe(w, n, &priv->container_list, container_entry) {
> + list_del(&w->container_entry);
> + remove_wait_queue(w->whead, &w->wait);
> + kmem_cache_free(kevent_poll_container_cache, w);
> + }
> + spin_unlock_irqrestore(&priv->container_lock, flags);
> +
> + kmem_cache_free(kevent_poll_priv_cache, priv);
> + k->priv = NULL;
> +
> + fput(file);
> +
> + return 0;
> +}
> +
> +static int kevent_poll_callback(struct kevent *k)
> +{
> + struct file *file = k->st->origin;
> + unsigned int revents = file->f_op->poll(file, NULL);
> + return (revents & k->event.event);
> +}
> +
> +static int __init kevent_poll_sys_init(void)
> +{
> + struct kevent_callbacks *pc = &kevent_registered_callbacks[KEVENT_POLL];
> +
> + kevent_poll_container_cache = kmem_cache_create("kevent_poll_container_cache",
> + sizeof(struct kevent_poll_wait_container), 0, 0, NULL, NULL);
> + if (!kevent_poll_container_cache) {
> + printk(KERN_ERR "Failed to create kevent poll container cache.\n");
> + return -ENOMEM;
> + }
> +
> + kevent_poll_priv_cache = kmem_cache_create("kevent_poll_priv_cache",
> + sizeof(struct kevent_poll_private), 0, 0, NULL, NULL);
> + if (!kevent_poll_priv_cache) {
> + printk(KERN_ERR "Failed to create kevent poll private data cache.\n");
> + kmem_cache_destroy(kevent_poll_container_cache);
> + kevent_poll_container_cache = NULL;
> + return -ENOMEM;
> + }
> +
> + pc->enqueue = &kevent_poll_enqueue;
> + pc->dequeue = &kevent_poll_dequeue;
> + pc->callback = &kevent_poll_callback;
> +
> + printk(KERN_INFO "Kevent poll()/select() subsystem has been initialized.\n");
> + return 0;
> +}
> +
> +static struct lock_class_key kevent_poll_key;
> +
> +void kevent_poll_reinit(struct file *file)
> +{
> + lockdep_set_class(&file->st.lock, &kevent_poll_key);
> +}
> +
> +static void __exit kevent_poll_sys_fini(void)
> +{
> + kmem_cache_destroy(kevent_poll_priv_cache);
> + kmem_cache_destroy(kevent_poll_container_cache);
> +}
> +
> +module_init(kevent_poll_sys_init);
> +module_exit(kevent_poll_sys_fini);
> diff --git a/kernel/kevent/kevent_timer.c b/kernel/kevent/kevent_timer.c
> new file mode 100644
> index 0000000..fe39b4e
> --- /dev/null
> +++ b/kernel/kevent/kevent_timer.c
> @@ -0,0 +1,108 @@
> +/*
> + * kevent_timer.c
> + *
> + * 2006 Copyright (c) Evgeniy Polyakov <[email protected]>
> + * All rights reserved.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/types.h>
> +#include <linux/list.h>
> +#include <linux/slab.h>
> +#include <linux/spinlock.h>
> +#include <linux/timer.h>
> +#include <linux/jiffies.h>
> +#include <linux/kevent.h>
> +
> +struct kevent_timer
> +{
> + struct timer_list ktimer;
> + struct kevent_storage ktimer_storage;
> +};
> +
> +static void kevent_timer_func(unsigned long data)
> +{
> + struct kevent *k = (struct kevent *)data;
> + struct timer_list *t = k->st->origin;
> +
> + kevent_storage_ready(k->st, NULL, KEVENT_MASK_ALL);
> + mod_timer(t, jiffies + msecs_to_jiffies(k->event.id.raw[0]));
> +}
> +
> +static struct lock_class_key kevent_timer_key;
> +
> +static int kevent_timer_enqueue(struct kevent *k)
> +{
> + int err;
> + struct kevent_timer *t;
> +
> + t = kmalloc(sizeof(struct kevent_timer), GFP_KERNEL);
> + if (!t)
> + return -ENOMEM;
> +
> + setup_timer(&t->ktimer, &kevent_timer_func, (unsigned long)k);
> +
> + err = kevent_storage_init(&t->ktimer, &t->ktimer_storage);
> + if (err)
> + goto err_out_free;
> + lockdep_set_class(&t->ktimer_storage.lock, &kevent_timer_key);
> +
> + err = kevent_storage_enqueue(&t->ktimer_storage, k);
> + if (err)
> + goto err_out_st_fini;
> +
> + mod_timer(&t->ktimer, jiffies + msecs_to_jiffies(k->event.id.raw[0]));
> +
> + return 0;
> +
> +err_out_st_fini:
> + kevent_storage_fini(&t->ktimer_storage);
> +err_out_free:
> + kfree(t);
> +
> + return err;
> +}
> +
> +static int kevent_timer_dequeue(struct kevent *k)
> +{
> + struct kevent_storage *st = k->st;
> + struct kevent_timer *t = container_of(st, struct kevent_timer, ktimer_storage);
> +
> + del_timer_sync(&t->ktimer);
> + kevent_storage_dequeue(st, k);
> + kfree(t);
> +
> + return 0;
> +}
> +
> +static int kevent_timer_callback(struct kevent *k)
> +{
> + k->event.ret_data[0] = (__u32)jiffies;
> + return 1;
> +}
> +
> +static int __init kevent_init_timer(void)
> +{
> + struct kevent_callbacks *tc = &kevent_registered_callbacks[KEVENT_TIMER];
> +
> + tc->enqueue = &kevent_timer_enqueue;
> + tc->dequeue = &kevent_timer_dequeue;
> + tc->callback = &kevent_timer_callback;
> +
> + return 0;
> +}
> +module_init(kevent_init_timer);
>
> -
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
---end quoted text---
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
