From nobody Wed Mar 4 01:20:23 2026 X-Original-To: dev-commits-src-all@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 4fQZbs0fqWz6Tvj7 for ; Wed, 04 Mar 2026 01:20:25 +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 4fQZbr31pWz3L4w for ; Wed, 04 Mar 2026 01:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772587224; 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=L8o1ci5HLD2xgv7GZCRrfecC/hLEUH2mqojDwJeX5Ts=; b=w5Hu4AXDwz6+k8m+e439GVTAqn3k64fVZVb5y5dPcIjWVrBmFqz1dN7INzk1gxuwXMh88H A6IHI8hnhVFEt98ba5Go+Is7DDYs9jSpJNM2CZ6ThTiEIIPdvyvC4UfBjfDH3WT1wRjW0Z UnVi0X4NGCQSW795aWNnYUuHna3Ah1SnjYw4CZWUwJMwNrbOB3AWzEVO0JK3MVMuYUsobe h9nHemqXWKnOvaEcBwVMLXxhgUbbbM8/QEvuhHD3x1YvCcy/JfWAKyuojHL6oRKovuWel9 cP2f+12fJ4qaWoMS3rNIujwBLt5mCMGG9qBjah5zpP0bfA9uaamVui7pMCoOcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772587224; a=rsa-sha256; cv=none; b=pJCogu+PCTavpZdVUAR4gKrh6eYJYml7YmauY/JrGCA4QYnCz2cLWuN6vPem9hCtweunao /d5hBdNilkXzWw4NT/t+LrXIcNrCWsxeKRZJE9lQhr8BGqpMJB4oVsnhVpnSZNP4zUoekc SSz59wxL2+aAr45gw71P9edpj5Lj5ACV2Gt4cN+g1PJMzM6RYHhwwM5WO0d6bJ0oFXOXfq TCmsPHI3Qt/4ynRcjjdSUEc3UaEk3VRtlel/FssFclAXrGoMZE10iH91LcrJzF4nwyCcZI zZjPSH/2oLQqQF67xEIX9vornCCDGTgRfSEBpxo0r+Pv+bmFNavzwZHwGMC3/w== 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=1772587224; 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=L8o1ci5HLD2xgv7GZCRrfecC/hLEUH2mqojDwJeX5Ts=; b=J8C0qZW5pAGc3DA336+HF+tintZ/orGFexfr2lzlIFelqOg+LPvw/pr7KTpQzeyTiSAGXX js5zfKer7KfOSb3/hMP0amN1AklqJWBEeqYox052fSW8zhC37zLl0SYcjyOwSgky8esTiE 4k+GTPLDP1x7OHJmBDRmsIh3cJeu7eh/GeojBmQ2/ovQ/m9CTosx7H8nqMp9jdHsSz1Hi1 nF8wDzSO3nr7BR1mOFapU7+ffKibmN0armAukuCDwc5f6AGRnlpg45CpitCIKm6d0YwD9P HykTWv0CSxTFuA+8BX27+Oi6ea+dTixLIEQpu5IAlD6dzwbEoHFEhR+E+utSjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fQZbq5hljzTHs for ; Wed, 04 Mar 2026 01:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18b2b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Mar 2026 01:20:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b17655c95c4c - stable/15 - mlx5: convert GET_TRUNK_IF() to function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: b17655c95c4cb313355de1ffd74cb8a4dcc1a053 Auto-Submitted: auto-generated Date: Wed, 04 Mar 2026 01:20:23 +0000 Message-Id: <69a788d7.18b2b.21880ab2@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b17655c95c4cb313355de1ffd74cb8a4dcc1a053 commit b17655c95c4cb313355de1ffd74cb8a4dcc1a053 Author: Konstantin Belousov AuthorDate: 2026-01-29 00:25:01 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-04 01:15:59 +0000 mlx5: convert GET_TRUNK_IF() to function (cherry picked from commit 87ca74de89e0ae96774674f7ae14d303fad5b780) --- 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);