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

Commit 80282a3d authored by Yang Yingliang's avatar Yang Yingliang Committed by Greg Kroah-Hartman
Browse files

RDMA/usnic: use iommu_map_atomic() under spin_lock() 



[ Upstream commit b7e08a5a63a11627601915473c3b569c1f6c6c06 ]

usnic_uiom_map_sorted_intervals() is called under spin_lock(), iommu_map()
might sleep, use iommu_map_atomic() to avoid potential sleep in atomic
context.

Fixes: e3cf00d0 ("IB/usnic: Add Cisco VIC low-level hardware driver")
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20230129093757.637354-1-yangyingliang@huawei.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent fe4d7086

drivers/infiniband/hw/usnic/usnic_uiom.c

+4 −4
Original line number Diff line number Diff line
@@ -281,8 +281,8 @@ static int usnic_uiom_map_sorted_intervals(struct list_head *intervals, 
				size = pa_end - pa_start + PAGE_SIZE;

				usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x",

					va_start, &pa_start, size, flags);

				err = iommu_map(pd->domain, va_start, pa_start,

							size, flags);

				err = iommu_map_atomic(pd->domain, va_start,

						       pa_start, size, flags);

				if (err) {

					usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n",

						va_start, &pa_start, size, err);
@@ -298,8 +298,8 @@ static int usnic_uiom_map_sorted_intervals(struct list_head *intervals, 
				size = pa - pa_start + PAGE_SIZE;

				usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x\n",

					va_start, &pa_start, size, flags);

				err = iommu_map(pd->domain, va_start, pa_start,

						size, flags);

				err = iommu_map_atomic(pd->domain, va_start,

						       pa_start, size, flags);

				if (err) {

					usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n",

						va_start, &pa_start, size, err);