From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 1E3CB1B87E9; Tue, 12 Aug 2025 19:16:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755026164; cv=none; b=Y+V4j9BOcvQ5V40gEN3zHI0joIJjfcdA3PQQJCbZ9kkYBznZrfgSD6FZEjnMnq6h3CMgHEPuyJLUEKJBDeyV1nZ6ZUjzkrHJYSV60rgE7TYdEJ4Mmfcg6T7Ene1+SvsgyMkMdBFKkw9Sd+DVUgp+QqfkdFOdu1NabrvmW6lzsHQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755026164; c=relaxed/simple; bh=GzU2LoaLBY/2/GEDBk9MRLloon/ayM4nTaezYcL+CZM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fTfrbQCQ6ZP7rFLxjfXyqTolxtBf/MoBki955u3NPKZzyhzMc6i+TBiAsFVcPck//wiHRfKcuiFIKr6suN965E9H+fWByug+A4phLjUQMQUzD6KBhWbWS5BrgJOqHaGhqEpwW3kin7YKIZffFG77Kg4NaXXeVSob4shRDDSuxOg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wkdP+Lds; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="wkdP+Lds" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FDCAC4CEF0; Tue, 12 Aug 2025 19:16:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755026164; bh=GzU2LoaLBY/2/GEDBk9MRLloon/ayM4nTaezYcL+CZM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wkdP+Lds/hjfv+DMGVhcIoxec+zFqmMk0PankDlCJjKTcKZch24q9JdE4Fu/exvkV HKRtoWsyl+tbKavOQSxcdzlLAsxv4ba2JmkqJ3LQo5bwEpthL+vR6B45PB9FX9UjT7 51zW+2dUcIBYqwokgxH22bQM25H2mz92KakgWSdY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Thomas Fourier , Leon Romanovsky , Sasha Levin Subject: [PATCH 6.15 254/480] Fix dma_unmap_sg() nents value Date: Tue, 12 Aug 2025 19:47:42 +0200 Message-ID: <20250812174407.926147832@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812174357.281828096@linuxfoundation.org> References: <20250812174357.281828096@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thomas Fourier [ Upstream commit 1db50f7b7a793670adcf062df9ff27798829d963 ] The dma_unmap_sg() functions should be called with the same nents as the dma_map_sg(), not the value the map function returned. Fixes: ed10435d3583 ("RDMA/erdma: Implement hierarchical MTT") Signed-off-by: Thomas Fourier Link: https://patch.msgid.link/20250630092346.81017-2-fourier.thomas@gmail.com Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/hw/erdma/erdma_verbs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/erdma/erdma_verbs.c b/drivers/infiniband/hw/erdma/erdma_verbs.c index af36a8d2df22..ec0ad4086066 100644 --- a/drivers/infiniband/hw/erdma/erdma_verbs.c +++ b/drivers/infiniband/hw/erdma/erdma_verbs.c @@ -629,7 +629,8 @@ static struct erdma_mtt *erdma_create_cont_mtt(struct erdma_dev *dev, static void erdma_destroy_mtt_buf_sg(struct erdma_dev *dev, struct erdma_mtt *mtt) { - dma_unmap_sg(&dev->pdev->dev, mtt->sglist, mtt->nsg, DMA_TO_DEVICE); + dma_unmap_sg(&dev->pdev->dev, mtt->sglist, + DIV_ROUND_UP(mtt->size, PAGE_SIZE), DMA_TO_DEVICE); vfree(mtt->sglist); } -- 2.39.5