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

Commit b02394aa authored by Moni Shoua's avatar Moni Shoua Committed by Leon Romanovsky
Browse files

IB/mlx5: Improve ODP debugging messages 



Add and modify debug messages to ODP related error flows.
In that context, return code EAGAIN is considered less severe and print
level for it is set debug instead of warn.

Signed-off-by: default avatarMoni Shoua <monis@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent 90290db7

drivers/infiniband/core/umem_odp.c

+12 −2
Original line number Diff line number Diff line
@@ -655,8 +655,13 @@ int ib_umem_odp_map_dma_pages(struct ib_umem_odp *umem_odp, u64 user_virt, 
				flags, local_page_list, NULL, NULL);

		up_read(&owning_mm->mmap_sem);



		if (npages < 0)

		if (npages < 0) {

			if (npages != -EAGAIN)

				pr_warn("fail to get %zu user pages with error %d\n", gup_num_pages, npages);

			else

				pr_debug("fail to get %zu user pages with error %d\n", gup_num_pages, npages);

			break;

		}



		bcnt -= min_t(size_t, npages << PAGE_SHIFT, bcnt);

		mutex_lock(&umem_odp->umem_mutex);
@@ -674,8 +679,13 @@ int ib_umem_odp_map_dma_pages(struct ib_umem_odp *umem_odp, u64 user_virt, 
			ret = ib_umem_odp_map_dma_single_page(

					umem_odp, k, local_page_list[j],

					access_mask, current_seq);

			if (ret < 0)

			if (ret < 0) {

				if (ret != -EAGAIN)

					pr_warn("ib_umem_odp_map_dma_single_page failed with error %d\n", ret);

				else

					pr_debug("ib_umem_odp_map_dma_single_page failed with error %d\n", ret);

				break;

			}



			p = page_to_phys(local_page_list[j]);

			k++;

drivers/infiniband/hw/mlx5/odp.c

+2 −2
Original line number Diff line number Diff line
@@ -607,8 +607,8 @@ static int pagefault_mr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr, 
			if (!wait_for_completion_timeout(

					&odp->notifier_completion,

					timeout)) {

				mlx5_ib_warn(dev, "timeout waiting for mmu notifier. seq %d against %d\n",

					     current_seq, odp->notifiers_seq);

				mlx5_ib_warn(dev, "timeout waiting for mmu notifier. seq %d against %d. notifiers_count=%d\n",

					     current_seq, odp->notifiers_seq, odp->notifiers_count);

			}

		} else {

			/* The MR is being killed, kill the QP as well. */