From: Alex Shi <alex.shi@linux.alibaba.com>
To: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, akpm@linux-foundation.org,
mgorman@techsingularity.net, tj@kernel.org, hughd@google.com,
khlebnikov@yandex-team.ru, daniel.m.jordan@oracle.com,
yang.shi@linux.alibaba.com, willy@infradead.org,
shakeelb@google.com, hannes@cmpxchg.org
Cc: Alex Shi <alex.shi@linux.alibaba.com>,
Michal Hocko <mhocko@kernel.org>,
Vladimir Davydov <vdavydov.dev@gmail.com>
Subject: [PATCH v6 09/10] mm/memcg: fold lock in lock_page_lru
Date: Mon, 16 Dec 2019 17:26:25 +0800 [thread overview]
Message-ID: <1576488386-32544-10-git-send-email-alex.shi@linux.alibaba.com> (raw)
In-Reply-To: <1576488386-32544-1-git-send-email-alex.shi@linux.alibaba.com>
According to the calling path of commit_charge, the lrucare is bound
with PageLRU, so we could just fold it under PageLRU. This has no
functional change.
Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: cgroups@vger.kernel.org
Cc: linux-mm@kvack.org
Cc: linux-kernel@vger.kernel.org
---
mm/memcontrol.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 138f298b694f..f8e279487e1d 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2621,9 +2621,10 @@ static void cancel_charge(struct mem_cgroup *memcg, unsigned int nr_pages)
static struct lruvec *lock_page_lru(struct page *page, int *isolated)
{
- struct lruvec *lruvec = lock_page_lruvec_irq(page);
+ struct lruvec *lruvec = NULL;
if (PageLRU(page)) {
+ lruvec = lock_page_lruvec_irq(page);
ClearPageLRU(page);
del_page_from_lru_list(page, lruvec, page_lru(page));
@@ -2637,17 +2638,18 @@ static struct lruvec *lock_page_lru(struct page *page, int *isolated)
static void unlock_page_lru(struct page *page, int isolated,
struct lruvec *locked_lruvec)
{
- struct lruvec *lruvec;
+ if (isolated) {
+ struct lruvec *lruvec;
- unlock_page_lruvec_irq(locked_lruvec);
- lruvec = lock_page_lruvec_irq(page);
+ if (locked_lruvec)
+ unlock_page_lruvec_irq(locked_lruvec);
+ lruvec = lock_page_lruvec_irq(page);
- if (isolated) {
VM_BUG_ON_PAGE(PageLRU(page), page);
SetPageLRU(page);
add_page_to_lru_list(page, lruvec, page_lru(page));
+ unlock_page_lruvec_irq(lruvec);
}
- unlock_page_lruvec_irq(lruvec);
}
static void commit_charge(struct page *page, struct mem_cgroup *memcg,
--
1.8.3.1
next prev parent reply other threads:[~2019-12-16 9:28 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-16 9:26 [PATCH v6 00/10] per lruvec lru_lock for memcg Alex Shi
2019-12-16 9:26 ` [PATCH v6 01/10] mm/vmscan: remove unnecessary lruvec adding Alex Shi
2019-12-16 9:26 ` [PATCH v6 02/10] mm/lru: replace pgdat lru_lock with lruvec lock Alex Shi
2019-12-16 12:14 ` Matthew Wilcox
2019-12-17 1:30 ` Alex Shi
2019-12-17 2:16 ` Matthew Wilcox
2019-12-17 13:11 ` Alex Shi
2019-12-16 9:26 ` [PATCH v6 03/10] mm/lru: introduce the relock_page_lruvec function Alex Shi
2019-12-16 9:26 ` [PATCH v6 04/10] mm/mlock: optimize munlock_pagevec by relocking Alex Shi
2019-12-16 9:26 ` [PATCH v6 05/10] mm/swap: only change the lru_lock iff page's lruvec is different Alex Shi
2019-12-16 9:26 ` [PATCH v6 06/10] mm/pgdat: remove pgdat lru_lock Alex Shi
2019-12-16 9:26 ` [PATCH v6 07/10] mm/lru: revise the comments of lru_lock Alex Shi
2019-12-16 9:26 ` [PATCH v6 08/10] mm/lru: debug checking for page memcg moving and lock_page_memcg Alex Shi
2019-12-16 9:26 ` Alex Shi [this message]
2019-12-16 9:26 ` [PATCH v6 10/10] mm: revise the comments of mem_cgroup_page_lruvec Alex Shi
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=1576488386-32544-10-git-send-email-alex.shi@linux.alibaba.com \
--to=alex.shi@linux.alibaba.com \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=daniel.m.jordan@oracle.com \
--cc=hannes@cmpxchg.org \
--cc=hughd@google.com \
--cc=khlebnikov@yandex-team.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@techsingularity.net \
--cc=mhocko@kernel.org \
--cc=shakeelb@google.com \
--cc=tj@kernel.org \
--cc=vdavydov.dev@gmail.com \
--cc=willy@infradead.org \
--cc=yang.shi@linux.alibaba.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).