From nobody Thu Oct 10 13:19:40 2024 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 4XPVj83HQQz5Z2Tv; Thu, 10 Oct 2024 13:19:40 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPVj82T4Bz4WcC; Thu, 10 Oct 2024 13:19:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728566380; 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=5p/sCNUNb0GqJw028bFPRtmMxOMu0BqF3YwPeoezvzo=; b=eu/ZfD2T7DXH4GgBXKy5BfVFN2o6m0cuxFcYjL6TNo2p+OxJXKXRwN+hdruQe4DENT7Mj2 FPPJtmHcEoiCYj4VCVm2L2qXcHI7ilLcH+NSQcWprJ/EDeu19kPqsclm5UNcuzmG9ZlNJU wNPJrTjPvkWwqYlfa5JNALKRAzC79FEJkAgmYj6FZD0/xZTN8NNwDy2qIe264qG1oO/xI1 2Q5EiCwrtOIpZO8b7vO2JzBa6+fb/ECr7e0dDg0nQ7CHRWKPbmkIjkTcouOfwy3LqvoLnk WuwB5NAaRw90kwDhUkgvO/tE/MAqJ0Vob9l5dAFovIsMAfGUf9dDCwag23CNog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728566380; 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=5p/sCNUNb0GqJw028bFPRtmMxOMu0BqF3YwPeoezvzo=; b=m6Ufd6sgr8Vg2p3zxX04r79zcl0jTq2ceEGN1ZXVMlYIBO2BwAJMPFQNxD/1E+Z5kCHFXi EPFZnu0YEd0VMRKSecxgMEpxfA/H/784BHJyGClMUSZ60R9LxzFz/mOLDK/sI8og8MQjXk 13SFzo/wXxFLZDAdfrbMLXuh2nkvTcyQNA+AOlwFOIEeJ+O80CL9F12QizDa150D5IjxzE P/MNR+psrJgWNAucdxGuahEMvZh70xO5RE4tqsel70nhSO9CcjsKI0q3u78nrlGlMGm2bb /Hr19YNZrYrPE1M4gOwQmHqrcwgX5B+drZy0r8Za1AodXPQVCUoxPqw821HArQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728566380; a=rsa-sha256; cv=none; b=qSesLidPhyeePa9HvIHgLXPAdMa8B1hGj3z9BPc0U0HqTc8ms9+SdyjXH8pFKMAVbzgK04 Hxjd88x9wvCtTFOJocqWLZYmR26D+L513RTUFhrPxFU7LnHLYoEbhbHV29lFBv83tQV5aW kz/uQYcn9N2YNhMuyh1X77h1LLr9sw7eeL910bv7lLJFczggPH64xpL2KdeWKlB0uk4doI jUudsvItycnZwnD3KLH1rvJowpTMBEuDaUB7/Ym+jEIhKQj+LIVShmGUI7LI9MRBl20Zxn vZqetX5XS83UzJQnXGACF+9Y3Dmh3bOTBX0iwVZ+yPsTDqMV6UVcreNetyYfFg== 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 4XPVj8240bz102h; Thu, 10 Oct 2024 13:19:40 +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 49ADJe1N075841; Thu, 10 Oct 2024 13:19:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ADJeDZ075838; Thu, 10 Oct 2024 13:19:40 GMT (envelope-from git) Date: Thu, 10 Oct 2024 13:19:40 GMT Message-Id: <202410101319.49ADJeDZ075838@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8e5b07dd0885 - main - mlx5_ipsec: add enough #ifdef IPSEC_OFFLOAD to make LINT_NOIP compilable 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: 8e5b07dd08853f5d910d826bf28d3ae5bccd5a63 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8e5b07dd08853f5d910d826bf28d3ae5bccd5a63 commit 8e5b07dd08853f5d910d826bf28d3ae5bccd5a63 Author: Konstantin Belousov AuthorDate: 2024-10-10 12:53:31 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-10 13:18:11 +0000 mlx5_ipsec: add enough #ifdef IPSEC_OFFLOAD to make LINT_NOIP compilable Reported by: kp Sponsored by: NVidia networking Fixes: 2851aafe96c1e357971f2b331fff837ead20522b --- sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c b/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c index 95afec40d4f6..159c82500a9f 100644 --- a/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c +++ b/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c @@ -328,7 +328,9 @@ mlx5e_if_sa_newkey_onedir(struct ifnet *ifp, void *sav, int dir, u_int drv_spi, struct mlx5e_ipsec_sa_entry **privp, struct mlx5e_ipsec_priv_bothdir *pb, struct ifnet *ifpo) { +#ifdef IPSEC_OFFLOAD struct rm_priotracker tracker; +#endif struct mlx5e_ipsec_sa_entry *sa_entry = NULL; struct mlx5e_priv *priv = if_getsoftc(ifp); struct mlx5_core_dev *mdev = priv->mdev; @@ -342,9 +344,13 @@ mlx5e_if_sa_newkey_onedir(struct ifnet *ifp, void *sav, int dir, u_int drv_spi, if (if_gettype(ifpo) == IFT_L2VLAN) VLAN_TAG(ifpo, &vid); +#ifdef IPSEC_OFFLOAD ipsec_sahtree_rlock(&tracker); +#endif err = mlx5e_xfrm_validate_state(mdev, sav); +#ifdef IPSEC_OFFLOAD ipsec_sahtree_runlock(&tracker); +#endif if (err) return err; @@ -359,14 +365,20 @@ mlx5e_if_sa_newkey_onedir(struct ifnet *ifp, void *sav, int dir, u_int drv_spi, sa_entry->ipsec = ipsec; sa_entry->vid = vid; +#ifdef IPSEC_OFFLOAD ipsec_sahtree_rlock(&tracker); +#endif err = mlx5e_xfrm_validate_state(mdev, sav); if (err != 0) { +#ifdef IPSEC_OFFLOAD ipsec_sahtree_runlock(&tracker); +#endif goto err_xfrm; } mlx5e_ipsec_build_accel_xfrm_attrs(sa_entry, &sa_entry->attrs, dir); +#ifdef IPSEC_OFFLOAD ipsec_sahtree_runlock(&tracker); +#endif err = mlx5e_ipsec_create_dwork(sa_entry, pb); if (err)