From: Suren Baghdasaryan <surenb@google.com>
To: akpm@linux-foundation.org
Cc: michel@lespinasse.org, jglisse@google.com, mhocko@suse.com,
vbabka@suse.cz, hannes@cmpxchg.org, mgorman@techsingularity.net,
dave@stgolabs.net, willy@infradead.org, liam.howlett@oracle.com,
peterz@infradead.org, ldufour@linux.ibm.com, paulmck@kernel.org,
luto@kernel.org, songliubraving@fb.com, peterx@redhat.com,
david@redhat.com, dhowells@redhat.com, hughd@google.com,
bigeasy@linutronix.de, kent.overstreet@linux.dev,
punit.agrawal@bytedance.com, lstoakes@gmail.com,
peterjung1337@gmail.com, rientjes@google.com,
axelrasmussen@google.com, joelaf@google.com, minchan@google.com,
jannh@google.com, shakeelb@google.com, tatashin@google.com,
edumazet@google.com, gthelen@google.com, gurua@google.com,
arjunroy@google.com, soheil@google.com, hughlynch@google.com,
leewalsh@google.com, posk@google.com, will@kernel.org,
aneesh.kumar@linux.ibm.com, npiggin@gmail.com,
chenhuacai@kernel.org, tglx@linutronix.de, mingo@redhat.com,
bp@alien8.de, dave.hansen@linux.intel.com, richard@nod.at,
anton.ivanov@cambridgegreys.com, johannes@sipsolutions.net,
qianweili@huawei.com, wangzhou1@hisilicon.com,
herbert@gondor.apana.org.au, davem@davemloft.net,
vkoul@kernel.org, airlied@gmail.com, daniel@ffwll.ch,
maarten.lankhorst@linux.intel.com, mripard@kernel.org,
tzimmermann@suse.de, l.stach@pengutronix.de,
krzysztof.kozlowski@linaro.org, patrik.r.jakobsson@gmail.com,
matthias.bgg@gmail.com, robdclark@gmail.com,
quic_abhinavk@quicinc.com, dmitry.baryshkov@linaro.org,
tomba@kernel.org, hjc@rock-chips.com, heiko@sntech.de,
ray.huang@amd.com, kraxel@redhat.com, sre@kernel.org,
mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com,
tfiga@chromium.org, m.szyprowski@samsung.com, mchehab@kernel.org,
dimitri.sivanich@hpe.com, zhangfei.gao@linaro.org,
jejb@linux.ibm.com, martin.petersen@oracle.com,
dgilbert@interlog.com, hdegoede@redhat.com, mst@redhat.com,
jasowang@redhat.com, alex.williamson@redhat.com, deller@gmx.de,
jayalk@intworks.biz, viro@zeniv.linux.org.uk, nico@fluxnic.net,
xiang@kernel.org, chao@kernel.org, tytso@mit.edu,
adilger.kernel@dilger.ca, miklos@szeredi.hu,
mike.kravetz@oracle.com, muchun.song@linux.dev, bhe@redhat.com,
andrii@kernel.org, yoshfuji@linux-ipv6.org, dsahern@kernel.org,
kuba@kernel.org, pabeni@redhat.com, perex@perex.cz,
tiwai@suse.com, haojian.zhuang@gmail.com, robert.jarzmik@free.fr,
linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org,
linuxppc-dev@lists.ozlabs.org, x86@kernel.org,
linux-kernel@vger.kernel.org,
linux-graphics-maintainer@vmware.com, linux-ia64@vger.kernel.org,
linux-arch@vger.kernel.org, loongarch@lists.linux.dev,
kvm@vger.kernel.org, linux-s390@vger.kernel.org,
linux-sgx@vger.kernel.org, linux-um@lists.infradead.org,
linux-acpi@vger.kernel.org, linux-crypto@vger.kernel.org,
nvdimm@lists.linux.dev, dmaengine@vger.kernel.org,
amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
etnaviv@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
intel-gfx@lists.freedesktop.org,
linux-mediatek@lists.infradead.org,
linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org,
linux-rockchip@lists.infradead.org, linux-tegra@vger.kernel.org,
virtualization@lists.linux-foundation.org,
xen-devel@lists.xenproject.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-rdma@vger.kernel.org, linux-media@vger.kernel.org,
linux-accelerators@lists.ozlabs.org, sparclinux@vger.kernel.org,
linux-scsi@vger.kernel.org, linux-staging@lists.linux.dev,
target-devel@vger.kernel.org, linux-usb@vger.kernel.org,
netdev@vger.kernel.org, linux-fbdev@vger.kernel.org,
linux-aio@kvack.org, linux-fsdevel@vger.kernel.org,
linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org,
devel@lists.orangefs.org, kexec@lists.infradead.org,
linux-xfs@vger.kernel.org, bpf@vger.kernel.org,
linux-perf-users@vger.kernel.org, kasan-dev@googlegroups.com,
selinux@vger.kernel.org, alsa-devel@alsa-project.org,
kernel-team@android.com, surenb@google.com
Subject: [PATCH v2 4/6] mm: replace vma->vm_flags indirect modification in ksm_madvise
Date: Wed, 25 Jan 2023 00:38:49 -0800 [thread overview]
Message-ID: <20230125083851.27759-5-surenb@google.com> (raw)
In-Reply-To: <20230125083851.27759-1-surenb@google.com>
Replace indirect modifications to vma->vm_flags with calls to modifier
functions to be able to track flag changes and to keep vma locking
correctness. Add a BUG_ON check in ksm_madvise() to catch indirect
vm_flags modification attempts.
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
---
arch/powerpc/kvm/book3s_hv_uvmem.c | 5 ++++-
arch/s390/mm/gmap.c | 5 ++++-
mm/khugepaged.c | 2 ++
mm/ksm.c | 2 ++
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kvm/book3s_hv_uvmem.c b/arch/powerpc/kvm/book3s_hv_uvmem.c
index 1d67baa5557a..325a7a47d348 100644
--- a/arch/powerpc/kvm/book3s_hv_uvmem.c
+++ b/arch/powerpc/kvm/book3s_hv_uvmem.c
@@ -393,6 +393,7 @@ static int kvmppc_memslot_page_merge(struct kvm *kvm,
{
unsigned long gfn = memslot->base_gfn;
unsigned long end, start = gfn_to_hva(kvm, gfn);
+ unsigned long vm_flags;
int ret = 0;
struct vm_area_struct *vma;
int merge_flag = (merge) ? MADV_MERGEABLE : MADV_UNMERGEABLE;
@@ -409,12 +410,14 @@ static int kvmppc_memslot_page_merge(struct kvm *kvm,
ret = H_STATE;
break;
}
+ vm_flags = vma->vm_flags;
ret = ksm_madvise(vma, vma->vm_start, vma->vm_end,
- merge_flag, &vma->vm_flags);
+ merge_flag, &vm_flags);
if (ret) {
ret = H_STATE;
break;
}
+ reset_vm_flags(vma, vm_flags);
start = vma->vm_end;
} while (end > vma->vm_end);
diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c
index 3a695b8a1e3c..d5eb47dcdacb 100644
--- a/arch/s390/mm/gmap.c
+++ b/arch/s390/mm/gmap.c
@@ -2587,14 +2587,17 @@ int gmap_mark_unmergeable(void)
{
struct mm_struct *mm = current->mm;
struct vm_area_struct *vma;
+ unsigned long vm_flags;
int ret;
VMA_ITERATOR(vmi, mm, 0);
for_each_vma(vmi, vma) {
+ vm_flags = vma->vm_flags;
ret = ksm_madvise(vma, vma->vm_start, vma->vm_end,
- MADV_UNMERGEABLE, &vma->vm_flags);
+ MADV_UNMERGEABLE, &vm_flags);
if (ret)
return ret;
+ reset_vm_flags(vma, vm_flags);
}
mm->def_flags &= ~VM_MERGEABLE;
return 0;
diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 8abc59345bf2..76b24cd0c179 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -354,6 +354,8 @@ struct attribute_group khugepaged_attr_group = {
int hugepage_madvise(struct vm_area_struct *vma,
unsigned long *vm_flags, int advice)
{
+ /* vma->vm_flags can be changed only using modifier functions */
+ BUG_ON(vm_flags == &vma->vm_flags);
switch (advice) {
case MADV_HUGEPAGE:
#ifdef CONFIG_S390
diff --git a/mm/ksm.c b/mm/ksm.c
index 04f1c8c2df11..992b2be9f5e6 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -2573,6 +2573,8 @@ int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
struct mm_struct *mm = vma->vm_mm;
int err;
+ /* vma->vm_flags can be changed only using modifier functions */
+ BUG_ON(vm_flags == &vma->vm_flags);
switch (advice) {
case MADV_MERGEABLE:
/*
--
2.39.1
next prev parent reply other threads:[~2023-01-25 8:41 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 ` [PATCH v2 2/6] mm: replace VM_LOCKED_CLEAR_MASK with VM_LOCKED_MASK Suren Baghdasaryan
2023-01-25 9:02 ` 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 ` Suren Baghdasaryan [this message]
2023-01-25 9:38 ` [PATCH v2 4/6] mm: replace vma->vm_flags indirect modification in ksm_madvise 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-5-surenb@google.com \
--to=surenb@google.com \
--cc=adilger.kernel@dilger.ca \
--cc=airlied@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=alex.williamson@redhat.com \
--cc=alexandre.torgue@foss.st.com \
--cc=alsa-devel@alsa-project.org \
--cc=amd-gfx@lists.freedesktop.org \
--cc=andrii@kernel.org \
--cc=aneesh.kumar@linux.ibm.com \
--cc=anton.ivanov@cambridgegreys.com \
--cc=arjunroy@google.com \
--cc=axelrasmussen@google.com \
--cc=bhe@redhat.com \
--cc=bigeasy@linutronix.de \
--cc=bp@alien8.de \
--cc=bpf@vger.kernel.org \
--cc=chao@kernel.org \
--cc=chenhuacai@kernel.org \
--cc=daniel@ffwll.ch \
--cc=dave.hansen@linux.intel.com \
--cc=dave@stgolabs.net \
--cc=davem@davemloft.net \
--cc=david@redhat.com \
--cc=deller@gmx.de \
--cc=devel@lists.orangefs.org \
--cc=dgilbert@interlog.com \
--cc=dhowells@redhat.com \
--cc=dimitri.sivanich@hpe.com \
--cc=dmaengine@vger.kernel.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=etnaviv@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=gthelen@google.com \
--cc=gurua@google.com \
--cc=hannes@cmpxchg.org \
--cc=haojian.zhuang@gmail.com \
--cc=hdegoede@redhat.com \
--cc=heiko@sntech.de \
--cc=herbert@gondor.apana.org.au \
--cc=hjc@rock-chips.com \
--cc=hughd@google.com \
--cc=hughlynch@google.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jannh@google.com \
--cc=jasowang@redhat.com \
--cc=jayalk@intworks.biz \
--cc=jejb@linux.ibm.com \
--cc=jglisse@google.com \
--cc=joelaf@google.com \
--cc=johannes@sipsolutions.net \
--cc=kasan-dev@googlegroups.com \
--cc=kent.overstreet@linux.dev \
--cc=kernel-team@android.com \
--cc=kexec@lists.infradead.org \
--cc=kraxel@redhat.com \
--cc=krzysztof.kozlowski@linaro.org \
--cc=kuba@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=l.stach@pengutronix.de \
--cc=ldufour@linux.ibm.com \
--cc=leewalsh@google.com \
--cc=liam.howlett@oracle.com \
--cc=linux-accelerators@lists.ozlabs.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-aio@kvack.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-erofs@lists.ozlabs.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-graphics-maintainer@vmware.com \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-mm@kvack.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-sgx@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux-tegra@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=loongarch@lists.linux.dev \
--cc=lstoakes@gmail.com \
--cc=luto@kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=martin.petersen@oracle.com \
--cc=matthias.bgg@gmail.com \
--cc=mchehab@kernel.org \
--cc=mcoquelin.stm32@gmail.com \
--cc=mgorman@techsingularity.net \
--cc=mhocko@suse.com \
--cc=michel@lespinasse.org \
--cc=mike.kravetz@oracle.com \
--cc=miklos@szeredi.hu \
--cc=minchan@google.com \
--cc=mingo@redhat.com \
--cc=mripard@kernel.org \
--cc=mst@redhat.com \
--cc=muchun.song@linux.dev \
--cc=netdev@vger.kernel.org \
--cc=nico@fluxnic.net \
--cc=npiggin@gmail.com \
--cc=nvdimm@lists.linux.dev \
--cc=pabeni@redhat.com \
--cc=patrik.r.jakobsson@gmail.com \
--cc=paulmck@kernel.org \
--cc=perex@perex.cz \
--cc=peterjung1337@gmail.com \
--cc=peterx@redhat.com \
--cc=peterz@infradead.org \
--cc=posk@google.com \
--cc=punit.agrawal@bytedance.com \
--cc=qianweili@huawei.com \
--cc=quic_abhinavk@quicinc.com \
--cc=ray.huang@amd.com \
--cc=richard@nod.at \
--cc=rientjes@google.com \
--cc=robdclark@gmail.com \
--cc=robert.jarzmik@free.fr \
--cc=selinux@vger.kernel.org \
--cc=shakeelb@google.com \
--cc=soheil@google.com \
--cc=songliubraving@fb.com \
--cc=sparclinux@vger.kernel.org \
--cc=sre@kernel.org \
--cc=target-devel@vger.kernel.org \
--cc=tatashin@google.com \
--cc=tfiga@chromium.org \
--cc=tglx@linutronix.de \
--cc=tiwai@suse.com \
--cc=tomba@kernel.org \
--cc=tytso@mit.edu \
--cc=tzimmermann@suse.de \
--cc=vbabka@suse.cz \
--cc=viro@zeniv.linux.org.uk \
--cc=virtualization@lists.linux-foundation.org \
--cc=vkoul@kernel.org \
--cc=wangzhou1@hisilicon.com \
--cc=will@kernel.org \
--cc=willy@infradead.org \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
--cc=xiang@kernel.org \
--cc=yoshfuji@linux-ipv6.org \
--cc=zhangfei.gao@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).