From owner-svn-soc-all@freebsd.org Fri Jun 17 16:27:21 2016 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E4B7AA778B0 for ; Fri, 17 Jun 2016 16:27:21 +0000 (UTC) (envelope-from vincenzo@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D84942709 for ; Fri, 17 Jun 2016 16:27:21 +0000 (UTC) (envelope-from vincenzo@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id u5HGRLD1029204 for ; Fri, 17 Jun 2016 16:27:21 GMT (envelope-from vincenzo@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u5HGRLwD029180 for svn-soc-all@FreeBSD.org; Fri, 17 Jun 2016 16:27:21 GMT (envelope-from vincenzo@FreeBSD.org) Date: Fri, 17 Jun 2016 16:27:21 GMT Message-Id: <201606171627.u5HGRLwD029180@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to vincenzo@FreeBSD.org using -f From: vincenzo@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r305306 - soc2016/vincenzo/head/sys/dev/netmap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2016 16:27:22 -0000 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; }