From mboxrd@z Thu Jan 1 00:00:00 1970 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: 8bit 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 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) != 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; 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_dev *dev) if (err) return err; - if ((MLX5_CAP_GEN(dev->mdev, port_type) == 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 = mlx5_ib_init_var_region(dev); -- 2.43.0