Date: Fri, 17 Jun 2016 16:27:21 GMT From: vincenzo@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r305306 - soc2016/vincenzo/head/sys/dev/netmap Message-ID: <201606171627.u5HGRLwD029180@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vincenzo Date: Fri Jun 17 16:27:20 2016 New Revision: 305306 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=305306 Log: freebsd: ptnet: allocate/deallocate buf_ring for TX queues Modified: soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c Modified: soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c ============================================================================== --- soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c Fri Jun 17 16:27:08 2016 (r305305) +++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c Fri Jun 17 16:27:20 2016 (r305306) @@ -102,6 +102,7 @@ struct ptnet_ring *ptring; unsigned int kick; struct mtx lock; + struct buf_ring *bufring; /* for TX queues */ struct taskqueue *taskq; struct task task; char lock_name[16]; @@ -214,6 +215,8 @@ extern int netmap_initialized; +#define PTNET_BUF_RING_SIZE 4096 + static int ptnet_attach(device_t dev) { @@ -296,12 +299,21 @@ pq->kring_id = i; pq->kick = PTNET_IO_KICK_BASE + 4 * i; pq->ptring = sc->csb->rings + i; - if (i >= num_tx_rings) { - pq->kring_id -= num_tx_rings; - } snprintf(pq->lock_name, sizeof(pq->lock_name), "%s-%d", device_get_nameunit(dev), i); mtx_init(&pq->lock, pq->lock_name, NULL, MTX_DEF); + if (i >= num_tx_rings) { + /* RX queue: fix kring_id. */ + pq->kring_id -= num_tx_rings; + } else { + /* TX queue: allocate buf_ring. */ + pq->bufring = buf_ring_alloc(PTNET_BUF_RING_SIZE, + M_DEVBUF, M_NOWAIT, &pq->lock); + if (pq->bufring == NULL) { + err = ENOMEM; + goto err_path; + } + } } err = ptnet_irqs_init(sc); @@ -424,6 +436,15 @@ } if (sc->queues) { + int i; + + for (i = 0; i < sc->num_rings; i++) { + struct ptnet_queue *pq = sc->queues + i; + + if (pq->bufring != NULL) { + buf_ring_free(pq->bufring, M_DEVBUF); + } + } free(sc->queues, M_DEVBUF); sc->queues = NULL; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606171627.u5HGRLwD029180>