From: Jinjiang Tu <tujinjiang@huawei.com>
To: <miklos@szeredi.hu>, <amir73il@gmail.com>,
<akpm@linux-foundation.org>, <lorenzo.stoakes@oracle.com>,
<vbabka@suse.cz>, <jannh@google.com>
Cc: <linux-mm@kvack.org>, <linux-unionfs@vger.kernel.org>,
<wangkefeng.wang@huawei.com>, <sunnanyong@huawei.com>,
<yi.zhang@huawei.com>, <tujinjiang@huawe.com>
Subject: [PATCH -next] ovl: respect underlying filesystem's get_unmapped_area()
Date: Thu, 5 Dec 2024 22:30:38 +0800 [thread overview]
Message-ID: <20241205143038.3260233-1-tujinjiang@huawei.com> (raw)
During our tests in containers, there is a read-only file (i.e., shared
libraies) in the overlayfs filesystem, and the underlying filesystem is
ext4, which supports large folio. We mmap the file with PROT_READ prot,
and then call madvise(MADV_COLLAPSE) for it. However, the madvise call
fails and returns EINVAL.
The reason is that the mapping address isn't aligned to PMD size. Since
overlayfs doesn't support large folio, __get_unmapped_area() doesn't call
thp_get_unmapped_area() to get a THP aligned address.
To fix it, call get_unmapped_area() with the realfile.
Besides, since overlayfs may be built with CONFIG_OVERLAY_FS=m, we should
export get_unmapped_area().
Signed-off-by: Jinjiang Tu <tujinjiang@huawei.com>
---
fs/overlayfs/file.c | 20 ++++++++++++++++++++
mm/mmap.c | 1 +
2 files changed, 21 insertions(+)
diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c
index 969b458100fe..d0dcf675ebe8 100644
--- a/fs/overlayfs/file.c
+++ b/fs/overlayfs/file.c
@@ -653,6 +653,25 @@ static int ovl_flush(struct file *file, fl_owner_t id)
return err;
}
+static unsigned long ovl_get_unmapped_area(struct file *file,
+ unsigned long addr, unsigned long len, unsigned long pgoff,
+ unsigned long flags)
+{
+ struct file *realfile;
+ const struct cred *old_cred;
+ unsigned long ret;
+
+ realfile = ovl_real_file(file);
+ if (IS_ERR(realfile))
+ return PTR_ERR(realfile);
+
+ old_cred = ovl_override_creds(file_inode(file)->i_sb);
+ ret = get_unmapped_area(realfile, addr, len, pgoff, flags);
+ ovl_revert_creds(old_cred);
+
+ return ret;
+}
+
const struct file_operations ovl_file_operations = {
.open = ovl_open,
.release = ovl_release,
@@ -661,6 +680,7 @@ const struct file_operations ovl_file_operations = {
.write_iter = ovl_write_iter,
.fsync = ovl_fsync,
.mmap = ovl_mmap,
+ .get_unmapped_area = ovl_get_unmapped_area,
.fallocate = ovl_fallocate,
.fadvise = ovl_fadvise,
.flush = ovl_flush,
diff --git a/mm/mmap.c b/mm/mmap.c
index 16f8e8be01f8..60eb1ff7c9a8 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -913,6 +913,7 @@ __get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
error = security_mmap_addr(addr);
return error ? error : addr;
}
+EXPORT_SYMBOL(__get_unmapped_area);
unsigned long
mm_get_unmapped_area(struct mm_struct *mm, struct file *file,
--
2.34.1
next reply other threads:[~2024-12-05 14:33 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-05 14:30 Jinjiang Tu [this message]
2024-12-05 15:04 ` Lorenzo Stoakes
2024-12-05 15:12 ` Amir Goldstein
2024-12-05 15:24 ` Lorenzo Stoakes
2024-12-06 3:35 ` Jinjiang Tu
2024-12-06 13:52 ` Matthew Wilcox
2024-12-10 17:36 ` Jann Horn
2024-12-06 3:35 ` Jinjiang Tu
2024-12-06 9:25 ` Lorenzo Stoakes
2024-12-06 10:45 ` Kefeng Wang
2024-12-06 11:53 ` Lorenzo Stoakes
2024-12-10 7:09 ` Kefeng Wang
2024-12-06 12:58 ` Amir Goldstein
2024-12-10 7:19 ` Kefeng Wang
2024-12-11 9:43 ` Amir Goldstein
2024-12-11 15:01 ` Kefeng Wang
2024-12-13 1:51 ` Jinjiang Tu
2024-12-13 4:25 ` Matthew Wilcox
2024-12-13 7:49 ` Kefeng Wang
2024-12-13 14:00 ` Matthew Wilcox
2024-12-14 7:58 ` Kefeng Wang
2024-12-05 21:21 ` kernel test robot
2024-12-06 13:58 ` Matthew Wilcox
2024-12-09 6:43 ` Jinjiang Tu
2024-12-09 13:33 ` Matthew Wilcox
2024-12-10 7:13 ` Jinjiang Tu
2024-12-10 17:58 ` Matthew Wilcox
2024-12-11 2:21 ` Zhang Yi
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=20241205143038.3260233-1-tujinjiang@huawei.com \
--to=tujinjiang@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=amir73il@gmail.com \
--cc=jannh@google.com \
--cc=linux-mm@kvack.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=lorenzo.stoakes@oracle.com \
--cc=miklos@szeredi.hu \
--cc=sunnanyong@huawei.com \
--cc=tujinjiang@huawe.com \
--cc=vbabka@suse.cz \
--cc=wangkefeng.wang@huawei.com \
--cc=yi.zhang@huawei.com \
/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