Commit 27560ee9 authored by Jérôme Glisse's avatar Jérôme Glisse Committed by Linus Torvalds

mm/mmu_notifier: convert mmu_notifier_range->blockable to a flags

Use an unsigned field for flags other than blockable and convert the
blockable field to be one of those flags.

Link: http://lkml.kernel.org/r/20190326164747.24405-4-jglisse@redhat.comSigned-off-by: default avatarJérôme Glisse <jglisse@redhat.com>
Reviewed-by: default avatarRalph Campbell <rcampbell@nvidia.com>
Reviewed-by: default avatarIra 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dfcd6660
...@@ -25,11 +25,13 @@ struct mmu_notifier_mm { ...@@ -25,11 +25,13 @@ struct mmu_notifier_mm {
spinlock_t lock; spinlock_t lock;
}; };
#define MMU_NOTIFIER_RANGE_BLOCKABLE (1 << 0)
struct mmu_notifier_range { struct mmu_notifier_range {
struct mm_struct *mm; struct mm_struct *mm;
unsigned long start; unsigned long start;
unsigned long end; unsigned long end;
bool blockable; unsigned flags;
}; };
struct mmu_notifier_ops { struct mmu_notifier_ops {
...@@ -229,7 +231,7 @@ extern void __mmu_notifier_invalidate_range(struct mm_struct *mm, ...@@ -229,7 +231,7 @@ extern void __mmu_notifier_invalidate_range(struct mm_struct *mm,
static inline bool static inline bool
mmu_notifier_range_blockable(const struct mmu_notifier_range *range) mmu_notifier_range_blockable(const struct mmu_notifier_range *range)
{ {
return range->blockable; return (range->flags & MMU_NOTIFIER_RANGE_BLOCKABLE);
} }
static inline void mmu_notifier_release(struct mm_struct *mm) static inline void mmu_notifier_release(struct mm_struct *mm)
...@@ -275,7 +277,7 @@ static inline void ...@@ -275,7 +277,7 @@ static inline void
mmu_notifier_invalidate_range_start(struct mmu_notifier_range *range) mmu_notifier_invalidate_range_start(struct mmu_notifier_range *range)
{ {
if (mm_has_notifiers(range->mm)) { if (mm_has_notifiers(range->mm)) {
range->blockable = true; range->flags |= MMU_NOTIFIER_RANGE_BLOCKABLE;
__mmu_notifier_invalidate_range_start(range); __mmu_notifier_invalidate_range_start(range);
} }
} }
...@@ -284,7 +286,7 @@ static inline int ...@@ -284,7 +286,7 @@ static inline int
mmu_notifier_invalidate_range_start_nonblock(struct mmu_notifier_range *range) mmu_notifier_invalidate_range_start_nonblock(struct mmu_notifier_range *range)
{ {
if (mm_has_notifiers(range->mm)) { if (mm_has_notifiers(range->mm)) {
range->blockable = false; range->flags &= ~MMU_NOTIFIER_RANGE_BLOCKABLE;
return __mmu_notifier_invalidate_range_start(range); return __mmu_notifier_invalidate_range_start(range);
} }
return 0; return 0;
...@@ -331,6 +333,7 @@ static inline void mmu_notifier_range_init(struct mmu_notifier_range *range, ...@@ -331,6 +333,7 @@ static inline void mmu_notifier_range_init(struct mmu_notifier_range *range,
range->mm = mm; range->mm = mm;
range->start = start; range->start = start;
range->end = end; range->end = end;
range->flags = 0;
} }
#define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment