xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

devbridge: various bugfixes and improvements from charles forsyth

Browse source
This commit is contained in:
cinap_lenrek 2016-11-07 22:43:37 +01:00
parent a54d1cd95e
commit 48b49361d8
1 changed files with 67 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

146
sys/src/9/port/devbridge.c
View file

@ -39,6 +39,7 @@ enum
CacheLook= 5, // how many cache entries to examine CacheLook= 5, // how many cache entries to examine
CacheSize= (CacheHash+CacheLook-1), CacheSize= (CacheHash+CacheLook-1),
CacheTimeout= 5*60, // timeout for cache entry in seconds CacheTimeout= 5*60, // timeout for cache entry in seconds
MaxMTU= IP_MAX, // allow for jumbo frames and large UDP
TcpMssMax = 1300, // max desirable Tcp MSS value TcpMssMax = 1300, // max desirable Tcp MSS value
TunnelMtu = 1400, TunnelMtu = 1400,
@ -109,9 +110,9 @@ struct Bridge
struct Port struct Port
{ {
Ref;
int id; int id;
Bridge *bridge; Bridge *bridge;
int ref;
int closed; int closed;
Chan *data[2]; // channel to data Chan *data[2]; // channel to data
@ -291,15 +292,21 @@ bridgeread(Chan *c, void *a, long n, vlong off)
USED(off); USED(off);
switch(TYPE(c->qid)) { switch(TYPE(c->qid)) {
default: default:
error(Eperm); error(Egreg);
case Qtopdir: case Qtopdir:
case Qbridgedir: case Qbridgedir:
case Qportdir: case Qportdir:
return devdirread(c, a, n, 0, 0, bridgegen); return devdirread(c, a, n, 0, 0, bridgegen);
case Qlog: case Qlog:
return logread(b, a, off, n); return logread(b, a, off, n);
case Qlocal:
return 0; /* TO DO */
case Qstatus: case Qstatus:
qlock(b); qlock(b);
if(waserror()){
qunlock(b);
nexterror();
}
port = b->port[PORT(c->qid)]; port = b->port[PORT(c->qid)];
if(port == 0) if(port == 0)
strcpy(buf, "unbound\n"); strcpy(buf, "unbound\n");
@ -318,16 +325,15 @@ bridgeread(Chan *c, void *a, long n, vlong off)
} }
ingood = port->in - port->inmulti - port->inunknown; ingood = port->in - port->inmulti - port->inunknown;
outgood = port->out - port->outmulti - port->outunknown; outgood = port->out - port->outmulti - port->outunknown;
i += snprint(buf+i, sizeof(buf)-i, snprint(buf+i, sizeof(buf)-i,
"in=%d(%d:%d:%d) out=%d(%d:%d:%d:%d)\n", "in=%d(%d:%d:%d) out=%d(%d:%d:%d:%d)\n",
port->in, ingood, port->inmulti, port->inunknown, port->in, ingood, port->inmulti, port->inunknown,
port->out, outgood, port->outmulti, port->out, outgood, port->outmulti,
port->outunknown, port->outfrag); port->outunknown, port->outfrag);
USED(i);
} }
n = readstr(off, a, n, buf); poperror();
qunlock(b); qunlock(b);
return n; return readstr(off, a, n, buf);
case Qbctl: case Qbctl:
snprint(buf, sizeof(buf), "%s tcpmss\ndelay %ld %ld\n", snprint(buf, sizeof(buf), "%s tcpmss\ndelay %ld %ld\n",
b->tcpmss ? "set" : "clear", b->delay0, b->delayn); b->tcpmss ? "set" : "clear", b->delay0, b->delayn);
@ -513,7 +519,7 @@ portbind(Bridge *b, int argc, char *argv[])
Chan *ctl; Chan *ctl;
int type = 0, i, n; int type = 0, i, n;
ulong ownhash; ulong ownhash;
char *dev, *dev2 = nil, *p; char *dev, *dev2 = nil;
char buf[100], name[KNAMELEN], path[8*KNAMELEN]; char buf[100], name[KNAMELEN], path[8*KNAMELEN];
static char usage[] = "usage: bind ether|tunnel name ownhash dev [dev2]"; static char usage[] = "usage: bind ether|tunnel name ownhash dev [dev2]";
@ -524,20 +530,20 @@ portbind(Bridge *b, int argc, char *argv[])
if(argc != 4) if(argc != 4)
error(usage); error(usage);
type = Tether; type = Tether;
strncpy(name, argv[1], KNAMELEN-1); strncpy(name, argv[1], KNAMELEN);
name[KNAMELEN-1] = 0; name[KNAMELEN-1] = 0;
// parseaddr(addr, argv[1], Eaddrlen); // parseaddr(addr, argv[1], Eaddrlen);
} else if(strcmp(argv[0], "tunnel") == 0) { } else if(strcmp(argv[0], "tunnel") == 0) {
if(argc != 5) if(argc != 5)
error(usage); error(usage);
type = Ttun; type = Ttun;
strncpy(name, argv[1], KNAMELEN-1); strncpy(name, argv[1], KNAMELEN);
name[KNAMELEN-1] = 0; name[KNAMELEN-1] = 0;
// parseip(addr, argv[1]); // parseip(addr, argv[1]);
dev2 = argv[4]; dev2 = argv[4];
} else } else
error(usage); error(usage);
ownhash = strtoul(argv[2], 0, 0); ownhash = atoi(argv[2]);
dev = argv[3]; dev = argv[3];
for(i=0; i<b->nport; i++) { for(i=0; i<b->nport; i++) {
port = b->port[i]; port = b->port[i];
@ -574,11 +580,9 @@ portbind(Bridge *b, int argc, char *argv[])
// check addr? // check addr?
// get directory name // get directory name
n = devtab[ctl->type]->read(ctl, buf, sizeof(buf), 0); n = devtab[ctl->type]->read(ctl, buf, sizeof(buf)-1, 0);
buf[n] = 0; buf[n] = 0;
for(p = buf; *p == ' '; p++) snprint(path, sizeof(path), "%s/%lud/data", dev, strtoul(buf, 0, 0));
;
snprint(path, sizeof(path), "%s/%lud/data", dev, strtoul(p, 0, 0));
// setup connection to be promiscuous // setup connection to be promiscuous
snprint(buf, sizeof(buf), "connect -1"); snprint(buf, sizeof(buf), "connect -1");
@ -613,8 +617,9 @@ portbind(Bridge *b, int argc, char *argv[])
b->nport = port->id+1; b->nport = port->id+1;
// assumes kproc always succeeds // assumes kproc always succeeds
kproc("etherread", etherread, port); // poperror must be next incref(port);
port->ref++; snprint(buf, sizeof(buf), "bridge:%s", dev);
kproc(buf, etherread, port);
} }
// assumes b is locked // assumes b is locked
@ -632,18 +637,18 @@ portunbind(Bridge *b, int argc, char *argv[])
error(usage); error(usage);
if(strcmp(argv[0], "ether") == 0) { if(strcmp(argv[0], "ether") == 0) {
type = Tether; type = Tether;
strncpy(name, argv[1], KNAMELEN-1); strncpy(name, argv[1], KNAMELEN);
name[KNAMELEN-1] = 0; name[KNAMELEN-1] = 0;
// parseaddr(addr, argv[1], Eaddrlen); // parseaddr(addr, argv[1], Eaddrlen);
} else if(strcmp(argv[0], "tunnel") == 0) { } else if(strcmp(argv[0], "tunnel") == 0) {
type = Ttun; type = Ttun;
strncpy(name, argv[1], KNAMELEN-1); strncpy(name, argv[1], KNAMELEN);
name[KNAMELEN-1] = 0; name[KNAMELEN-1] = 0;
// parseip(addr, argv[1]); // parseip(addr, argv[1]);
} else } else
error(usage); error(usage);
if(argc == 3) if(argc == 3)
ownhash = strtoul(argv[2], 0, 0); ownhash = atoi(argv[2]);
else else
ownhash = 0; ownhash = 0;
for(i=0; i<b->nport; i++) { for(i=0; i<b->nport; i++) {
@ -781,14 +786,21 @@ cachedump(Bridge *b)
char c; char c;
qlock(b); qlock(b);
if(waserror()) {
qunlock(b);
nexterror();
}
sec = TK2SEC(m->ticks); sec = TK2SEC(m->ticks);
n = 0; n = 0;
for(i=0; i<CacheSize; i++) for(i=0; i<CacheSize; i++)
if(b->cache[i].expire != 0) if(b->cache[i].expire != 0)
n++; n++;
n *= 51; // change if print format is changed n *= 51; // change if print format is changed
n += 10; // some slop at the end n += 10; // some slop at the end
buf = smalloc(n); buf = malloc(n);
if(buf == nil)
error(Enomem);
p = buf; p = buf;
ep = buf + n; ep = buf + n;
ce = b->cache; ce = b->cache;
@ -801,27 +813,22 @@ cachedump(Bridge *b)
ce->port, ce->src, ce->dst, ce->expire+off, c); ce->port, ce->src, ce->dst, ce->expire+off, c);
} }
*p = 0; *p = 0;
poperror();
qunlock(b); qunlock(b);
return buf; return buf;
} }
// assumes b is locked // assumes b is locked, no error return
static void static void
ethermultiwrite(Bridge *b, Block *bp, Port *port) ethermultiwrite(Bridge *b, Block *bp, Port *port)
{ {
Port *oport; Port *oport;
Block *bp2;
Etherpkt *ep; Etherpkt *ep;
int i, mcast; int i, mcast;
if(waserror()) {
if(bp)
freeb(bp);
nexterror();
}
ep = (Etherpkt*)bp->rp; ep = (Etherpkt*)bp->rp;
mcast = ep->d[0] & 1; /* multicast bit of ethernet address */ mcast = ep->d[0] & 1; /* multicast bit of ethernet address */
@ -841,26 +848,16 @@ ethermultiwrite(Bridge *b, Block *bp, Port *port)
// delay one so that the last write does not copy // delay one so that the last write does not copy
if(oport != nil) { if(oport != nil) {
b->copy++; b->copy++;
bp2 = copyblock(bp, blocklen(bp)); etherwrite(oport, copyblock(bp, blocklen(bp)));
if(!waserror()) {
etherwrite(oport, bp2);
poperror();
}
} }
oport = b->port[i]; oport = b->port[i];
} }
// last write free block // last write free block
if(oport) { if(oport)
bp2 = bp; bp = nil; USED(bp); etherwrite(oport, bp);
if(!waserror()) { else
etherwrite(oport, bp2);
poperror();
}
} else
freeb(bp); freeb(bp);
poperror();
} }
static void static void
@ -954,10 +951,10 @@ etherread(void *a)
{ {
Port *port = a; Port *port = a;
Bridge *b = port->bridge; Bridge *b = port->bridge;
Block *bp, *bp2; Block *bp;
Etherpkt *ep; Etherpkt *ep;
Centry *ce; Centry *ce;
long md; long md, n;
qlock(b); qlock(b);
port->readp = up; /* hide identity under a rock for unbind */ port->readp = up; /* hide identity under a rock for unbind */
@ -970,64 +967,56 @@ etherread(void *a)
qlock(b); qlock(b);
break; break;
} }
if(0) bp = devtab[port->data[0]->type]->bread(port->data[0], MaxMTU, 0);
print("devbridge: etherread: reading\n");
bp = devtab[port->data[0]->type]->bread(port->data[0],
ETHERMAXTU, 0);
if(0)
print("devbridge: etherread: blocklen = %d\n",
blocklen(bp));
poperror(); poperror();
qlock(b); qlock(b);
if(bp == nil || port->closed) if(bp == nil)
break; break;
if(waserror()) { n = blocklen(bp);
// print("etherread bridge error\n"); if(port->closed || n < ETHERMINTU){
if(bp) freeb(bp);
freeb(bp); continue;
}
if(waserror()) {
// print("etherread bridge error\n");
freeb(bp);
continue; continue;
} }
if(blocklen(bp) < ETHERMINTU)
error("short packet");
port->in++; port->in++;
ep = (Etherpkt*)bp->rp; ep = (Etherpkt*)bp->rp;
cacheupdate(b, ep->s, port->id); cacheupdate(b, ep->s, port->id);
if(b->tcpmss) if(b->tcpmss)
tcpmsshack(ep, BLEN(bp)); tcpmsshack(ep, n);
/* /*
* delay packets to simulate a slow link * delay packets to simulate a slow link
*/ */
if(b->delay0 || b->delayn){ if(b->delay0 != 0 || b->delayn != 0){
md = b->delay0 + b->delayn * BLEN(bp); md = b->delay0 + b->delayn * n;
if(md > 0) if(md > 0)
microdelay(md); microdelay(md);
} }
poperror(); /* must now dispose of bp */
if(ep->d[0] & 1) { if(ep->d[0] & 1) {
log(b, Logmcast, "multicast: port=%d src=%E dst=%E type=%#.4ux\n", log(b, Logmcast, "multicast: port=%d src=%E dst=%E type=%#.4ux\n",
port->id, ep->s, ep->d, ep->type[0]<<8|ep->type[1]); port->id, ep->s, ep->d, ep->type[0]<<8|ep->type[1]);
port->inmulti++; port->inmulti++;
bp2 = bp; bp = nil; ethermultiwrite(b, bp, port);
ethermultiwrite(b, bp2, port);
} else { } else {
ce = cachelookup(b, ep->d); ce = cachelookup(b, ep->d);
if(ce == nil) { if(ce == nil) {
b->miss++; b->miss++;
port->inunknown++; port->inunknown++;
bp2 = bp; bp = nil; ethermultiwrite(b, bp, port);
ethermultiwrite(b, bp2, port);
}else if(ce->port != port->id){ }else if(ce->port != port->id){
b->hit++; b->hit++;
bp2 = bp; bp = nil; etherwrite(b->port[ce->port], bp);
etherwrite(b->port[ce->port], bp2); }else
} freeb(bp);
} }
poperror();
if(bp)
freeb(bp);
} }
// print("etherread: trying to exit\n"); // print("etherread: trying to exit\n");
port->readp = nil; port->readp = nil;
@ -1061,7 +1050,6 @@ fragment(Etherpkt *epkt, int n)
return 1; return 1;
} }
static void static void
etherwrite(Port *port, Block *bp) etherwrite(Port *port, Block *bp)
{ {
@ -1075,13 +1063,16 @@ etherwrite(Port *port, Block *bp)
epkt = (Etherpkt*)bp->rp; epkt = (Etherpkt*)bp->rp;
n = blocklen(bp); n = blocklen(bp);
if(port->type != Ttun || !fragment(epkt, n)) { if(port->type != Ttun || !fragment(epkt, n)) {
devtab[port->data[1]->type]->bwrite(port->data[1], bp, 0); if(!waserror()){
devtab[port->data[1]->type]->bwrite(port->data[1], bp, 0);
poperror();
}
return; return;
} }
port->outfrag++; port->outfrag++;
if(waserror()){ if(waserror()){
freeblist(bp); freeblist(bp);
nexterror(); return;
} }
seglen = (TunnelMtu - ETHERHDRSIZE - IPHDR) & ~7; seglen = (TunnelMtu - ETHERHDRSIZE - IPHDR) & ~7;
@ -1152,10 +1143,7 @@ etherwrite(Port *port, Block *bp)
static void static void
portfree(Port *port) portfree(Port *port)
{ {
port->ref--; if(decref(port) != 0)
if(port->ref < 0)
panic("portfree: bad ref");
if(port->ref > 0)
return; return;
if(port->data[0]) if(port->data[0])