From owner-svn-src-all@freebsd.org Sat Apr 18 08:00:59 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 390A82C0CE4; Sat, 18 Apr 2020 08:00:59 +0000 (UTC) (envelope-from kp@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49454W0NSgz3FWm; Sat, 18 Apr 2020 08:00:59 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 086408FAB; Sat, 18 Apr 2020 08:00:59 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03I80wmF040208; Sat, 18 Apr 2020 08:00:58 GMT (envelope-from kp@FreeBSD.org) Received: (from kp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03I80wxq040207; Sat, 18 Apr 2020 08:00:58 GMT (envelope-from kp@FreeBSD.org) Message-Id: <202004180800.03I80wxq040207@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kp set sender to kp@FreeBSD.org using -f From: Kristof Provost Date: Sat, 18 Apr 2020 08:00:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r360069 - head/sys/net X-SVN-Group: head X-SVN-Commit-Author: kp X-SVN-Commit-Paths: head/sys/net X-SVN-Commit-Revision: 360069 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Apr 2020 08:00:59 -0000 Author: kp Date: Sat Apr 18 08:00:58 2020 New Revision: 360069 URL: https://svnweb.freebsd.org/changeset/base/360069 Log: bridge: Simplify mac address generation Unconditionally use ether_gen_addr() to generate bridge mac addresses. This function is now less likely to generate duplicate mac addresses across jails. The old hand rolled hostid based code adds no value. Reviewed by: bz Differential Revision: https://reviews.freebsd.org/D24432 Modified: head/sys/net/if_bridge.c Modified: head/sys/net/if_bridge.c ============================================================================== --- head/sys/net/if_bridge.c Sat Apr 18 07:50:30 2020 (r360068) +++ head/sys/net/if_bridge.c Sat Apr 18 08:00:58 2020 (r360069) @@ -676,10 +676,8 @@ SYSCTL_PROC(_net_link_bridge, OID_AUTO, ipfw, static int bridge_clone_create(struct if_clone *ifc, int unit, caddr_t params) { - struct bridge_softc *sc, *sc2; - struct ifnet *bifp, *ifp; - int fb, retry; - unsigned long hostid; + struct bridge_softc *sc; + struct ifnet *ifp; sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK|M_ZERO); ifp = sc->sc_ifp = if_alloc(IFT_ETHER); @@ -709,41 +707,7 @@ bridge_clone_create(struct if_clone *ifc, int unit, ca ifp->if_init = bridge_init; ifp->if_type = IFT_BRIDGE; - /* - * Generate an ethernet address with a locally administered address. - * - * Since we are using random ethernet addresses for the bridge, it is - * possible that we might have address collisions, so make sure that - * this hardware address isn't already in use on another bridge. - * The first try uses the hostid and falls back to arc4rand(). - */ - fb = 0; - getcredhostid(curthread->td_ucred, &hostid); - do { - if (fb || hostid == 0) { - ether_gen_addr(ifp, &sc->sc_defaddr); - } else { - sc->sc_defaddr.octet[0] = 0x2; - sc->sc_defaddr.octet[1] = (hostid >> 24) & 0xff; - sc->sc_defaddr.octet[2] = (hostid >> 16) & 0xff; - sc->sc_defaddr.octet[3] = (hostid >> 8 ) & 0xff; - sc->sc_defaddr.octet[4] = hostid & 0xff; - sc->sc_defaddr.octet[5] = ifp->if_dunit & 0xff; - } - - fb = 1; - retry = 0; - BRIDGE_LIST_LOCK(); - LIST_FOREACH(sc2, &V_bridge_list, sc_list) { - bifp = sc2->sc_ifp; - if (memcmp(sc->sc_defaddr.octet, - IF_LLADDR(bifp), ETHER_ADDR_LEN) == 0) { - retry = 1; - break; - } - } - BRIDGE_LIST_UNLOCK(); - } while (retry == 1); + ether_gen_addr(ifp, &sc->sc_defaddr); bstp_attach(&sc->sc_stp, &bridge_ops); ether_ifattach(ifp, sc->sc_defaddr.octet);