From nobody Tue Jun 16 01:17:11 2026 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (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 DB8564A07 for ; Wed, 15 Apr 2026 00:20:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776212420; cv=none; b=qv6lK1RqGh0cum+uEcDK0KzFGW5FmG5uENsepbp36Brf/t/HfN3Y3lh2FUZXW4f6vWJ9fc5yLlE0uL7g23/K5GIz0FFMVjF85D9nfm5oFoWM5VmJjiVD98Y95VFQoJm7FRjzOR1cFbDhIuajTooBQgaFUwHbp1mmDiDh6bvBk7g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776212420; c=relaxed/simple; bh=LeP2oP08iWfA527sR3xSm3hK0yGVnGcK8rykCpaWSGs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HmZXB4YIFYRMnmW762fMSVw7F+uHw3pcLtYLCgB/rkCSCReWOyXNCD0ulzuEV+cpDnuj6sIp3eQdcA6Zt1U+BaTRilUHRprz6eqGcpXG1dv+GIe+DU9NvxIFgFqyAqGu3v63CF+AS9HWx2bwNgqWrNK0Una5Z0PnAg+Z4fMQraA= 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=G3DHhfh4; arc=none smtp.client-ip=209.85.128.44 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="G3DHhfh4" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-488b150559bso48149635e9.1 for ; Tue, 14 Apr 2026 17:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776212416; x=1776817216; 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=+CcaICa7vcqzbMPnF104DyEZHT8VB+CnqUsr4qDqEA8=; b=G3DHhfh45SwN4W1vmoXqCdSnXKPnTFwtsBzFtEfw3LFA8zVCpnLNwDz0Han4P8ZE1+ IXECWfUDqle5hhFzdZICqsT+gMJr49CzoeBeJVZS/Gy6g446iRj0CYjhNtXhjB+CWUzM 87QOPP7eM1t2LufF8DmfwAVCDuphCP0W/PGFGSDjD2V633bBFN2UIbAIFJEBIDNKL26g OPO3nEyG8f0l1XIxXyyUaJd7hNQYO8sOG0eEfleP1Smi8jyIOgz/nirzinwvsUIMbC1k oxBqEGXZiYaw+WvYwAKUZW+zVb5Sa0tNhOH6pA+GhOTWX4GybZlPk+7X7gcwbLbiil2i Jexw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776212416; x=1776817216; 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=+CcaICa7vcqzbMPnF104DyEZHT8VB+CnqUsr4qDqEA8=; b=gAdbuQWI0UlF6NV1Na1S2cccbOHnI9uIMbfJLVlSH7e3abjjiJ9bo3BA/4VJJxI17l opq2rDSCNsMJr3CH8QeoZscrRtouFeyh1xQN2Fu+ymKQd/QKgmWj4nTDHtUSHQRjzxyc Jw5Irl8me6880rr1OwfBAiZw6jU+SHHKcBcfLGP3koHpvQeKlhS1J7yZUIDlEyzOE6Uu V1ugDuM7zfYamWkYvdn7+hk6HAIUkIU32VQMMAuaNA5jlJFnlVfhwYRMY9qj8oCb7+9N TIvzIppdXlUzQhQH92R/mzkMh4OAUFZEBe5cZvuFz6hNicB8sAWkuLe6AeKbCfaFYbXg vdKw== X-Forwarded-Encrypted: i=1; AFNElJ+MqAPhgGyYnmkJK03U81k4maHEASf8W/HLqhqan2gJrQX98Y3cHK+2TDQgNe4qmbMeldPSKyh6nYeaM/g=@vger.kernel.org X-Gm-Message-State: AOJu0Yws9UHpE/OQWLLRqeQUdpPRDLqygm1Lqt7d061h8zAMSA+2HbWj lpzdtU58f+T1yuwKzDpy6ibaNsEL8TZFEhzaOUTsCnBD+dnbDpCxA4EDoj0tagSs X-Gm-Gg: AeBDiesSz7RpI7k7rKKX1indirFymKROug09/byLWCmTrwTCIK7Gea17AF64GU7BNFy h534yxEQLWcICQdZBVTM2NMOd1qaWd9Gz33JwRtiGegFTl00D3RFLyjNKQq/XdVCtMJX5UYzk5n CeY53x7WdVSWKd89KcXeSvE8HU808JTjwAaiZRWQK7yN2OJUuDdqhDbKguZerONLe0bmsGb2Hmr MERjUmFdr40eiqWCmwSVrbsddC4ejJhi7OEl8fstWUe9y6defT31lY61sxmnYR0I2s3r2xHgXGJ tVprxhVKtLtwephBUgOpeoDayQDWO1/q4u2/RZZAfJUu+aMjXapesSVEIpOUP/iuyT9hdecAwlA VXZje+TM383AMXZGe7GMHDp2wtN+Wi65ArPA9QjYc3lyu3CS5lpMQA0Y22ZLMN/CqqcevTdLIiC eYoMLj6c49S7y1ZMgzWA9oCdetxkDJ7hEkEctZJH3preos0N3Ss7nHhKLHNj32AbFiYIaVnSqA9 juRsvE42XwrKfK/Vsaa+FPSCGyS9Te5Ggp5dgtQ/g== X-Received: by 2002:a05:600c:8907:b0:488:a14d:3d8e with SMTP id 5b1f17b1804b1-488d67f4c6fmr185812345e9.11.1776212416157; Tue, 14 Apr 2026 17:20:16 -0700 (PDT) Received: from SD.localdomain (heme-13-b2-v4wan-167795-cust403.vm32.cable.virginm.net. [81.108.45.148]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488ee03898bsm83149055e9.11.2026.04.14.17.20.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Apr 2026 17:20:15 -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 v11 1/2] IB/mlx5: Fix transport-domain rollback and initialize lb mutex earlier Date: Wed, 15 Apr 2026 01:19:45 +0100 Message-ID: <20260415002001.25702-2-prathameshdeshpande7@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260415002001.25702-1-prathameshdeshpande7@gmail.com> References: <20260415002001.25702-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 | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5= /main.c index e02bfb1479f5..b3b297bc2f2b 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, @@ -4486,6 +4490,8 @@ static int mlx5_ib_stage_init_init(struct mlx5_ib_dev= *dev) dev->port[i].roce.last_port_state =3D IB_PORT_DOWN; } =20 + mutex_init(&dev->lb.mutex); + err =3D mlx5r_cmd_query_special_mkeys(dev); if (err) return err; @@ -4786,11 +4792,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 Tue Jun 16 01:17:11 2026 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 14FD740DFB8 for ; Wed, 15 Apr 2026 00:20:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776212421; cv=none; b=il360m0KhrZsCRe2jLXR/CZoqOd/dVNRizJR0D51o62gvVidLIKJKHn8OtDxFgoLHnG2p+WHsnKPNvGz4uJg6acK2Rrh/5cYfQbn0F07j6QD5HCMXuSFr6p8L3zceTroePPc9zavryoCIFzY++64CF3xrksZcvJhFr+sg83hLng= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776212421; c=relaxed/simple; bh=wRRC+myoDRNiS3Chjt9jKzeFURG8nCHhZyCnT4uClAs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BRW1ipRaWtT5Rhg77AN7EOp8/GDUA9YB6bjS31QaUfJUwItBE5WncBqp0KMywW573jAg4o3FV/e3dG3U0PZY8AoG/4bLOpMWU8GhU32cSc2mMRZdL4q05XPpD0c7+W4ChznViILnBD0k5AL8Eqg1C3tOByoTRPj09YfFtrZOQs8= 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=bPeLgbeI; arc=none smtp.client-ip=209.85.128.46 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="bPeLgbeI" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-488b0046078so60832265e9.1 for ; Tue, 14 Apr 2026 17:20:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776212418; x=1776817218; 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=cTGfSgIst+cFmUNo9YdtWhV3CTyBFHxJWs4hrjTeAxE=; b=bPeLgbeIoVvibYJ4jPk0ICILTXd4K54AvqkwrJexOIuzaTExyo92VJH3UgfLXlmDir mTRY3TdUeXoTW5i8iyPfAhc792K7WaOEZf8sWhqvDNVmPDDsVPXvatFtW54v04WscbRX VfIzFW1esbuTQUMK16SR4THG/ZaAlGJP+fk1HOkGDRkAWbkja8vFh6EIYnKGsOKvktv4 1uHAAArVUOktgJ60ZldDUwmlAi90WQlOD+OZgODX1ew2/mAvELd+KRs1rb/qgEP2YOck tJm0mb+ZMdldUwbdfsdB//i7lhmpNY8zx90rO+Aiyh1tZJmNthpbLBMsp5Q7L+1w1ycv 2GJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776212418; x=1776817218; 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=cTGfSgIst+cFmUNo9YdtWhV3CTyBFHxJWs4hrjTeAxE=; b=Ds3kuYjyHil+epVkUGhTUxAbLlLlaSTbrCxswEbJTWqcojdBFhe4TmwZxH5M7JvA59 GXCAsqQUVT6dnpKQ8n7/SkA9RjXR0VfZqNjrucIW+mVcG+OOJOV3CSYGcucYVb1qGkE+ t0/p3SFk3jujLOjyBud2RYS18bY2uv4HP0pqDxF+iRTKeYGS24E/C3wtw6qrgUIzRL/b BmNNJCGJh1MtjK8NXszEdGguAw3HiOjbUDAzadSWP/kGivdDndtfova6um6xvkz8ISV2 EzmQtWmWDg20RpnXOdG/58fwc6GiGHZT36wjWHXqBIf9co08YfHdCzCPMn2AAMZhr9ES 2ARw== X-Forwarded-Encrypted: i=1; AFNElJ/7B7nsMIOlAlxglPkf21UNWWf7NvEo90wIbpkgDiAG7sXOCHm9lJSFfwaDbqtyQq+Nszml0gLisVTy/8k=@vger.kernel.org X-Gm-Message-State: AOJu0Yw678+sATd3ZcUWQN4nn1HdqkC9S5/NfyRyBHaDyiXE7u8Ia3kr SUbee6S8a4KDngin42TzxhxedA25zhQlpRyiHntEDPNOU4qxRwtEy/X2hfv4QqiM X-Gm-Gg: AeBDievq4J64/tr6EEiMTKyBtqcdBneMww9YgkbLKacjVVc52zilTo+VY1XUNvdXpEE bfWzbSTq+Agc5YnemGd8Z+gr+/cPPTIV6BLmZUsaYDcjtqwBpFzSo5vjK5OjSI+pW2SRw3pvmyj B/T7nTkWIqv/t4yoJLXaNGiUlATh52XUBQL/Z266qTI653qks7pXg8eUomt87XCWLQNUopKLuK+ GFJLAPTCNlMI8rC1gwBi3e4wzYAf/qm9pZBxShl6zYBm1plye2Xf13Dht8/7xR6AT8JkhxYDYn6 SdNUoiCkzSkgcJr+hSQzMrEyE6zsxEtrnnk24pZJLM/dsYIJXVIm4tzSUjT1fCzOFGwLWkPjpe+ dMdwKnRUc6tywKXbVic++S+oCFMx0F5sKE34EOoqUISS9nxu+0+rV1ZmxaQg2F8gvQNCrBATGMW 6pxpFD6CLXMLLwm1ZgmGaPDsO9EmAJ5Nlv4eKbaNKCUq7xNTdnLAK09EJny+18uWP1Li1Lnutfu 74kcW2td837i4d5H+tySdOHPjjzdRLxbQ+itZqzaA== X-Received: by 2002:a05:600c:c088:b0:488:a98b:b891 with SMTP id 5b1f17b1804b1-488d67bf75amr198310845e9.3.1776212418391; Tue, 14 Apr 2026 17:20:18 -0700 (PDT) Received: from SD.localdomain (heme-13-b2-v4wan-167795-cust403.vm32.cable.virginm.net. [81.108.45.148]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488ee03898bsm83149055e9.11.2026.04.14.17.20.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Apr 2026 17:20:17 -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 v11 2/2] IB/mlx5: Fix loopback threshold/accounting in regular path Date: Wed, 15 Apr 2026 01:19:46 +0100 Message-ID: <20260415002001.25702-3-prathameshdeshpande7@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260415002001.25702-1-prathameshdeshpande7@gmail.com> References: <20260415002001.25702-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" In regular (non-MP) loopback enable/disable paths, threshold logic uses a hardcoded user_td baseline and does not rollback counters when HW enable fails. Use a TD-capability-aware baseline for user_td transitions, and rollback user_td/qps accounting if mlx5_nic_vport_update_local_lb() fails. Per review, keep MP helper behavior unchanged. Fixes: 08aae7860450 ("RDMA/mlx5: Fix vport loopback forcing for MPV device") Signed-off-by: Prathamesh Deshpande --- drivers/infiniband/hw/mlx5/main.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5= /main.c index b3b297bc2f2b..6b1182b18702 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -2005,8 +2005,14 @@ static void mlx5_ib_disable_lb_mp(struct mlx5_core_d= ev *master, lb_state->force_enable =3D false; } =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; +} + 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) @@ -2018,11 +2024,18 @@ int mlx5_ib_enable_lb(struct mlx5_ib_dev *dev, bool= td, bool qp) if (qp) dev->lb.qps++; =20 - if (dev->lb.user_td =3D=3D 2 || + 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 @@ -2033,6 +2046,8 @@ 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) { + u32 td_base =3D mlx5_ib_lb_td_base(dev->mdev); + if (dev->lb.force_enable) return; =20 @@ -2042,7 +2057,7 @@ void mlx5_ib_disable_lb(struct mlx5_ib_dev *dev, bool= td, bool qp) if (qp) dev->lb.qps--; =20 - if (dev->lb.user_td =3D=3D 1 && + if (dev->lb.user_td <=3D td_base && dev->lb.qps =3D=3D 0) { if (dev->lb.enabled) { mlx5_nic_vport_update_local_lb(dev->mdev, false); --=20 2.43.0