d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

There is no need to hold the freelist lock around alloc/free of

Browse Source 
software descriptors.  This also silences WITNESS warnings when
the software descriptors are allocated with M_WAITOK.

MFC after:	1 week
This commit is contained in:
np 2013-08-23 18:03:18 +00:00
parent 1a535523cd
commit cde487f27a
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/cxgbe/t4_sge.c
View File

@ -1802,9 +1802,7 @@ alloc_iq_fl(struct port_info *pi, struct sge_iq *iq, struct sge_fl *fl,
/* Allocate space for one software descriptor per buffer. */ /* Allocate space for one software descriptor per buffer. */
fl->cap = (fl->qsize - spg_len / RX_FL_ESIZE) * 8; fl->cap = (fl->qsize - spg_len / RX_FL_ESIZE) * 8;
FL_LOCK(fl);
rc = alloc_fl_sdesc(fl); rc = alloc_fl_sdesc(fl);
FL_UNLOCK(fl);
if (rc != 0) { if (rc != 0) {
device_printf(sc->dev, device_printf(sc->dev,
"failed to setup fl software descriptors: %d\n", "failed to setup fl software descriptors: %d\n",
@ -1937,11 +1935,8 @@ free_iq_fl(struct port_info *pi, struct sge_iq *iq, struct sge_fl *fl)
free_ring(sc, fl->desc_tag, fl->desc_map, fl->ba, free_ring(sc, fl->desc_tag, fl->desc_map, fl->ba,
fl->desc); fl->desc);
if (fl->sdesc) { if (fl->sdesc)
FL_LOCK(fl);
free_fl_sdesc(fl); free_fl_sdesc(fl);
FL_UNLOCK(fl);
}
if (mtx_initialized(&fl->fl_lock)) if (mtx_initialized(&fl->fl_lock))
mtx_destroy(&fl->fl_lock); mtx_destroy(&fl->fl_lock);
@ -2788,8 +2783,6 @@ alloc_fl_sdesc(struct sge_fl *fl)
bus_dma_tag_t tag; bus_dma_tag_t tag;
int i, rc; int i, rc;
FL_LOCK_ASSERT_OWNED(fl);
fl->sdesc = malloc(fl->cap * sizeof(struct fl_sdesc), M_CXGBE, fl->sdesc = malloc(fl->cap * sizeof(struct fl_sdesc), M_CXGBE,
M_ZERO | M_WAITOK); M_ZERO | M_WAITOK);
@ -2828,8 +2821,6 @@ free_fl_sdesc(struct sge_fl *fl)
struct fl_sdesc *sd; struct fl_sdesc *sd;
int i; int i;
FL_LOCK_ASSERT_OWNED(fl);
sd = fl->sdesc; sd = fl->sdesc;
for (i = 0; i < fl->cap; i++, sd++) { for (i = 0; i < fl->cap; i++, sd++) {