From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0B07D30C345; Tue, 16 Jun 2026 13:40:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781617214; cv=none; b=TsE+UryD10JZUjRjX3gwjTk7Uw8u49YO9LPPgej7vp8HbWNvoU+UsWqAi6xYl/QqlLUxIJWPFeDslJsrQD/VZtQ8DcynZs410wMjML/vd3w22u9WWHg4G4XDsdWTLK8m2eyyTx6MU9BuOZacbLvcyvGODUNS36wTsEqg7IqXwwY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781617214; c=relaxed/simple; bh=wA8wW4j3hNvH6XU6Pxe8tuS8j0Q5lz1tEPHcKGyaS3U=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=aLL4jerc165UUeLVJkPN4l7Zja2d6+O+Ynv/qy7LqpkE1mbm04BfQtoKKPwcEO6K5qYvhj0RcrArNJK1rEBF1KP/dPzqndNkKs/HzMcjyUdPrNegHOXP2X1Xdoh0h7HhyYcVJW7CzTx62eHnXM4JnOjBBvWQyTC7pGCs81WqiCQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Ld0iLY9I; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Ld0iLY9I" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5DAFB1F00A3A; Tue, 16 Jun 2026 13:40:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781617212; bh=9wpiz9obU8g5CgCdynYedfjfq3YjfyVdL+5vnduwH0U=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=Ld0iLY9IgD+oJuC/zIviQjB1K5QnZkoSd9Wo7trZTQmtffn20/bsnGnkmdtVNKcG6 0oW3ScGlbmzpe606mnT9ueBBWpwtxrxrmWV58buxRxzqhaYZHmdlxrCqIljaF/6Fys nzr7Dp7GlXohyR4yqlVMT/3YjItecEUL0NAwWDww= Date: Tue, 16 Jun 2026 19:09:06 +0530 From: Greg Kroah-Hartman To: Vladislav Nikolaev Cc: stable@vger.kernel.org, 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: Re: [PATCH 6.1 1/3] Revert "RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task"" Message-ID: <2026061651-affected-ream-c0b3@gregkh> References: <20260605170349.1524-1-vlad102nikolaev@gmail.com> <20260605170349.1524-2-vlad102nikolaev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260605170349.1524-2-vlad102nikolaev@gmail.com> On Fri, Jun 05, 2026 at 08:03:27PM +0300, Vladislav Nikolaev wrote: > This reverts commit 3236221bb8e4de8e3d0c8385f634064fb26b8e38. > > The reverted commit is an incomplete backport of upstream > commit b2b1ddc45745. It added guards for req.task and comp.task > cleanup, but missed resp.task cleanup and left it before the RC timer > cleanup, unlike the upstream fix. Revert it first so the correct > backport can be applied cleanly in the following patch. > > Signed-off-by: Vladislav Nikolaev > --- > drivers/infiniband/sw/rxe/rxe_qp.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c > index 709c63e9773c..05e4a270084f 100644 > --- a/drivers/infiniband/sw/rxe/rxe_qp.c > +++ b/drivers/infiniband/sw/rxe/rxe_qp.c > @@ -788,11 +788,8 @@ static void rxe_qp_do_cleanup(struct work_struct *work) > del_timer_sync(&qp->rnr_nak_timer); > } > > - if (qp->req.task.func) > - rxe_cleanup_task(&qp->req.task); > - > - if (qp->comp.task.func) > - rxe_cleanup_task(&qp->comp.task); > + rxe_cleanup_task(&qp->req.task); > + rxe_cleanup_task(&qp->comp.task); > > /* flush out any receive wr's or pending requests */ > if (qp->req.task.func) > -- > 2.43.0 > This series does not apply to the latest tree :( Are you sure it is still needed? thanks, greg k-h