From nobody Wed Feb 23 11:03:04 2022 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 49FC419DE917; Wed, 23 Feb 2022 11:03:04 +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 4K3Y6c1ZBMz4rqf; Wed, 23 Feb 2022 11:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645614184; 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=0tuAEPWuZYUVg+MkApD/J3vb7hlEyzSIQFDSfzkE/aw=; b=J4Z+whskz1YhF7wqX0MJi6j43v3bwURxxGAgVcBijqXKtTE2dksGO1iJO8bN3JN40F/by2 zCezLHU0ez6G3X7pDpRaCqVX+uaQ4sczpKk6SIqMXLoA/rnfXY0r+f5UoRyozf/NbccgqE hcpdnja+0zrMZa9DoSowRg5CxDPM0xukrFlckQkSaIf0DxoJNeNsD/FmYKONU7WH0Md6Uy Eljahgf/c5zPqY9uGHM96hH3od1xCZI5pP5snk/u03dm/UfKDFz4g2EDEONIwcN8WYFFeA 8USJy4R3zdREon7DHe/IOFG8SXFwg58z3oOoDUgbNXE6fh7gYjMAv1bnOY3D3Q== 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 15AF3171D2; Wed, 23 Feb 2022 11:03:04 +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 21NB34dL052196; Wed, 23 Feb 2022 11:03:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21NB34Vh052195; Wed, 23 Feb 2022 11:03:04 GMT (envelope-from git) Date: Wed, 23 Feb 2022 11:03:04 GMT Message-Id: <202202231103.21NB34Vh052195@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Aleksandr Fedorov Subject: git: 543b492fa569 - stable/13 - if_vxlan(4): Allow netmap_generic to intercept RX packets. 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: afedorov X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 543b492fa569cd5839657bd9f74826ef2df121fb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645614184; 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=0tuAEPWuZYUVg+MkApD/J3vb7hlEyzSIQFDSfzkE/aw=; b=a9NMZmYigQ4mGTUr00L0OnVDF94n9f2WvKGoYfjqpZHA0H5OHSO6ymzWLy/SVWkEqQpuyK K1SdGWHvDbQLG8zVFdIYrNEFqtmWqpiyk1fb4xqzJOQ0Z+/AcPoPPHrQ5Wd+/LAFDxfIFO coRZR5OvtHc3aD6GreVsIw7Nzhv+e7Y9feAYmv5weG4lR1sWLSJAvegt5qY7/+7uQXmccF jv6bNVrEpjTPlKf3DRuFvA8CfTguhr8meoOABnutGJybHJLSAopTSD12Fn9PtKxlu01130 g787X4uQdiv4VEnSadau8bdmxk3PqBEGspyJgZtgO/MI9MboGU7lQ5qb5Omofg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645614184; a=rsa-sha256; cv=none; b=Rtv/VpUF5IbjDz0xo0c6yBGh6GilFOp9OShU4V9nVnlBjpzbC5VGmCGcyUUHkt9GOo7HC/ T1bYAaqfY8zhz9JJJ381njPZGqGpBGdnO2qJ/Ypqz5iiOSYsv4if0E+wOj70xx1+X392xw tELTdY4NSQbVfGEqw6mJHmwnk3U3brtQQ74VvkKkHYIAGhDoWc5qZf+Rh9F5PpvBlx9pNn JOX4uK6f912DK33NpcLTkbIQO0dl2ct/csd8nlVoi2NrU2BsOR536FCLS2B9p1xpfM/g5l /3wW0RDTH+EWZtld1KdQA2BHVZSvtEEgmRW1lNS+pWsfGFbyJ2gCSBGCcf0GPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by afedorov: URL: https://cgit.FreeBSD.org/src/commit/?id=543b492fa569cd5839657bd9f74826ef2df121fb commit 543b492fa569cd5839657bd9f74826ef2df121fb Author: Aleksandr Fedorov AuthorDate: 2022-02-06 12:27:46 +0000 Commit: Aleksandr Fedorov CommitDate: 2022-02-23 11:01:20 +0000 if_vxlan(4): Allow netmap_generic to intercept RX packets. Netmap (generic) intercepts the if_input method to handle RX packets. Call ifp->if_input() instead of netisr_dispatch(). Add stricter check for incoming packet length. This change is very useful with bhyve + vale + if_vxlan. Reviewed by: vmaffione (mentor), kib, np, donner Approved by: vmaffione (mentor), kib, np, donner MFC after: 2 weeks Sponsored by: vstack.com Differential Revision: https://reviews.freebsd.org/D30638 (cherry picked from commit ceaf442ff236dd0dcd303001ff41e6c64a0cfc1f) --- sys/net/if_vxlan.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index f56ec23540a7..972af73fb50e 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -2812,12 +2812,16 @@ vxlan_input(struct vxlan_socket *vso, uint32_t vni, struct mbuf **m0, struct ether_header *eh; int error; + m = *m0; + + if (m->m_pkthdr.len < ETHER_HDR_LEN) + return (EINVAL); + sc = vxlan_socket_lookup_softc(vso, vni); if (sc == NULL) return (ENOENT); ifp = sc->vxl_ifp; - m = *m0; eh = mtod(m, struct ether_header *); if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { @@ -2857,8 +2861,9 @@ vxlan_input(struct vxlan_socket *vso, uint32_t vni, struct mbuf **m0, m->m_pkthdr.csum_data = 0; } - error = netisr_dispatch(NETISR_ETHER, m); + (*ifp->if_input)(ifp, m); *m0 = NULL; + error = 0; out: vxlan_release(sc);