Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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 602d9858f07c72eab64f5f00e2fae55f9902cfbe ]

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 <nikita.yoush@cogentembedded.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad@kernel.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 68a5dc38

lib/swiotlb.c

+3 −3
Original line number Diff line number Diff line
@@ -456,11 +456,11 @@ phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, 
		    : 1UL << (BITS_PER_LONG - IO_TLB_SHIFT);



	/*

	 * 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));

	else

		stride = 1;