From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) (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 35B87377543 for ; Fri, 5 Jun 2026 17:04:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780679065; cv=none; b=evxjXl4vOHb6IDYHdMlTovHsvoYcS1hAKEhIn3GxBf0jM/+brkqW6jGHsrglMg9gIbO4zaGrt3pJhv8aq5V0Ia9qnlOOzLRIf+rLzRro9T0enybfMSZp2Xj3W+0/GUGghB/nayOyenxt2ZZ2+2Ah2Q6z7ehvvSJdkNmtIM8iQ14= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780679065; c=relaxed/simple; bh=qlOqJCumkmHJfJLiXXOXhCO/dxGSCrwCfvho3e9vArQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IDu9zBn/QjDIeuMc9iPDyIl/NDv/dGjAQYyaRQVWAyQ4S4/3ukqEac8UymkJLy4QIW3N/vZOGH2YL2R/0rVQrTTl3vBaHGroE7EZGE1sf24Sf7LuYObHkCZsTo3cF3BHtX1bUXAWd0Qdv3hry9w+z3dcvnEfd2/ghJ90dWpPA1Q= 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=K+c8TiKF; arc=none smtp.client-ip=209.85.208.177 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="K+c8TiKF" Received: by mail-lj1-f177.google.com with SMTP id 38308e7fff4ca-39666ac91a2so32709771fa.1 for ; Fri, 05 Jun 2026 10:04:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780679062; x=1781283862; 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=EB08X2I3fy3wrkRM6VsdXZolE8SRqefSruMLGUvZ7UY=; b=K+c8TiKFsFhtazVJVRNzywEeWp31xZHpogsefp63IVsiZNG0J3VMXaj5HLrErarTpK melF8isolHsoW2o7ypPKwXLnVbfSbnuSWnwLOdeWc6p9ZY7MZK+pbfLm3maUTHG4zyl5 geyZjjPNhZdmbNDDXsnkSFDg5aTBbpiI+dm2S9UtFj8QNkQA00bd08+4S257XstnlFCj RxbP4IdFiNJnU9T0SKkrt9SC+yXfCnUS7E7FDdvU4miqCzQai0qXN9nKqRp5zsJUjQ45 sDoZKGc4xMMBLLxtDZFv1HKtpnUaYCKa3iyUPdNz3I9LgvE1W/Ai9lZHh6232m9jklWb 4MGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780679062; x=1781283862; 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=EB08X2I3fy3wrkRM6VsdXZolE8SRqefSruMLGUvZ7UY=; b=Afocy0FPtmvCNDqM9ioPXAHaiffDR1PmSiAZQobJ5R3n8P2a0hOB0WLej9mIoRL1WK hxfuVMTeLPdAuCwQZQJrzDsP4tOf69VnKNQW9BqSZCv8UI7RFXvZlAn4kaMGmmBps33S UPhVWCLtYjar2/uNEzyeHIqBwfdjKAQB18qQc9xgnuSzP6+uSuw++TnR36GyKY/LH4wC dNpf04LDj/21u2Tn/tvv892106NRQEZFlHg7kscznArMDdt9NqhiPXhwMA37w5IiJ2Wb fF1f1GEhjxT6KK9Bj3rybPvLG2oynhCw92pJ3QzUd+u7e37vxTp2S9JrZZ8Fhf6yN/Sj 7jpQ== X-Forwarded-Encrypted: i=1; AFNElJ/LZhPHY3LTrPSdlsw3rxiIDgemlatFSqWEztB67+Xoya153Okz3i9Br8vXAGb4xXUOURAZ1zPrbVWzEgo=@vger.kernel.org X-Gm-Message-State: AOJu0YwtAQydMj/Vtq2QPIReLy9DhGRz3uYiBcROgmlhYePHvFI/M2ku zpxIhrEJsEysjMEuFZg5OhL/PWro2g5hJ8KKaGrVRUc9ekUxyVNYUQae X-Gm-Gg: Acq92OGju+7jT7kqDx35xs3dxb/nt8VsKtyuNpAnmhPWCvRcGTltlAghaqMXaKRxFxH KQKSVcrnIxRvsVD+fBFRxtAX2sV1WbMDHOe11RumFnCZw06ibTedbn6/H9heHvqWmdwij2dowzv LGYjidVuIu3MprwW4hmrAzaOjleOPYXfKbgVSwEId/ev2G4l6PB676J0uf8iEXfYerTHHslas4u KjYG3JKplF2xEneurq4odt2sIuokQLHzQK7fA6acBlasAnjAZXmk6DZLlzf4d63yJXwvhunm6uc hCNk71RGqy9IXAKvzVXPso4MMsUnYhuEPkuak34BJlL+grBxxnonz9gChpVQauLFALS++AiAjFu kCPazkDky7wGjKSBOa2SIcGdr58f5rnNda3jS9UfU96eXm9Cg5CisRyRfOe4dLzp8+TlKmA8cDR shbEXrHaEX+Ku4D+rAWRKtKXBZSoy982ZZiei2+HWGhW2Y0VLIntHLSEAZL1NZhnECpDTWOAudU WAcMvc= X-Received: by 2002:a2e:a58a:0:b0:394:8fc:8c3d with SMTP id 38308e7fff4ca-396d2892d2fmr10213551fa.4.1780679062303; Fri, 05 Jun 2026 10:04:22 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2026 10:04:20 -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 1/3] Revert "RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task"" Date: Fri, 5 Jun 2026 20:03:27 +0300 Message-ID: <20260605170349.1524-2-vlad102nikolaev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260605170349.1524-1-vlad102nikolaev@gmail.com> References: <20260605170349.1524-1-vlad102nikolaev@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 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