diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-03 07:56:15 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-03 07:56:15 +0100 |
| commit | 22fee7d3851314f8384c9d44233bb86a2862ed64 (patch) | |
| tree | f080b7f8b8f4e24e3e349a4c45ce9463718716f8 /drivers/infiniband/hw/mlx5/odp.c | |
| parent | uio: dismiss waiters on device unregistration (diff) | |
| parent | Linux 4.20-rc5 (diff) | |
| download | linux-22fee7d3851314f8384c9d44233bb86a2862ed64.tar.xz linux-22fee7d3851314f8384c9d44233bb86a2862ed64.zip | |
Merge 4.20-rc5 into char-misc-next
We need the fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/infiniband/hw/mlx5/odp.c')
| -rw-r--r-- | drivers/infiniband/hw/mlx5/odp.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/mlx5/odp.c b/drivers/infiniband/hw/mlx5/odp.c index b04eb6775326..2cc3d69ab6f6 100644 --- a/drivers/infiniband/hw/mlx5/odp.c +++ b/drivers/infiniband/hw/mlx5/odp.c @@ -674,6 +674,15 @@ next_mr: goto srcu_unlock; } + if (!mr->umem->is_odp) { + mlx5_ib_dbg(dev, "skipping non ODP MR (lkey=0x%06x) in page fault handler.\n", + key); + if (bytes_mapped) + *bytes_mapped += bcnt; + ret = 0; + goto srcu_unlock; + } + ret = pagefault_mr(dev, mr, io_virt, bcnt, bytes_mapped); if (ret < 0) goto srcu_unlock; @@ -735,6 +744,7 @@ next_mr: head = frame; bcnt -= frame->bcnt; + offset = 0; } break; |