From nobody Fri Jun 19 09:06:06 2026 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 3639913959D for ; Sat, 25 Apr 2026 01:17:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777079872; cv=none; b=Btcll9uQuhMOzWI4i6p6x7mhgGXFo3RkW66OQd3/gbcgsziX51SZhOnUmEh+Xj8gC+czYwS6NmXaZWcB9bQ4h5LxT0veAfIZItXHZgJx+vzKSTafoZZP1nuv2hGlIvZz4Qkn5gDlCaK4BeYyviWqZaobdOk+5jOdl/KGvYYGVIw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777079872; c=relaxed/simple; bh=j1GqOGyw5FPqwJe4InJ5sUFWXvL/G1NJ0Gt5UZ/j/zc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=CyUkaPUehO3SH6p4qGji+SC3ujOJ9LJKvJPGnRa+KoA9kTgUPKp0P28Mg46gliXDd79TNqdFkrnrGVZwOFrODYST+N8Ff93HSa4rpHjbNVvOR8rhBWZ/YUWTn7SgH41ZxZWSy2ZymVXxeVaROUJo4qV94rhFCex0VMqGPxrCoHg= 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=eANfOi+3; arc=none smtp.client-ip=209.85.128.47 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="eANfOi+3" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4891e86fabeso84093275e9.1 for ; Fri, 24 Apr 2026 18:17:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777079869; x=1777684669; 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=8R+K/lrchlEuKESbig6vaThp46zt3bXsNQE6bFQm4Mc=; b=eANfOi+3OdF7eiZ+Wh3gMqjHYyIKe6ErGg1Qa//qNHUM9tEn8HxCfEELkJnQ0v/dGi 2NG0br8V+sqhhaTt4SZiUdkfxWlcZfVr4NXIekD+p1zZLZ0DVfmjReNRebIXLL5dicwN SfLYUn929EgkyJxfdwVLYf1paO8jNmRiMMuGoEroO14oww4RiRpjntmOPv1vOkcqWWBz TcCT1JDL0WKDzi92NKNJoGeCjQbSEINw74xbkSDyyqsUQLxPmUxHAmiEPNo8Vi4KejUS wt9RfTmybYuwbJeWLlb8zCFesm+xD93cV4a8UZavbXSgDBnQfpyznuh8ZqRowX+6gaSz uTiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777079869; x=1777684669; 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=8R+K/lrchlEuKESbig6vaThp46zt3bXsNQE6bFQm4Mc=; b=g4tR65UDoOaMco6NGEuxkbDmoJcFDmfHTKZPIwJBwiddvt0FEzLI0+sy8WS9aqjVCn eJIxcNaF515zmRImCpOec2JDWKxE/UmbtN/mlSdx1CqYIbct1UjJugu0vCRy8NlpmCaz OP4dKmFv3BcVEzUx+V906bGoGrS1uABrTzpMgwtNNV3lEoHUXIiWr7+IIkwEbZy03nHR wV8PdkYEh6TDRZYJM8QFoyP1bVxxK1NrZnqze2gCNzLUjs2s4LuYbzMw+O45wQJfl8Kg sf203GbXnZ1pXQa5C0zrpilnY31gv3XngD0xvjh+NTpLOmyFaPYi1LMLK3+YOz9dxMob Gugg== X-Forwarded-Encrypted: i=1; AFNElJ8fMLSiRaXr5/JpZwNF9OwnJudfUhrxX/D9yf4TYD2xV46zFNFiZCfSjimgai8GRuio/3cZyS8PMz712Vw=@vger.kernel.org X-Gm-Message-State: AOJu0YzDoWznsRXm+8hIzjDHHlvp/Jn7dU5h7K7HSN83X9YUbOPqQIuG 9+ui8nivtS7Z5LYDAYhhR2Jy9G4F0KGEF0moJgPR4wovEz6ByqK5d8jJ8Mt/3WEC X-Gm-Gg: AeBDietglbZ9MlEdUA8ks7QvNLfkG57B5AZ2gVW7RE6EXWR5+labo2sGx2S5CF96gEB 9cwde/NblnstAOcb9v0Ezbc7o/VmGn8zKVifiPBUqGKYBe42OIT12BTNHzQkz0Nbf7EQaMpNS4e h82+S9TsbLrX3P/6EkcVyrgatnMPqpBDR3hExgjAWrh1jyfTbhjyCyApRC8QFLJwZFjHlrbbfd/ FkHh2J0AyAFHOmTrZea76pW0VLi1nYH1f0pxOQ0358A0LqU6qYeqioAdSdOf//4jqmzx87St0Ln douV21RpG3sXE6bg/rZl4fU5GKBU51Xv3lDz9OFJz98bqAdZK90FcpDbnHVCtBPlp6PVtkxbf62 vojqFi2HBoy/ugCT4pp9i7nU24aSuL9FNxfNntPid++CyY84QBjCjYNigU3zxVXQMqvfme+6C39 1XfBIOqIJZpAHOGsvU/yvbcSIcu8DSt87J9Z+W5ptkbc1sDlLAnul5LssDCSijAIdeg0uNTqDjg G0e4WC/UoBPQ6LWRy8HHKfLmEjteX/VX/9dR+aXyQ== X-Received: by 2002:a05:600c:8908:b0:48a:58e1:6d02 with SMTP id 5b1f17b1804b1-48a58e16eb2mr176025505e9.19.1777079868565; Fri, 24 Apr 2026 18:17:48 -0700 (PDT) Received: from SD.localdomain (heme-13-b2-v4wan-167795-cust403.vm32.cable.virginm.net. [81.108.45.148]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488ffc5e3f4sm350796605e9.2.2026.04.24.18.17.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2026 18:17:46 -0700 (PDT) From: Prathamesh Deshpande To: jgg@ziepe.ca, leon@kernel.org Cc: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Prathamesh Deshpande Subject: [PATCH rdma v1] RDMA/mlx5: Fix UMR XLT cleanup on ODP populate failure Date: Sat, 25 Apr 2026 02:17:28 +0100 Message-ID: <20260425011739.21557-1-prathameshdeshpande7@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: quoted-printable Content-Type: text/plain; charset="utf-8" mlx5r_umr_update_xlt() allocates and DMA maps an XLT buffer with mlx5r_umr_create_xlt(). The buffer is released by the common cleanup path through mlx5r_umr_unmap_free_xlt(). After mlx5_odp_populate_xlt() became fallible, its error path returned directly and skipped that cleanup. This leaks the XLT DMA mapping and buffer. If the emergency XLT page was used, it also leaves xlt_emergency_page_mutex locked. Jump to the existing cleanup path instead of returning directly. Fixes: 1efe8c0670d6 ("RDMA/core: Convert UMEM ODP DMA mapping to caching IO= VA and page linkage") Signed-off-by: Prathamesh Deshpande --- drivers/infiniband/hw/mlx5/umr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/mlx5/umr.c b/drivers/infiniband/hw/mlx5/= umr.c index 29488fba21a0..14ed8e8182f8 100644 --- a/drivers/infiniband/hw/mlx5/umr.c +++ b/drivers/infiniband/hw/mlx5/umr.c @@ -915,7 +915,7 @@ int mlx5r_umr_update_xlt(struct mlx5_ib_mr *mr, u64 idx= , int npages, */ err =3D mlx5_odp_populate_xlt(xlt, idx, npages, mr, flags); if (err) - return err; + goto out; dma_sync_single_for_device(ddev, sg.addr, sg.length, DMA_TO_DEVICE); sg.length =3D ALIGN(size_to_map, MLX5_UMR_FLEX_ALIGNMENT); @@ -925,6 +925,7 @@ int mlx5r_umr_update_xlt(struct mlx5_ib_mr *mr, u64 idx= , int npages, mlx5r_umr_update_offset(&wqe.ctrl_seg, idx * desc_size); err =3D mlx5r_umr_post_send_wait(dev, mr->mmkey.key, &wqe, true); } +out: sg.length =3D orig_sg_length; mlx5r_umr_unmap_free_xlt(dev, xlt, &sg); return err; --=20 2.43.0