From nobody Sat Jun 20 20:53:39 2026 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 306AB314A65 for ; Fri, 10 Apr 2026 00:52:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775782354; cv=none; b=ltHE00nBfGe/WmWVNUWOtmdlTkXA5frORdZVIXcz6F9JU/9mxDZvTgVICWV1U4Rv6v2DUM+BtMbLLZWxrg320bwzAf0JhPTA8r/TRfCEhrHlmwe+uV/96eSkGg3eX+yHTRl51lfXb29od57Un0h0hsPHI663QHUfFdfiR+7oe1I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775782354; c=relaxed/simple; bh=5xpLfgmznOqThzhOWpy2txoSbW6meHNUelMnc1s51kM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RWfKMmGwe/1DNT6+KU3ppaqLESMAcZnIukhb2ZVOqEgWR//BK1yxZ0+p3lhV4zW3bULzZnOx7QTXnTSIBpTjIFGZxsnIPGBUE9/h38qOnPsMJG8fUChToUlSvj0Dp68RvS/ovfSj8FZyYMKSagb1EqHSdOpBFbvKZ/W+iFqKcMY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lKpTS/bS; arc=none smtp.client-ip=209.85.128.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lKpTS/bS" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-488a4bc360bso8147355e9.0 for ; Thu, 09 Apr 2026 17:52:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775782351; x=1776387151; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P2lfBh3OiNADt8pKhCYVYWBN8nfUz+AvYZosbodFys0=; b=lKpTS/bS8qimSjLPBV0WTODPuNkhuos/1EYvC38edFDU+EedPZEH061lMY0IOslLrC AJ5yxCr5rVqecVyD22sjpa/sbzuaSUtT9GBlut1Yib2LJzuPD0CKkKJyTCnwl4sLPrA8 eT4A0LwId5rPmJGQ8h859O1FcVHZw2l6QBgFvmhuzAsPxYFabRS+3CbaXnB2/UZUo58M 0b/A/FeCZy348VRlLIwGwr8H+YgQE532KpoJ1o4ywX3DJ+a5ic24dDSFACGNN9bKbuMm wq4yFhWYvu9XpJiW/InWqscuXoQfTD1RlpAbeIqIWJGp0Hou+6Z4h3KU8yuQkDa84qaI NLaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775782351; x=1776387151; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=P2lfBh3OiNADt8pKhCYVYWBN8nfUz+AvYZosbodFys0=; b=ijffiJhgCNkzzbCwr5Xlak2Z2mOC+EWLkzLaGHzZaneLxJ1aSvSGEfkUJRKGANyEfz QZqktEtbR5IJ4PinfD4yZnyH0+tBBCyOm/d+2Z8EEEv7hfWqeCpQRRmfeLJmVldK4WOT c+5aHGzZEJQnsxaBDZc4Uw04g837QP1XZgy8V/Hkxh2KRjTETirD2cGRusCZhVzHLYMc zOQzcC+fgmhi9XgS4ovSKwEIfnD2UkzHpKFG1zoDRoa8eo8a+Ndbdv7y0iK5bIc3jI8x UdU+oOGga5G2T/I2wEbgP5eU9fPy+iXJUiRa+yx0yBj7Ta59cEjWcWb/xspOfwMjSvN7 ie3Q== X-Forwarded-Encrypted: i=1; AJvYcCVW8MOcG1L8l83kiMQgYcCzUJ4GSBfJTZQTJH6lw2eHE+XEJ+dNpC8pbx6ysoZ4+sssVg6qDF+w//WD7Gk=@vger.kernel.org X-Gm-Message-State: AOJu0YyT/jR3OoZ9eaUnaRysez16xfj1/Skg4VF7Zzb3ABV1Xsb9iqK7 xC19UrwPBLbxeLmjjCZWRf/EjrMhmntabBEyqFIN5ANZVk8aAatzXVVO+f9uQCVd X-Gm-Gg: AeBDieszwTsDvC4Au9pX15tJ9JaK2hsPx/pjy3YO3W3enRWX41UzyQhK5HhxagCG7vF YDYEWUyJ3FvgElXFCFt7AwXKg3o3MUG4a0i05A89vTXVLTViJKAnPi7WwWaFpWOJXUld8l9kjQT /651XYlWdlrVxSiOBbD2/uhLODbUX5EGliAB/TAY/6zvg8pUxUXekEwDnyDMo1vPeXiirjt1GBU 3UpkQEtHqkUweu29Wp/dxI6nbVH5nnCS0wxUCjVZ4zYwJC/mCfvPj8mmODDoSQ0gt7NcQk/jxcX CTk0wkK5OblyhK9neEhjLnovZFNfndmXtLQRLUQ0m0u4zix5aTJlIEPM53iwcRU9XDl4vRazEKq TIlPdHl5zzlVZ55H8wjKWwn4KM7MePp8W/Vxuad+lMMqmLAKzeECXYxVn2Pm25Vsbb8V120AaK5 IR3WF48oTIjwGhbEPNcmoPTLmbZVYs3U2xOZ2FV0GeWskjWZe2SaWt3R7EWVrkAivTRXauSiP6h BCpOHdzTn1ym6B6GB5RHeONMj9AY2fr590bhIs+F1sXSSxN X-Received: by 2002:a05:600c:45c9:b0:480:4a8f:2d5c with SMTP id 5b1f17b1804b1-488d689cf9emr9658985e9.29.1775782351429; Thu, 09 Apr 2026 17:52:31 -0700 (PDT) Received: from DESKTOP-NQ2T5I7.localdomain (heme-13-b2-v4wan-167795-cust403.vm32.cable.virginm.net. [81.108.45.148]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488d67b4903sm8508265e9.5.2026.04.09.17.52.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Apr 2026 17:52:30 -0700 (PDT) From: Prathamesh Deshpande To: Leon Romanovsky , Jason Gunthorpe Cc: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, dledford@redhat.com, haggaie@mellanox.com, Prathamesh Deshpande Subject: [PATCH v9 1/2] IB/mlx5: Fix transport-domain rollback and initialize lb mutex earlier Date: Fri, 10 Apr 2026 01:52:17 +0100 Message-ID: <20260410005219.5197-2-prathameshdeshpande7@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260410005219.5197-1-prathameshdeshpande7@gmail.com> References: <20260410005219.5197-1-prathameshdeshpande7@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" mlx5_ib_alloc_transport_domain() allocates a transport domain and then may fail in mlx5_ib_enable_lb(). In that case, the allocated TD is leaked. Fix this by deallocating the TD when mlx5_ib_enable_lb() returns an error. Also return 0 explicitly in the no-loopback-capability success branch, and move dev->lb.mutex initialization to mlx5_ib_stage_init_init(). Fixes: 146d2f1af324 ("IB/mlx5: Allocate a Transport Domain for each ucontex= t") Signed-off-by: Prathamesh Deshpande --- drivers/infiniband/hw/mlx5/main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5= /main.c index e02bfb1479f5..6be198c0651c 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -2068,9 +2068,13 @@ static int mlx5_ib_alloc_transport_domain(struct mlx= 5_ib_dev *dev, u32 *tdn, if ((MLX5_CAP_GEN(dev->mdev, port_type) !=3D MLX5_CAP_PORT_TYPE_ETH) || (!MLX5_CAP_GEN(dev->mdev, disable_local_lb_uc) && !MLX5_CAP_GEN(dev->mdev, disable_local_lb_mc))) - return err; + return 0; + + err =3D mlx5_ib_enable_lb(dev, true, false); + if (err) + mlx5_cmd_dealloc_transport_domain(dev->mdev, *tdn, uid); =20 - return mlx5_ib_enable_lb(dev, true, false); + return err; } =20 static void mlx5_ib_dealloc_transport_domain(struct mlx5_ib_dev *dev, u32 = tdn, @@ -4513,6 +4517,7 @@ static int mlx5_ib_stage_init_init(struct mlx5_ib_dev= *dev) =20 mutex_init(&dev->cap_mask_mutex); mutex_init(&dev->data_direct_lock); + mutex_init(&dev->lb.mutex); INIT_LIST_HEAD(&dev->qp_list); spin_lock_init(&dev->reset_flow_resource_lock); xa_init(&dev->odp_mkeys); @@ -4786,11 +4791,6 @@ static int mlx5_ib_stage_caps_init(struct mlx5_ib_de= v *dev) if (err) return err; =20 - if ((MLX5_CAP_GEN(dev->mdev, port_type) =3D=3D MLX5_CAP_PORT_TYPE_ETH) && - (MLX5_CAP_GEN(dev->mdev, disable_local_lb_uc) || - MLX5_CAP_GEN(dev->mdev, disable_local_lb_mc))) - mutex_init(&dev->lb.mutex); - if (MLX5_CAP_GEN_64(dev->mdev, general_obj_types) & MLX5_GENERAL_OBJ_TYPES_CAP_VIRTIO_NET_Q) { err =3D mlx5_ib_init_var_region(dev); --=20 2.43.0 From nobody Sat Jun 20 20:53:39 2026 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4001D317146 for ; Fri, 10 Apr 2026 00:52:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775782355; cv=none; b=EZiR0o/58ATmrLsVN/VGrjG1EfJO2dz1Size+nSR8pwFDjXru7bejUHuieYRXAxjfVlHHWI2LD086q05/S8RltlY/xQlujpnwvBEsm53cQcHv0MicFc9yZNqiE69DF9SdqPTf0ytde3xtXk4OxqUTqgYa7Hl7k65xMrgAkgp/uI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775782355; c=relaxed/simple; bh=AzK9ruia8Q87pTv0kbUNrH9po6XlPjhIs72J+aJy4qk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NLdlTnz9hjyRiUBFxeJAOeiXNolPsWRFf8JoBm5OCKfwzAWlJZaU+NDK+Cv4WptaWib7w2zmPHw+C+fVtV3hd6xVDu0eh/Pk1th2czH8+pKJQ/ba0U94XInPDSbVK4Nrp1d9DvePCps5rSTp0wp6toU94XwIST1cxOIcDjF37iI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=K/V86Vaw; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="K/V86Vaw" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-488a88aeec9so18533975e9.2 for ; Thu, 09 Apr 2026 17:52:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775782353; x=1776387153; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SLgSuAiphf84lF6XSAXW7SBQ6kFrrEH+AhQsxWrl6jA=; b=K/V86VawsDbtK7h0C1poS645DEzuhXJSSSdciQRFmkbw+NN52QsR8zX0Eewz+VhwqW BZgUHfst6CEZRAzKiRNqTJVwvG6cWBL4/USJPiAAjLb7vtS9gnIKh+sNG+Jfi6qXZFSA +RURRo8sUbjp/U1PfBltau06dZzWeLYiClXFWdOAliWoH6qUy7Q++B/ZjR9vEwx7PQXp VaJ2V+d4TaYWrVuuxKVojhBWnQ0DJvAYhiZ89JXW9gDBsrQJH/tq3lH6SVNixhxmbJ0F ZVD3sQNdhPK4s7Ld37hI2KyjyRJ32MOuwHPM+hJu3c0r3X89rMfmuvetAWbDTQlDAetN npSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775782353; x=1776387153; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=SLgSuAiphf84lF6XSAXW7SBQ6kFrrEH+AhQsxWrl6jA=; b=gutQ2iz0Xa/9/25cxBbCDwABh0tmtdaz4blzyBmtf3+9S1W/dcs/Y2f2akWDNBqzGM S+Q83IBnfPmEFCrfzcFbJMbnvwTbt1aTcPtzMrLu1z3X5DMbxnchbROZzx8GZjoGTNQ7 sOTTBluMhFHi3i9tpzhdCchnPJjudvpy0uST1ROAfQeEeEke7eb0EjhkTcihm05hPQAA fFxcnkck9qsgNqD7GfBSeWaN8x9VEByfrH153y9TwpviWooGIieQmZWQsTT+bSbT23g1 sdjrbsPyKxN0Z7kfP+kmRv4oPZXjHXqv+LhY3ECMLqzAIsR4oX92E8BR63/AsoHvcElE ktzg== X-Forwarded-Encrypted: i=1; AJvYcCXUnXx5g597fzyhkd4th1/UcZ3XDLwpaCmyPi2hFiXNZEqi+N053Lq9PECtJcpSIvt/yRFp6aSR+OMD3TY=@vger.kernel.org X-Gm-Message-State: AOJu0Yx8tTRhKvcyewImW2nSO85wQUaxXpdSkC6hkoZN0BbpM/8rYZNk crK+x8X+82iqMaQnwD9+BM15IH4Ze166klEOlwDk4N5yRzVco+2X7VJC X-Gm-Gg: AeBDievFB4rh1rUaTO3v82STwMShJcXA5IaHlGp6XXGVhEmQOS14LzwvN5qEml+mS2Z lqSuWKa6G6qLswngEN5oiwo3TzBHEr1X7Zy8A5106Kp0F6j1C3jqFarFrFmi/WnJ87GAU+5XeJs 3HJc0i+GstCK6V5iNlT8bbHxdP7Yu3lhxsZ2VVhMm8qzdAxoTngRXxACxTpcFKYUeKn6JnDkozp LlktP4+bPtG6jtS2OMOTlh3AWohefbxkEsxPm1j5cs9d40/fj4OlqUZUozR9Rmk4N5DiQ4IBVDC Rp0YOdFFQj+yVHQMJzj/M2ljLsfEu3/fMBRGwC6aXgWcivd9pjQBbgzQKBFswW9D35TYUKKmfOP 7B3anAD1HgOF46/5D9ElMQBp9Q4nrq+3kUUD9bHWVtVfRp9bXb9YdhaKr1JcHwSgW+cZHnkP9SG R1SMFe3vp/DStWY1Xyb6Xlpqq1/8v1yZFe/yT5+fpEFIz9oKO7DKcjMVaWeNR7gNnFfDGQkjOdl X7L3NsNgcsHzM1VM8G4wI+H/e0TNvriJy3fHSchWMg7CQXo X-Received: by 2002:a05:600c:64cd:b0:487:21c7:2885 with SMTP id 5b1f17b1804b1-488d67df57dmr10982015e9.5.1775782352671; Thu, 09 Apr 2026 17:52:32 -0700 (PDT) Received: from DESKTOP-NQ2T5I7.localdomain (heme-13-b2-v4wan-167795-cust403.vm32.cable.virginm.net. [81.108.45.148]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488d67b4903sm8508265e9.5.2026.04.09.17.52.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Apr 2026 17:52:31 -0700 (PDT) From: Prathamesh Deshpande To: Leon Romanovsky , Jason Gunthorpe Cc: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, dledford@redhat.com, haggaie@mellanox.com, Prathamesh Deshpande Subject: [PATCH v9 2/2] IB/mlx5: Serialize force-enable state and preserve loopback accounting Date: Fri, 10 Apr 2026 01:52:18 +0100 Message-ID: <20260410005219.5197-3-prathameshdeshpande7@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260410005219.5197-1-prathameshdeshpande7@gmail.com> References: <20260410005219.5197-1-prathameshdeshpande7@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" force_enable is shared between MP bind/unbind flows and regular loopback enable/disable flows. MP helpers updated force_enable without lb.mutex, while regular paths read it under lb.mutex, allowing races and state mismatches. Serialize MP force-enable transitions under lb.mutex. In regular loopback paths, update counters before checking force_enable and roll them back if HW enable fails. Also keep pre-existing master loopback enabled when MP enable fails on the slave side. Use a TD-capability-aware baseline for user_td transitions so threshold checks are correct on both TD-capable and no-TD hardware. Fixes: 08aae7860450 ("RDMA/mlx5: Fix vport loopback forcing for MPV device") Signed-off-by: Prathamesh Deshpande --- drivers/infiniband/hw/mlx5/main.c | 67 +++++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 12 deletions(-) diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5= /main.c index 6be198c0651c..5038053cc9cc 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -1973,25 +1973,45 @@ static void deallocate_uars(struct mlx5_ib_dev *dev, context->devx_uid); } =20 +static inline u32 mlx5_ib_lb_td_base(struct mlx5_core_dev *mdev) +{ + return MLX5_CAP_GEN(mdev, log_max_transport_domain) ? 1 : 0; +} + static int mlx5_ib_enable_lb_mp(struct mlx5_core_dev *master, struct mlx5_core_dev *slave, struct mlx5_ib_lb_state *lb_state) { + bool user_enabled; int err; =20 + lockdep_assert_held(&mlx5_ib_multiport_mutex); + + mutex_lock(&lb_state->mutex); + if (lb_state->force_enable) { + mutex_unlock(&lb_state->mutex); + return 0; + } + user_enabled =3D lb_state->enabled; + err =3D mlx5_nic_vport_update_local_lb(master, true); if (err) - return err; + goto unlock; =20 err =3D mlx5_nic_vport_update_local_lb(slave, true); if (err) goto out; =20 lb_state->force_enable =3D true; + lb_state->enabled =3D true; + mutex_unlock(&lb_state->mutex); return 0; =20 out: - mlx5_nic_vport_update_local_lb(master, false); + if (!user_enabled) + mlx5_nic_vport_update_local_lb(master, false); +unlock: + mutex_unlock(&lb_state->mutex); return err; } =20 @@ -1999,33 +2019,53 @@ static void mlx5_ib_disable_lb_mp(struct mlx5_core_= dev *master, struct mlx5_core_dev *slave, struct mlx5_ib_lb_state *lb_state) { - mlx5_nic_vport_update_local_lb(slave, false); - mlx5_nic_vport_update_local_lb(master, false); + u32 td_base =3D mlx5_ib_lb_td_base(master); + + lockdep_assert_held(&mlx5_ib_multiport_mutex); + + mutex_lock(&lb_state->mutex); =20 + mlx5_nic_vport_update_local_lb(slave, false); lb_state->force_enable =3D false; + if (lb_state->enabled && + lb_state->user_td =3D=3D td_base && lb_state->qps =3D=3D 0) { + mlx5_nic_vport_update_local_lb(master, false); + lb_state->enabled =3D false; + } + + mutex_unlock(&lb_state->mutex); } =20 int mlx5_ib_enable_lb(struct mlx5_ib_dev *dev, bool td, bool qp) { + u32 td_base =3D mlx5_ib_lb_td_base(dev->mdev); int err =3D 0; =20 - if (dev->lb.force_enable) - return 0; - mutex_lock(&dev->lb.mutex); if (td) dev->lb.user_td++; if (qp) dev->lb.qps++; =20 - if (dev->lb.user_td =3D=3D 2 || + if (dev->lb.force_enable) + goto unlock; + + if (dev->lb.user_td =3D=3D td_base + 1 || dev->lb.qps =3D=3D 1) { if (!dev->lb.enabled) { err =3D mlx5_nic_vport_update_local_lb(dev->mdev, true); - dev->lb.enabled =3D true; + if (err) { + if (td) + dev->lb.user_td--; + if (qp) + dev->lb.qps--; + } else { + dev->lb.enabled =3D true; + } } } =20 +unlock: mutex_unlock(&dev->lb.mutex); =20 return err; @@ -2033,8 +2073,7 @@ int mlx5_ib_enable_lb(struct mlx5_ib_dev *dev, bool t= d, bool qp) =20 void mlx5_ib_disable_lb(struct mlx5_ib_dev *dev, bool td, bool qp) { - if (dev->lb.force_enable) - return; + u32 td_base =3D mlx5_ib_lb_td_base(dev->mdev); =20 mutex_lock(&dev->lb.mutex); if (td) @@ -2042,7 +2081,10 @@ void mlx5_ib_disable_lb(struct mlx5_ib_dev *dev, boo= l td, bool qp) if (qp) dev->lb.qps--; =20 - if (dev->lb.user_td =3D=3D 1 && + if (dev->lb.force_enable) + goto unlock; + + if (dev->lb.user_td =3D=3D td_base && dev->lb.qps =3D=3D 0) { if (dev->lb.enabled) { mlx5_nic_vport_update_local_lb(dev->mdev, false); @@ -2050,6 +2092,7 @@ void mlx5_ib_disable_lb(struct mlx5_ib_dev *dev, bool= td, bool qp) } } =20 +unlock: mutex_unlock(&dev->lb.mutex); } =20 --=20 2.43.0