From nobody Sun Feb 06 12:31:47 2022 X-Original-To: dev-commits-src-all@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 17A6619B73A4; Sun, 6 Feb 2022 12:31:48 +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 4Js7tq6pD8z3jLd; Sun, 6 Feb 2022 12:31:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644150708; 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=Zi6A2I+4nCB/xS7dPzRjyhxILZxid+5Lpc/pn61cIsU=; b=DrtMmcxBhp0Oh9DP2S5VjpeqHvOPPHY97ddUegN2hgCrOwbsK/ysadkwV8xeOERFWHmPkt 6ifSLEt7AatY3pvjx8CLeipkx6Uu8TWk9PC0dRj6wrzbJL1HWCcu39IFn54HI7nqgm+Rr/ owYCE5Iz5zdS0wZnXgxTa56suS5i82GWN4JC7RA3MtpNMa2BCBb60Iwq6exJ3rL9cjaDfn 5aqd2HwhSGdpSi1n5T3ca0yxURVqRTYQcBndXvr1DqCXS9KzwM8iFW0CzMiDB6gEYxrAuS Fyc5Ec6AcJe0TjJBIwVGnAHbWL14Id3Rm8zvpkBdlY/bC9C1QS9enWjUshcNbA== 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 C75C412178; Sun, 6 Feb 2022 12:31:47 +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 216CVlKc053865; Sun, 6 Feb 2022 12:31:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 216CVlV5053864; Sun, 6 Feb 2022 12:31:47 GMT (envelope-from git) Date: Sun, 6 Feb 2022 12:31:47 GMT Message-Id: <202202061231.216CVlV5053864@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aleksandr Fedorov Subject: git: ceaf442ff236 - main - if_vxlan(4): Allow netmap_generic to intercept RX packets. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: ceaf442ff236dd0dcd303001ff41e6c64a0cfc1f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644150708; 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=Zi6A2I+4nCB/xS7dPzRjyhxILZxid+5Lpc/pn61cIsU=; b=tz1yIybfcwn8cs1GveJroJm4BrEzTrOWG2vA9CowCbOqGX/aZAKL0uigA/oZwV+etGJc+6 5yGJYOIbfv5DAAtfo6VKjPwODrDuTuBk/4QhKE7FfmuI406Kzmp4oRrVEmKNW3Llf5ja7t R0ygvIngcTch/kKVaqMVBqlJ6/ib46slArr1J+Wdw+CnYUq8HszSVlXupEQATXEIsuXzsn yc+B8TXRH2VIL/bXms0O5XQ/EadwybU+CzzslI1S5FfJhhZv5pHqG0JbT2XqwqplQfCZPJ d+Db0aFBKxD0v5RJYEiC7lvKr+byDN9iZpYgU841GjXNA5LPM0rJUaPpVKm3zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644150708; a=rsa-sha256; cv=none; b=yRdFkYEGOuhn+PhGi8YmUkUBdi61PAeHzCXuCdaBul/0fULEltW8FYHvmLFPWG7WldO7OJ cfP6NsJ6+nfjyxa7TlswKlMMM8EMzCyOKtdqsFhrV1NBW97n4qUm3fAqBw9PyWZB/OzNaO c8v8iQnwREFGPEIOZe96l9oA6HTCYftHYA3ne533Pwa/Wo/WPj5hGFqzDrC/UYSR7BvU9X 9xkKMPByB4l0L/LRa0D7EVM+MF+xW0D2Ij5kL1Y9cNTkEC2o5P43LTJSqodz1L0IfYnwYP 1oxnpBl5Vh4NWFs4BdlxVHxlj0qrvsLpRTdEE7zXpA4HfQMNOHXOnBsjvcfnZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by afedorov: URL: https://cgit.FreeBSD.org/src/commit/?id=ceaf442ff236dd0dcd303001ff41e6c64a0cfc1f commit ceaf442ff236dd0dcd303001ff41e6c64a0cfc1f Author: Aleksandr Fedorov AuthorDate: 2022-02-06 12:27:46 +0000 Commit: Aleksandr Fedorov CommitDate: 2022-02-06 12:27:46 +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 --- 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 b03357c30c08..107a836f91de 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -2814,12 +2814,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) { @@ -2859,8 +2863,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);