From nobody Sun Jun 14 18:59:06 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 09E2221D3E4 for ; Sun, 5 Apr 2026 13:09:51 +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=1775394593; cv=none; b=b5slm5veqA5pAI6EmArRimeMsQWhZta+2CP0eN9qj5PDL1rscpFrGIOm4ryLYsPgIkYq1u0DStcSk1w+3aQt54E4wDixNitjCqVZCcq6Q5JKvh7HmMtC3eW5GJvV0AYNiQMzTvSKALQsR+uJm2yw5VxL+wMtBgs8YvhVSwsrWP4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775394593; c=relaxed/simple; bh=YfHmKYI37GoShLNMdwhL2o5tuNgdu9lle6dFckw+2VQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tukQE/7sgfMj7synkehBEncdisKg6Ju5KzOXezGZYM48Kkm6NJe+OAncwNzpIFDnpLJhKDeBVhujVJP+SVXjPTOYJpzqgUmGqtgQzhXm8EHAG4EwSEqYty9VdJUOWqvlOUCwFjJGXnMBzNoCGu+l34aEFzybCi9OsyzHy1mT4VQ= 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=p2w/1XfD; 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="p2w/1XfD" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-488b00ed86fso1644725e9.3 for ; Sun, 05 Apr 2026 06:09:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775394590; x=1775999390; 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=NBvtBljrek8teKlQeknTTprNwlFhKwreqPuWUjtwfNQ=; b=p2w/1XfDAUKAR6K/RrYXbX2K+giLxdCUld0TIwgE/wM5vkveqLdW/phuYC5S7l0fnf wv4ZSf7X1R2qfNGa/IfaHBvzma7Wzw1ztpntzFyDPwfpLOWcRIXCV5GokLCQb5GIjJfX W7XZ8sZowBheJe9fFDParXrMOi9X27y1XoZXdmdac0NMGVVFCBWQ4NXd7L9cmru8TXmA 9h+zc1hwWkGlNJxy+rZtCihDtQIjNGY6dyAL4NmsumLVdZLN4NHMxmEk9MVSNokvEUlC P8whnBBpk5RCJxtC9kGs9D4kiNwhGSOi/wRI5LnJPIi3nR2xrdeglR8wCadKUDpxXrkp Yf9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775394590; x=1775999390; 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=NBvtBljrek8teKlQeknTTprNwlFhKwreqPuWUjtwfNQ=; b=O9Md0aQzUutfLSJbzneUaiehggT9tn6i6uWeGn7A4DttMB6qChK9j7AYbyMNv8Le+w 6mrHDKI/KfyB7nRWbBWO8VI6vvC1MSSVWfg7yAHqvlJVNsCG0XA3cHaHXn+cgbjnV63g 9RRDQQfIz/hbBHxIfnwwvuTncxQYpPdMqI1ADPxZohTzm4zOi8vMIi6beYPXZqDn+MDi 1Ml9MeHlzH2PnBiEGsQEs7r3+CVXRJWcmoV3jhqNRTi1LIEPwWIbQ5oVKP/a2Xfrbdm/ EXyCTKV2bn36FzxpBhNbDgV00C7va4GUoSHN2ng9RQ+onUaZnmTYSD7xeQ0Q9bJq7I6g T7wg== X-Forwarded-Encrypted: i=1; AJvYcCUw7kfPO4b9XxccIsYWR0XbM/Cv7wOpUqd4c1249/c8NnSJouzNkWuvHAq+Smh7fuw7bAR70+l/Fs6oaGs=@vger.kernel.org X-Gm-Message-State: AOJu0YxvuFBgy+eo0bOaCBn4v7/ecUgxzLPTv1oz/9WGuxhM/13SQyKp Gnwd0KjOPBG/cihzZIGLXr7jh2oi7GAKs2tBKBKFmPuI+a/pX1QLgzJ+ X-Gm-Gg: AeBDiesdF2j0Zra/YzXzxITiLXdBDUGVe2zeFpB7gIMIn30nM/uLoiB2qfxK37wRKvZ J0vmlgGuh871/Nb+AJd5zgXUiFq47Yc9G0KTcu+kqpPaExGQp/kGb/7gooHBDqRIW8attS7qT+W m0ao9XstF+yxWZN6BUTKIstp79ixwqrfDyZ+JsgImLMvJT5a7rlXLeI/kxDwE5YRyvpxuAqHVRm OYfbhLXsHmMZ7WvccaDrHU89N6QkqqhdmF22kqq7X877DbXYfpyCPHrksdRBXWffqgQXlzhVX3Q ddGlfhacCQAZ3hJgXqSe1PJOggVV9rEj/q+7v9724q/OUYByCqjF/zThKEGQp3NdvYEIGrJe6ZZ tc5SeWDoz+sA1H0oqJjzXDheGWsve9nZgYuuo52RtBt2ixv7c77JSskq6Q/Zn55ygOJC7pD44tg Yrz1f3TcNuytpms1qy1np2qO429AUpTs+zKUmjScBhcoJM1e444TTvXrXrPaUC/m4juzlzjievT 01pvXVJbn+jgu+ZIItX06q9/TBKDTfogfLVApWKBz1fuJ3j X-Received: by 2002:a05:600c:8b34:b0:487:1fb4:7e1 with SMTP id 5b1f17b1804b1-488997d530fmr141904315e9.22.1775394590467; Sun, 05 Apr 2026 06:09:50 -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-4889f6843dfsm180115695e9.12.2026.04.05.06.09.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Apr 2026 06:09:49 -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 v7 1/2] IB/mlx5: Fix success return path and mutex initialization Date: Sun, 5 Apr 2026 14:09:22 +0100 Message-ID: <20260405130924.18901-2-prathameshdeshpande7@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260405130924.18901-1-prathameshdeshpande7@gmail.com> References: <20260404230759.15131-1-prathameshdeshpande7@gmail.com> <20260405130924.18901-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 --- 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:59:06 2026 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 BF0A2347512 for ; Sun, 5 Apr 2026 13:09:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775394595; cv=none; b=pEgczU6+97X8zXe2fu6a/CRMVXVFAfs1qfSPUXrwYoHUuup0fPttsuQWV6XowXyfW50UcpfYlJ5/9ODy65hRo2VMAX1fv5lGStv5EGHVrecNNTxJogIgx2bFs5fZPOadMkOTwO151Zc8q+NZNiSnJNFA6EBDB5C+kfa/yEBJSsQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775394595; c=relaxed/simple; bh=okQQngKXo+aY1Qeyh5ia3DdILYQcp1oNFcCB0azXW5w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WnUX8yrtESffl1jSlBSqIRdp5vtB3IjviyVWANwhV8CpnP+lI/zeEXnekGNkxt9Waf9fGHin9sBJ250N8OTaGD0TvpMsGG9n8ozr8rIGVEl6Rhbqu1O1Ff+U0UNWerpv4EOkS6RvocYEy17TrnU6bsgrZrJCmZuye3mcIdrszes= 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=i4WuUICt; arc=none smtp.client-ip=209.85.128.42 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="i4WuUICt" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-488afb0427eso2119115e9.1 for ; Sun, 05 Apr 2026 06:09:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775394592; x=1775999392; 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=8uiNnAyaBFWdCwNFZVe5fPpU1Jq+Fz5rI3i14Oz+jO4=; b=i4WuUICtyr/pYBJS4dF9kksS/KmNsJ9VK6AWWQ2ZDkET8IihjcPG3BBWSaxlqwyCVz wQ4pX43S0/iDpdN09DXKc4ZUCMgd1nFWFnZy4rnFzIns+ScynU3j09hNMLRbkWS1HMq7 +ONsAM8OioR/ds9c5j9HohynHzhdRpGITrbtWSc/t5a5iRmdbH45MMW7g+LC2nCuXxJE ZSCrUz+DjRmOe+aJEUe1t9MbxumUdtvji28upX5SCRs/loTunr1KfRF6qsBi+qjOOc9K oIWUWYI0ZQOE16WGMM6EjmqDJj4fjPaMUKvNG0cv2zzFGA7Q6fYomcFBwrNCY1WF+qwf /QIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775394592; x=1775999392; 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=8uiNnAyaBFWdCwNFZVe5fPpU1Jq+Fz5rI3i14Oz+jO4=; b=Z3h67Pi0vZcJxlwy7ZFxRG4A6wtwVIOBwnNITSJejrlNnDVtrYHFSypcr6Dk0pXHHZ pfk10elDvxIQqpUF6CwlxwueDBpopwJGqcjVEn6R2rfC74TgIMETe7WQbt5sY8yiGEqf qZXfHBuTfzuhvljkJa0+G5m3RWbxduUA4zeKU4h4nDAz5nbGPhgpnliz047iJHtCxXVe mcCMoCSgzKMBlac4h1o7W4so51AIfF1p6VLSpzsYZoR5O/a3X38Nr3bc5sInyPbbaAi0 ZjvYNcHbP2gnsEOneN8qSHR1shDK61Dt4CtyW2zk5sHho1ZuJPgckNtlmcRJTPtUzqaj Gjxg== X-Forwarded-Encrypted: i=1; AJvYcCUdupMt0bBE6uP5o9MhLEqfKBQ3yq6TO9zT6GBnEFJvo5UZUKYAiVgiO/cWqq8lTXxeqc8liXjUo1ix1cU=@vger.kernel.org X-Gm-Message-State: AOJu0YzaScNATf4m2djIS6YspkaKh04R+J2DGi3zFRHin7wA0dUNYjhV 8JlbLx7+BSdp3UwTQ/JrO5Evdxr4q/4R94nExkZ8rK6FSm3kE8bYmdKP X-Gm-Gg: AeBDiev5THz7nkC+EBpUxyUhphLwkeIwzw1LJYYX4/n0MykP8jiuqe4oaES4uiC17bB Ys+ep8KAV0YzmajvOxXZf+/Lj0KdesP5PJWfiS7xWdOn6OPBeVdYKDU6dpQwsqCivFp03JZeU14 Xj0kJ0Nlw2RIbAvoEbzL3V/ipVmNvPyFRPJ1qwHR0ceKPiWMLaFvuHBnMnWCwLouineYs0Wblkv 4N5WoQ1t/qIATOycHI/+KpKZyBpo37IqdLJfRsCm4rTFX5fpXHalkGmNqfqH30fMJm86/GgWBF+ RlWLnEcHCiY6Oi5huQEh5wYEGY20ax/fubhV6CqFG8z0HtmG0AymftH7k9qfwhl/PA42n+UDDTq WeHZZ4QYy+AfPBjzusexAy7fvln6AGKJnDNUEjF7aV5AOQ7t8vjjp2joGQ4bBQ21wPcBrlESSYw 0iCrko9pEn9Wtv6RveO92xdEQXqmV2iM1xoMv9DZpEQETIB61AoH4w682AOQbZRb3e8uD39T5qP dGCiUaQ0ttDK4S03OvViPI2z6BLc0liMTeQJN/56iAxHT9vHAkcD0gUMI0= X-Received: by 2002:a05:600c:a11:b0:488:8185:e672 with SMTP id 5b1f17b1804b1-488998f8562mr127912955e9.30.1775394591786; Sun, 05 Apr 2026 06:09:51 -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-4889f6843dfsm180115695e9.12.2026.04.05.06.09.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Apr 2026 06:09:50 -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 v7 2/2] IB/mlx5: Fix loopback refcounting leaks and premature disable Date: Sun, 5 Apr 2026 14:09:23 +0100 Message-ID: <20260405130924.18901-3-prathameshdeshpande7@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260405130924.18901-1-prathameshdeshpande7@gmail.com> References: <20260404230759.15131-1-prathameshdeshpande7@gmail.com> <20260405130924.18901-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 --- 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