From nobody Fri Jan 13 04:33:34 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 4NtT7g10r9z2qkLd; Fri, 13 Jan 2023 04:33:35 +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 4NtT7g0Q1Jz45r8; Fri, 13 Jan 2023 04:33:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673584415; 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=Ip39axMwGNXWLUjfvXaGNgLKCd9TcAdKNFTfZoce36I=; b=pmQvTmdN/sTqI/80eDeRti4IROnablgUp8vzp3kA7aYsSbtNq9l3a2wVqI4OkJtqP+Pqeu MXls+iY4Xm/cw3lHWUYf0iMHXgGqpvdBUvLpaQ6nVs9018aSoF0u0rDA+WNFnn0wlX8dfu l0OGQXLyuoxveQQZcWmG8l8n981J/sPQ93AJlLRfQX3hixafezKROGuzIbT8ZslvDUlakh nGOuay0AdNvuGdLr3jXE7Q2vdD4rC5DWWWEgRPuQ2rxaZXWGxYEKoh1LwU1esXEQWU5tKw 4WxSCUnFaKdupw3Xrra/U3u7AEAWOTiZRhW8prv8P7xj6cobISbPq05ImeF9xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673584415; 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=Ip39axMwGNXWLUjfvXaGNgLKCd9TcAdKNFTfZoce36I=; b=bT0zPsBvTRy4sKGrpG1pQDyP9CiQPwDEeGZQKPEFT3Ggd7aKKwCe4cJKu8kngNJnEcYNsU LLTxrmPCLO5vv2B5Ya8b7Dnux9geregzU6hAy+h8qTEwZqMtzFU44mltmKgg1VZvlJY3lf OsQb8DzQK/HopwXoqN7RxVQOLRMMmcUsdJdhBPdUXtOiU76Vr0cA39Kh3ENLL4OAf0D3Ig gwOWguavj7qNwZ+X9OW6m6XBGBsurJqMkM4L9VAsFsOU5RstrFNfVex3a4qgmJskZP7iTt 4r5q/oPKF5iym9aV5VhJr/Jj9nH4xCoXzZ8jeqgCaIMED9O6tP3YgS2pW8q/kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673584415; a=rsa-sha256; cv=none; b=fTmsSUW5WrkdS7LPnl7QFcMUH7fQB+wp37+I1Fc7jjxp07tDrPRAchq9h1cdDTcj1o+T7b +Q5TAO4gQdtfsxPkff2aVOol6RBWFp+cbEzWg3dpZeyPXhGmTlbdflfiWoRLvq7dwfdScT P5bWl7LQbsbxQ+U1g36SKnz3+lA+96Dh76mtWNLzuVO9sRfTrHDw6b2M51Q/JSE4TdPVnc DKg2walGkffAoL4nsKOfFv6xK2aKBzO0BGJII21VmQ+d7EhBNEd26Nap9VngHcAOcm6tlN 7b9Kzy4rfoT1GS/vTEUnnQVHZ/FldK7l54ZbhPyDDXypMB8nSnYTJzpo92a74Q== 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 4NtT7f6XWgzvBv; Fri, 13 Jan 2023 04:33:34 +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 30D4XYdU095184; Fri, 13 Jan 2023 04:33:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30D4XYl4095183; Fri, 13 Jan 2023 04:33:34 GMT (envelope-from git) Date: Fri, 13 Jan 2023 04:33:34 GMT Message-Id: <202301130433.30D4XYl4095183@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: 40beb4ae59ce - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: 40beb4ae59ce85c3139539d87ad52a777ee2cbf4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=40beb4ae59ce85c3139539d87ad52a777ee2cbf4 commit 40beb4ae59ce85c3139539d87ad52a777ee2cbf4 Author: Zhenlei Huang AuthorDate: 2022-07-08 18:12:14 +0000 Commit: Zhenlei Huang CommitDate: 2023-01-13 04:30:20 +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) (cherry picked from commit 8819353dd0dfddb9bcd156a2773efc3770d09eff) --- sbin/ifconfig/ifconfig.8 | 5 +++-- sys/net/if_vxlan.c | 26 +++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index f1c09885be0f..5c3a554c2b46 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -390,9 +390,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 67aa760f7fcf..7cb0471b8667 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -141,6 +141,7 @@ struct vxlan_statistics { struct vxlan_softc { struct ifnet *vxl_ifp; + u_int vxl_fibnum; struct vxlan_socket *vxl_sock; uint32_t vxl_vni; union vxlan_sockaddr vxl_src_addr; @@ -2238,6 +2239,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; @@ -2247,10 +2249,11 @@ vxlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifr = (struct ifreq *) data; ifd = (struct ifdrv *) data; + error = 0; + switch (cmd) { case SIOCADDMULTI: case SIOCDELMULTI: - error = 0; break; case SIOCGDRVSPEC: @@ -2267,6 +2270,25 @@ vxlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) error = ifmedia_ioctl(ifp, ifr, &sc->vxl_media, cmd); 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; @@ -2462,6 +2484,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); @@ -2721,6 +2744,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); if (params != 0) {