From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f39.google.com (mail-pj2-f39.google.com [74.125.227.167]) (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 7F0954EDCA8 for ; Mon, 28 Sep 2026 17:18:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.167 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790615920; cv=none; b=HN0nrH2YghGor7JMo86RttdFa4dKEQtmb/mYL4N2ovx3bJp6obmgyqEK5njEsQjlZQhkc7EEX1jTZCqEI9g7t2DwPLwYqY5GhUgMJXm5bFROIOK5NRo9Hydrwv19vLyivgST/QcwKYAiaIxqCFcAH9QLx0nIJ6JSALYgpV2QDJE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790615920; c=relaxed/simple; bh=tpRDS3QWQEz+EWPX/708eI/ejVeubEVNFCMjuV09I4g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BwLnAVtTUvKqfy4t6qsPXteLU44IQkZiZn3Tjt4vC/TRZpnG+/6L5kz9xyapSfn7+vky8jfht69+Xfu+0Lhvulmn/t1y9FKjfk/8RQy3jvG18Gr/0Mxrw15+OvBLm0yRFao/fuC0y6Mv8xQIZcf7qUvem9abZlwpSttGp3EpShM= 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=i3nJ6bH/; arc=none smtp.client-ip=74.125.227.167 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="i3nJ6bH/" Received: by mail-pj2-f39.google.com with SMTP id 98e67ed59e1d1-3a498cb99b3so47215a91.0 for ; Mon, 28 Sep 2026 10:18:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790615915; x=1791220715; 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:content-type; bh=r2fwOkBrxfItcV7iU7YqqxJNyvpWradYv+am29lYRQI=; b=i3nJ6bH/6+SXD9eV+cHZybSoCH83UG6N5pbyqKj15RgHVyAjaBXzjiXSFWvJXRTPw+ tR/iNHNfb4iCuRF0U645/YSfuN7xu44FI3J3GVVRSsxPGwHXcLYxPsCur+tOl5rU/GBE 0IL8TtHu0XCN5lyAtCHalplWz4/PcrWo1RPU4maHVpOkWGCRHZci1buVHIQZPusLutmV /u32w7fiIYsuyBA7G2QKYmvmWNnnh8vE0SiX0+TJERP/HFICLOgGzEF7eTp7Ch5nJKKq tQBBvSNnEA70/Y3vT8Xu2OmMhgbMIyux6zwjUM0HRgnKXWVfU1keQ51C/cuT7ULb/lqV 1BFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790615915; x=1791220715; 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:content-type; bh=r2fwOkBrxfItcV7iU7YqqxJNyvpWradYv+am29lYRQI=; b=BZqSe5hMnj0lkUrbU9FVy/XUxDShKnj14X5gc1ogLuHznwtTNJv7qq87/qdFfgvGZD PM5RcOgRbgjU3uBFgMYJNC5R1D4d+Jdvp2AitX1GrcqENMhka5LBJ5jQklyAgi3PoJYu 2OfJaHDtkfq2rPTBKJ24GPD7QlWNSUcv/S/LgvM/ZG02+z1cpXmgGVc2MVzlgM19+20p HaKfdJGMlalaFv3fp0Gelez6rK4TLmRE7zOUlh07f+vK0nqAr5NRP79m/WqaAQWga+5e p2jII+2zhxvsd67aoMtW4JeLknQAHgBYfhgMIYeFkT4xA4ItIDc4F6Yzq3CEu5duAC76 loyg== X-Forwarded-Encrypted: i=1; AKwUvBxqGG5MnbBEWX6G6WDxjEf5Hla+iiv/AQNAZvmvbs77uXDBJSsGBzewdfFEdqYZR2a3PMmuwM81tKUgr+0=@vger.kernel.org X-Gm-Message-State: AFq9FYJQUC8lpXsIdh5FPGnj/M5s0cWiRqYXXqpBkvZjt3db/Y9aT6Su QdlnH/CKgmG1jPMAf0QWLiQKoqO4FRPlGVKcfYsNzDshA29KjTiYTgCr X-Gm-Gg: AYBFou3h4/UVA7KTuL9EhEVF8cR2XqbpBHdA9bxuwEnMAWV8D9MdW3ckGaC7YRQ5XyE xB+ThWxpLRbBo0t3aAfpwNuHB4Ihz8iruP5alVu0OY0SrOrN8aEgqz7YyEHUl1IVonCP+11xlHn g9HjhWmbtyDsQrdHJN/VzzB3+96T9GxVpN7s3ZbV9ut4P4IT67+Db8Gigx8NNSUJj2tumHpRlnW cF+L3XacootFr5s0yp2TuMzCmqHcEwXnUuIQbR/N9S4WB+nLky/IUewKZ3Ue+E91Skg+5nAu8oo f0PsTC1XeahYzKgn8oaNott/b9WBuNynJyGhTdkgyshN3Aiv1NF/Yvhd/O4+rMUB74qJ9PEncBF SBlwhtIVTbeq2xhK5IFu/MmLTZWIKoQDJqFvyNsKescS3oOq4c0T0BfuAQmvoh7IZ8McXycNXur YWbVr4v0dZQKA0Jm08MH8dPuI4bzBSXycgHs1sbyyy7YO/rg7d4RhtgDBeTno5TnAGEYT8CXsoh VnqAf7fm6m15InNIyyUkI1Y X-Received: by 2002:a17:90b:1c89:b0:3a0:ace4:d2b4 with SMTP id 98e67ed59e1d1-3a0ace4d752mr7661768a91.23.1790615914640; Mon, 28 Sep 2026 10:18:34 -0700 (PDT) Received: from localhost.localdomain ([43.224.245.233]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3a4986bb8f6sm189139a91.0.2026.09.28.10.18.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2026 10:18:34 -0700 (PDT) From: Dongliang Qin To: Zhu Yanjun , Jason Gunthorpe , Leon Romanovsky Cc: Dongliang Qin , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Bob Pearson , stable@vger.kernel.org Subject: [PATCH v2 4/4] RDMA/rxe: Do not force cleanup on pool timeout Date: Tue, 29 Sep 2026 01:17:56 +0800 Message-ID: <20260928171756.3254016-5-cccccccccccc777777@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260928171756.3254016-1-cccccccccccc777777@gmail.com> References: <20260928171756.3254016-1-cccccccccccc777777@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 The sleepable pool cleanup path waits up to 50 seconds for the last reference and then continues cleanup anyway. If a reference is still held, that turns a lifetime bug into a use-after-free. Wait for completion instead. A stuck object is easier to diagnose than a stale pointer; the existing non-sleepable path is unchanged. Fixes: 215d0a755e1b ("RDMA/rxe: Stop lookup of partially built objects") Cc: stable@vger.kernel.org Signed-off-by: Dongliang Qin --- drivers/infiniband/sw/rxe/rxe_pool.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/infiniband/sw/rxe/rxe_pool.c b/drivers/infiniband/sw/rxe/rxe_pool.c index d9cb682fd71f8..d5ff5d453f5f8 100644 --- a/drivers/infiniband/sw/rxe/rxe_pool.c +++ b/drivers/infiniband/sw/rxe/rxe_pool.c @@ -178,7 +178,7 @@ int __rxe_cleanup(struct rxe_pool_elem *elem, bool sleepable) { struct rxe_pool *pool = elem->pool; struct xarray *xa = &pool->xa; - int ret, err = 0; + int err = 0; void *xa_ret; if (sleepable) @@ -201,17 +201,7 @@ int __rxe_cleanup(struct rxe_pool_elem *elem, bool sleepable) * return to rdma-core */ if (sleepable) { - if (!completion_done(&elem->complete)) { - ret = wait_for_completion_timeout(&elem->complete, - msecs_to_jiffies(50000)); - - /* Shouldn't happen. There are still references to - * the object but, rather than deadlock, free the - * object or pass back to rdma-core. - */ - if (WARN_ON(!ret)) - err = -ETIMEDOUT; - } + wait_for_completion(&elem->complete); } else { unsigned long until = jiffies + RXE_POOL_TIMEOUT; -- 2.43.0