From nobody Mon Oct 28 15:14:46 2024 X-Original-To: dev-commits-src-main@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 4XccPf61LFz5bSdL; Mon, 28 Oct 2024 15:14:46 +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 4XccPf5KQYz4tCK; Mon, 28 Oct 2024 15:14:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730128486; 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=WSvQU20AJ+DvlhpDpWPsTX1p1O0LMzOZJ/57s7B5gq8=; b=IYkHPuZ0IklYsbQCenZ+eoJ2/j5NsfhIjgHNlqcBE371yWUOUhoM4Hs1Bi5gy1aT6T1sEW AxaXDK52EyaegRB8LVsnCL2VUMH+SvRrCgxxTOeEiHqMcYrM858OJPHfrQNqLIll9uIdXv 5zrQmanEuc4Pgnjv0j6YxjUjluu2bRh9ipUWbPu34rqHXm3Z8CZBwyjSX6VXy/Ytb6dtoU LpVGoqqwi7xKXaxFwm4N4W2bZDBI8UwOqXqZHAd7YLifGpTu+6agWTgoeAuWxe8+Xv3C/+ gNrAfi1FRgW0Qc3IUCSjsNHGmuCLyjL7S1G7/yBoQI67pTjdHaTsMKlFyff5MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730128486; 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=WSvQU20AJ+DvlhpDpWPsTX1p1O0LMzOZJ/57s7B5gq8=; b=rUb4BuZs7mBXzyuCGVtfpOPD12QHK2fKx7VF4E/tPLUAZs4wsVEArK18g+5H2bGd0DHQx9 TzdnkXIG4e0Ld1S7ti0YGcYSjyq+RTrIn0XdDS1Jo1A38HnI6LSUGkZ8q8Y0gfYIxsV+tj Zt7FyULva+zELBhYvx+qtEo3zlR1CXSdzOLzc7iTM+w8in+3LF/3MmwiAMWHI4ibdCLm1e lNf1EJvFW9gdT/ZnBYq8Ydw+Gu9tmS6ww1DZvBTDwDbf0EmFxi9EUIrzqzh2X6scdtr5wl crgVdUtyeqMOXHQa7QtokpNkIUbK+JRVz2V85OlwLGPrqhT97sPWOKcbz1nI7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730128486; a=rsa-sha256; cv=none; b=Wax76XEP/GSYhaeN5p5inq92EfdhBCJxDzP1YLVndVsjx/MukdeNR0OsqOWo8uYGb4GIK2 /RZwp9WKr9VuxtBRcTBz2muMYNUBCXN/ptlz2DP0Kc3SrK3BE6PYVESYC8lgFPnSZRLlnQ 46v2+1bnejgOCtj6zGYBanAZ3lnemrEy87SGQRPweUga9kAZ/3CTCR1k3NR16IAoQsrhSO anJSyEM/gen04v1z3O72n9WTheuS2VqyQZZu7XP1jfhHDmA1Z9BbY4Xektfwp9Pz7YiiNv sSUzi3YjzbY7HvRUsaXeAMyklCrBSeF6VaL43eQnNWeN0qP1HbWXigwSas8UKQ== 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 4XccPf4xZKzkgN; Mon, 28 Oct 2024 15:14:46 +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 49SFEk15053750; Mon, 28 Oct 2024 15:14:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49SFEkMG053747; Mon, 28 Oct 2024 15:14:46 GMT (envelope-from git) Date: Mon, 28 Oct 2024 15:14:46 GMT Message-Id: <202410281514.49SFEkMG053747@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 01c738cd5c39 - main - if_tuntap: Enable MEXTPG support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 01c738cd5c3938374cce8293c82753d977966154 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=01c738cd5c3938374cce8293c82753d977966154 commit 01c738cd5c3938374cce8293c82753d977966154 Author: Mark Johnston AuthorDate: 2024-10-28 13:52:14 +0000 Commit: Mark Johnston CommitDate: 2024-10-28 15:14:36 +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 --- 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 00ebc9546af6..f82480971b10 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -944,11 +944,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; @@ -1728,18 +1728,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); }