Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify, improve, etc.

This commit is contained in:
pooka 2010-08-16 17:33:52 +00:00
parent 795224299a
commit 1108237392
2 changed files with 79 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
sys/rump/net/lib/libshmif/if_shmem.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_shmem.c,v 1.25 2010/08/15 21:57:58 pooka Exp $ */ /* $NetBSD: if_shmem.c,v 1.26 2010/08/16 17:33:52 pooka Exp $ */
/* /*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved. * Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@ -28,7 +28,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_shmem.c,v 1.25 2010/08/15 21:57:58 pooka Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_shmem.c,v 1.26 2010/08/16 17:33:52 pooka Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/atomic.h> #include <sys/atomic.h>
@ -69,8 +69,8 @@ struct shmif_sc {
int sc_memfd; int sc_memfd;
int sc_kq; int sc_kq;
uint64_t sc_devgen;
uint32_t sc_nextpacket; uint32_t sc_nextpacket;
uint32_t sc_prevgen;
}; };
static const uint32_t busversion = SHMIF_VERSION; static const uint32_t busversion = SHMIF_VERSION;
@ -157,7 +157,7 @@ rump_shmif_create(const char *path, int *ifnum)
} }
sc->sc_nextpacket = sc->sc_busmem->shm_last; sc->sc_nextpacket = sc->sc_busmem->shm_last;
sc->sc_prevgen = sc->sc_busmem->shm_gen; sc->sc_devgen = sc->sc_busmem->shm_gen;
shmif_unlockbus(sc->sc_busmem); shmif_unlockbus(sc->sc_busmem);
sc->sc_kq = rumpuser_writewatchfile_setup(-1, sc->sc_memfd, 0, &error); sc->sc_kq = rumpuser_writewatchfile_setup(-1, sc->sc_memfd, 0, &error);
@ -171,7 +171,7 @@ rump_shmif_create(const char *path, int *ifnum)
ifp->if_ioctl = shmif_ioctl; ifp->if_ioctl = shmif_ioctl;
ifp->if_start = shmif_start; ifp->if_start = shmif_start;
ifp->if_stop = shmif_stop; ifp->if_stop = shmif_stop;
ifp->if_mtu = 1518; ifp->if_mtu = ETHERMTU;
if_attach(ifp); if_attach(ifp);
ether_ifattach(ifp, enaddr); ether_ifattach(ifp, enaddr);
@ -223,13 +223,16 @@ static void
shmif_start(struct ifnet *ifp) shmif_start(struct ifnet *ifp)
{ {
struct shmif_sc *sc = ifp->if_softc; struct shmif_sc *sc = ifp->if_softc;
struct shmif_mem *busmem = sc->sc_busmem;
struct mbuf *m, *m0; struct mbuf *m, *m0;
uint32_t lastoff, dataoff, npktlenoff; uint32_t dataoff;
uint32_t pktsize; uint32_t pktsize, pktwrote;
bool wrote = false; bool wrote = false;
bool wrap; bool wrap;
int error; int error;
ifp->if_flags |= IFF_OACTIVE;
for (;;) { for (;;) {
struct shmif_pkthdr sp; struct shmif_pkthdr sp;
struct timeval tv; struct timeval tv;
@ -243,29 +246,31 @@ shmif_start(struct ifnet *ifp)
for (m = m0; m != NULL; m = m->m_next) { for (m = m0; m != NULL; m = m->m_next) {
pktsize += m->m_len; pktsize += m->m_len;
} }
KASSERT(pktsize <= ETHERMTU + ETHER_HDR_LEN);
getmicrouptime(&tv); getmicrouptime(&tv);
sp.sp_len = pktsize; sp.sp_len = pktsize;
sp.sp_sec = tv.tv_sec; sp.sp_sec = tv.tv_sec;
sp.sp_usec = tv.tv_usec; sp.sp_usec = tv.tv_usec;
shmif_lockbus(sc->sc_busmem); shmif_lockbus(busmem);
lastoff = sc->sc_busmem->shm_last; KASSERT(busmem->shm_magic == SHMIF_MAGIC);
npktlenoff = shmif_nextpktoff(sc->sc_busmem, lastoff); busmem->shm_last = shmif_nextpktoff(busmem, busmem->shm_last);
wrap = false; wrap = false;
dataoff = shmif_buswrite(sc->sc_busmem, dataoff = shmif_buswrite(busmem,
npktlenoff, &sp, sizeof(sp), &wrap); busmem->shm_last, &sp, sizeof(sp), &wrap);
pktwrote = 0;
for (m = m0; m != NULL; m = m->m_next) { for (m = m0; m != NULL; m = m->m_next) {
dataoff = shmif_buswrite(sc->sc_busmem, dataoff, pktwrote += m->m_len;
dataoff = shmif_buswrite(busmem, dataoff,
mtod(m, void *), m->m_len, &wrap); mtod(m, void *), m->m_len, &wrap);
} }
KASSERT(pktwrote == pktsize);
if (wrap) if (wrap)
sc->sc_busmem->shm_gen++; busmem->shm_gen++;
sc->sc_busmem->shm_last = npktlenoff; shmif_unlockbus(busmem);
shmif_unlockbus(sc->sc_busmem);
m_freem(m0); m_freem(m0);
wrote = true; wrote = true;
@ -273,6 +278,9 @@ shmif_start(struct ifnet *ifp)
DPRINTF(("shmif_start: send %d bytes at off %d\n", DPRINTF(("shmif_start: send %d bytes at off %d\n",
pktsize, npktlenoff)); pktsize, npktlenoff));
} }
ifp->if_flags &= ~IFF_OACTIVE;
/* wakeup */ /* wakeup */
if (wrote) if (wrote)
rumpuser_pwrite(sc->sc_memfd, rumpuser_pwrite(sc->sc_memfd,
@ -291,9 +299,10 @@ shmif_rcv(void *arg)
{ {
struct ifnet *ifp = arg; struct ifnet *ifp = arg;
struct shmif_sc *sc = ifp->if_softc; struct shmif_sc *sc = ifp->if_softc;
struct shmif_mem *busmem = sc->sc_busmem;
struct mbuf *m = NULL; struct mbuf *m = NULL;
struct ether_header *eth; struct ether_header *eth;
uint32_t nextpkt, lastpkt, busgen, lastnext; uint32_t nextpkt, busgen;
bool wrap; bool wrap;
int error; int error;
@ -305,26 +314,19 @@ shmif_rcv(void *arg)
MCLGET(m, M_WAIT); MCLGET(m, M_WAIT);
} }
DPRINTF(("waiting %d/%d\n", sc->sc_nextpacket, sc->sc_prevgen)); DPRINTF(("waiting %d/%d\n", sc->sc_nextpacket, sc->sc_devgen));
KASSERT(m->m_flags & M_EXT); KASSERT(m->m_flags & M_EXT);
shmif_lockbus(sc->sc_busmem);
lastpkt = sc->sc_busmem->shm_last; shmif_lockbus(busmem);
busgen = sc->sc_busmem->shm_gen; busgen = busmem->shm_gen;
lastnext = shmif_nextpktoff(sc->sc_busmem, lastpkt); KASSERT(busmem->shm_magic == SHMIF_MAGIC);
if ((lastnext > sc->sc_nextpacket && busgen > sc->sc_prevgen) KASSERT(busgen >= sc->sc_devgen);
|| (busgen > sc->sc_prevgen+1)) {
nextpkt = lastpkt;
sc->sc_prevgen = busgen;
rumpuser_dprintf("shmif_rcv: generation overrun, "
"skipping invalid packets\n");
} else {
nextpkt = sc->sc_nextpacket;
}
/* need more data? */ /* need more data? */
if (lastnext == nextpkt && sc->sc_prevgen == busgen){ if (sc->sc_devgen == busgen &&
shmif_unlockbus(sc->sc_busmem); shmif_nextpktoff(busmem, busmem->shm_last)
== sc->sc_nextpacket) {
shmif_unlockbus(busmem);
error = 0; error = 0;
rumpuser_writewatchfile_wait(sc->sc_kq, NULL, &error); rumpuser_writewatchfile_wait(sc->sc_kq, NULL, &error);
if (__predict_false(error)) if (__predict_false(error))
@ -332,22 +334,48 @@ shmif_rcv(void *arg)
continue; continue;
} }
/*
* Check if we have been sleeping too long. There are
* basically two scenarios:
* 1) our next packet is behind the first packet and
* we are a generation behind
* 2) we are over two generations behind
*/
if ((sc->sc_nextpacket < busmem->shm_first
&& sc->sc_devgen < busgen) || (sc->sc_devgen+1 < busgen)) {
KASSERT(busgen > 0);
nextpkt = busmem->shm_first;
if (busmem->shm_first > busmem->shm_last)
sc->sc_devgen = busgen - 1;
else
sc->sc_devgen = busgen;
} else {
nextpkt = sc->sc_nextpacket;
}
/*
* If our read pointer is ahead the bus last write, our
* generation must be one behind.
*/
KASSERT(!(nextpkt > busmem->shm_last
&& sc->sc_devgen == busgen));
wrap = false; wrap = false;
shmif_busread(sc->sc_busmem, nextpkt = shmif_busread(busmem, &sp,
&sp, nextpkt, sizeof(sp), &wrap); nextpkt, sizeof(sp), &wrap);
KASSERT(sp.sp_len <= MCLBYTES); KASSERT(sp.sp_len <= ETHERMTU + ETHER_HDR_LEN);
shmif_busread(sc->sc_busmem, mtod(m, void *), nextpkt = shmif_busread(busmem, mtod(m, void *),
shmif_advance(nextpkt, sizeof(sp)), sp.sp_len, &wrap); nextpkt, sp.sp_len, &wrap);
if (wrap)
sc->sc_prevgen = sc->sc_busmem->shm_gen;
DPRINTF(("shmif_rcv: read packet of length %d at %d\n", DPRINTF(("shmif_rcv: read packet of length %d at %d\n",
sp.sp_len, nextpkt)); sp.sp_len, nextpkt));
sc->sc_nextpacket = shmif_nextpktoff(sc->sc_busmem, nextpkt); sc->sc_nextpacket = nextpkt;
sc->sc_prevgen = busgen;
shmif_unlockbus(sc->sc_busmem); shmif_unlockbus(sc->sc_busmem);
if (wrap)
sc->sc_devgen++;
m->m_len = m->m_pkthdr.len = sp.sp_len; m->m_len = m->m_pkthdr.len = sp.sp_len;
m->m_pkthdr.rcvif = ifp; m->m_pkthdr.rcvif = ifp;

16
sys/rump/net/lib/libshmif/shmif_busops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: shmif_busops.c,v 1.4 2010/08/15 18:55:03 pooka Exp $ */ /* $NetBSD: shmif_busops.c,v 1.5 2010/08/16 17:33:52 pooka Exp $ */
/* /*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved. * Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@ -28,7 +28,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: shmif_busops.c,v 1.4 2010/08/15 18:55:03 pooka Exp $"); __KERNEL_RCSID(0, "$NetBSD: shmif_busops.c,v 1.5 2010/08/16 17:33:52 pooka Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/atomic.h> #include <sys/atomic.h>
@ -49,9 +49,8 @@ shmif_advance(uint32_t oldoff, uint32_t delta)
newoff = oldoff + delta; newoff = oldoff + delta;
if (newoff >= BUSMEM_DATASIZE) if (newoff >= BUSMEM_DATASIZE)
newoff -= (BUSMEM_DATASIZE); newoff -= BUSMEM_DATASIZE;
return newoff; return newoff;
} }
uint32_t uint32_t
@ -60,7 +59,7 @@ shmif_busread(struct shmif_mem *busmem, void *dest, uint32_t off, size_t len,
{ {
size_t chunk; size_t chunk;
KASSERT(len < (BUSMEM_DATASIZE) && off <= BUSMEM_DATASIZE); KASSERT(len < (BUSMEM_DATASIZE/2) && off <= BUSMEM_DATASIZE);
chunk = MIN(len, BUSMEM_DATASIZE - off); chunk = MIN(len, BUSMEM_DATASIZE - off);
memcpy(dest, busmem->shm_data + off, chunk); memcpy(dest, busmem->shm_data + off, chunk);
len -= chunk; len -= chunk;
@ -69,12 +68,11 @@ shmif_busread(struct shmif_mem *busmem, void *dest, uint32_t off, size_t len,
return off + chunk; return off + chunk;
/* else, wraps around */ /* else, wraps around */
off = 0;
*wrap = true; *wrap = true;
/* finish reading */ /* finish reading */
memcpy((uint8_t *)dest + chunk, busmem->shm_data + off, len); memcpy((uint8_t *)dest + chunk, busmem->shm_data, len);
return off + len; return len;
} }
void void
@ -95,7 +93,7 @@ shmif_buswrite(struct shmif_mem *busmem, uint32_t off, void *data, size_t len,
{ {
size_t chunk; size_t chunk;
KASSERT(len < (BUSMEM_DATASIZE) && off <= BUSMEM_DATASIZE); KASSERT(len < (BUSMEM_DATASIZE/2) && off <= BUSMEM_DATASIZE);
chunk = MIN(len, BUSMEM_DATASIZE - off); chunk = MIN(len, BUSMEM_DATASIZE - off);
len -= chunk; len -= chunk;