IB/umem: Set correct address to the invalidation function (605728e6) · Commits · 戴 / test

The invalidate range was using PAGE_SIZE instead of the computed 'end', and had the wrong transformation of page_index due the weird construction. This can trigger during error unwind and would cause malfunction. Inline the code and correct the math. Fixes: ("IB/umem: Add contiguous ODP support") Signed-off-by:

Artemy Kovalyov <artemyko@mellanox.com> Signed-off-by:

Moni Shoua <monis@mellanox.com> Signed-off-by:

Leon Romanovsky <leonro@mellanox.com> Signed-off-by:

Jason Gunthorpe <jgg@mellanox.com>

drivers/infiniband/core/umem_odp.c

+6 −14

Original line number	Diff line number	Diff line
		@@ -137,15 +137,6 @@ static void ib_umem_notifier_release(struct mmu_notifier *mn,
		up_read(&per_mm->umem_rwsem);
		}

		static int invalidate_page_trampoline(struct ib_umem_odp *item, u64 start,
		u64 end, void *cookie)
		{
		ib_umem_notifier_start_account(item);
		item->umem.context->invalidate_range(item, start, start + PAGE_SIZE);
		ib_umem_notifier_end_account(item);
		return 0;
		}

		static int invalidate_range_start_trampoline(struct ib_umem_odp *item,
		u64 start, u64 end, void *cookie)
		{
		@@ -553,12 +544,13 @@ out:
		put_page(page);

		if (remove_existing_mapping && umem->context->invalidate_range) {
		invalidate_page_trampoline(
		ib_umem_notifier_start_account(umem_odp);
		umem->context->invalidate_range(
		umem_odp,
		ib_umem_start(umem) + (page_index >> umem->page_shift),
		ib_umem_start(umem) + ((page_index + 1) >>
		umem->page_shift),
		NULL);
		ib_umem_start(umem) + (page_index << umem->page_shift),
		ib_umem_start(umem) +
		((page_index + 1) << umem->page_shift));
		ib_umem_notifier_end_account(umem_odp);
		ret = -EAGAIN;
		}

Admin message