From: Kirill Tkhai <ktkhai@virtuozzo.com>
To: akpm@linux-foundation.org, hannes@cmpxchg.org,
josef@toxicpanda.com, jack@suse.cz, hughd@google.com,
ktkhai@virtuozzo.com, darrick.wong@oracle.com, mhocko@suse.com,
aryabinin@virtuozzo.com, guro@fb.com,
mgorman@techsingularity.net, shakeelb@google.com,
linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/3] mm: Pass FGP_NOWAIT in generic_file_buffered_read and enable ext4
Date: Wed, 09 Jan 2019 15:20:35 +0300 [thread overview]
Message-ID: <154703643564.32690.8416317230641240199.stgit@localhost.localdomain> (raw)
In-Reply-To: <154703479840.32690.6504699919905946726.stgit@localhost.localdomain>
All page-obtaining functions, which are used by ext4, look
to go thru pagecache_get_page() path, so all taken uncharged
pages will be properly charged. Thus, we enable AS_KEEP_MEMCG_RECLAIM
for ext4 regular files.
Since memcg accounting requires page lock, and function
generic_file_buffered_read() is the only of ext4-used
functions, which does not care about FGP_NOWAIT, we make
it use find_get_page_flags() and pass the flag. This allows
pagecache_get_page() to use lock_page(), when it's possible.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
fs/ext4/inode.c | 1 +
mm/filemap.c | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index b1d7ddd70eee..2fc9e4a7c0db 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -5065,6 +5065,7 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,
inode->i_op = &ext4_file_inode_operations;
inode->i_fop = &ext4_file_operations;
ext4_set_aops(inode);
+ set_bit(AS_KEEP_MEMCG_RECLAIM, &inode->i_mapping->flags);
} else if (S_ISDIR(inode->i_mode)) {
inode->i_op = &ext4_dir_inode_operations;
inode->i_fop = &ext4_dir_operations;
diff --git a/mm/filemap.c b/mm/filemap.c
index 2603c44fc74a..46922003811f 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2061,6 +2061,11 @@ static void shrink_readahead_size_eio(struct file *filp,
ra->ra_pages /= 4;
}
+static int kiocb_fgp_flags(struct kiocb *iocb)
+{
+ return (iocb->ki_flags & IOCB_NOWAIT) ? FGP_NOWAIT : 0;
+}
+
/**
* generic_file_buffered_read - generic file read routine
* @iocb: the iocb to read
@@ -2111,7 +2116,8 @@ static ssize_t generic_file_buffered_read(struct kiocb *iocb,
goto out;
}
- page = find_get_page(mapping, index);
+ page = find_get_page_flags(mapping, index,
+ kiocb_fgp_flags(iocb));
if (!page) {
if (iocb->ki_flags & IOCB_NOWAIT)
goto would_block;
next prev parent reply other threads:[~2019-01-09 12:20 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-09 12:20 [PATCH RFC 0/3] mm: Reduce IO by improving algorithm of memcg pagecache pages eviction Kirill Tkhai
2019-01-09 12:20 ` [PATCH 1/3] mm: Uncharge and keep page in pagecache on memcg reclaim Kirill Tkhai
2019-01-09 12:20 ` [PATCH 2/3] mm: Recharge page memcg on first get from pagecache Kirill Tkhai
2019-01-09 12:20 ` Kirill Tkhai [this message]
2019-01-09 14:11 ` [PATCH RFC 0/3] mm: Reduce IO by improving algorithm of memcg pagecache pages eviction Michal Hocko
2019-01-09 15:43 ` Kirill Tkhai
2019-01-09 17:10 ` Michal Hocko
2019-01-10 9:42 ` Kirill Tkhai
2019-01-10 9:57 ` Michal Hocko
2019-01-09 15:49 ` Josef Bacik
2019-01-09 16:08 ` Kirill Tkhai
2019-01-09 16:33 ` Josef Bacik
2019-01-10 10:06 ` Kirill Tkhai
2019-01-09 16:45 ` Johannes Weiner
2019-01-09 17:44 ` Shakeel Butt
2019-01-09 19:20 ` Johannes Weiner
2019-01-09 17:37 ` Shakeel Butt
2019-01-10 9:46 ` Kirill Tkhai
2019-01-10 19:19 ` Shakeel Butt
2019-01-11 12:17 ` Kirill Tkhai
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=154703643564.32690.8416317230641240199.stgit@localhost.localdomain \
--to=ktkhai@virtuozzo.com \
--cc=akpm@linux-foundation.org \
--cc=aryabinin@virtuozzo.com \
--cc=darrick.wong@oracle.com \
--cc=guro@fb.com \
--cc=hannes@cmpxchg.org \
--cc=hughd@google.com \
--cc=jack@suse.cz \
--cc=josef@toxicpanda.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@techsingularity.net \
--cc=mhocko@suse.com \
--cc=shakeelb@google.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;
as well as URLs for NNTP newsgroup(s).