From nobody Wed Feb 25 17:20:23 2026 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 4fLhDl3tNgz6TK6V for ; Wed, 25 Feb 2026 17:20:23 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLhDl1Qwnz3ZdD for ; Wed, 25 Feb 2026 17:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772040023; 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=NJkhGFj2VhcKwNEJoL2Jq5qdTmurkNR8AFBSelPT7jA=; b=FYSVseSmPKkJZLar13vzU8wCVT6nDi4YOyxVrkK+VHyTNOpxl0YhRKCkGfk7pe1uJxt/P5 rF2CqHqN+RD3OyWs6iKUFHge0pX6Qz6fJiXMesSgITbLenxDZYgTEH8cfb6appWOV5e2yS gkJip3h2HRYKTBJvlle/Kkt0nZyy9I4zdlvudicVcmElfGMYMd2zILbeVw0DClSnqhclke pMDSpoRDOlZupACnvVlGE2EWXapABePE+PEEoqKptzKH+p7iJie92bG4halKqRqBj8bd7n j+4J/vTqCVO/0rk0DmVDBENmCHoq/gOe/IOYSA7RDbShUISbW4ZBWmUXZ9GDpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772040023; a=rsa-sha256; cv=none; b=ZVH+KAYBgABAeFuDGt6JwrdWlzujbFtD4xqgFTtIramkDPkdzycJrdbWBU5i7ABfcaeLgr k2xJRLNoRcaWm+RythCYG56e4RTlCjRTtitZCT54jstXaXNVxrUknmZSFlMyGTDzTBWDGZ sP+A7wmWEDo8/FKlEkMjsHK2x0UUmCt4K6UkEIvBNTn6VHGG721Xy8w/x2MPRdZqmgWNia vD0GSTcQXyxueRvfGZB7OqiZyzqnFm/8r/HeFehE78iwmodWLBGgJJGhPnMVMjfdjVRIH/ MItfSdZoIdP3cUFL0RgwPWjGc24hFdnmsF/I260jTN862y6I97warizmdbd2Yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772040023; 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=NJkhGFj2VhcKwNEJoL2Jq5qdTmurkNR8AFBSelPT7jA=; b=yzBMb0JUefBXfX/FFuXwjr/U/xvz40fUmj7L28KTgtRITWd+NP7MFhxfQNv3kU475Tos3p GEBrpkcm7UL7pWPgPS26DHOs7E/tFQIKp3i5+2EBr5HMwffZcnPD+3/TBKgXsEC/3MAOWO A5NcfKltOQ6V34GWEKqJjMF0YnOQTavJWuVwuFyzl0VFS0/ugjHK0GSUbV0ryQWyAKbDQE YK2gAk7p/8gRF4tke2Sb82ki1nNq3wed4ireY6olTA1U4LL7Lyo1RTMZNwTA/4tFmAtMLS b36lGeU5Olx4BmwGs4MAPSUxNHgVOQenOUZZ4r1Mgpv36MsYiveQH5lMehym1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLhDl0HgXz19LZ for ; Wed, 25 Feb 2026 17:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37432 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 17:20:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 87ca74de89e0 - main - mlx5: convert GET_TRUNK_IF() to function 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87ca74de89e0ae96774674f7ae14d303fad5b780 Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 17:20:23 +0000 Message-Id: <699f2f57.37432.4a747006@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=87ca74de89e0ae96774674f7ae14d303fad5b780 commit 87ca74de89e0ae96774674f7ae14d303fad5b780 Author: Konstantin Belousov AuthorDate: 2026-01-29 00:25:01 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-25 17:19:36 +0000 mlx5: convert GET_TRUNK_IF() to function Reviewed by: slavash Tested by: Wafa Hamzah Sponsored by: Nvidia networking MFC after: 1 week --- sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c b/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c index bdbad6a084d9..325c70969306 100644 --- a/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c +++ b/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c @@ -418,24 +418,30 @@ err_xfrm: return err; } -#define GET_TRUNK_IF(vifp, ifp, ept) \ - if (if_gettype(vifp) == IFT_L2VLAN) { \ - NET_EPOCH_ENTER(ept); \ - ifp = VLAN_TRUNKDEV(vifp); \ - NET_EPOCH_EXIT(ept); \ - } else { \ - ifp = vifp; \ +static struct ifnet * +mlx5_get_trunk_if(struct ifnet *vifp) +{ + struct epoch_tracker et; + struct ifnet *res; + + if (if_gettype(vifp) == IFT_L2VLAN) { + NET_EPOCH_ENTER(et); + res = VLAN_TRUNKDEV(vifp); + NET_EPOCH_EXIT(et); + } else { + res = vifp; } + return (res); +} static int mlx5e_if_sa_newkey(struct ifnet *ifpo, void *sav, u_int dev_spi, void **privp) { struct mlx5e_ipsec_priv_bothdir *pb; - struct epoch_tracker et; struct ifnet *ifp; int error; - GET_TRUNK_IF(ifpo, ifp, et); + ifp = mlx5_get_trunk_if(ifpo); pb = malloc(sizeof(struct mlx5e_ipsec_priv_bothdir), M_DEVBUF, M_WAITOK | M_ZERO); @@ -478,10 +484,9 @@ static int mlx5e_if_sa_deinstall(struct ifnet *ifpo, u_int dev_spi, void *priv) { struct mlx5e_ipsec_priv_bothdir pb, *pbp; - struct epoch_tracker et; struct ifnet *ifp; - GET_TRUNK_IF(ifpo, ifp, et); + ifp = mlx5_get_trunk_if(ifpo); pbp = priv; pb = *(struct mlx5e_ipsec_priv_bothdir *)priv; @@ -516,10 +521,9 @@ mlx5e_if_sa_cnt(struct ifnet *ifpo, void *sa, uint32_t drv_spi, void *priv, struct mlx5e_ipsec_priv_bothdir *pb; u64 packets_in, packets_out; u64 bytes_in, bytes_out; - struct epoch_tracker et; struct ifnet *ifp; - GET_TRUNK_IF(ifpo, ifp, et); + ifp = mlx5_get_trunk_if(ifpo); pb = priv; mlx5e_if_sa_cnt_one(ifp, sa, drv_spi, pb->priv_in, @@ -652,12 +656,11 @@ mlx5e_if_spd_install(struct ifnet *ifpo, void *sp, void *inp1, void **ifdatap) { struct mlx5e_ipsec_pol_entry *pol_entry; struct mlx5e_priv *priv; - struct epoch_tracker et; u16 vid = VLAN_NONE; struct ifnet *ifp; int err; - GET_TRUNK_IF(ifpo, ifp, et); + ifp = mlx5_get_trunk_if(ifpo); if (if_gettype(ifpo) == IFT_L2VLAN) VLAN_TAG(ifpo, &vid); priv = if_getsoftc(ifp);