From: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
To: netfilter-devel@lists.netfilter.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 2.6.20 08/10] nfnetlink_log: shorten instances_lock holding time
Date: Mon, 12 Feb 2007 01:40:12 +0100 [thread overview]
Message-ID: <20070212004012.GI8262@rere.qmqm.pl> (raw)
Shorten instances_lock window at the cost of doing unnecessary work
on the failure case. I don't know if it makes sense actually. ;>
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
--- linux-2.6.20/net/netfilter/nfnetlink_log.c.6 2007-02-11 22:31:19.000000000 +0100
+++ linux-2.6.20/net/netfilter/nfnetlink_log.c 2007-02-11 22:41:18.000000000 +0100
@@ -149,18 +149,14 @@ instance_create(u_int16_t group_num, int
if (!try_module_get(THIS_MODULE)) {
UDEBUG("aborting, could not reference own module (module unloading?)\n");
- goto out_modunload;
- }
-
- write_lock_bh(&instances_lock);
- if (__instance_lookup(group_num)) {
- UDEBUG("aborting, instance already exists\n");
- goto out_unlock;
+ return NULL;
}
inst = kzalloc(sizeof(*inst), GFP_ATOMIC);
- if (!inst)
- goto out_unlock;
+ if (!inst) {
+ module_put(THIS_MODULE);
+ return NULL;
+ }
INIT_HLIST_NODE(&inst->hlist);
spin_lock_init(&inst->lock);
@@ -181,21 +177,25 @@ instance_create(u_int16_t group_num, int
inst->copy_mode = NFULNL_COPY_PACKET;
inst->copy_range = 0xffff;
- hlist_add_head(&inst->hlist,
+ write_lock_bh(&instances_lock);
+
+ if (!__instance_lookup(group_num)) {
+ hlist_add_head(&inst->hlist,
&instance_table[instance_hashfn(group_num)]);
- UDEBUG("newly added node: %p, next=%p\n", &inst->hlist,
- inst->hlist.next);
+ UDEBUG("newly added node: %p, next=%p\n", &inst->hlist,
+ inst->hlist.next);
+ } else {
+ UDEBUG("aborting, instance already exists\n");
+
+ kfree(inst);
+ module_put(THIS_MODULE);
+ inst = NULL;
+ }
write_unlock_bh(&instances_lock);
return inst;
-
-out_unlock:
- write_unlock_bh(&instances_lock);
- module_put(THIS_MODULE);
-out_modunload:
- return NULL;
}
static int __nfulnl_send(struct nfulnl_instance *inst);
reply other threads:[~2007-02-12 9:09 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20070212004012.GI8262@rere.qmqm.pl \
--to=mirq-linux@rere.qmqm.pl \
--cc=linux-kernel@vger.kernel.org \
--cc=netfilter-devel@lists.netfilter.org \
/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).