Date: Wed, 2 Feb 2000 20:53:09 -0500 (EST) From: "Matthew N. Dodd" <winter@jurai.net> To: Jasper Wallace <jasper@ivision.co.uk> Cc: Mike Nowlin <mike@argos.org>, freebsd-net@FreeBSD.ORG Subject: Re: 802.1Q VLANs Message-ID: <Pine.BSF.4.21.0002022049240.479-200000@sasami.jurai.net> In-Reply-To: <Pine.GSO.4.21.0002022029090.248-100000@avengers.ivision.co.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
This message is in MIME format. The first part should be readable text,
while the remaining parts are likely unreadable without MIME-aware tools.
Send mail to mime@docserver.cac.washington.edu for more info.
--0-1845923715-949542789=:479
Content-Type: TEXT/PLAIN; charset=US-ASCII
On Wed, 2 Feb 2000, Jasper Wallace wrote:
> oh well, with the vlan code in -stable i could ping, but tcp or udp packets
> would eventually panic the machine, it's fine with the patches from the
> above url.
Ok, I've reviewed the patches (crap) and fixed the problem (easy).
I'm not terribly happy with how the double queuing ends up working but its
much better than polluting sys/net/if_ethersubr.c with all sorts of VLAN
defines.
The correct solution will be to write a vlan_output() routine that does
the right thing so we can place packets right on the parent interface's
queue instead of calling ether_output twice. I'm not inclined to do this
so close to release so the brief patch will have to do.
Patch follows:
Index: if_vlan.c
===================================================================
RCS file: /cvs/src/sys/net/if_vlan.c,v
retrieving revision 1.13
diff -u -1 -2 -r1.13 if_vlan.c
--- if_vlan.c 2000/01/29 16:56:24 1.13
+++ if_vlan.c 2000/02/02 22:36:55
@@ -184,25 +184,25 @@
static void
vlan_ifinit(void *foo)
{
return;
}
static void
vlan_start(struct ifnet *ifp)
{
struct ifvlan *ifv;
struct ifnet *p;
struct ether_vlan_header *evl;
- struct mbuf *m;
+ struct mbuf *m, *m0;
ifv = ifp->if_softc;
p = ifv->ifv_p;
ifp->if_flags |= IFF_OACTIVE;
for (;;) {
IF_DEQUEUE(&ifp->if_snd, m);
if (m == 0)
break;
if (ifp->if_bpf)
bpf_mtap(ifp, m);
@@ -220,27 +220,39 @@
* valid. We need to do this because sometimes mbufs will
* be allocated by other parts of the system that contain
* garbage in the rcvif pointer. Using the M_PROTO1 flag
* lets the driver perform a proper sanity check and avoid
* following potentially bogus rcvif pointers off into
* never-never land.
*/
if (ifp->if_flags & IFF_LINK0) {
m->m_pkthdr.rcvif = ifp;
m->m_flags |= M_PROTO1;
} else {
M_PREPEND(m, EVL_ENCAPLEN, M_DONTWAIT);
- if (m == 0)
+ if (m == NULL) {
+ printf("vlan%d: M_PREPEND failed", ifp->if_unit );
+ ifp->if_ierrors++;
continue;
+ }
/* M_PREPEND takes care of m_len, m_pkthdr.len for us */
+
+ m0 = m_pullup(m, ETHER_HDR_LEN + EVL_ENCAPLEN);
+ if (m0 == NULL) {
+ printf("vlan%d: m_pullup failed", ifp->if_unit );
+ ifp->if_ierrors++;
+ m_freem(m);
+ continue;
+ }
+ m = m0;
/*
* Transform the Ethernet header into an Ethernet header
* with 802.1Q encapsulation.
*/
bcopy(mtod(m, char *) + EVL_ENCAPLEN, mtod(m, char *),
sizeof(struct ether_header));
evl = mtod(m, struct ether_vlan_header *);
evl->evl_proto = evl->evl_encap_proto;
evl->evl_encap_proto = htons(vlan_proto);
evl->evl_tag = htons(ifv->ifv_tag);
#ifdef DEBUG
--
| Matthew N. Dodd | '78 Datsun 280Z | '75 Volvo 164E | FreeBSD/NetBSD |
| winter@jurai.net | 2 x '84 Volvo 245DL | ix86,sparc,pmax |
| http://www.jurai.net/~winter | This Space For Rent | ISO8802.5 4ever |
--0-1845923715-949542789=:479
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="if_vlan.patch"
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.BSF.4.21.0002022053090.479@sasami.jurai.net>
Content-Description:
Content-Disposition: attachment; filename="if_vlan.patch"
SW5kZXg6IGlmX3ZsYW4uYw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNT
IGZpbGU6IC9jdnMvc3JjL3N5cy9uZXQvaWZfdmxhbi5jLHYNCnJldHJpZXZp
bmcgcmV2aXNpb24gMS4xMw0KZGlmZiAtdSAtMSAtMiAtcjEuMTMgaWZfdmxh
bi5jDQotLS0gaWZfdmxhbi5jCTIwMDAvMDEvMjkgMTY6NTY6MjQJMS4xMw0K
KysrIGlmX3ZsYW4uYwkyMDAwLzAyLzAyIDIyOjM2OjU1DQpAQCAtMTg0LDI1
ICsxODQsMjUgQEANCiBzdGF0aWMgdm9pZA0KIHZsYW5faWZpbml0KHZvaWQg
KmZvbykNCiB7DQogCXJldHVybjsNCiB9DQogDQogc3RhdGljIHZvaWQNCiB2
bGFuX3N0YXJ0KHN0cnVjdCBpZm5ldCAqaWZwKQ0KIHsNCiAJc3RydWN0IGlm
dmxhbiAqaWZ2Ow0KIAlzdHJ1Y3QgaWZuZXQgKnA7DQogCXN0cnVjdCBldGhl
cl92bGFuX2hlYWRlciAqZXZsOw0KLQlzdHJ1Y3QgbWJ1ZiAqbTsNCisJc3Ry
dWN0IG1idWYgKm0sICptMDsNCiANCiAJaWZ2ID0gaWZwLT5pZl9zb2Z0YzsN
CiAJcCA9IGlmdi0+aWZ2X3A7DQogDQogCWlmcC0+aWZfZmxhZ3MgfD0gSUZG
X09BQ1RJVkU7DQogCWZvciAoOzspIHsNCiAJCUlGX0RFUVVFVUUoJmlmcC0+
aWZfc25kLCBtKTsNCiAJCWlmIChtID09IDApDQogCQkJYnJlYWs7DQogCQlp
ZiAoaWZwLT5pZl9icGYpDQogCQkJYnBmX210YXAoaWZwLCBtKTsNCiANCkBA
IC0yMjAsMjcgKzIyMCwzOSBAQA0KIAkJICogdmFsaWQuIFdlIG5lZWQgdG8g
ZG8gdGhpcyBiZWNhdXNlIHNvbWV0aW1lcyBtYnVmcyB3aWxsDQogCQkgKiBi
ZSBhbGxvY2F0ZWQgYnkgb3RoZXIgcGFydHMgb2YgdGhlIHN5c3RlbSB0aGF0
IGNvbnRhaW4NCiAJCSAqIGdhcmJhZ2UgaW4gdGhlIHJjdmlmIHBvaW50ZXIu
IFVzaW5nIHRoZSBNX1BST1RPMSBmbGFnDQogCQkgKiBsZXRzIHRoZSBkcml2
ZXIgcGVyZm9ybSBhIHByb3BlciBzYW5pdHkgY2hlY2sgYW5kIGF2b2lkDQog
CQkgKiBmb2xsb3dpbmcgcG90ZW50aWFsbHkgYm9ndXMgcmN2aWYgcG9pbnRl
cnMgb2ZmIGludG8NCiAJCSAqIG5ldmVyLW5ldmVyIGxhbmQuDQogCQkgKi8N
CiAJCWlmIChpZnAtPmlmX2ZsYWdzICYgSUZGX0xJTkswKSB7DQogCQkJbS0+
bV9wa3RoZHIucmN2aWYgPSBpZnA7DQogCQkJbS0+bV9mbGFncyB8PSBNX1BS
T1RPMTsNCiAJCX0gZWxzZSB7DQogCQkJTV9QUkVQRU5EKG0sIEVWTF9FTkNB
UExFTiwgTV9ET05UV0FJVCk7DQotCQkJaWYgKG0gPT0gMCkNCisJCQlpZiAo
bSA9PSBOVUxMKSB7DQorCQkJCXByaW50ZigidmxhbiVkOiBNX1BSRVBFTkQg
ZmFpbGVkIiwgaWZwLT5pZl91bml0ICk7DQorCQkJCWlmcC0+aWZfaWVycm9y
cysrOw0KIAkJCQljb250aW51ZTsNCisJCQl9DQogCQkJLyogTV9QUkVQRU5E
IHRha2VzIGNhcmUgb2YgbV9sZW4sIG1fcGt0aGRyLmxlbiBmb3IgdXMgKi8N
CisNCisJCQltMCA9IG1fcHVsbHVwKG0sIEVUSEVSX0hEUl9MRU4gKyBFVkxf
RU5DQVBMRU4pOw0KKwkJCWlmIChtMCA9PSBOVUxMKSB7DQorCQkJCXByaW50
ZigidmxhbiVkOiBtX3B1bGx1cCBmYWlsZWQiLCBpZnAtPmlmX3VuaXQgKTsN
CisJCQkJaWZwLT5pZl9pZXJyb3JzKys7DQorCQkJCW1fZnJlZW0obSk7DQor
CQkJCWNvbnRpbnVlOw0KKwkJCX0NCisJCQltID0gbTA7DQogDQogCQkJLyoN
CiAJCQkgKiBUcmFuc2Zvcm0gdGhlIEV0aGVybmV0IGhlYWRlciBpbnRvIGFu
IEV0aGVybmV0IGhlYWRlcg0KIAkJCSAqIHdpdGggODAyLjFRIGVuY2Fwc3Vs
YXRpb24uDQogCQkJICovDQogCQkJYmNvcHkobXRvZChtLCBjaGFyICopICsg
RVZMX0VOQ0FQTEVOLCBtdG9kKG0sIGNoYXIgKiksDQogCQkJICAgICAgc2l6
ZW9mKHN0cnVjdCBldGhlcl9oZWFkZXIpKTsNCiAJCQlldmwgPSBtdG9kKG0s
IHN0cnVjdCBldGhlcl92bGFuX2hlYWRlciAqKTsNCiAJCQlldmwtPmV2bF9w
cm90byA9IGV2bC0+ZXZsX2VuY2FwX3Byb3RvOw0KIAkJCWV2bC0+ZXZsX2Vu
Y2FwX3Byb3RvID0gaHRvbnModmxhbl9wcm90byk7DQogCQkJZXZsLT5ldmxf
dGFnID0gaHRvbnMoaWZ2LT5pZnZfdGFnKTsNCiAjaWZkZWYgREVCVUcNCg==
--0-1845923715-949542789=:479--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-net" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0002022049240.479-200000>