From: Suren Baghdasaryan <surenb@google•com>
To: akpm@linux-foundation•org
Cc: michel@lespinasse•org, nvdimm@lists•linux.dev, heiko@sntech•de,
leewalsh@google•com, dri-devel@lists•freedesktop.org,
perex@perex•cz, jglisse@google•com, arjunroy@google•com,
m.szyprowski@samsung•com, linux-arch@vger•kernel.org,
qianweili@huawei•com, linux-samsung-soc@vger•kernel.org,
aneesh.kumar@linux•ibm.com, chenhuacai@kernel•org,
kasan-dev@googlegroups•com, linux-acpi@vger•kernel.org,
rientjes@google•com, xen-devel@lists•xenproject.org,
devel@lists•orangefs.org, robdclark@gmail•com,
minchan@google•com, robert.jarzmik@free•fr,
linux-um@lists•infradead.org, etnaviv@lists•freedesktop.org,
npiggin@gmail•com, alex.williamson@redhat•com,
viro@zeniv•linux.org.uk, luto@kernel•org, gthelen@google•com,
tglx@linutronix•de, ldufour@linux•ibm.com, surenb@google•com,
linux-sgx@vger•kernel.org, martin.petersen@oracle•com,
linux-usb@vger•kernel.org, linux-kernel@vger•kernel.org,
linux-perf-users@vger•kernel.org, linux-crypto@vger•kernel.org,
linux-fsdevel@vger•kernel.org, linux-media@vger•k ernel.org,
freedreno@lists•freedesktop.org, joelaf@google•com,
linux-aio@kvack•org, linux-fbdev@vger•kernel.org,
linux-ia64@vger•kernel.org, david@redhat•com,
dave.hansen@linux•intel.com,
virtualization@lists•linux-foundation.org, edumazet@google•com,
target-devel@vger•kernel.org, punit.agrawal@bytedance•com,
linux-s390@vger•kernel.org, dave@stgolabs•net, deller@gmx•de,
hughd@google•com, andrii@kernel•org,
patrik.r.jakobsson@gmail•com,
linux-stm32@st-md-mailman•stormreply.com,
linux-rockchip@lists•infradead.org,
linux-graphics-maintainer@vmware•com, kernel-team@android•com,
jayalk@intworks•biz, soheil@google•com, selinux@vger•kernel.org,
linux-arm-msm@vger•kernel.org, mripard@kernel•org,
shakeelb@google•com, haojian.zhuang@gmail•com,
loongarch@lists•linux.dev, linux-arm-kernel@lists•infradead.org,
tytso@mit•edu, nico@fluxnic•net, muchun.song@linux•dev,
hjc@rock-chips•com, mcoquelin.stm32@gmail•com,
tatashin@google•com, mike.kravetz@oracle•com,
songliubraving@fb•com, jasowang@redhat. com,
alsa-devel@alsa-project•org, peterx@redhat•com,
linux-tegra@vger•kernel.org, kraxel@redhat•com, will@kernel•org,
dmaengine@vger•kernel.org, bhe@redhat•com, miklos@szeredi•hu,
linux-rdma@vger•kernel.org, linux-staging@lists•linux.dev,
willy@infradead•org, gurua@google•com, dgilbert@interlog•com,
xiang@kernel•org, pabeni@redhat•com, jejb@linux•ibm.com,
quic_abhinavk@quicinc•com, bp@alien8•de, mchehab@kernel•org,
linux-ext4@vger•kernel.org, tomba@kernel•org,
hughlynch@google•com, sre@kernel•org, tfiga@chromium•org,
linux-xfs@vger•kernel.org, zhangfei.gao@linaro•org,
wangzhou1@hisilicon•com, netdev@vger•kernel.org,
bpf@vger•kernel.org, linux-erofs@lists•ozlabs.org,
davem@davemloft•net, mhocko@suse•com, kvm@vger•kernel.org,
mst@redhat•com, peterz@infradead•org, bigeasy@linutronix•de,
alexandre.torgue@foss•st.com, dhowells@redhat•com,
linux-mm@kvack•org, ray.huang@amd•com, adilger.kernel@dilger•ca,
kuba@kernel•org, sparclinux@vger•kernel.org, airlied@gmail•com,
anton.ivanov@cambridge greys.com, herbert@gondor•apana.org.au,
linux-scsi@vger•kernel.org, richard@nod•at, x86@kernel•org,
vkoul@kernel•org, mingo@redhat•com, axelrasmussen@google•com,
intel-gfx@lists•freedesktop.org, daniel@ffwll•ch,
paulmck@kernel•org, jannh@google•com, chao@kernel•org,
maarten.lankhorst@linux•intel.com, liam.howlett@oracle•com,
hdegoede@redhat•com, linux-mediatek@lists•infradead.org,
matthias.bgg@gmail•com, vbabka@suse•cz, dimitri.sivanich@hpe•com,
amd-gfx@lists•freedesktop.org, posk@google•com,
lstoakes@gmail•com, peterjung1337@gmail•com,
yoshfuji@linux-ipv6•org, linuxppc-dev@lists•ozlabs.org,
dsahern@kernel•org, kent.overstreet@linux•dev,
kexec@lists•infradead.org, tiwai@suse•com,
krzysztof.kozlowski@linaro•org, tzimmermann@suse•de,
hannes@cmpxchg•org, dmitry.baryshkov@linaro•org,
johannes@sipsolutions•net, mgorman@techsingularity•net,
linux-accelerators@lists•ozlabs.org, l.stach@pengutronix•de
Subject: [PATCH v2 2/6] mm: replace VM_LOCKED_CLEAR_MASK with VM_LOCKED_MASK
Date: Wed, 25 Jan 2023 00:38:47 -0800 [thread overview]
Message-ID: <20230125083851.27759-3-surenb@google.com> (raw)
In-Reply-To: <20230125083851.27759-1-surenb@google.com>
To simplify the usage of VM_LOCKED_CLEAR_MASK in clear_vm_flags(),
replace it with VM_LOCKED_MASK bitmask and convert all users.
Signed-off-by: Suren Baghdasaryan <surenb@google•com>
---
include/linux/mm.h | 4 ++--
kernel/fork.c | 2 +-
mm/hugetlb.c | 4 ++--
mm/mlock.c | 6 +++---
mm/mmap.c | 6 +++---
mm/mremap.c | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index b71f2809caac..da62bdd627bf 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -421,8 +421,8 @@ extern unsigned int kobjsize(const void *objp);
/* This mask defines which mm->def_flags a process can inherit its parent */
#define VM_INIT_DEF_MASK VM_NOHUGEPAGE
-/* This mask is used to clear all the VMA flags used by mlock */
-#define VM_LOCKED_CLEAR_MASK (~(VM_LOCKED | VM_LOCKONFAULT))
+/* This mask represents all the VMA flag bits used by mlock */
+#define VM_LOCKED_MASK (VM_LOCKED | VM_LOCKONFAULT)
/* Arch-specific flags to clear when updating VM flags on protection change */
#ifndef VM_ARCH_CLEAR
diff --git a/kernel/fork.c b/kernel/fork.c
index 6683c1b0f460..03d472051236 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -669,7 +669,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
tmp->anon_vma = NULL;
} else if (anon_vma_fork(tmp, mpnt))
goto fail_nomem_anon_vma_fork;
- tmp->vm_flags &= ~(VM_LOCKED | VM_LOCKONFAULT);
+ clear_vm_flags(tmp, VM_LOCKED_MASK);
file = tmp->vm_file;
if (file) {
struct address_space *mapping = file->f_mapping;
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index d20c8b09890e..4ecdbad9a451 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -6973,8 +6973,8 @@ static unsigned long page_table_shareable(struct vm_area_struct *svma,
unsigned long s_end = sbase + PUD_SIZE;
/* Allow segments to share if only one is marked locked */
- unsigned long vm_flags = vma->vm_flags & VM_LOCKED_CLEAR_MASK;
- unsigned long svm_flags = svma->vm_flags & VM_LOCKED_CLEAR_MASK;
+ unsigned long vm_flags = vma->vm_flags & ~VM_LOCKED_MASK;
+ unsigned long svm_flags = svma->vm_flags & ~VM_LOCKED_MASK;
/*
* match the virtual addresses, permission and the alignment of the
diff --git a/mm/mlock.c b/mm/mlock.c
index 0336f52e03d7..5c4fff93cd6b 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -497,7 +497,7 @@ static int apply_vma_lock_flags(unsigned long start, size_t len,
if (vma->vm_start != tmp)
return -ENOMEM;
- newflags = vma->vm_flags & VM_LOCKED_CLEAR_MASK;
+ newflags = vma->vm_flags & ~VM_LOCKED_MASK;
newflags |= flags;
/* Here we know that vma->vm_start <= nstart < vma->vm_end. */
tmp = vma->vm_end;
@@ -661,7 +661,7 @@ static int apply_mlockall_flags(int flags)
struct vm_area_struct *vma, *prev = NULL;
vm_flags_t to_add = 0;
- current->mm->def_flags &= VM_LOCKED_CLEAR_MASK;
+ current->mm->def_flags &= ~VM_LOCKED_MASK;
if (flags & MCL_FUTURE) {
current->mm->def_flags |= VM_LOCKED;
@@ -681,7 +681,7 @@ static int apply_mlockall_flags(int flags)
for_each_vma(vmi, vma) {
vm_flags_t newflags;
- newflags = vma->vm_flags & VM_LOCKED_CLEAR_MASK;
+ newflags = vma->vm_flags & ~VM_LOCKED_MASK;
newflags |= to_add;
/* Ignore errors */
diff --git a/mm/mmap.c b/mm/mmap.c
index d4abc6feced1..323bd253b25a 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2671,7 +2671,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
if ((vm_flags & VM_SPECIAL) || vma_is_dax(vma) ||
is_vm_hugetlb_page(vma) ||
vma == get_gate_vma(current->mm))
- vma->vm_flags &= VM_LOCKED_CLEAR_MASK;
+ clear_vm_flags(vma, VM_LOCKED_MASK);
else
mm->locked_vm += (len >> PAGE_SHIFT);
}
@@ -3340,8 +3340,8 @@ static struct vm_area_struct *__install_special_mapping(
vma->vm_start = addr;
vma->vm_end = addr + len;
- vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
- vma->vm_flags &= VM_LOCKED_CLEAR_MASK;
+ init_vm_flags(vma, (vm_flags | mm->def_flags |
+ VM_DONTEXPAND | VM_SOFTDIRTY) & ~VM_LOCKED_MASK);
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
vma->vm_ops = ops;
diff --git a/mm/mremap.c b/mm/mremap.c
index 1b3ee02bead7..35db9752cb6a 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -687,7 +687,7 @@ static unsigned long move_vma(struct vm_area_struct *vma,
if (unlikely(!err && (flags & MREMAP_DONTUNMAP))) {
/* We always clear VM_LOCKED[ONFAULT] on the old vma */
- vma->vm_flags &= VM_LOCKED_CLEAR_MASK;
+ clear_vm_flags(vma, VM_LOCKED_MASK);
/*
* anon_vma links of the old vma is no longer needed after its page
--
2.39.1
next prev parent reply other threads:[~2023-01-25 11:53 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-25 8:38 [PATCH v2 0/6] introduce vm_flags modifier functions Suren Baghdasaryan
2023-01-25 8:38 ` [PATCH v2 1/6] mm: introduce vma->vm_flags " Suren Baghdasaryan
2023-01-25 8:56 ` Michal Hocko
2023-01-25 9:09 ` Peter Zijlstra
2023-01-25 16:49 ` Suren Baghdasaryan
2023-01-25 18:37 ` Matthew Wilcox
2023-01-25 19:21 ` Suren Baghdasaryan
2023-01-25 18:33 ` Matthew Wilcox
2023-01-25 19:22 ` Suren Baghdasaryan
2023-01-26 9:17 ` Mike Rapoport
2023-01-26 14:50 ` Mike Rapoport
2023-01-26 15:09 ` Matthew Wilcox
2023-01-26 16:25 ` Suren Baghdasaryan
2023-01-25 8:38 ` Suren Baghdasaryan [this message]
2023-01-25 9:02 ` [PATCH v2 2/6] mm: replace VM_LOCKED_CLEAR_MASK with VM_LOCKED_MASK Michal Hocko
2023-01-26 9:19 ` Mike Rapoport
2023-01-25 8:38 ` [PATCH v2 3/6] mm: replace vma->vm_flags direct modifications with modifier calls Suren Baghdasaryan
2023-01-25 9:30 ` Michal Hocko
2023-01-25 16:55 ` Suren Baghdasaryan
2023-01-26 9:21 ` Mike Rapoport
2023-01-26 17:07 ` Sebastian Reichel
2023-01-25 8:38 ` [PATCH v2 4/6] mm: replace vma->vm_flags indirect modification in ksm_madvise Suren Baghdasaryan
2023-01-25 9:38 ` Michal Hocko
2023-01-25 16:57 ` Suren Baghdasaryan
2023-01-25 17:08 ` Michal Hocko
2023-01-25 17:22 ` Suren Baghdasaryan
2023-01-26 9:26 ` Mike Rapoport
2023-01-25 8:38 ` [PATCH v2 5/6] mm: introduce mod_vm_flags_nolock and use it in untrack_pfn Suren Baghdasaryan
2023-01-25 9:42 ` Michal Hocko
2023-01-25 17:00 ` Suren Baghdasaryan
2023-01-26 9:34 ` Mike Rapoport
2023-01-25 8:38 ` [PATCH v2 6/6] mm: export dump_mm() Suren Baghdasaryan
2023-01-25 9:43 ` Michal Hocko
2023-01-26 14:48 ` Mike Rapoport
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230125083851.27759-3-surenb@google.com \
--to=surenb@google$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=alex.williamson@redhat$(echo .)com \
--cc=aneesh.kumar@linux$(echo .)ibm.com \
--cc=arjunroy@google$(echo .)com \
--cc=chenhuacai@kernel$(echo .)org \
--cc=devel@lists$(echo .)orangefs.org \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=etnaviv@lists$(echo .)freedesktop.org \
--cc=gthelen@google$(echo .)com \
--cc=heiko@sntech$(echo .)de \
--cc=jglisse@google$(echo .)com \
--cc=kasan-dev@googlegroups$(echo .)com \
--cc=ldufour@linux$(echo .)ibm.com \
--cc=leewalsh@google$(echo .)com \
--cc=linux-acpi@vger$(echo .)kernel.org \
--cc=linux-arch@vger$(echo .)kernel.org \
--cc=linux-crypto@vger$(echo .)kernel.org \
--cc=linux-fsdevel@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-media@vger$(echo .)k \
--cc=linux-perf-users@vger$(echo .)kernel.org \
--cc=linux-samsung-soc@vger$(echo .)kernel.org \
--cc=linux-sgx@vger$(echo .)kernel.org \
--cc=linux-um@lists$(echo .)infradead.org \
--cc=linux-usb@vger$(echo .)kernel.org \
--cc=luto@kernel$(echo .)org \
--cc=m.szyprowski@samsung$(echo .)com \
--cc=martin.petersen@oracle$(echo .)com \
--cc=michel@lespinasse$(echo .)org \
--cc=minchan@google$(echo .)com \
--cc=npiggin@gmail$(echo .)com \
--cc=nvdimm@lists$(echo .)linux.dev \
--cc=perex@perex$(echo .)cz \
--cc=qianweili@huawei$(echo .)com \
--cc=rientjes@google$(echo .)com \
--cc=robdclark@gmail$(echo .)com \
--cc=robert.jarzmik@free$(echo .)fr \
--cc=tglx@linutronix$(echo .)de \
--cc=viro@zeniv$(echo .)linux.org.uk \
--cc=xen-devel@lists$(echo .)xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox