From nobody Mon Nov 11 14:09:11 2024 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 4XnBHW541dz5bcPR; Mon, 11 Nov 2024 14:09:11 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XnBHW3hplz3ymR; Mon, 11 Nov 2024 14:09:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731334151; 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=LyG4wvf7uPab1TwdTaatgrMk4AK+EZV8bxrOLoyf/VI=; b=Quk/EfSuKEPNVPm8J9u4cklx+bw6UCf4IAvm5G6xN+61BFFIRagzHls2zNr3C1ZIVQdt4y utUFq79wDZ9YxoTq80r/vntb6NeNkRmJPjlzusxGLujRIXkvoae1+wMimEKtcYyoloKlBD gYC23Aq7CFA/XgVuCXeBXZULiSajTK/sbNaeF3Kr2NXcigtzTx6p4o1RudeQzdX9+4/i1P rG8jGeCkYbHFuZ3YrREi/VFToZhwrfjvFrObGOIVgyzTVwtqvPn7Av2Wf0NRFNWTCIsvQx TWlvdf32C6tXAOZ+U5jdPYmXuE+4TCMiFNMmPfJ3eX0Xzn/OpARIq1sGwFS+Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731334151; 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=LyG4wvf7uPab1TwdTaatgrMk4AK+EZV8bxrOLoyf/VI=; b=YEXNGco8jOmTcptJSvO8PqoFTJAKa/dKt5pY9Q58zdnA47BQ4QbOAwrZd8/qpcZPtAUgh8 LxZXwa6yyPNG/qjLAW7Z/+wAByVitqZckDrd5qrZGQtL0UBMtdvT9NYIu4z1HQ2iRCUx54 4f72bxroLgyB5UNFEvxbvQYWt+A+8EmcIYHNH24UK+vhdd8IMBnl5RqBOY1+COQ/1N+Qqj AdQCwLjHgYTe4yT6/Hp0bJFin4r+R1aXbxtyeVTY/3+1t3msP0u8RN2XbrnGzg29tMTIqG fMQcS7cE2q0P+shheOVDfWBCUvH7S6VDS1/miOyrwWEAcjusWu/6uUxRQgOQGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731334151; a=rsa-sha256; cv=none; b=cZEdA9713DjEDz9hiV7j1K1aSp+669JgGFY4xJeexc7WvYO2lTuriuCSX/+8l7S3nNqwXh jN7SxJ/Eiq9LeZQ8ch1P1MAfUPW1h2NTwVMhw96i1YdfC8DHhlTduvMRJKPCOCwZOyMY5M TOgyzOMIk5esvZu6u2tLjPSJWaB+6Di+x+apxf7yOuPqA6PMsPIVzFI2d6b9+4g+x0VO9F z4D5w6pjcxLUVtDeBdAOexfrrfoqriZbzSi/a0oFi9yxrSeaBhtnEGFT0HCjOCuHsAuxRG C5Nl8nrm0zcS3budIGWNLrdrEwhYkDaofCOmdnWJPbOLqHy+hcx+6XnbA6cC9g== 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 4XnBHW2jqWzTQh; Mon, 11 Nov 2024 14:09:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4ABE9BVp092180; Mon, 11 Nov 2024 14:09:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ABE9BOM092177; Mon, 11 Nov 2024 14:09:11 GMT (envelope-from git) Date: Mon, 11 Nov 2024 14:09:11 GMT Message-Id: <202411111409.4ABE9BOM092177@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: e6f9f493a827 - stable/14 - if_tuntap: Enable MEXTPG support 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: e6f9f493a827bb900e324d6790ea0ff465018ee3 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e6f9f493a827bb900e324d6790ea0ff465018ee3 commit e6f9f493a827bb900e324d6790ea0ff465018ee3 Author: Mark Johnston AuthorDate: 2024-10-28 13:52:14 +0000 Commit: Mark Johnston CommitDate: 2024-11-11 14:02:30 +0000 if_tuntap: Enable MEXTPG support Fix tunread() to use m_mbuftouio() instead of manually copying (which doesn't work for unmapped mbufs). Reviewed by: jhb, gallatin MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47295 (cherry picked from commit 01c738cd5c3938374cce8293c82753d977966154) --- sys/net/if_tuntap.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c index 54d1908b078c..0dee2260973d 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -976,11 +976,11 @@ tuncreate(struct cdev *dev) ifp->if_ioctl = tunifioctl; ifp->if_flags = iflags; IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen); - ifp->if_capabilities |= IFCAP_LINKSTATE; + ifp->if_capabilities |= IFCAP_LINKSTATE | IFCAP_MEXTPG; if ((tp->tun_flags & TUN_L2) != 0) ifp->if_capabilities |= IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6 | IFCAP_LRO; - ifp->if_capenable |= IFCAP_LINKSTATE; + ifp->if_capenable |= IFCAP_LINKSTATE | IFCAP_MEXTPG; if ((tp->tun_flags & TUN_L2) != 0) { ifp->if_init = tunifinit; @@ -1760,18 +1760,9 @@ tunread(struct cdev *dev, struct uio *uio, int flag) vhdr.hdr.csum_offset); error = uiomove(&vhdr, len, uio); } - - while (m && uio->uio_resid > 0 && error == 0) { - len = min(uio->uio_resid, m->m_len); - if (len != 0) - error = uiomove(mtod(m, void *), len, uio); - m = m_free(m); - } - - if (m) { - TUNDEBUG(ifp, "Dropping mbuf\n"); - m_freem(m); - } + if (error == 0) + error = m_mbuftouio(uio, m, 0); + m_freem(m); return (error); }