From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) (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 165F03644A2 for ; Fri, 5 Jun 2026 17:04:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780679048; cv=none; b=O1n2mliMNJfGyB7HlFAnVx1bSkoFt7Y0kb0vUKKvNFk4e5C9UTAJJ1WOi+0OC/bSWMEiS/W8izcI+YDz1obAnzkn7nvCbcYbNs6TCZnaDZqQ2sIQWTSDvM7AJOQmllURzCa+BPJjGhlkDrpVvhv/EoEMuCgYA0oqUYCW0K3D3Js= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780679048; c=relaxed/simple; bh=YtZE1xyk23OmFsw35vKQUZbSJ+FESk2hBRqIFSzm6Ms=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=GKFvvnZlM4H+Zg8CGD2ugAwOLZwYxD+zUE4KE7D2/COWRZEuSupsf0IGanhJsp0A7TvzmuD6c5f8fXISdkR9vo3A8IhjvpbM2bcXCD7zU4V4vXzaSXJE1TCFUuplmhKWSG9yxRmceMn0k1jSLuwXA48lIkbz2pXwrusw3x5zNMg= 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=ArWgcvT9; arc=none smtp.client-ip=209.85.208.178 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="ArWgcvT9" Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-39677c80386so24657511fa.3 for ; Fri, 05 Jun 2026 10:04:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780679045; x=1781283845; 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=+9Ork6uYNXL+eeO+phzb3xUI2OLrfdgYyvNm4Wy1uWc=; b=ArWgcvT9KiY9SmhPeAmoxZZwK0uT2Qjkp3pcAoy6Rr5EVe1YDlkH+zVsukaxJhyvZJ TZaukM+Z0ZmIT+mCl67mCVbMQLTmDwh+9kdZq8eqF3Afh6Eedd4tfk3/mHfF6RovH1p2 0gLJqz/mYtl9tL73XJFDNSOycwUO/vYq2arcFk4Z6HTabZpaMU+dP6pz0wTB+yJllTqB ysFsRGNtuSIgLvi40pcksrGurAUNRgNyb62/2koQVCl9lVAdYjf16TcuiRRyd8cKUkKe qdtemW6qcISbDAtsfvSPgN0xcSY5tPWOL/47fn+k664aNqJ/Hgsyb0N/iMMPGo9lMntq zeAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780679045; x=1781283845; 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=+9Ork6uYNXL+eeO+phzb3xUI2OLrfdgYyvNm4Wy1uWc=; b=syCqGifhFVufESUdyW/+6j37wF/X12aei24/toT8T/L3wn5v2AF03XPLAkXxHljD13 Kog4O9UJGalovYxT7h0EjiKOX0JLMwWylPFbRy411/YVGg4lXJxNVVkU6yO/7Pqrp3Xf XoVEog6IbPz3uGbgfWAdsxYSSiyAXZC+L8lUOxDL5slLeqF7HjtAOlUM4VjLTx3pEDLX 8txkZKNM4c0YNID/CKrTH7K+YFVbIcjkmXanjuOrFsJw6ODAV6lG4O5P/vdDL/zkVlrf ig8IzK8dXewsADk3aYiATGz15vXwfV50nWy+Yk36savkrCvLxjyFVOHPzR6Y6+c7KUOX S9bg== X-Forwarded-Encrypted: i=1; AFNElJ8N4dSKnO2W4w/KzSI+nKbFCfyiE6lh/oFIT//D+HbCIWcYlzi8j/1ssfER+XxfGBtfVWrjRpdY26aY8jM=@vger.kernel.org X-Gm-Message-State: AOJu0Yy05pWvp1iqPCPfr7Gcs3kh079f+57LIaGDHn7pGjJm7UdMEG3W zYfSkxt5pIHvvx1AH7xxMQphyhkzV+sZR+lpk+QYRVaA2TtY3PQgyduB X-Gm-Gg: Acq92OFvtxnfY+ugM96DI+iZSpn/eOeiWLPFDUMq2YIdfcOuljCiRBy56lPE3Nb2OZa j2jjfzEJAKX0OkeIo3KCTnS8FQeGurVpbVktNoqcOJRVfZDbuc9pG8Z0qU7o8Z6+dNmGdq+Q4IU D26nkimV+TRPOamLjzVQqI5dZxrYWwUhfOruvHZonn3aooOpzuyjBK/67uIPCQAQD0RSU3d+w+b tk1jEkgoW3TcjSZO51BGNaMTsIaUS1nV/5lOELTEUBqCpssCiNhAXj/q+RtwA05MLqeifeZU90w DZEANuuJvLIEt8J3quy1OQwDovga3AaLKfK+AmvtRpjrA45tzKXZ9DhhPmAV3PqWJMc2XDIelHY YPfmxnIrbHvGh4anWPsHooIKyakfRSJm0ygQjb79VYoVvOShaXZiGXKwPmhDNTiXyRkGUN7wQbB 2eHzQW2NWPwK4b+F2fU0+fTeIhu9HxXbFEHOOSzTjlrXlsqWoUp8Di1sedgrBdxI2SZczA X-Received: by 2002:a05:6512:1056:b0:5a8:8eda:bed5 with SMTP id 2adb3069b0e04-5aa87bc934dmr1434238e87.32.1780679045157; Fri, 05 Jun 2026 10:04:05 -0700 (PDT) Received: from c0624c666cc5.devsec.astralinux.ru ([93.188.205.42]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-396ac07b66asm26931161fa.11.2026.06.05.10.04.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2026 10:04:04 -0700 (PDT) From: Vladislav Nikolaev To: stable@vger.kernel.org, Greg Kroah-Hartman Cc: Vladislav Nikolaev , Zhu Yanjun , Doug Ledford , Jason Gunthorpe , Haggai Eran , Kamal Heib , Amir Vadai , Moni Shoua , Yonatan Cohen , Leon Romanovsky , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Zhu Yanjun , lvc-project@linuxtesting.org Subject: [PATCH 6.1 0/3] RDMA/rxe: correct cleanup-task backport and timer cleanup Date: Fri, 5 Jun 2026 20:03:26 +0300 Message-ID: <20260605170349.1524-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 The linux-6.1.y tree contains commit 3236221bb8e4 ("RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task""), which is an incomplete backport of upstream commit b2b1ddc45745 ("RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task""). The stable backport added guards for req.task and comp.task, but missed the resp.task guard and also left rxe_cleanup_task(&qp->resp.task) above the RC timer cleanup. The upstream fix checks all three tasks and keeps resp.task cleanup after the timer cleanup. This series first reverts the incomplete stable backport, then applies the correct backport, and finally backports commit 1c7eec4d5f3b ("RDMA/rxe: Fix "trying to register non-static key in rxe_qp_do_cleanup" bug") to avoid deleting uninitialized RC timers during QP cleanup. The last patch keeps del_timer_sync(), because linux-6.1.y has not renamed it to timer_delete_sync() yet. Vladislav Nikolaev (1): Revert "RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task"" Zhu Yanjun (2): RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task" RDMA/rxe: Fix "trying to register non-static key in rxe_qp_do_cleanup" bug drivers/infiniband/sw/rxe/rxe_qp.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) -- 2.43.0