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 A6C023F7A83 for ; Mon, 15 Jun 2026 14:23:09 +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=1781533390; cv=none; b=TfLaEHUHSaxfeRLyTtRnIG+L6kOot8xtTKmBEdgf6g50q/hLO0VYGLllkTTk32YFUU3hnNThyNKSdaL1gkjoaMZmjRJ4Lqtw6R1T2THA01GxsAoOhjYbG+5qRez9VPcnmpfSvUDIbCmYa0d3dSaUnX2n2bi2Q//7zf+ZFKu9N+c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781533390; c=relaxed/simple; bh=kTQQ//KP9pf/h93CxI57v7oGZ/2efBABc94cVmfMpRc=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=hMajLUCcem9tCwOb3PGCAOtTz9y/EDjjBYXQ/MAsjTkOjGVd7wRzhhcieQFVo1Lg/Ju+NQ650iD+oiHfZBNTdd4f/HNoHs3YqhrKHIokZwftOh8BkYE52r4r4WEwIAGr+URVnsdW5wLAVg7RqDb1bv+8odBv02vGs9XdYDWjbl0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LoIYmwO+; 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="LoIYmwO+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 631631F000E9; Mon, 15 Jun 2026 14:23:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781533389; bh=jI28YwfoSMnI15T50tvJ6DrSj6ZAyh/6JRPyMswWrZU=; h=Subject:To:Cc:From:Date; b=LoIYmwO+6LlC3K32u4yYb2FtVwfWe/Qd+j9wmeQUo+IgKUYYcUGK17FjJtzZAkSU2 ySdzGRCDdsOmNwxVnRZjvkkeNFA3Xdx3NdsTiCK27XcAIk0aLdA5S4uJgvIlfoVMtC oTP0ksLbHl2BusK2hWF89G5xrZAkBcgzYow4WXig= Subject: FAILED: patch "[PATCH] RDMA/umem: Fix truncation for block sizes >= 4G" failed to apply to 6.1-stable tree To: jgg@ziepe.ca,jgg@nvidia.com Cc: From: Date: Mon, 15 Jun 2026 16:21:10 +0200 Message-ID: <2026061510-undamaged-opulently-daf3@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 15fe76e23615f502d051ef0768f86babaf08746c # git commit -s git send-email --to '' --in-reply-to '2026061510-undamaged-opulently-daf3@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 15fe76e23615f502d051ef0768f86babaf08746c Mon Sep 17 00:00:00 2001 From: Jason Gunthorpe Date: Mon, 1 Jun 2026 13:52:31 -0300 Subject: [PATCH] RDMA/umem: Fix truncation for block sizes >= 4G When the iommu is used the linearization of the mapping can give a single block that is very large split across multiple SG entries. When __rdma_block_iter_next() reassembles the split SG entries it is overflowing the 32 bit stack values and computed the wrong DMA addresses for blocks after the truncation. Use the right types to hold DMA addresses. Link: https://patch.msgid.link/r/1-v1-88303e9e509f+f7-ib_umem_types_jgg@nvidia.com Cc: stable@vger.kernel.org Fixes: a808273a495c ("RDMA/verbs: Add a DMA iterator to return aligned contiguous memory blocks") Signed-off-by: Jason Gunthorpe diff --git a/drivers/infiniband/core/iter.c b/drivers/infiniband/core/iter.c index 8e543d100657..3ed351e8fcf6 100644 --- a/drivers/infiniband/core/iter.c +++ b/drivers/infiniband/core/iter.c @@ -19,8 +19,8 @@ EXPORT_SYMBOL(__rdma_block_iter_start); bool __rdma_block_iter_next(struct ib_block_iter *biter) { - unsigned int block_offset; - unsigned int delta; + dma_addr_t block_offset; + dma_addr_t delta; if (!biter->__sg_nents || !biter->__sg) return false;