From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (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 CF4F62C3255 for ; Wed, 3 Jun 2026 13:27:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780493257; cv=none; b=H+eGaBsWMagjgvDBl7gyplGIAIS2WN5nH75W/zHf6MFTNliORw2prvagqq0rr8sCkilDVb1mRMqVoqpX1ClQEpIiaqVzV9HnIb3p4LksQGqGhJRkh/wGCdddQdiixBGWaZUbCMJ/qKUJLjOPjSA4BO1DVV5HHGxv9gMUJKcz3zs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780493257; c=relaxed/simple; bh=ZKmIfYiJUMLvnY0Ua9XlJaLUeAaZxb1MUfLcnPeVDeI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=qnv2MMkDMp4enJ1RFICaD37pzVW3Faq+qMcLNZ4QZo6ll+Nm+iRGPqdDhbgELpJzqiU+rGT3yWscQjaFAQ7/2ktdQHd5CmBQ5MYN4G49amsw6ANIrwVqzmayzzXbVTeMJDgYvmWnMjP/11Yqw92UGNCD+h5bQUAt5bVQ/iA++6o= 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=ZknzVmwJ; arc=none smtp.client-ip=209.85.167.48 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="ZknzVmwJ" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-5aa7a7c9711so859774e87.0 for ; Wed, 03 Jun 2026 06:27:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780493254; x=1781098054; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2h2vROgMXzHw1sF/4pXkeNWKYSy/sCswN0t0aO0Lclk=; b=ZknzVmwJv+xZP/AQeZ6RpppJQ7ghZ24HNJEfOZDOFXyz8HHGAXdeOkIHz3u8LFzLYL yxQrbnCJ4EZDPIO1MpejEWMDzNYOYM6R64tQQvM8u/flpi9RHiE23I4MuKf45OeHsXRz JHNA2clWC/w/TTbwdsxLhRTwdVePSpr8Ex3E8u4MkpO7rX+EuJ5rT9R5coH4AFmDicfN pcBrANNEF94TAEevep+oa2GbYaMQDZNZIAnm1Swh7cNVOi/SsOuZ0pJ40rKCi4/lMH8X EuYQ7//n/3TkylgeZ73ACSniNVkQxstZXgovVra7FFDT+7IUVjAQtUNKFBV7zPOHTLBn dBGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780493254; x=1781098054; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=2h2vROgMXzHw1sF/4pXkeNWKYSy/sCswN0t0aO0Lclk=; b=aMaVbMqeKGvN0Yp1+riOUmeveyimaGRCkPts6TIoyN0IZKqusq7XEVO6KauZ+0yx3b yysB2X5U5lp6NJtcNnehY35VDO50yiDk5b8urIcoxt4m5UCpn8gPrj6yn2WBTeOFw1VN Ofa+oCpC6BDojvM4FN987HYo+alUCjz7Jt99LoQ/L0kPYHaHvn7n3kb8wS/0uXJX5uyN clgYCI0UUUClWzGwCfgc1HIAZbVkuzRRY3SDdq2Qv1YyWeKsUHSKt6dK8Fa/qvRYGTYN T82kOi5qMEN3vSOETtmoVhGDkyP9aSD/1rGpRjwRPLX2RmMpm9TG1XwclPSiAziO72Xa UwJQ== X-Forwarded-Encrypted: i=1; AFNElJ+GzNXA27EcfFTlQfm7GATDFxQYVGlkyhH/MkONofvsI8I16yiwO9dzdmFldFDqFFfUk9Jq7k3tlzLYXgg=@vger.kernel.org X-Gm-Message-State: AOJu0YxosYGwP7CGJlQTEntXxcl4sk8Kx22HycwgsMOm/vjKgZ2S6RIz n77pS9rxnRUSD0vC3j302lhT1P2FGuIXJj+Wic5NOVXItLI9UFpiHUDi X-Gm-Gg: Acq92OFk4TVUtV/CSowqaVD3G+eHEBLfTLuquv3mJqZP4Zl6/mMYk0wi43QlNa45951 212vH6wVbeoNzd12IOZ5DKcyHIBvMqgjHXr+WpLBuZ42kEXUMaat6tkbjGOwgMUcpt1m5iwuvUi YK2Z0oajDUvxRw6kgEnCS9YSCsYWgqiHFhX7U6QZs8IxhqynWZZWl80tx1i8lNVgEbNxqtL8tXH 5qWjZwMDi06A4JG+5rn3pLOh3IZ1PVNfbi7a8/wet7yHXnJoUo2pIlRRSlopg/I/5/IKV4oOEIJ OlZbrfcu5fQK9be8z7EIGh9tRseEvl9OOYvX3W51jJOkO5BFx+vYkKmGqpXqjSJlMPV8AoNikFe bzs+DPGQXRJIKKbL7LWyjvxocbsAHaGumean+ddrJU4iAHInSensZ1FT5Xp3sfY1WbLgE0hJTwF zI8CaVOqVT4IwEqzch99Yx8TjQCCKaMc0FH/IbhdUxLBivfS9eCzKuzhgKCNalD2npOaGG X-Received: by 2002:ac2:4bc4:0:b0:5a3:ff48:f7d6 with SMTP id 2adb3069b0e04-5aa7c7921f2mr967973e87.13.1780493253776; Wed, 03 Jun 2026 06:27:33 -0700 (PDT) Received: from c0624c666cc5.devsec.astralinux.ru ([93.188.205.42]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5aa7b8ed90csm653167e87.7.2026.06.03.06.27.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2026 06:27:33 -0700 (PDT) From: Vladislav Nikolaev To: stable@vger.kernel.org, Greg Kroah-Hartman , Sasha Levin , Zhu Yanjun , Doug Ledford , Jason Gunthorpe , Haggai Eran , Kamal Heib , Amir Vadai , Moni Shoua , Yonatan Cohen , Leon Romanovsky , Zhu Yanjun Cc: Vladislav Nikolaev , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, lvc-project@linuxtesting.org Subject: [PATCH 6.1] RDMA/rxe: Complete the rxe_cleanup_task backport Date: Wed, 3 Jun 2026 16:27:15 +0300 Message-ID: <20260603132729.423-1-vlad102nikolaev@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit No upstream commit exists for this patch. The issue was introduced with backporting upstream commit b2b1ddc45745 ("RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task"") to the 6.1 stable tree as commit 3236221bb8e4 ("RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task""). The 6.1 backport guarded qp->req.task and qp->comp.task before calling rxe_cleanup_task(), but left qp->resp.task unguarded. It also kept the responder task cleanup before deleting the RC timers, while upstream had already moved it after the timer shutdown by commit 960ebe97e523 ("RDMA/rxe: Remove __rxe_do_task()"). In the 6.1 tree, rxe_qp_from_init() calls rxe_qp_init_req() before rxe_qp_init_resp(). Therefore, if rxe_qp_init_req() fails, cleanup can run before qp->resp.task has been initialized by rxe_init_task(), and the unconditional rxe_cleanup_task(&qp->resp.task) can still hit the same uninitialized task lock problem that upstream commit b2b1ddc45745 fixed. Move responder task cleanup after deleting the RC timers, matching the upstream cleanup order, and guard it with qp->resp.task.func like the requester and completer tasks. Fixes: 3236221bb8e4 ("RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task"") Signed-off-by: Vladislav Nikolaev --- drivers/infiniband/sw/rxe/rxe_qp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c index 709c63e9773c..171c0f4dcbec 100644 --- a/drivers/infiniband/sw/rxe/rxe_qp.c +++ b/drivers/infiniband/sw/rxe/rxe_qp.c @@ -781,13 +781,15 @@ static void rxe_qp_do_cleanup(struct work_struct *work) qp->valid = 0; qp->qp_timeout_jiffies = 0; - rxe_cleanup_task(&qp->resp.task); if (qp_type(qp) == IB_QPT_RC) { del_timer_sync(&qp->retrans_timer); del_timer_sync(&qp->rnr_nak_timer); } + if (qp->resp.task.func) + rxe_cleanup_task(&qp->resp.task); + if (qp->req.task.func) rxe_cleanup_task(&qp->req.task); -- 2.39.5