From nobody Tue Aug 05 14:53:35 2025 X-Original-To: dev-commits-src-main@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 4bxGdX1DW1z63KN9; Tue, 05 Aug 2025 14:53:36 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bxGdX0fP7z3MBQ; Tue, 05 Aug 2025 14:53:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754405616; 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=MAR6JT6NTb8Ij4zu1AiJMxtUtjUAPMuNUSaO/97P+zI=; b=pMAeq+7JatyKERhamJhCAmWhqg0JJXoDkLA3Hxg7t7NxGsJowtdGs7k1zExsA9DoSrIFbJ wBxYMG8Bd9eYnFCzTX2+ZiN0lRHrAi0ntEnBPiQHOgONjQGWerlG8Yr3s5BKiUCEm6++mH bgjyewTIX9ikXUAlSO/Qx7wPEY3vmpkwWBylZXJacIFQDx2qtXOCJFqyewuKqxDfDWjMR0 K5VAoFjwFc2JrocbcIRheSTGD22zSVUiC8RC+N9afGNkW2Mn4P5r9qO3LC8fpqHuLHexst BrUjVYx9hcN1TWyGml7YhagdMzPKtEK/SvyVxwZmRb/vFZynTsc+1jF9ByV97w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754405616; 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=MAR6JT6NTb8Ij4zu1AiJMxtUtjUAPMuNUSaO/97P+zI=; b=pcyhBI3PvYFTY/76dxqYVehbVGAl0K7qvtcqWNOPisqGYR8qgyaZY1kIAL/ACxmHIiCZX0 bc2dTibwNA2AMk7XBUlSn7tEh3SfAiI6VyzoGhClfSr47fjdSvGtdoJgmHdWb3+A7ltFZN HornY1LuZ4IfEXYseIFtUwU8P8z9fMVFV1JHuIgAPg8ywq5DXHKS2v0Z2j0aW4tCdqruTw R83WSGRCS6YGV8Gj05xlpSr+/5Yimw6fDyQhOn5+odLJRpQiRbk9fbL677ewrXSpcknC9c NeOQlTSzrzmsPjlsMnkYGZayMZPuaCINMH+aZ7gRw+s6mihbptJMCi8MnABSgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754405616; a=rsa-sha256; cv=none; b=MXpOOa6fxOQwEqUuFxu1oOfRRRKY2RK4gSut4LU8x8QORxahgm5GC+TFHd/d8uuMPiFrHm Q3SkZiqRoApkJJTwL2U6cZhkVV9elG0JK7RDqzBfYgpYk9OfLjf3wHjSVHpQZdem+GN10+ AbrH/zTS52xb5xFuzQCXsZXRw6e2UNFdOY6FE9hruDVSD7XdkG5qWeKJ3Ucl0luCjcFqS7 VXeNkHkiZroZQRnksvGl9s82838AsFR0BRYuon7cw+y3DtMu39cH7x9AiAOrbWjxyEE3NY wTIuGTtP0WMZbY4sv5UGc076kzMaIV6UVjHG4JiY/manzTt3d/DMZUpiSHuGHw== 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 4bxGdX0BdPzgL5; Tue, 05 Aug 2025 14:53:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 575ErZct064024; Tue, 5 Aug 2025 14:53:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 575ErZXQ064021; Tue, 5 Aug 2025 14:53:35 GMT (envelope-from git) Date: Tue, 5 Aug 2025 14:53:35 GMT Message-Id: <202508051453.575ErZXQ064021@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ronald Klop Subject: git: 590493c14190 - main - if_epair(4): use ether_gen_addr(9) for stable MAC address List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ronald X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 590493c1419092e98f7ad1dcadb886973502341e Auto-Submitted: auto-generated The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/src/commit/?id=590493c1419092e98f7ad1dcadb886973502341e commit 590493c1419092e98f7ad1dcadb886973502341e Author: Ronald Klop AuthorDate: 2025-07-03 16:33:03 +0000 Commit: Ronald Klop CommitDate: 2025-08-05 14:53:04 +0000 if_epair(4): use ether_gen_addr(9) for stable MAC address Before this change epair interfaces get a random MAC. This does not help dhcp/dyndns when an epair gets destroyed/recreated after restart of a jail. With this change: $ sysctl net.link.epair.ether_gen_addr=0 $ ifconfig epair8 create > /dev/null; ifconfig epair8a | grep ether; ifconfig epair8b | grep ether; ifconfig epair8a destroy ether 02:cb:78:56:e4:0a ether 02:cb:78:56:e4:0b $ ifconfig epair8 create > /dev/null; ifconfig epair8a | grep ether; ifconfig epair8b | grep ether; ifconfig epair8a destroy ether 02:8b:9b:6a:8f:0a ether 02:8b:9b:6a:8f:0b $ sysctl net.link.epair.ether_gen_addr=1 $ ifconfig epair8 create > /dev/null; ifconfig epair8a | grep ether; ifconfig epair8b | grep ether; ifconfig epair8a destroy ether 58:9c:fc:10:2b:b4 ether 58:9c:fc:00:39:10 $ ifconfig epair8 create > /dev/null; ifconfig epair8a | grep ether; ifconfig epair8b | grep ether; ifconfig epair8a destroy ether 58:9c:fc:10:2b:b4 ether 58:9c:fc:00:39:10 A follow up commit will change the default to 1 in main. Approved by: bz,ivy,kp MFC after: 2 weeks Relnotes: yes Differential Revision: https://reviews.freebsd.org/D51157 --- sys/net/if_epair.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c index 7051e31565d4..4d35584925a1 100644 --- a/sys/net/if_epair.c +++ b/sys/net/if_epair.c @@ -58,6 +58,7 @@ #include #include #include +#include #include #include @@ -97,6 +98,15 @@ static unsigned int next_index = 0; #define EPAIR_LOCK() mtx_lock(&epair_n_index_mtx) #define EPAIR_UNLOCK() mtx_unlock(&epair_n_index_mtx) +SYSCTL_DECL(_net_link); +static SYSCTL_NODE(_net_link, OID_AUTO, epair, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "Pair of virtual cross-over connected Ethernet-like interfaces"); + +static bool use_ether_gen_addr = false; +SYSCTL_BOOL(_net_link_epair, OID_AUTO, ether_gen_addr, CTLFLAG_RWTUN, + &use_ether_gen_addr, false, + "Generate MAC with FreeBSD OUI using ether_gen_addr(9)"); + struct epair_softc; struct epair_queue { struct mtx mtx; @@ -495,6 +505,17 @@ epair_clone_match(struct if_clone *ifc, const char *name) return (1); } +static void +epair_generate_mac_byname(struct epair_softc *sc, uint8_t eaddr[]) +{ + struct ether_addr gen_eaddr; + int i; + + ether_gen_addr_byname(if_name(sc->ifp), &gen_eaddr); + for (i = 0; i < ETHER_ADDR_LEN; i++) + eaddr[i] = gen_eaddr.octet[i]; +} + static void epair_clone_add(struct if_clone *ifc, struct epair_softc *scb) { @@ -502,9 +523,12 @@ epair_clone_add(struct if_clone *ifc, struct epair_softc *scb) uint8_t eaddr[ETHER_ADDR_LEN]; /* 00:00:00:00:00:00 */ ifp = scb->ifp; - /* Copy epairNa etheraddr and change the last byte. */ - memcpy(eaddr, scb->oifp->if_hw_addr, ETHER_ADDR_LEN); - eaddr[5] = 0x0b; + if (!use_ether_gen_addr) { + /* Copy epairNa etheraddr and change the last byte. */ + memcpy(eaddr, scb->oifp->if_hw_addr, ETHER_ADDR_LEN); + eaddr[5] = 0x0b; + } else + epair_generate_mac_byname(scb, eaddr); ether_ifattach(ifp, eaddr); if_clone_addif(ifc, ifp); @@ -719,7 +743,10 @@ epair_clone_create(struct if_clone *ifc, char *name, size_t len, /* Finish initialization of interface a. */ ifp = sca->ifp; epair_setup_ifp(sca, name, unit); - epair_generate_mac(sca, eaddr); + if (!use_ether_gen_addr) + epair_generate_mac(sca, eaddr); + else + epair_generate_mac_byname(sca, eaddr); ether_ifattach(ifp, eaddr);