From nobody Sun Jun 14 18:58:25 2026 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 48879383C74 for ; Sun, 5 Apr 2026 21:57:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775426280; cv=none; b=uUVpgphtDQ/dc+N/t8H4S6Cyfy+4URi2BErON1QxuUB/U5QdAHIMRbLv5HWa8+ch49vjGGskPAlx3snQvObrUQODrW6OfKdB2mX6LOPzh+IHgTIlIkehfypYioeULd8LWKJco5G59fWDEwyxHSeUqhKnVEWmjt3xVNV0qMLM2pE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775426280; c=relaxed/simple; bh=DdsGXKq7JrIi6Ap2XlQ6ivb0KWDCoxWf3NDaNcl8uRM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YHbaJ8KP0PPEq8yEyKTcrY0lby+pKuSK4Gyvv76iY2ezAuy+fWTFtjvSxOL6kfvWwfavXvJ6kF6TpEKiFfIxyrQumIJBswXK1GRLVJEbxDi2BPqAv9xIk1WbWIIeCCsiDYLbIpEBHwtdMWEbuAJuKvvpxBIHOocrinJntP+5DiM= 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=mkmthDRa; arc=none smtp.client-ip=209.85.128.51 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="mkmthDRa" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-48896199cbaso27390645e9.1 for ; Sun, 05 Apr 2026 14:57:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775426278; x=1776031078; 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=NxHEOhMOVO/qSnCy85SUvcOrw4K95Fgay2xDlWGFRLU=; b=mkmthDRaH74shdqey89bMUVC9zSDyCGxatKCPdY6R1mGDD6jF0fYOcaZu8uMAS1dH2 1QZI22hf+8BV7eysBxkts0SppAQyJWj3ZE7/8j9UYoJJJK9gQusx0R6ES0vmVAKjV+eH Jf7Jv8qvlqsnJ8nGFVd2OEyydo3xsM28pZg2tFxuXBZWBDJZkax2YAadfFgJPBROaYTE L5f6RXOkbnSEHwVg7ko1bjdjUy63ukawBKBcukNS2foVrO25Aka3mbTxaF4Djcet6LUZ av/XiY8DpGkzthG6NPlfMBntHRekmbGIsFwL98j5aCekxez6y3kLiBght2eclFJKbWou hCNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775426278; x=1776031078; 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=NxHEOhMOVO/qSnCy85SUvcOrw4K95Fgay2xDlWGFRLU=; b=kqRH/veSyEPW0XIjr+9OFw2UZx06vbCDXv1u07t6wUDIzfAQzCTQPp5wKVsqfDR7Se ZRmcFzTgAgwf3omjheapP0NdMzkI6S0Pi2AsNOnt6ZT5HJYpAn9iy2OGgY3DGMGinGUi qAUT014OBxiMVTAW/5AMsfYHQY2aENQcs3MKbgiBM5soQs6Vse53x+ZitxtJSN+R8wGp rw3nHKWIL0MvJow/n9lEAUtQ6JJo9a5noVkvf0ZX04P3G+rdurhL749Pmq8OEVkN4FHm g0cm8V4KPE9Mn5GlOfh377hLDUUZSVCopf/7Ikb+WD6bcPj+oFmhfgWRTpEl0VLcvW3B GxlQ== X-Forwarded-Encrypted: i=1; AJvYcCVJa+7FlWIY20xwYWI4TsAUXbBHZuRytAKCa7DqIJlDl5FKYTkJOIeoVBLhNj2caxl7cCZgxGePh1jf7HQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yxe8v9OW0mBXd1RbiVjgRVv+y1eNnL8U6A/F1MOYWX2K1OVt8mz uZPF13TTzuoRj3a3RO4WlBv/etLWJpQBQ8o4Gvl1Gdq7fRvTQJtXyzlG X-Gm-Gg: AeBDievEV7Gxlpmbt5FXlYlD+ONEUMaa45fntNU8rGbmWYd9KLkaMqk2VolIFy+1cIw OOxjHOEysXmD6f60ZDPgUO9lgp1Cx+TUY6gsLYPJoqlYc4UP1xXyi5VusBPjL0IOYjmkwH7jlhh 9GE4/Xmj7FubtEmn5mlitdf6IhSDoc2CTUYlp+kWxwuRqp4lONf8TMft9f3mwz2fYAkO85meNdF ykiZYNC5372/KsWBHQbfJSdmbCjk/BbZGg11FLwzAKSgtlFLatUAQ80GtI66F7MVq2cG/8gmg4M FVsm2B/phYjWgVpxSWjHDEPV2zIv1kK3IuaRRJynDah8Mo4i77XLQE6I4ecONFbwqLh9E0fTBE1 ZBH96elo/5IlpvVi4AAG+IivreJUeh4yUZ7YDbWQbUJRRQ4XdEDZikvPWHh85SIMQvTpQ+ZAg2b iUhghKjiNMvfWXPyvSa2FAWN6QkoBbqczQE1gu6SC0/UURpIZNh82bRv/tnzZpM4lOh9OWgrIiF BbdTC/L0x/vIa+2k9WORi08IBdOK0kHFplggDZne9stR4eo X-Received: by 2002:a05:600c:820e:b0:485:40c6:f507 with SMTP id 5b1f17b1804b1-488997ee0bdmr157827325e9.30.1775426277589; Sun, 05 Apr 2026 14:57:57 -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-4887e822227sm479479095e9.4.2026.04.05.14.57.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Apr 2026 14:57:56 -0700 (PDT) From: Prathamesh Deshpande To: linux-rdma@vger.kernel.org Cc: prathameshdeshpande7@gmail.com, dledford@redhat.com, haggaie@mellanox.com, jgg@ziepe.ca, leon@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 1/2] IB/mlx5: Fix success return path and mutex initialization Date: Sun, 5 Apr 2026 22:57:17 +0100 Message-ID: <20260405215718.19301-2-prathameshdeshpande7@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260405215718.19301-1-prathameshdeshpande7@gmail.com> References: <20260405215718.19301-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" Fix an incorrect return path in mlx5_ib_alloc_transport_domain() where a success case could return an uninitialized error value instead of 0. Additionally, move dev->lb.mutex initialization to mlx5_ib_stage_init_init(). This ensures the mutex is initialized before potential access by create_raw_packet_qp_tir(), preventing a null pointer dereference. Signed-off-by: Prathamesh Deshpande --- v8: - Resubmitted as a fresh, independent thread per maintainer request. - No functional changes since v7. v7: - Split from the main loopback refactor into a standalone patch to improve bisection and isolate the return-value fix. v1-v6: - Part of the combined "IB/mlx5: Fix loopback enablement state and=20 resource leaks" patch. drivers/infiniband/hw/mlx5/main.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5= /main.c index b74bf2697655..f49f746bc5bd 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -2068,7 +2068,7 @@ static int mlx5_ib_alloc_transport_domain(struct mlx5= _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; =20 return mlx5_ib_enable_lb(dev, true, false); } @@ -4515,6 +4515,7 @@ static int mlx5_ib_stage_init_init(struct mlx5_ib_dev= *dev) mutex_init(&dev->data_direct_lock); INIT_LIST_HEAD(&dev->qp_list); spin_lock_init(&dev->reset_flow_resource_lock); + mutex_init(&dev->lb.mutex); xa_init(&dev->odp_mkeys); xa_init(&dev->sig_mrs); atomic_set(&dev->mkey_var, 0); @@ -4786,11 +4787,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 Sun Jun 14 18:58:25 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 9218A38424A for ; Sun, 5 Apr 2026 21:58:00 +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=1775426282; cv=none; b=dRav43x1i5tEZPcPYOhrwspm5W/naRa+kqJIE+3iLvUwrgWQrGOVWu3WTjPCs//njklu6PO+9eR07Ga3CqLiXc3rV7T9NIZPq4LsKu+YZOTIPHOh0NncyhynKFOWGYpaF2Hx8GaSxB7ZSv1wyS12ob+45w4cAeHFtQlfLpAuPO4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775426282; c=relaxed/simple; bh=9PgSB8kogVBI6kHUCqIahqOtnI0C8AyrDlTTT0+XSNs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aO935lJLBHkkKSpotTbacXOD/w2Q/z+r/5Mnx0doK/xH6wImTytjB575Gy/l1Hqo2xakeTo9KCRK+79ecPNa6yb+zACQdwU+/WJaGV5EFG9VKzux0gLltDy5Hbj7Rvs/ygX0fusNbcHrZ3yQbPB7hXjmb85hmvnAEwlNCkA55DA= 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=Psy7yL6y; 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="Psy7yL6y" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-488b0046078so4505885e9.1 for ; Sun, 05 Apr 2026 14:58:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775426279; x=1776031079; 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=p0RodKviW51tNwaUnbNGUJi1Hu9hhGtdKumi2ui2WlY=; b=Psy7yL6ykPJlGPcYCjH+/wzMZOMkbH94ezRDlsKzHlO633ZtmOYUpC9Phn23nBDsc7 tRzsdp3mOukmjDlIzEohdww0FO9SWp0ZlBCC9L7ilkfXrjiXvzC8ACGib23EZIYoE/zl oweiCG3rn+mdRwSKc1euyWl2NfZBO85TnBb0VlNvcAhFg1ZuC5obIbfZXILm+gDRu+tO LSHUC1xnLUgtILzRl6JIrKdDBa4DWeU+e6LpQDUaCE2Me06MlTi4xC0rROfFGOxO4mTp XsYQ6GBA+u4sNzBpUuQaE3522QjMyYJ7BeVtn3+5UqsWhFtMm1a9emu9yAvZx/9EQdU1 WWfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775426279; x=1776031079; 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=p0RodKviW51tNwaUnbNGUJi1Hu9hhGtdKumi2ui2WlY=; b=HZZZj6KpBLo8egJttY/1HkGiYMEB++iRk0nAfeocis6kURlAAtvVgDBfQKqcX4VJPe 6gMQg4m2jkhdSDUY0YxUIuytPY9TFsul1SUEd/NV4Cu8UmEAsk7ZBe9TT72DzKk8C1Zr iiqbUKKCoiu5XMVh//PwkO7UiXdoyiH+W+0H7KuGgDSei/RK3TchWuwU55GB6yU9QMs5 3OYk2AlYYVRlVZBOsvULnykUh0qEXWeMwuFEOwKla4RfKsaEhTlOmMJU77Phu7DGbAt1 YpfxPGFbl0MLXh4Ti5CFzwlWCrYel/LMSo6Gj4peVtc+/ReAuh0OgZ11TjxF+vV9aR0e a4BQ== X-Forwarded-Encrypted: i=1; AJvYcCV16RA230rhcQLFrQE655JM+dxOU2jBdjKeW1bF/7hA3GhIr6rh4dYcj8aTZ2yCZvse/6MD9F6EinfpPuA=@vger.kernel.org X-Gm-Message-State: AOJu0YxrW4K3W/j24sghTlc3LIgCBvWkctneNAtrKTUOc29j+eb5uI5v ChUS8zFOwVW+cT4pdlyoIKUNBiCyLRCig8pH5j8rw4LRgQB8hYIhzZwG X-Gm-Gg: AeBDiesBfrX04L7+hJ2ozZ53P3TkoNCvkVznWZwvRL9QXTiawQyQoheBqoQhcjXPU/I ELm9W972+2WqfasxCxUKxkCviedGjS9ikPlBVBxPm6uyShYCM95EqJkWB73pacfbQRc11jHn+Im zsPAmlTK5h095mMLfZUqvZxj/J/BGKpK3Yr0a+4gmSQ+jQ/jAUfCcVggUm5O5S8wWWtqsW+ALbo ra+RBIcrEDoNLIJlLfNQIjZvTZB9hxH6wSmQGUoiEhB9piGSNBIdEx+96YpjbzXsHOLxAHkL+Q3 t+olWJfrR6h/Ctvv85N1HEikyWRGcIOBz2O0834raY3xXmLfKC28R7TrvTijcB7mqp4tBJTTas7 GOTatClwr5TP9VK5ttp5XBZraDtoLFieiQshYoqXGulfLmAFSz+p7p6FWbqSSNUsYjxpOVTwVUU myZ+l04YizDt+dPm3S55ZS+yqHMH6J5t4yIw6Ncxoe/lcZnc15a+9pNOaPh+5uqCMYTYhXCivq7 ukvhrVZ11EguIb1B64gXaPl2TnXJlcg683617kFTl4nb99J X-Received: by 2002:a05:600c:530d:b0:485:3692:e8f7 with SMTP id 5b1f17b1804b1-488997b7d62mr156567995e9.25.1775426278993; Sun, 05 Apr 2026 14:57:58 -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-4887e822227sm479479095e9.4.2026.04.05.14.57.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Apr 2026 14:57:58 -0700 (PDT) From: Prathamesh Deshpande To: linux-rdma@vger.kernel.org Cc: prathameshdeshpande7@gmail.com, dledford@redhat.com, haggaie@mellanox.com, jgg@ziepe.ca, leon@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 2/2] IB/mlx5: Fix loopback refcounting leaks and premature disable Date: Sun, 5 Apr 2026 22:57:18 +0100 Message-ID: <20260405215718.19301-3-prathameshdeshpande7@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260405215718.19301-1-prathameshdeshpande7@gmail.com> References: <20260405215718.19301-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" Update mlx5_ib_enable_lb() and mlx5_ib_disable_lb() to ensure symmetric updates of user_td and qps counters. Software state leaks can occur if the force_enable flag is checked before updating counters. Furthermore, the hardware deactivation condition in the original code (user_td =3D=3D 1) can fail to disable loopback if user_td remains 0, or cause premature deactivation in multi-user scenarios. Fix these by: - Updating counters prior to checking the force_enable gate. - Disabling hardware only when both user_td and qps reach zero. - Implementing a counter rollback if the hardware command fails. Signed-off-by: Prathamesh Deshpande --- v8: - Resubmitted as a fresh, independent thread per maintainer request. - No functional changes since v7. v7: - Split into a separate patch for better bisection. - Moved force_enable check after increments/decrements to fix leaks [Sashik= o]. - Updated hardware disable condition to a strict zero-check. v6: - Always update software counters regardless of force_enable to prevent=20 underflows during dynamic unbinding [Sashiko]. - Updated disable condition to user_td <=3D 1 to prevent HW state leaks=20 on systems without transport domains [Sashiko]. - Rebased on rdma/for-next to resolve baseline application failures. v5: - Moved mutex_init to stage_init_init to prevent crashes on non-ETH hardwar= e. - Implemented 'goto unlock' for concurrency safety in enable/disable paths. - Added atomic rollback and fixed tdn leak. v4: - Moved rollback logic into mlx5_ib_enable_lb() to ensure atomicity within the mutex and prevent race conditions [Sashiko]. v3: - Also call mlx5_ib_disable_lb() on failure to roll back software state/cou= nters [Sashiko]. v2: - Added deallocation of tdn if mlx5_ib_enable_lb() fails [Sashiko]. - Reworded commit message to reflect the functional fix and credit the tool. drivers/infiniband/hw/mlx5/main.c | 37 ++++++++++++++++++------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5= /main.c index f49f746bc5bd..fde72ebe721a 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -2009,23 +2009,29 @@ int mlx5_ib_enable_lb(struct mlx5_ib_dev *dev, bool= td, bool qp) { 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 || - dev->lb.qps =3D=3D 1) { - if (!dev->lb.enabled) { - err =3D mlx5_nic_vport_update_local_lb(dev->mdev, true); + if (dev->lb.force_enable) + goto unlock; + + if (!dev->lb.enabled && (dev->lb.user_td >=3D 1 || dev->lb.qps >=3D 1)) { + err =3D mlx5_nic_vport_update_local_lb(dev->mdev, 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,23 +2039,22 @@ int mlx5_ib_enable_lb(struct mlx5_ib_dev *dev, bool= td, bool qp) =20 void mlx5_ib_disable_lb(struct mlx5_ib_dev *dev, bool td, bool qp) { - if (dev->lb.force_enable) - return; - mutex_lock(&dev->lb.mutex); + if (td) dev->lb.user_td--; if (qp) dev->lb.qps--; =20 - if (dev->lb.user_td =3D=3D 1 && - dev->lb.qps =3D=3D 0) { - if (dev->lb.enabled) { - mlx5_nic_vport_update_local_lb(dev->mdev, false); - dev->lb.enabled =3D false; - } + if (dev->lb.force_enable) + goto unlock; + + if (dev->lb.enabled && (dev->lb.user_td =3D=3D 0 && dev->lb.qps =3D=3D 0)= ) { + mlx5_nic_vport_update_local_lb(dev->mdev, false); + dev->lb.enabled =3D false; } =20 +unlock: mutex_unlock(&dev->lb.mutex); } =20 --=20 2.43.0