mm/mmu_notifier: convert user range->blockable to helper function

Use the mmu_notifier_range_blockable() helper function instead of directly
dereferencing the range->blockable field.  This is done to make it easier
to change the mmu_notifier range field.

This patch is the outcome of the following coccinelle patch:

%<-------------------------------------------------------------------
@@
identifier I1, FN;
@@
FN(..., struct mmu_notifier_range *I1, ...) {
<...
-I1->blockable
+mmu_notifier_range_blockable(I1)
...>
}
------------------------------------------------------------------->%

spatch --in-place --sp-file blockable.spatch --dir .

Link: http://lkml.kernel.org/r/20190326164747.24405-3-jglisse@redhat.com
Signed-off-by: Jérôme Glisse <jglisse@redhat.com>
Reviewed-by: Ralph Campbell <rcampbell@nvidia.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Felix Kuehling <Felix.Kuehling@amd.com>
Cc: Jason Gunthorpe <jgg@mellanox.com>
Cc: Ross Zwisler <zwisler@kernel.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krcmar <rkrcmar@redhat.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Christian Koenig <christian.koenig@amd.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
index 3e6823fdd93942cce3ace2c21b456f1e4e1d8d84..58ed401c5996eb3af99843f2be577e633bd04bf4 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
@@ -256,14 +256,14 @@ static int amdgpu_mn_invalidate_range_start_gfx(struct mmu_notifier *mn,
        /* TODO we should be able to split locking for interval tree and
         * amdgpu_mn_invalidate_node
         */
-       if (amdgpu_mn_read_lock(amn, range->blockable))
+       if (amdgpu_mn_read_lock(amn, mmu_notifier_range_blockable(range)))
                return -EAGAIN;
 
        it = interval_tree_iter_first(&amn->objects, range->start, end);
        while (it) {
                struct amdgpu_mn_node *node;
 
-               if (!range->blockable) {
+               if (!mmu_notifier_range_blockable(range)) {
                        amdgpu_mn_read_unlock(amn);
                        return -EAGAIN;
                }
@@ -299,7 +299,7 @@ static int amdgpu_mn_invalidate_range_start_hsa(struct mmu_notifier *mn,
        /* notification is exclusive, but interval is inclusive */
        end = range->end - 1;
 
-       if (amdgpu_mn_read_lock(amn, range->blockable))
+       if (amdgpu_mn_read_lock(amn, mmu_notifier_range_blockable(range)))
                return -EAGAIN;
 
        it = interval_tree_iter_first(&amn->objects, range->start, end);
@@ -307,7 +307,7 @@ static int amdgpu_mn_invalidate_range_start_hsa(struct mmu_notifier *mn,
                struct amdgpu_mn_node *node;
                struct amdgpu_bo *bo;
 
-               if (!range->blockable) {
+               if (!mmu_notifier_range_blockable(range)) {
                        amdgpu_mn_read_unlock(amn);
                        return -EAGAIN;
                }

diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c
index 215bf3fef10c9a1e3785f73ba55fe10a896d0f70..8079ea3af10398b31ea9b7e8a4b7cc7011bc5788 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
@@ -122,7 +122,7 @@ userptr_mn_invalidate_range_start(struct mmu_notifier *_mn,
        while (it) {
                struct drm_i915_gem_object *obj;
 
-               if (!range->blockable) {
+               if (!mmu_notifier_range_blockable(range)) {
                        ret = -EAGAIN;
                        break;
                }

diff --git a/drivers/gpu/drm/radeon/radeon_mn.c b/drivers/gpu/drm/radeon/radeon_mn.c
index b3019505065ab2d2591aad3fb077b9a6183a5a10..c9bd1278f57391bcb145cdc7686d016a65a8ca12 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_mn.c
+++ b/drivers/gpu/drm/radeon/radeon_mn.c
@@ -133,7 +133,7 @@ static int radeon_mn_invalidate_range_start(struct mmu_notifier *mn,
        /* TODO we should be able to split locking for interval tree and
         * the tear down.
         */
-       if (range->blockable)
+       if (mmu_notifier_range_blockable(range))
                mutex_lock(&rmn->lock);
        else if (!mutex_trylock(&rmn->lock))
                return -EAGAIN;
@@ -144,7 +144,7 @@ static int radeon_mn_invalidate_range_start(struct mmu_notifier *mn,
                struct radeon_bo *bo;
                long r;
 
-               if (!range->blockable) {
+               if (!mmu_notifier_range_blockable(range)) {
                        ret = -EAGAIN;
                        goto out_unlock;
                }

diff --git a/drivers/infiniband/core/umem_odp.c b/drivers/infiniband/core/umem_odp.c
index c7226cf52acc2f2d146efac2ffa9d3405f2303d0..f962b5bbfa40e4268de37f99c78b6653895c9599 100644 (file)
--- a/drivers/infiniband/core/umem_odp.c
+++ b/drivers/infiniband/core/umem_odp.c
@@ -152,7 +152,7 @@ static int ib_umem_notifier_invalidate_range_start(struct mmu_notifier *mn,
        struct ib_ucontext_per_mm *per_mm =
                container_of(mn, struct ib_ucontext_per_mm, mn);
 
-       if (range->blockable)
+       if (mmu_notifier_range_blockable(range))
                down_read(&per_mm->umem_rwsem);
        else if (!down_read_trylock(&per_mm->umem_rwsem))
                return -EAGAIN;
@@ -170,7 +170,8 @@ static int ib_umem_notifier_invalidate_range_start(struct mmu_notifier *mn,
        return rbt_ib_umem_for_each_in_range(&per_mm->umem_tree, range->start,
                                             range->end,
                                             invalidate_range_start_trampoline,
-                                            range->blockable, NULL);
+                                            mmu_notifier_range_blockable(range),
+                                            NULL);
 }
 
 static int invalidate_range_end_trampoline(struct ib_umem_odp *item, u64 start,

diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 02bc815982d47256e413d396f863645d91ae27e2..559d4b7f807d5270bc4fa3cfdd328175051802a8 100644 (file)
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -526,20 +526,20 @@ static int mn_invl_range_start(struct mmu_notifier *mn,
        struct gntdev_grant_map *map;
        int ret = 0;
 
-       if (range->blockable)
+       if (mmu_notifier_range_blockable(range))
                mutex_lock(&priv->lock);
        else if (!mutex_trylock(&priv->lock))
                return -EAGAIN;
 
        list_for_each_entry(map, &priv->maps, next) {
                ret = unmap_if_in_range(map, range->start, range->end,
-                                       range->blockable);
+                                       mmu_notifier_range_blockable(range));
                if (ret)
                        goto out_unlock;
        }
        list_for_each_entry(map, &priv->freeable_maps, next) {
                ret = unmap_if_in_range(map, range->start, range->end,
-                                       range->blockable);
+                                       mmu_notifier_range_blockable(range));
                if (ret)
                        goto out_unlock;
        }

diff --git a/mm/hmm.c b/mm/hmm.c
index 44a238642b1d359c4840a648b3e682ec537c55df..0db8491090b888f708a7b52a7dba780d5b335b8c 100644 (file)
--- a/mm/hmm.c
+++ b/mm/hmm.c
@@ -205,9 +205,9 @@ static int hmm_invalidate_range_start(struct mmu_notifier *mn,
        update.start = nrange->start;
        update.end = nrange->end;
        update.event = HMM_UPDATE_INVALIDATE;
-       update.blockable = nrange->blockable;
+       update.blockable = mmu_notifier_range_blockable(nrange);
 
-       if (nrange->blockable)
+       if (mmu_notifier_range_blockable(nrange))
                mutex_lock(&hmm->lock);
        else if (!mutex_trylock(&hmm->lock)) {
                ret = -EAGAIN;
@@ -222,7 +222,7 @@ static int hmm_invalidate_range_start(struct mmu_notifier *mn,
        }
        mutex_unlock(&hmm->lock);
 
-       if (nrange->blockable)
+       if (mmu_notifier_range_blockable(nrange))
                down_read(&hmm->mirrors_sem);
        else if (!down_read_trylock(&hmm->mirrors_sem)) {
                ret = -EAGAIN;

diff --git a/mm/mmu_notifier.c b/mm/mmu_notifier.c
index 9c884abc785089d596b13a1edf7520ef0ee4123d..abd88c466eb248a2a89ae875fae8db95b3873790 100644 (file)
--- a/mm/mmu_notifier.c
+++ b/mm/mmu_notifier.c
@@ -180,7 +180,7 @@ int __mmu_notifier_invalidate_range_start(struct mmu_notifier_range *range)
                        if (_ret) {
                                pr_info("%pS callback failed with %d in %sblockable context.\n",
                                        mn->ops->invalidate_range_start, _ret,
-                                       !range->blockable ? "non-" : "");
+                                       !mmu_notifier_range_blockable(range) ? "non-" : "");
                                ret = _ret;
                        }
                }

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index a704d1f9bd962e99d3b6fb927cbf0d3574dc1f41..5fb0f1656a966d45c35438881a88b58678753de7 100644 (file)
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -391,7 +391,8 @@ static int kvm_mmu_notifier_invalidate_range_start(struct mmu_notifier *mn,
        spin_unlock(&kvm->mmu_lock);
 
        ret = kvm_arch_mmu_notifier_invalidate_range(kvm, range->start,
-                                       range->end, range->blockable);
+                                       range->end,
+                                       mmu_notifier_range_blockable(range));
 
        srcu_read_unlock(&kvm->srcu, idx);