From owner-svn-src-stable@freebsd.org Wed Jun 10 19:57:10 2020 Return-Path: Delivered-To: svn-src-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E611033E03D; Wed, 10 Jun 2020 19:57:10 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49hySQ5g9tz4TZk; Wed, 10 Jun 2020 19:57:10 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BDBE2BF4E; Wed, 10 Jun 2020 19:57:10 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05AJvAqv025596; Wed, 10 Jun 2020 19:57:10 GMT (envelope-from vmaffione@FreeBSD.org) Received: (from vmaffione@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05AJvAlD025595; Wed, 10 Jun 2020 19:57:10 GMT (envelope-from vmaffione@FreeBSD.org) Message-Id: <202006101957.05AJvAlD025595@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to vmaffione@FreeBSD.org using -f From: Vincenzo Maffione Date: Wed, 10 Jun 2020 19:57:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r362019 - stable/12/sys/dev/netmap X-SVN-Group: stable-12 X-SVN-Commit-Author: vmaffione X-SVN-Commit-Paths: stable/12/sys/dev/netmap X-SVN-Commit-Revision: 362019 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jun 2020 19:57:11 -0000 Author: vmaffione Date: Wed Jun 10 19:57:10 2020 New Revision: 362019 URL: https://svnweb.freebsd.org/changeset/base/362019 Log: MFC r361697 netmap: if_vtnet: replace vtnet_free_used() The functionality contained in this function is duplicated, as it is already available in vtnet_txq_free_mbufs() and vtnet_rxq_free_mbufs(). Modified: stable/12/sys/dev/netmap/if_vtnet_netmap.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/netmap/if_vtnet_netmap.h ============================================================================== --- stable/12/sys/dev/netmap/if_vtnet_netmap.h Wed Jun 10 19:55:36 2020 (r362018) +++ stable/12/sys/dev/netmap/if_vtnet_netmap.h Wed Jun 10 19:57:10 2020 (r362019) @@ -52,37 +52,6 @@ vtnet_netmap_queue_on(struct vtnet_softc *sc, enum txr na->tx_rings[idx]->nr_mode == NKR_NETMAP_ON); } -static void -vtnet_free_used(struct virtqueue *vq, int netmap_bufs, enum txrx t, int idx) -{ - void *cookie; - int deq = 0; - - while ((cookie = virtqueue_dequeue(vq, NULL)) != NULL) { - if (netmap_bufs) { - /* These are netmap buffers: there is nothing to do. */ - } else { - /* These are mbufs that we need to free. */ - struct mbuf *m; - - if (t == NR_TX) { - struct vtnet_tx_header *txhdr = cookie; - m = txhdr->vth_mbuf; - m_freem(m); - uma_zfree(vtnet_tx_header_zone, txhdr); - } else { - m = cookie; - m_freem(m); - } - } - deq++; - } - - if (deq) - nm_prinf("%d sgs dequeued from %s-%d (netmap=%d)", - deq, nm_txrx2str(t), idx, netmap_bufs); -} - /* Register and unregister. */ static int vtnet_netmap_reg(struct netmap_adapter *na, int state) @@ -113,18 +82,13 @@ vtnet_netmap_reg(struct netmap_adapter *na, int state) for (i = 0; i < sc->vtnet_act_vq_pairs; i++) { struct vtnet_txq *txq = &sc->vtnet_txqs[i]; struct vtnet_rxq *rxq = &sc->vtnet_rxqs[i]; - struct netmap_kring *kring; VTNET_TXQ_LOCK(txq); - kring = NMR(na, NR_TX)[i]; - vtnet_free_used(txq->vtntx_vq, - kring->nr_mode == NKR_NETMAP_ON, NR_TX, i); + vtnet_txq_free_mbufs(txq); VTNET_TXQ_UNLOCK(txq); VTNET_RXQ_LOCK(rxq); - kring = NMR(na, NR_RX)[i]; - vtnet_free_used(rxq->vtnrx_vq, - kring->nr_mode == NKR_NETMAP_ON, NR_RX, i); + vtnet_rxq_free_mbufs(rxq); VTNET_RXQ_UNLOCK(rxq); } vtnet_init_locked(sc);