Message ID | 20090608131133.10052.40836.stgit@localhost |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Mon, Jun 08, 2009 at 03:11:33PM +0200, Jesper Dangaard Brouer wrote: > This module uses rcu_call() thus it should use rcu_barrier() on module unload. > > Also fixed a trivial typo 'nfetlink' -> 'nfnetlink' in comment. Assuming that netlink_unregister_notifier(), nfnetlink_subsys_unregister(), and so on prevent any subsequent calls to call_rcu(), looks good!!! Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> > Signed-off-by: Jesper Dangaard Brouer <hawk@comx.dk> > --- > > net/netfilter/nfnetlink_queue.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c > index 8c86011..71daa09 100644 > --- a/net/netfilter/nfnetlink_queue.c > +++ b/net/netfilter/nfnetlink_queue.c > @@ -1,6 +1,6 @@ > /* > * This is a module which is used for queueing packets and communicating with > - * userspace via nfetlink. > + * userspace via nfnetlink. > * > * (C) 2005 by Harald Welte <laforge@netfilter.org> > * (C) 2007 by Patrick McHardy <kaber@trash.net> > @@ -932,6 +932,8 @@ static void __exit nfnetlink_queue_fini(void) > #endif > nfnetlink_subsys_unregister(&nfqnl_subsys); > netlink_unregister_notifier(&nfqnl_rtnl_notifier); > + > + rcu_barrier(); /* Wait for completion of call_rcu()'s */ > } > > MODULE_DESCRIPTION("netfilter packet queue handler"); > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 08 Jun 2009 15:11:33 +0200 Jesper Dangaard Brouer <hawk@comx.dk> wrote: > This module uses rcu_call() thus it should use rcu_barrier() on module unload. > > Also fixed a trivial typo 'nfetlink' -> 'nfnetlink' in comment. > > Signed-off-by: Jesper Dangaard Brouer <hawk@comx.dk> > --- > > net/netfilter/nfnetlink_queue.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c > index 8c86011..71daa09 100644 > --- a/net/netfilter/nfnetlink_queue.c > +++ b/net/netfilter/nfnetlink_queue.c > @@ -1,6 +1,6 @@ > /* > * This is a module which is used for queueing packets and communicating with > - * userspace via nfetlink. > + * userspace via nfnetlink. > * > * (C) 2005 by Harald Welte <laforge@netfilter.org> > * (C) 2007 by Patrick McHardy <kaber@trash.net> > @@ -932,6 +932,8 @@ static void __exit nfnetlink_queue_fini(void) > #endif > nfnetlink_subsys_unregister(&nfqnl_subsys); > netlink_unregister_notifier(&nfqnl_rtnl_notifier); > + > + rcu_barrier(); /* Wait for completion of call_rcu()'s */ > } > > MODULE_DESCRIPTION("netfilter packet queue handler"); Possibly you've fixed the bug which the module_put(THIS_MODULE) in instance_destroy_rcu() is addressing. Do we still need to take a ref against the module for each instance once the above fix is in place? <goes git mining> Nope, the THIS_MODULE games have been there since day one, and I can't work out why they're there. net/netfilter/nfnetlink_log.c has them too. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index 8c86011..71daa09 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c @@ -1,6 +1,6 @@ /* * This is a module which is used for queueing packets and communicating with - * userspace via nfetlink. + * userspace via nfnetlink. * * (C) 2005 by Harald Welte <laforge@netfilter.org> * (C) 2007 by Patrick McHardy <kaber@trash.net> @@ -932,6 +932,8 @@ static void __exit nfnetlink_queue_fini(void) #endif nfnetlink_subsys_unregister(&nfqnl_subsys); netlink_unregister_notifier(&nfqnl_rtnl_notifier); + + rcu_barrier(); /* Wait for completion of call_rcu()'s */ } MODULE_DESCRIPTION("netfilter packet queue handler");
This module uses rcu_call() thus it should use rcu_barrier() on module unload. Also fixed a trivial typo 'nfetlink' -> 'nfnetlink' in comment. Signed-off-by: Jesper Dangaard Brouer <hawk@comx.dk> --- net/netfilter/nfnetlink_queue.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html