Date: Sun, 21 Oct 2007 04:29:42 GMT From: Kip Macy <kmacy@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 127880 for review Message-ID: <200710210429.l9L4Tgka005461@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=127880 Change 127880 by kmacy@kmacy_home:ethng on 2007/10/21 04:29:30 change buf_ring member names to be prefixed by br_ Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_multiq.c#26 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_osdep.h#17 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#35 edit .. //depot/projects/ethng/src/sys/dev/cxgb/sys/cxgb_support.c#6 edit .. //depot/projects/ethng/src/sys/dev/cxgb/t3cdev.h#2 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_multiq.c#26 (text+ko) ==== @@ -128,19 +128,19 @@ txq = &qs->txq[TXQ_ETH]; mr = &txq->txq_mr; - mtx_lock(&mr->mr_lock); - cons = mr->mr_cons; - prod = mr->mr_prod; - mask = mr->mr_size - 1; + mtx_lock(&mr->br_lock); + cons = mr->br_cons; + prod = mr->br_prod; + mask = mr->br_size - 1; if (((prod + 1) & mask) != cons) { - mr->mr_ring[prod] = (caddr_t)m; + mr->br_ring[prod] = (caddr_t)m; mb(); - mr->mr_prod = (prod + 1) & mask; + mr->br_prod = (prod + 1) & mask; } else { txq->txq_drops++; err = ENOBUFS; } - mtx_unlock(&mr->mr_lock); + mtx_unlock(&mr->br_lock); if ((qs->txq[TXQ_ETH].flags & TXQ_TRANSMITTING) == 0) wakeup(qs); if (err) @@ -613,8 +613,8 @@ if ((!buf_ring_empty(&txq->txq_mr)) && err == 0) { if (cxgb_debug) printf("head=%p cons=%d prod=%d\n", - txq->sendq.head, txq->txq_mr.mr_cons, - txq->txq_mr.mr_prod); + txq->sendq.head, txq->txq_mr.br_cons, + txq->txq_mr.br_prod); continue; } done: ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_osdep.h#17 (text+ko) ==== @@ -162,11 +162,11 @@ #endif struct buf_ring { - caddr_t *mr_ring; - volatile uint32_t mr_cons; - volatile uint32_t mr_prod; - int mr_size; - struct mtx mr_lock; + caddr_t *br_ring; + volatile uint32_t br_cons; + volatile uint32_t br_prod; + int br_size; + struct mtx br_lock; }; struct buf_ring *buf_ring_alloc(int count, int flags); @@ -175,16 +175,16 @@ static __inline int buf_ring_count(struct buf_ring *mr) { - int size = mr->mr_size; + int size = mr->br_size; int mask = size - 1; - return ((size + mr->mr_prod - mr->mr_cons) & mask); + return ((size + mr->br_prod - mr->br_cons) & mask); } static __inline int buf_ring_empty(struct buf_ring *mr) { - return (mr->mr_cons == mr->mr_prod); + return (mr->br_cons == mr->br_prod); } /* @@ -198,14 +198,14 @@ int prod, cons, mask; caddr_t *ring, m; - ring = (caddr_t *)mr->mr_ring; - mask = mr->mr_size - 1; - cons = mr->mr_cons; - prod = mr->mr_prod; + ring = (caddr_t *)mr->br_ring; + mask = mr->br_size - 1; + cons = mr->br_cons; + prod = mr->br_prod; m = NULL; if (cons != prod) { m = ring[cons]; - mr->mr_cons = (cons + 1) & mask; + mr->br_cons = (cons + 1) & mask; mb(); } return (m); @@ -218,13 +218,13 @@ int prod, cons, mask, err; - cons = mr->mr_cons; - prod = mr->mr_prod; - mask = mr->mr_size - 1; + cons = mr->br_cons; + prod = mr->br_prod; + mask = mr->br_size - 1; if (((prod + 1) & mask) != cons) { - mr->mr_ring[prod] = m; + mr->br_ring[prod] = m; mb(); - mr->mr_prod = (prod + 1) & mask; + mr->br_prod = (prod + 1) & mask; err = 0; } else err = ENOBUFS; @@ -237,9 +237,9 @@ { int err; - mtx_lock(&mr->mr_lock); + mtx_lock(&mr->br_lock); err = __buf_ring_enqueue(mr, m); - mtx_unlock(&mr->mr_lock); + mtx_unlock(&mr->br_lock); return (err); } @@ -250,10 +250,10 @@ int prod, cons, mask; caddr_t *ring, m; - ring = (caddr_t *)mr->mr_ring; - mask = mr->mr_size - 1; - cons = mr->mr_cons; - prod = mr->mr_prod; + ring = (caddr_t *)mr->br_ring; + mask = mr->br_size - 1; + cons = mr->br_cons; + prod = mr->br_prod; m = NULL; if (cons != prod) m = ring[cons]; ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#35 (text+ko) ==== @@ -1707,9 +1707,9 @@ t3_free_tx_desc_all(&q->txq[TXQ_ETH]); for (i = 0; i < SGE_TXQ_PER_SET; i++) - if (q->txq[i].txq_mr.mr_ring != NULL) { - free(q->txq[i].txq_mr.mr_ring, M_DEVBUF); - mtx_destroy(&q->txq[i].txq_mr.mr_lock); + if (q->txq[i].txq_mr.br_ring != NULL) { + free(q->txq[i].txq_mr.br_ring, M_DEVBUF); + mtx_destroy(&q->txq[i].txq_mr.br_lock); } for (i = 0; i < SGE_RXQ_PER_SET; ++i) { if (q->fl[i].desc) { @@ -2259,14 +2259,14 @@ int i, ret = 0; for (i = 0; i < SGE_TXQ_PER_SET; i++) { - if ((q->txq[i].txq_mr.mr_ring = malloc(cxgb_txq_buf_ring_size*sizeof(struct mbuf *), + if ((q->txq[i].txq_mr.br_ring = malloc(cxgb_txq_buf_ring_size*sizeof(struct mbuf *), M_DEVBUF, M_WAITOK|M_ZERO)) == NULL) { device_printf(sc->dev, "failed to allocate mbuf ring\n"); goto err; } - q->txq[i].txq_mr.mr_prod = q->txq[i].txq_mr.mr_cons = 0; - q->txq[i].txq_mr.mr_size = cxgb_txq_buf_ring_size; - mtx_init(&q->txq[i].txq_mr.mr_lock, "txq mbuf ring", NULL, MTX_DEF); + q->txq[i].txq_mr.br_prod = q->txq[i].txq_mr.br_cons = 0; + q->txq[i].txq_mr.br_size = cxgb_txq_buf_ring_size; + mtx_init(&q->txq[i].txq_mr.br_lock, "txq mbuf ring", NULL, MTX_DEF); } init_qset_cntxt(q, id); @@ -3160,10 +3160,10 @@ CTLFLAG_RD, &qs->txq[TXQ_ETH].sendq.qlen, 0, "#tunneled packets waiting to be sent"); SYSCTL_ADD_UINT(ctx, qspoidlist, OID_AUTO, "queue_pidx", - CTLFLAG_RD, (uint32_t *)(uintptr_t)&qs->txq[TXQ_ETH].txq_mr.mr_prod, + CTLFLAG_RD, (uint32_t *)(uintptr_t)&qs->txq[TXQ_ETH].txq_mr.br_prod, 0, "#tunneled packets queue producer index"); SYSCTL_ADD_UINT(ctx, qspoidlist, OID_AUTO, "queue_cidx", - CTLFLAG_RD, (uint32_t *)(uintptr_t)&qs->txq[TXQ_ETH].txq_mr.mr_cons, + CTLFLAG_RD, (uint32_t *)(uintptr_t)&qs->txq[TXQ_ETH].txq_mr.br_cons, 0, "#tunneled packets queue consumer index"); SYSCTL_ADD_INT(ctx, qspoidlist, OID_AUTO, "processed", CTLFLAG_RD, &qs->txq[TXQ_ETH].processed, ==== //depot/projects/ethng/src/sys/dev/cxgb/sys/cxgb_support.c#6 (text+ko) ==== @@ -310,13 +310,13 @@ if (br == NULL) return (NULL); - br->mr_ring = malloc(sizeof(caddr_t)*count, M_DEVBUF, flags|M_ZERO); - if (br->mr_ring == NULL) { + br->br_ring = malloc(sizeof(caddr_t)*count, M_DEVBUF, flags|M_ZERO); + if (br->br_ring == NULL) { free(br, M_DEVBUF); return (NULL); } - mtx_init(&br->mr_lock, "buf ring", NULL, MTX_DUPOK|MTX_DEF); + mtx_init(&br->br_lock, "buf ring", NULL, MTX_DUPOK|MTX_DEF); br->br_size = count; br->br_prod = br->br_cons = 0; ==== //depot/projects/ethng/src/sys/dev/cxgb/t3cdev.h#2 (text+ko) ==== @@ -17,8 +17,8 @@ char name[T3CNAMSIZ]; /* T3C device name */ enum t3ctype type; TAILQ_ENTRY(t3cdev) ofld_entry; /* for list linking */ - struct ifnet *lldev; /* LL dev associated with T3C messages */ - struct adapter *adapter; + struct ifnet *lldev; /* LL dev associated with T3C messages */ + struct adapter *adapter; int (*send)(struct t3cdev *dev, struct mbuf *m); int (*recv)(struct t3cdev *dev, struct mbuf **m, int n); int (*ctl)(struct t3cdev *dev, unsigned int req, void *data);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710210429.l9L4Tgka005461>