From nobody Fri Jun 19 08:14:05 2026 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 B2E681714AA for ; Sun, 26 Apr 2026 13:24:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777209844; cv=none; b=qZQnfgabuQgIqZQJFn3I5dStBTep2mRSPBGDnlcQ/PoPH6wnzYYPtpihcwk4qiN8RVZ4E91zbPINneOfoPmr6ABCyvby2BhDMHvXuvNzsjT/b5m2VnzTRMidirCQh6YPXh36gFKOKUs87GVhcmuuM7VqZYR6ukbBjq3haueWU14= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777209844; c=relaxed/simple; bh=LWM6HVvLB3siDa8uee4eKBpkMgIxMcJcTfUZ2PDqrpk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=HCfVoMTnAyuE6FF7zViwSg+1pZJqIiKAR9w0uErTy5TqJ/Rae7Yt/KOxCWTiA4tCh5amyhwnwAoMUgREWDSFRh8V/p6WirtJDmhG2aDBTmsU8NFq1zp7/9eDRUpF2iz0eYO/tczfpqgQbYgnQab6hz340iYLKplK9MF2E2rvI2E= 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=Q5Lk5kxR; arc=none smtp.client-ip=209.85.128.53 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="Q5Lk5kxR" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-488a88aeec9so116429265e9.2 for ; Sun, 26 Apr 2026 06:24:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777209841; x=1777814641; 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=glWTzLuCweIyCCW4tksfnjVH1VqFaefOjJWpjhDpMUo=; b=Q5Lk5kxRvNLPiFU8aRm8JODwoRyNXqGSolBkPS7UhOaDueHFg/VaFoWL3RnRQ35ixP grLAFlZz44EgKKG24++NReNimSkMh1HXjrcGNHTbpjxKAg0mZ2iJN93cszoC8TOoeDvA VyJih2aBYrAjlWGpe4PKrO25lGnqsgm2rGVuZmKtoKHfbOOyi22NFoNMtmeueqcUIhEO kKAEfad8PdWI7Rl1WUhXgL4n9A8GWCBJzH+x13PDTBZHgs5lyBLlHGIw515eisb2FgNc ehsdixMG/a1xB6UgS6zwwxYj8R/yTFv2I2fznMBh1xCf8ddVTs5iJh1nmpMo4VrzDljI SjXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777209841; x=1777814641; 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=glWTzLuCweIyCCW4tksfnjVH1VqFaefOjJWpjhDpMUo=; b=DV9veVgmjkK00ozLvv2VhTJtDca19fmpP2pc4fnpUeyHM0WX9lmbyd19vrr8hACE1m 5bE9xuAoyIpGbIjYy1SDV9Jkcq8jZVPbxbYDFNf0FA3qZU98YE4HWrL3Pw4i4fM110zV qxG8k5Z1r/ywxR9GWxLBT2YWFr86NaWwaQmHMmJ1r/lbiv5d+E3Guj89X5clbfeFxbOx WC8A9bdPxl404PedGrUHN81IWsuzyhkDRe9YQog6JCRua/gNNjX43qcdYvOaajXpTz/U 9hbAe1i27z5jVF363UcE8v9s054T4YmjCfE5eBW/M+CWxi1orqHdLXXsIuqfYhmFgOva n4TA== X-Forwarded-Encrypted: i=1; AFNElJ/LRq4Fdj6zcBo0C8fdSosDWxHstb6NcpbftnbWbpt6T/1kotd31yBslyYImMjSS628vYOmw+G6YVUgKng=@vger.kernel.org X-Gm-Message-State: AOJu0YwhSS7IBiJZQ5pl5itWoL6cnCcxC8zW3zXXR2fkcFheiF7vlNLf 0N6WGrSDxe5qBwfamUIUnAsuz7a11noFy6xTbghJjpt9ApE9kIKKohCM X-Gm-Gg: AeBDietmaFX5sYQpJvUsp/OjgfSwy6uB+J72UxzMXSLQCDy9W9b7ZxI2IwWPz/002jh NP3YxzWNTxelWsdxa2i74GkQKmy2EDw3mhixCtE/0Hm4B11527tfNJ/OfXOlvr+QJ5Rfj/sq+KU FTtM3Kq3pAWTf75HJpcp2snb6iZN3uWSpfXTY8KdHekCks3yPbqFGbFg6jzwqwXGZgykwvjW8LN fXLGTIuPskdRAhL14Bow5qkby2hDXU2+LTqY5kjEVlEpp5OvtMda0QOpcL7WyvtCxPap8ozjwtN Usdf/QsRtcTT5jZ9/GE3yxn8Awrqel38UUuTDJzlAdee48MZlql0a9gAms2bVTnLYsAi5kH8MVl 3OUt52rrwgMvKSyMcvE8ETYCvnK/i/FUHzpeDAGhvfLUYY/0NVYHe5ZsMYvlVVghYNkUzwjTBzq 0I9cqjZyFV5TkG+KOXBkKfdRsM/jYsVXXPzdE4mnu0dqBYGIo/WMDdY7H6HxMabK6TykS388wxz +ze9cFFEFxrJIJzvBz3Td9Er0/Uvtz/hZu7tVumPA== X-Received: by 2002:a05:600c:4fd2:b0:488:e192:6fbd with SMTP id 5b1f17b1804b1-488fb790869mr549903445e9.30.1777209840929; Sun, 26 Apr 2026 06:24:00 -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-48a52583fe7sm401895935e9.13.2026.04.26.06.23.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2026 06:24:00 -0700 (PDT) From: Prathamesh Deshpande To: jgg@ziepe.ca, leon@kernel.org Cc: michaelgur@nvidia.com, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Prathamesh Deshpande Subject: [PATCH v2] RDMA/mlx5: Fix UMR XLT cleanup on ODP populate failure Date: Sun, 26 Apr 2026 14:23:41 +0100 Message-ID: <20260426132356.22264-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. Break out of the loop so execution falls through the existing cleanup path. Fixes: 1efe8c0670d6 ("RDMA/core: Convert UMEM ODP DMA mapping to caching IO= VA and page linkage") Signed-off-by: Prathamesh Deshpande --- v2: - Use 'break' instead of 'goto' as the loop already checks 'err'. (Michael= Gur) drivers/infiniband/hw/mlx5/umr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/mlx5/umr.c b/drivers/infiniband/hw/mlx5/= umr.c index 29488fba21a0..71f331ce6d89 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; + break; dma_sync_single_for_device(ddev, sg.addr, sg.length, DMA_TO_DEVICE); sg.length =3D ALIGN(size_to_map, MLX5_UMR_FLEX_ALIGNMENT); --=20 2.43.0