From nobody Wed Apr 12 14:22:18 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxPzx2Xz0z44rJs; Wed, 12 Apr 2023 14:22:21 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxPzw6WJ1z3k0H; Wed, 12 Apr 2023 14:22:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681309341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wtPxMqs97H+404ni++x8i8S29d/PEnYKUX+2HrZCxnM=; b=Ljpic0mpEfVRmo6REmWjJbkrbZ2jurWbiTlaisUiaNT0TDTB2kdcvSik4KhiSdkUzsDzHb F189KkhWZ9nuf/Xq8+q9tYtrfOiKGHdoFKjII7EkCCsni76yZg47VgP/MRfI+8m94egCW1 9Izcod+hzH3eyeqOwm5NZKB/4dN0TLFISFZy4MIY48knqBvoaXQ7gtizwcZBO8q/AobXtJ QX96FeRxTJnC2lmzp9MvB82jd/I+lHSYUCsyfNyUt8chelIDrV+QcV05a/q4dn9hSdbcCB 8fmkJlN+5mV5AGybdqwT8Hv64fAC0C6M3dWDg6ERapGbZVe1AGpc8KAxvk/fdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681309341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wtPxMqs97H+404ni++x8i8S29d/PEnYKUX+2HrZCxnM=; b=l6XCNsdRN8KB2jEVB+oR8qSiy/Df/FrUPINdl6L/OAH4ciiMCwSHCVm4y6S7SlcjuODKYP m8k/sQb36a4H1aUgZMdmGHgFB+BVrRwa6Cq/uX6ImzvsbDp68eIVPyeDUGI8N0SVOqOqIN RyYWFkCGFd1+FeN8J+czBqvTWL0KGQZkMGTy0ft7s/upbEBNlxAnTl5ov8HByQrPoNAlvj 8BHfAvjxMBN9Qf/Z3HywqE+6knjXTHKusGFgyAxwSJadGpkk+tNHdABpqfzizdy78IE88b tE60HlLq+ufbY4srXVwwMd+udvwWK+hmdjEOH7YjSOvGxtnzeFQzFIbbieIvug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681309341; a=rsa-sha256; cv=none; b=ExGAsN2EhYpI61BNoFE9NSFDsG4db5CW6uNBHFD+hw5jx6sCmAA1IM6eUScd/y7b0naNSR JjTpZgPkhFXhF+idzQXcr21g9scdWa+DPdEVNh/mrLkvwu7CLgx3Z4rIAS7Lbd77iHW+yH 0JdTh1zj9nXuQ+qbVzd2g4jyJBemSDg4vNWNDiaRsH9Y1tTlcEUreTT/P/QwEl7md/PvsE nsiQO/P+abG6emMDKYTKV9o1D+D6V7qr2uwYEaOP5kv/U0F8K7u7STxL+wzQIen8cksh9O /I1PP4eL622j8y0AgkdoGTbI1dpcUq7e+ku8T3UoBEDTyyuvt7ZabUcGayRBCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxPzt59CGz13D4; Wed, 12 Apr 2023 14:22:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33CEMIHU084730; Wed, 12 Apr 2023 14:22:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CEMI7f084729; Wed, 12 Apr 2023 14:22:18 GMT (envelope-from git) Date: Wed, 12 Apr 2023 14:22:18 GMT Message-Id: <202304121422.33CEMI7f084729@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3d55de76e30d - stable/13 - netmap: Handle packet batches in generic mode List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3d55de76e30d34a411630d986153ae803915e95f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3d55de76e30d34a411630d986153ae803915e95f commit 3d55de76e30d34a411630d986153ae803915e95f Author: Mark Johnston AuthorDate: 2023-04-05 20:52:41 +0000 Commit: Mark Johnston CommitDate: 2023-04-12 14:18:48 +0000 netmap: Handle packet batches in generic mode ifnets are allowed to pass batches of multiple packets to if_input, linked by the m_nextpkt pointer. iflib_rxeof() sometimes does this, for example. Netmap's generic mode did not handle this and would only deliver the first packet in the batch, leaking the rest. PR: 270636 Reviewed by: vmaffione MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39426 (cherry picked from commit 5f6d37787f1e6aaf9b18392e8cff65ed4e094f2c) --- sys/dev/netmap/netmap_freebsd.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/dev/netmap/netmap_freebsd.c b/sys/dev/netmap/netmap_freebsd.c index 19708406dc93..91c3e380117a 100644 --- a/sys/dev/netmap/netmap_freebsd.c +++ b/sys/dev/netmap/netmap_freebsd.c @@ -325,10 +325,17 @@ freebsd_generic_rx_handler(struct ifnet *ifp, struct mbuf *m) return; } - stolen = generic_rx_handler(ifp, m); - if (!stolen) { - NA(ifp)->if_input(ifp, m); - } + do { + struct mbuf *n; + + n = m->m_nextpkt; + m->m_nextpkt = NULL; + stolen = generic_rx_handler(ifp, m); + if (!stolen) { + NA(ifp)->if_input(ifp, m); + } + m = n; + } while (m != NULL); } /*