From: Stephen Hemminger <shemminger@osdl.org>
To: Linus Torvalds <torvalds@transmeta.com>, David Miller <davem@redhat.com>
Cc: linux-net@vger.kernel.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH] (2/8) Eliminate brlock for packet_type
Date: 11 Mar 2003 16:14:40 -0800 [thread overview]
Message-ID: <1047428080.15872.99.camel@dell_ss3.pdx.osdl.net> (raw)
In-Reply-To: <Pine.LNX.4.44.0303091831560.2129-100000@home.transmeta.com>
Replace linked list for packet_type with brlock with list macros and RCU.
diff -urN -X dontdiff linux-2.5.64/net/8021q/vlan.c linux-2.5-nobrlock/net/8021q/vlan.c
--- linux-2.5.64/net/8021q/vlan.c 2003-03-11 09:08:01.000000000 -0800
+++ linux-2.5-nobrlock/net/8021q/vlan.c 2003-03-11 14:31:28.000000000 -0800
@@ -29,7 +29,6 @@
#include <net/p8022.h>
#include <net/arp.h>
#include <linux/rtnetlink.h>
-#include <linux/brlock.h>
#include <linux/notifier.h>
#include <linux/if_vlan.h>
@@ -68,7 +67,6 @@
.dev =NULL,
.func = vlan_skb_recv, /* VLAN receive method */
.data = (void *)(-1), /* Set here '(void *)1' when this code can SHARE SKBs */
- .next = NULL
};
/* End of global variables definitions. */
@@ -231,9 +229,10 @@
real_dev->vlan_rx_kill_vid(real_dev, vlan_id);
}
- br_write_lock(BR_NETPROTO_LOCK);
grp->vlan_devices[vlan_id] = NULL;
- br_write_unlock(BR_NETPROTO_LOCK);
+
+ /* wait for RCU in network receive */
+ synchronize_kernel();
/* Caller unregisters (and if necessary, puts)
diff -urN -X dontdiff linux-2.5.64/net/8021q/vlan_dev.c linux-2.5-nobrlock/net/8021q/vlan_dev.c
--- linux-2.5.64/net/8021q/vlan_dev.c 2003-03-11 09:08:01.000000000 -0800
+++ linux-2.5-nobrlock/net/8021q/vlan_dev.c 2003-03-10 15:49:52.000000000 -0800
@@ -31,7 +31,6 @@
#include <net/datalink.h>
#include <net/p8022.h>
#include <net/arp.h>
-#include <linux/brlock.h>
#include "vlan.h"
#include "vlanproc.h"
next prev parent reply other threads:[~2003-03-12 0:07 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-03-09 23:44 [PATCH] small fixes in brlock.h Zwane Mwaikambo
2003-03-10 0:00 ` Robert Love
2003-03-10 0:03 ` Zwane Mwaikambo
2003-03-10 0:10 ` Robert Love
2003-03-10 1:11 ` Zwane Mwaikambo
2003-03-10 0:15 ` Robert Love
2003-03-10 2:33 ` Linus Torvalds
2003-03-10 21:54 ` Roman Zippel
2003-03-12 0:13 ` [PATCH] (0/8) replace brlock with RCU Stephen Hemminger
2003-03-12 0:23 ` Linus Torvalds
2003-03-12 0:28 ` David S. Miller
2003-03-12 1:36 ` Roman Zippel
2003-03-12 0:14 ` [PATCH] (1/8) Eliminate brlock in psnap Stephen Hemminger
2003-03-12 1:03 ` Roman Zippel
2003-03-12 1:13 ` Zwane Mwaikambo
2003-03-12 0:14 ` Stephen Hemminger [this message]
2003-03-12 0:20 ` [PATCH] (2/8) Eliminate brlock for packet_type David S. Miller
2003-03-12 0:25 ` Stephen Hemminger
2003-03-12 0:14 ` [PATCH] (3/8) Eliminate brlock from vlan Stephen Hemminger
2003-03-12 0:14 ` [PATCH] (4/8) Eliminate brlock in net/bridge Stephen Hemminger
2003-03-12 0:14 ` [PATCH] (5/8) Eliminate brlock from netfilter Stephen Hemminger
2003-03-12 1:25 ` Zwane Mwaikambo
2003-03-12 0:15 ` [PATCH] (6/8) Eliminate brlock from ipv4 Stephen Hemminger
2003-03-12 0:15 ` [PATCH] (7/8) Eliminate brlock from IPV6 Stephen Hemminger
2003-03-12 0:15 ` [PATCH] (8/8) Kill brlock Stephen Hemminger
2003-03-12 0:23 ` David S. Miller
2003-03-12 0:31 ` Stephen Hemminger
2003-03-12 0:34 ` David S. Miller
2003-03-12 0:44 ` Linus Torvalds
2003-03-12 0:48 ` Stephen Hemminger
2003-03-12 2:31 ` Alan Cox
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=1047428080.15872.99.camel@dell_ss3.pdx.osdl.net \
--to=shemminger@osdl.org \
--cc=davem@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-net@vger.kernel.org \
--cc=torvalds@transmeta.com \
/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
all inboxes | Powered by JetHome®