From nobody Thu Dec 18 16:47:07 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 4dXGmD20R1z6LKjD for ; Thu, 18 Dec 2025 16:47:08 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dXGmD0pHSz3rhb for ; Thu, 18 Dec 2025 16:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766076428; 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=5ekn7BQXiG+vkqtijJEjD8cyfo6PPu4S5FuZeI7qS2Y=; b=qCis+k0nyshIm/HIcwUor77RyR0WRmd6CZmN32cFKxMK4h5Les49WyzW+dYZ2j2QX9n59M LpUynGSQuiiJUallCqB6gB9cS28vJdxJPSA2PRBrFSlTsx633x08pUOKSmMnS6Pw0XO2YG laXh1USpoGVHNho1IomnTV/AhaAyGZJqKNerBYTgEjNEC7EF5Et0NzxSCmgvkLlpDa3vEd RDi6TR5kLIclsVkArzOJyv9p/wxmxXq5T8NukojUt2W9iNvYDILU7BHCqzwYRE25kSh/9t +nsJbqB6zO/sCOvtqrHo1fJ1ulG0tN42bs5aZyhdV/pbQ2SytcZ5oWuX9TRD2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766076428; 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=5ekn7BQXiG+vkqtijJEjD8cyfo6PPu4S5FuZeI7qS2Y=; b=WcxILErHP/zmhjook8yfE8PeyB0JXkrxr5OmzyZm5QDqBt15FDe8Wrlc4yeTUJIrlGWEdR bXIcyR5evW5qNYp0j3LqPfuAnpezHxX8Xh0lnrJ0OdYizaVHQbq0Sfuercy/29SPCFPnQf hP6EYqQNzeJZflA63hAFZbctyNM/NBeUZ9S00WNBR9crii7Bh0otHYq6MSWRWNcr54vmtF 1u8WFrZEJkm2G1KRgyQcEfwC+qPUamAlvpNS/qXbd3bUB2FareM+VxtTvdm2WVrPxAphGY rQolZezch8TxEdMLwoY+w+wKdUOCLifW1E5n/ybWCzNlg7EFGNxfm2SXUz3FJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766076428; a=rsa-sha256; cv=none; b=SyV9l3ntScbmJ4GNTdJVn9hBqOvyBkpUjeiTKvsfdDqrVovTr6cRoyVXRKuylf86nBpZbm AJ3xi7ZZzEJ5OkQ7bmsUxTfU5gYhrUYg8x72aA+Ro9Nw+sZ4KXtVfyPZ5Lm0xb1YcAuiA7 KeYOWauM7wsBx+RKDYDazPd4JZlen3f8qCzfbZseNzMAJvR7j9EXS9BGWx6V5OaR8fw5Kq wlkqV3F7uNylvQwyBA8hDWxCYTopGKcPheaR2XwZl50b6VlrypNRF5KjwuHHCU0V5d10+4 0R0VfH/1OipWSBQaWhLGTRNI071f0DS17YJWjzQ1tSNFHERgAUVuwoDEpLCyDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dXGmC6XkkzmYG for ; Thu, 18 Dec 2025 16:47:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c8c6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Dec 2025 16:47:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: a4d766caf711 - main - bpf: add a crutch to support if_vmove 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a4d766caf7114392b80793c8306d5a712f31557c Auto-Submitted: auto-generated Date: Thu, 18 Dec 2025 16:47:07 +0000 Message-Id: <6944300b.c8c6.e13af2c@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a4d766caf7114392b80793c8306d5a712f31557c commit a4d766caf7114392b80793c8306d5a712f31557c Author: Gleb Smirnoff AuthorDate: 2025-12-18 16:46:20 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-18 16:46:20 +0000 bpf: add a crutch to support if_vmove Fixes: 0bf42a0a05b9c802a6d9ca4a6b8696b29a26e08b --- sys/net/bpf.c | 16 ++++++++++++++++ sys/net/bpf.h | 1 + sys/net/if.c | 1 + 3 files changed, 18 insertions(+) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 54da49f3d656..9f0b57728e88 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -2722,6 +2722,22 @@ bpf_detach(struct bpf_if *bp) BPF_UNLOCK(); } +#ifdef VIMAGE +/* + * Move bpf to a different VNET. This KPI is a crutch to support if_vmove + * and is not supposed to be used anywhere else. + */ +void +bpf_vmove(struct bpf_if *bp) +{ + + BPF_LOCK(); + LIST_REMOVE(bp, bif_next); + LIST_INSERT_HEAD(&V_bpf_iflist, bp, bif_next); + BPF_UNLOCK(); +} +#endif + bool bpf_peers_present_if(struct ifnet *ifp) { diff --git a/sys/net/bpf.h b/sys/net/bpf.h index f6bcb0e34ed4..6d2ecd985225 100644 --- a/sys/net/bpf.h +++ b/sys/net/bpf.h @@ -425,6 +425,7 @@ CK_LIST_HEAD(bpfd_list, bpf_d); struct bpf_if * bpf_attach(const char *, u_int, u_int, const struct bif_methods *, void *); void bpf_detach(struct bpf_if *); +void bpf_vmove(struct bpf_if *bp); void bpf_bufheld(struct bpf_d *d); int bpf_validate(const struct bpf_insn *, int); void bpf_tap(struct bpf_if *, u_char *, u_int); diff --git a/sys/net/if.c b/sys/net/if.c index f5006781541c..d7c6b22821e2 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1285,6 +1285,7 @@ if_vmove(struct ifnet *ifp, struct vnet *new_vnet) */ CURVNET_SET_QUIET(new_vnet); if_attach_internal(ifp, true); + bpf_vmove(ifp->if_bpf); CURVNET_RESTORE(); }