diff options
| author |   naddy <naddy@openbsd.org> | 2010-01-10 00:07:40 +0000 |
|---|---|---|
| committer | naddy <naddy@openbsd.org> | 2010-01-10 00:07:40 +0000 |
| commit | 878bc460be14131ce513e848657a4d6cee755070 (patch) | |
| tree | 23350f953502e253ed853a8bd6fe9c7335e2ef97 | |
| parent | L2 cache line is at least 64 bytes long on r10k, so use 64 byte increments to (diff) | |
| download | wireguard-openbsd-878bc460be14131ce513e848657a4d6cee755070.tar.xz wireguard-openbsd-878bc460be14131ce513e848657a4d6cee755070.zip | |
Do not try to reevaluate the current RX production index on each
loop iteration as it can be updated by the card while we process
the RX ring, forcing us to process RX descriptors for which DMA
synchronisation has not been performed. This fixes a bug where
bge(4) will drop packets packets under heavy load.
Adapted from FreeBSD by Brad.
| -rw-r--r-- | sys/dev/pci/if_bge.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 667a3d228e0..325235dfbf2 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bge.c,v 1.290 2010/01/09 06:19:01 naddy Exp $ */ +/* $OpenBSD: if_bge.c,v 1.291 2010/01/10 00:07:40 naddy Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -2493,15 +2493,18 @@ void bge_rxeof(struct bge_softc *sc) { struct ifnet *ifp; + uint16_t rx_prod, rx_cons; int stdcnt = 0, jumbocnt = 0; bus_dmamap_t dmamap; bus_addr_t offset, toff; bus_size_t tlen; int tosync; + rx_cons = sc->bge_rx_saved_considx; + rx_prod = sc->bge_rdata->bge_status_block.bge_idx[0].bge_rx_prod_idx; + /* Nothing to do */ - if (sc->bge_rx_saved_considx == - sc->bge_rdata->bge_status_block.bge_idx[0].bge_rx_prod_idx) + if (rx_cons == rx_prod) return; ifp = &sc->arpcom.ac_if; @@ -2512,13 +2515,12 @@ bge_rxeof(struct bge_softc *sc) BUS_DMASYNC_POSTREAD); offset = offsetof(struct bge_ring_data, bge_rx_return_ring); - tosync = sc->bge_rdata->bge_status_block.bge_idx[0].bge_rx_prod_idx - - sc->bge_rx_saved_considx; + tosync = rx_prod - rx_cons; - toff = offset + (sc->bge_rx_saved_considx * sizeof (struct bge_rx_bd)); + toff = offset + (rx_cons * sizeof (struct bge_rx_bd)); if (tosync < 0) { - tlen = (sc->bge_return_ring_cnt - sc->bge_rx_saved_considx) * + tlen = (sc->bge_return_ring_cnt - rx_cons) * sizeof (struct bge_rx_bd); bus_dmamap_sync(sc->bge_dmatag, sc->bge_ring_map, toff, tlen, BUS_DMASYNC_POSTREAD); @@ -2529,17 +2531,15 @@ bge_rxeof(struct bge_softc *sc) offset, tosync * sizeof (struct bge_rx_bd), BUS_DMASYNC_POSTREAD); - while(sc->bge_rx_saved_considx != - sc->bge_rdata->bge_status_block.bge_idx[0].bge_rx_prod_idx) { + while (rx_cons != rx_prod) { struct bge_rx_bd *cur_rx; u_int32_t rxidx; struct mbuf *m = NULL; - cur_rx = &sc->bge_rdata-> - bge_rx_return_ring[sc->bge_rx_saved_considx]; + cur_rx = &sc->bge_rdata->bge_rx_return_ring[rx_cons]; rxidx = cur_rx->bge_idx; - BGE_INC(sc->bge_rx_saved_considx, sc->bge_return_ring_cnt); + BGE_INC(rx_cons, sc->bge_return_ring_cnt); if (cur_rx->bge_flags & BGE_RXBDFLAG_JUMBO_RING) { m = sc->bge_cdata.bge_rx_jumbo_chain[rxidx]; @@ -2629,6 +2629,7 @@ bge_rxeof(struct bge_softc *sc) ether_input_mbuf(ifp, m); } + sc->bge_rx_saved_considx = rx_cons; bge_writembx(sc, BGE_MBX_RX_CONS0_LO, sc->bge_rx_saved_considx); if (stdcnt) bge_fill_rx_ring_std(sc); |