Commit 9d00195b authored by Nikita Yushchenko's avatar Nikita Yushchenko Committed by Greg Kroah-Hartman
Browse files

swiotlb: ensure that page-sized mappings are page-aligned

[ Upstream commit 602d9858


Some drivers do depend on page mappings to be page aligned.

Swiotlb already enforces such alignment for mappings greater than page,
extend that to page-sized mappings as well.

Without this fix, nvme hits BUG() in nvme_setup_prps(), because that routine
assumes page-aligned mappings.
Signed-off-by: default avatarNikita Yushchenko <>
Reviewed-by: default avatarChristoph Hellwig <>
Reviewed-by: default avatarSagi Grimberg <>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <>
Signed-off-by: default avatarSasha Levin <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 68a5dc38
......@@ -456,11 +456,11 @@ phys_addr_t swiotlb_tbl_map_single(struct device *hwdev,
* For mappings greater than a page, we limit the stride (and
* hence alignment) to a page size.
* For mappings greater than or equal to a page, we limit the stride
* (and hence alignment) to a page size.
nslots = ALIGN(size, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT;
if (size > PAGE_SIZE)
if (size >= PAGE_SIZE)
stride = (1 << (PAGE_SHIFT - IO_TLB_SHIFT));
stride = 1;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment