From nobody Wed Jan 11 10:39:54 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 4NsPMH02pNz2r1fC; Wed, 11 Jan 2023 10:39:55 +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 4NsPMG6fJVz3Ny8; Wed, 11 Jan 2023 10:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673433594; 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=FhszcMJj7n3aVHgeLLfQgrcqTETAX7V4QvaKFuMIZ9A=; b=doxmih14j9mrv3QxgXzfnPb5ebshFgpfhN0ItBkyNtbxvs+Ttm+3xNLKo1ttekV38GAdBm c2VuesLXerowWAeQTPOal4YKbEGGcJh8xJBNm1+8mz0bySwqF/5rbnc18KwPWBdCNSibSA 1IBRVBhMpPTIV8NEIRSndePFEZc2FBC79gL2KPMrMKuaWFar/ggo3mKL0YX0Z41XmsEowZ a00HHS6isvV0tB2kV4DBW0WEc32q0+orcRiduMrfki1mbj3LJ3GJPQCk2k4dMATM3D2eb4 K3DgfhFcJj8PTiV/kI1SKeEUhTlUm7Dw1cpYCEOTStbyCW3l0lQKLCB4Crd0gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673433594; 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=FhszcMJj7n3aVHgeLLfQgrcqTETAX7V4QvaKFuMIZ9A=; b=Apk4nI8a/SIV00RZQFb9PR3F9CkHB6bp3iP5/KqzAz33tittcWQUlr7GFCskd/AzQLsHdd NxJg+ryQbP2atWUCov8nEPTzpVgrMzZ/pxUiaHGZDYuP20InEJihcFKfsMRczXLesQNcKy qLmAtJdQ/IHlWhiSxElUY/0QrLMMbmEdMo257icZcvXqJjXupLjKC2VTaBoNBiqIE4wWnS 2sgKlaUSIDk7dU9dosllT9qLJs9w1frCupSbPFdnyH106GyWxVhSQ2AW9VLSozQXDHRa7P YIfNoUSSn42x7gpQgv0TsdiSzNnlD2+D469jUed1XZ7IBkKQvuXMLM+PmVGOOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673433594; a=rsa-sha256; cv=none; b=kodYCJIs2P75/Fnh3B+tnNiA0gGieyAoGALsVTj2Ls9MfX9+3/lSxvhpO6lG+m8pIwzPHL 8u0ZlUX34dRPu3cfzGzrkV44y1vZJHS8BTJEoX7b3foqBzEnT3suoZCnCuJOur9JFFkwiy zS8oT4cM1UraRixS0uD1h4U6FXUkmA0MeA8x1JmF665taPGKR2Z/GsWjLpEQX2jtjK3SBd AhKNFU3Roa/eOGtA33tOKpbRwanczrA1rW3WZxMh/2MECW4lHMwxseKC2nJwujuNESiK4u MclR6rPniwqCMSmgn4O9rSUaeq5VY8CMpPK1DJZoWFTby73l0lcpVROxehXNrw== 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 4NsPMG5jB3zlSH; Wed, 11 Jan 2023 10:39:54 +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 30BAdsYd067996; Wed, 11 Jan 2023 10:39:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30BAdssI067995; Wed, 11 Jan 2023 10:39:54 GMT (envelope-from git) Date: Wed, 11 Jan 2023 10:39:54 GMT Message-Id: <202301111039.30BAdssI067995@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 8819353dd0df - stable/13 - vxlan: Add support for socket ioctls SIOC[SG]TUNFIB 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8819353dd0dfddb9bcd156a2773efc3770d09eff Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8819353dd0dfddb9bcd156a2773efc3770d09eff commit 8819353dd0dfddb9bcd156a2773efc3770d09eff Author: Zhenlei Huang AuthorDate: 2022-07-08 18:12:14 +0000 Commit: Zhenlei Huang CommitDate: 2023-01-11 10:35:59 +0000 vxlan: Add support for socket ioctls SIOC[SG]TUNFIB Submitted by: Luiz Amaral PR: 244004 Reviewed by: gbe (manpages), melifaro, pauamma (manpages) Approved by: kp (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D32820 (cherry picked from commit 7f7a804ae077a0c43d8c3f1444f90bdfb841c6b1) --- sbin/ifconfig/ifconfig.8 | 5 +++-- sys/net/if_vxlan.c | 27 +++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 3ab145160caa..99a858aec021 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -500,9 +500,10 @@ Specify tunnel FIB. A FIB .Ar fib_number is assigned to all packets encapsulated by tunnel interface, e.g., -.Xr gif 4 +.Xr gif 4 , +.Xr gre 4 and -.Xr gre 4 . +.Xr vxlan 4 . .It Cm maclabel Ar label If Mandatory Access Control support is enabled in the kernel, set the MAC label to diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index c8bb1ac53981..cf1f96cc0c1f 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -163,6 +163,7 @@ struct vxlan_statistics { struct vxlan_softc { struct ifnet *vxl_ifp; int vxl_reqcap; + u_int vxl_fibnum; struct vxlan_socket *vxl_sock; uint32_t vxl_vni; union vxlan_sockaddr vxl_src_addr; @@ -2329,6 +2330,7 @@ vxlan_ioctl_drvspec(struct vxlan_softc *sc, struct ifdrv *ifd, int get) static int vxlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { + struct rm_priotracker tracker; struct vxlan_softc *sc; struct ifreq *ifr; struct ifdrv *ifd; @@ -2378,6 +2380,25 @@ vxlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) VXLAN_WUNLOCK(sc); break; + case SIOCGTUNFIB: + VXLAN_RLOCK(sc, &tracker); + ifr->ifr_fib = sc->vxl_fibnum; + VXLAN_RUNLOCK(sc, &tracker); + break; + + case SIOCSTUNFIB: + if ((error = priv_check(curthread, PRIV_NET_VXLAN)) != 0) + break; + + if (ifr->ifr_fib >= rt_numfibs) + error = EINVAL; + else { + VXLAN_WLOCK(sc); + sc->vxl_fibnum = ifr->ifr_fib; + VXLAN_WUNLOCK(sc); + } + break; + default: error = ether_ioctl(ifp, cmd, data); break; @@ -2531,7 +2552,7 @@ vxlan_encap4(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, sin->sin_family = AF_INET; sin->sin_len = sizeof(*sin); sin->sin_addr = ip->ip_dst; - ro->ro_nh = fib4_lookup(RT_DEFAULT_FIB, ip->ip_dst, 0, NHR_NONE, + ro->ro_nh = fib4_lookup(M_GETFIB(m), ip->ip_dst, 0, NHR_NONE, 0); if (ro->ro_nh == NULL) { m_freem(m); @@ -2643,7 +2664,7 @@ vxlan_encap6(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, sin6->sin6_family = AF_INET6; sin6->sin6_len = sizeof(*sin6); sin6->sin6_addr = ip6->ip6_dst; - ro->ro_nh = fib6_lookup(RT_DEFAULT_FIB, &ip6->ip6_dst, 0, + ro->ro_nh = fib6_lookup(M_GETFIB(m), &ip6->ip6_dst, 0, NHR_NONE, 0); if (ro->ro_nh == NULL) { m_freem(m); @@ -2720,6 +2741,7 @@ vxlan_transmit(struct ifnet *ifp, struct mbuf *m) ETHER_BPF_MTAP(ifp, m); VXLAN_RLOCK(sc, &tracker); + M_SETFIB(m, sc->vxl_fibnum); if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { VXLAN_RUNLOCK(sc, &tracker); m_freem(m); @@ -3183,6 +3205,7 @@ vxlan_clone_create(struct if_clone *ifc, int unit, caddr_t params) sc = malloc(sizeof(struct vxlan_softc), M_VXLAN, M_WAITOK | M_ZERO); sc->vxl_unit = unit; + sc->vxl_fibnum = curthread->td_proc->p_fibnum; vxlan_set_default_config(sc); error = vxlan_stats_alloc(sc); if (error != 0)