mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-18 03:23:53 -04:00
mm: convert core mm to mm_flags_*() accessors
As part of the effort to move to mm->flags becoming a bitmap field, convert existing users to making use of the mm_flags_*() accessors which will, when the conversion is complete, be the only means of accessing mm_struct flags. This will result in the debug output being that of a bitmap output, which will result in a minor change here, but since this is for debug only, this should have no bearing. Otherwise, no functional changes intended. [akpm@linux-foundation.org: fix typo in comment]Link: https://lkml.kernel.org/r/1eb2266f4408798a55bda00cb04545a3203aa572.1755012943.git.lorenzo.stoakes@oracle.com Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com> Reviewed-by: Mike Rapoport (Microsoft) <rppt@kernel.org> Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com> Acked-by: David Hildenbrand <david@redhat.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Gordeev <agordeev@linux.ibm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Andreas Larsson <andreas@gaisler.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Barry Song <baohua@kernel.org> Cc: Ben Segall <bsegall@google.com> Cc: Borislav Betkov <bp@alien8.de> Cc: Chengming Zhou <chengming.zhou@linux.dev> Cc: Christian Borntraeger <borntraeger@linux.ibm.com> Cc: Christian Brauner <brauner@kernel.org> Cc: David Rientjes <rientjes@google.com> Cc: David S. Miller <davem@davemloft.net> Cc: Dev Jain <dev.jain@arm.com> Cc: Dietmar Eggemann <dietmar.eggemann@arm.com> Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com> Cc: Heiko Carstens <hca@linux.ibm.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ian Rogers <irogers@google.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jan Kara <jack@suse.cz> Cc: Jann Horn <jannh@google.com> Cc: Jason Gunthorpe <jgg@ziepe.ca> Cc: Jiri Olsa <jolsa@kernel.org> Cc: John Hubbard <jhubbard@nvidia.com> Cc: Juri Lelli <juri.lelli@redhat.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Kees Cook <kees@kernel.org> Cc: Marc Rutland <mark.rutland@arm.com> Cc: Mariano Pache <npache@redhat.com> Cc: "Masami Hiramatsu (Google)" <mhiramat@kernel.org> Cc: Mateusz Guzik <mjguzik@gmail.com> Cc: Matthew Wilcox (Oracle) <willy@infradead.org> Cc: Mel Gorman <mgorman <mgorman@suse.de> Cc: Michal Hocko <mhocko@suse.com> Cc: Namhyung kim <namhyung@kernel.org> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Peter Xu <peterx@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ryan Roberts <ryan.roberts@arm.com> Cc: Shakeel Butt <shakeel.butt@linux.dev> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Suren Baghdasaryan <surenb@google.com> Cc: Sven Schnelle <svens@linux.ibm.com> Cc: Thomas Gleinxer <tglx@linutronix.de> Cc: Valentin Schneider <vschneid@redhat.com> Cc: Vasily Gorbik <gor@linux.ibm.com> Cc: Vincent Guittot <vincent.guittot@linaro.org> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: xu xin <xu.xin16@zte.com.cn> Cc: Zi Yan <ziy@nvidia.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
committed by
Andrew Morton
parent
bb6525f2f8
commit
12e423ba4e
32
mm/ksm.c
32
mm/ksm.c
@@ -1217,8 +1217,8 @@ mm_exiting:
|
||||
spin_unlock(&ksm_mmlist_lock);
|
||||
|
||||
mm_slot_free(mm_slot_cache, mm_slot);
|
||||
clear_bit(MMF_VM_MERGEABLE, &mm->flags);
|
||||
clear_bit(MMF_VM_MERGE_ANY, &mm->flags);
|
||||
mm_flags_clear(MMF_VM_MERGEABLE, mm);
|
||||
mm_flags_clear(MMF_VM_MERGE_ANY, mm);
|
||||
mmdrop(mm);
|
||||
} else
|
||||
spin_unlock(&ksm_mmlist_lock);
|
||||
@@ -2620,8 +2620,8 @@ no_vmas:
|
||||
spin_unlock(&ksm_mmlist_lock);
|
||||
|
||||
mm_slot_free(mm_slot_cache, mm_slot);
|
||||
clear_bit(MMF_VM_MERGEABLE, &mm->flags);
|
||||
clear_bit(MMF_VM_MERGE_ANY, &mm->flags);
|
||||
mm_flags_clear(MMF_VM_MERGEABLE, mm);
|
||||
mm_flags_clear(MMF_VM_MERGE_ANY, mm);
|
||||
mmap_read_unlock(mm);
|
||||
mmdrop(mm);
|
||||
} else {
|
||||
@@ -2742,7 +2742,7 @@ static int __ksm_del_vma(struct vm_area_struct *vma)
|
||||
vm_flags_t ksm_vma_flags(const struct mm_struct *mm, const struct file *file,
|
||||
vm_flags_t vm_flags)
|
||||
{
|
||||
if (test_bit(MMF_VM_MERGE_ANY, &mm->flags) &&
|
||||
if (mm_flags_test(MMF_VM_MERGE_ANY, mm) &&
|
||||
__ksm_should_add_vma(file, vm_flags))
|
||||
vm_flags |= VM_MERGEABLE;
|
||||
|
||||
@@ -2784,16 +2784,16 @@ int ksm_enable_merge_any(struct mm_struct *mm)
|
||||
{
|
||||
int err;
|
||||
|
||||
if (test_bit(MMF_VM_MERGE_ANY, &mm->flags))
|
||||
if (mm_flags_test(MMF_VM_MERGE_ANY, mm))
|
||||
return 0;
|
||||
|
||||
if (!test_bit(MMF_VM_MERGEABLE, &mm->flags)) {
|
||||
if (!mm_flags_test(MMF_VM_MERGEABLE, mm)) {
|
||||
err = __ksm_enter(mm);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
|
||||
set_bit(MMF_VM_MERGE_ANY, &mm->flags);
|
||||
mm_flags_set(MMF_VM_MERGE_ANY, mm);
|
||||
ksm_add_vmas(mm);
|
||||
|
||||
return 0;
|
||||
@@ -2815,7 +2815,7 @@ int ksm_disable_merge_any(struct mm_struct *mm)
|
||||
{
|
||||
int err;
|
||||
|
||||
if (!test_bit(MMF_VM_MERGE_ANY, &mm->flags))
|
||||
if (!mm_flags_test(MMF_VM_MERGE_ANY, mm))
|
||||
return 0;
|
||||
|
||||
err = ksm_del_vmas(mm);
|
||||
@@ -2824,7 +2824,7 @@ int ksm_disable_merge_any(struct mm_struct *mm)
|
||||
return err;
|
||||
}
|
||||
|
||||
clear_bit(MMF_VM_MERGE_ANY, &mm->flags);
|
||||
mm_flags_clear(MMF_VM_MERGE_ANY, mm);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -2832,9 +2832,9 @@ int ksm_disable(struct mm_struct *mm)
|
||||
{
|
||||
mmap_assert_write_locked(mm);
|
||||
|
||||
if (!test_bit(MMF_VM_MERGEABLE, &mm->flags))
|
||||
if (!mm_flags_test(MMF_VM_MERGEABLE, mm))
|
||||
return 0;
|
||||
if (test_bit(MMF_VM_MERGE_ANY, &mm->flags))
|
||||
if (mm_flags_test(MMF_VM_MERGE_ANY, mm))
|
||||
return ksm_disable_merge_any(mm);
|
||||
return ksm_del_vmas(mm);
|
||||
}
|
||||
@@ -2852,7 +2852,7 @@ int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
|
||||
if (!vma_ksm_compatible(vma))
|
||||
return 0;
|
||||
|
||||
if (!test_bit(MMF_VM_MERGEABLE, &mm->flags)) {
|
||||
if (!mm_flags_test(MMF_VM_MERGEABLE, mm)) {
|
||||
err = __ksm_enter(mm);
|
||||
if (err)
|
||||
return err;
|
||||
@@ -2912,7 +2912,7 @@ int __ksm_enter(struct mm_struct *mm)
|
||||
list_add_tail(&slot->mm_node, &ksm_scan.mm_slot->slot.mm_node);
|
||||
spin_unlock(&ksm_mmlist_lock);
|
||||
|
||||
set_bit(MMF_VM_MERGEABLE, &mm->flags);
|
||||
mm_flags_set(MMF_VM_MERGEABLE, mm);
|
||||
mmgrab(mm);
|
||||
|
||||
if (needs_wakeup)
|
||||
@@ -2954,8 +2954,8 @@ void __ksm_exit(struct mm_struct *mm)
|
||||
|
||||
if (easy_to_free) {
|
||||
mm_slot_free(mm_slot_cache, mm_slot);
|
||||
clear_bit(MMF_VM_MERGE_ANY, &mm->flags);
|
||||
clear_bit(MMF_VM_MERGEABLE, &mm->flags);
|
||||
mm_flags_clear(MMF_VM_MERGE_ANY, mm);
|
||||
mm_flags_clear(MMF_VM_MERGEABLE, mm);
|
||||
mmdrop(mm);
|
||||
} else if (mm_slot) {
|
||||
mmap_write_lock(mm);
|
||||
|
||||
Reference in New Issue
Block a user