From: Kirill Tkhai <ktkhai@virtuozzo.com>
To: vdavydov.dev@gmail.com, shakeelb@google.com,
viro@zeniv.linux.org.uk, hannes@cmpxchg.org, mhocko@kernel.org,
tglx@linutronix.de, pombredanne@nexb.com,
stummala@codeaurora.org, gregkh@linuxfoundation.org,
sfr@canb.auug.org.au, guro@fb.com, mka@chromium.org,
penguin-kernel@I-love.SAKURA.ne.jp, chris@chris-wilson.co.uk,
longman@redhat.com, minchan@kernel.org, ying.huang@intel.com,
mgorman@techsingularity.net, jbacik@fb.com, linux@roeck-us.net,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
willy@infradead.org, lirongqing@baidu.com,
aryabinin@virtuozzo.com
Subject: [PATCH v7 REBASED 09/17] list_lru: Add memcg argument to list_lru_from_kmem()
Date: Mon, 18 Jun 2018 12:46:20 +0300 [thread overview]
Message-ID: <152931518013.28457.11886844069560873308.stgit@localhost.localdomain> (raw)
In-Reply-To: <152931506756.28457.5620076974981468927.stgit@localhost.localdomain>
This is just refactoring to allow next patches to have
memcg pointer in list_lru_from_kmem().
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Acked-by: Vladimir Davydov <vdavydov.dev@gmail.com>
Tested-by: Shakeel Butt <shakeelb@google.com>
---
mm/list_lru.c | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/mm/list_lru.c b/mm/list_lru.c
index 077956f8d58f..55a76465f7a2 100644
--- a/mm/list_lru.c
+++ b/mm/list_lru.c
@@ -65,18 +65,24 @@ static __always_inline struct mem_cgroup *mem_cgroup_from_kmem(void *ptr)
}
static inline struct list_lru_one *
-list_lru_from_kmem(struct list_lru_node *nlru, void *ptr)
+list_lru_from_kmem(struct list_lru_node *nlru, void *ptr,
+ struct mem_cgroup **memcg_ptr)
{
- struct mem_cgroup *memcg;
+ struct list_lru_one *l = &nlru->lru;
+ struct mem_cgroup *memcg = NULL;
if (!nlru->memcg_lrus)
- return &nlru->lru;
+ goto out;
memcg = mem_cgroup_from_kmem(ptr);
if (!memcg)
- return &nlru->lru;
+ goto out;
- return list_lru_from_memcg_idx(nlru, memcg_cache_id(memcg));
+ l = list_lru_from_memcg_idx(nlru, memcg_cache_id(memcg));
+out:
+ if (memcg_ptr)
+ *memcg_ptr = memcg;
+ return l;
}
#else
static void list_lru_register(struct list_lru *lru)
@@ -99,8 +105,11 @@ list_lru_from_memcg_idx(struct list_lru_node *nlru, int idx)
}
static inline struct list_lru_one *
-list_lru_from_kmem(struct list_lru_node *nlru, void *ptr)
+list_lru_from_kmem(struct list_lru_node *nlru, void *ptr,
+ struct mem_cgroup **memcg_ptr)
{
+ if (memcg_ptr)
+ *memcg_ptr = NULL;
return &nlru->lru;
}
#endif /* CONFIG_MEMCG_KMEM */
@@ -113,7 +122,7 @@ bool list_lru_add(struct list_lru *lru, struct list_head *item)
spin_lock(&nlru->lock);
if (list_empty(item)) {
- l = list_lru_from_kmem(nlru, item);
+ l = list_lru_from_kmem(nlru, item, NULL);
list_add_tail(item, &l->list);
l->nr_items++;
nlru->nr_items++;
@@ -133,7 +142,7 @@ bool list_lru_del(struct list_lru *lru, struct list_head *item)
spin_lock(&nlru->lock);
if (!list_empty(item)) {
- l = list_lru_from_kmem(nlru, item);
+ l = list_lru_from_kmem(nlru, item, NULL);
list_del_init(item);
l->nr_items--;
nlru->nr_items--;
next prev parent reply other threads:[~2018-06-18 9:46 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-18 9:44 [PATCH v7 REBASED 00/17] Improve shrink_slab() scalability (old complexity was O(n^2), new is O(n)) Kirill Tkhai
2018-06-18 9:44 ` [PATCH v7 REBASED 01/17] list_lru: Combine code under the same define Kirill Tkhai
2018-06-18 9:45 ` [PATCH v7 REBASED 02/17] mm: Introduce CONFIG_MEMCG_KMEM as combination of CONFIG_MEMCG && !CONFIG_SLOB Kirill Tkhai
2018-06-18 9:45 ` [PATCH v7 REBASED 03/17] mm: Assign id to every memcg-aware shrinker Kirill Tkhai
2018-06-18 9:45 ` [PATCH v7 REBASED 04/17] memcg: Move up for_each_mem_cgroup{, _tree} defines Kirill Tkhai
2018-06-18 9:45 ` [PATCH v7 REBASED 05/17] mm: Assign memcg-aware shrinkers bitmap to memcg Kirill Tkhai
2018-06-18 9:45 ` [PATCH v7 REBASED 06/17] mm: Refactoring in workingset_init() Kirill Tkhai
2018-06-18 9:45 ` [PATCH v7 REBASED 07/17] fs: Refactoring in alloc_super() Kirill Tkhai
2018-06-18 9:46 ` [PATCH v7 REBASED 08/17] fs: Propagate shrinker::id to list_lru Kirill Tkhai
2018-06-18 9:46 ` Kirill Tkhai [this message]
2018-06-18 9:46 ` [PATCH v7 REBASED 10/17] list_lru: Pass dst_memcg argument to memcg_drain_list_lru_node() Kirill Tkhai
2018-06-18 9:46 ` [PATCH v7 REBASED 11/17] list_lru: Pass lru " Kirill Tkhai
2018-06-18 9:46 ` [PATCH v7 REBASED 12/17] mm: Export mem_cgroup_is_root() Kirill Tkhai
2018-06-18 9:47 ` [PATCH v7 REBASED 13/17] mm: Set bit in memcg shrinker bitmap on first list_lru item apearance Kirill Tkhai
2018-06-18 9:47 ` [PATCH v7 REBASED 14/17] mm: Iterate only over charged shrinkers during memcg shrink_slab() Kirill Tkhai
2018-06-18 9:47 ` [PATCH v7 REBASED 15/17] mm: Generalize shrink_slab() calls in shrink_node() Kirill Tkhai
2018-06-18 9:47 ` [PATCH v7 REBASED 16/17] mm: Add SHRINK_EMPTY shrinker methods return value Kirill Tkhai
2018-06-18 9:47 ` [PATCH v7 REBASED 17/17] mm: Clear shrinker bit if there are no objects related to memcg Kirill Tkhai
2018-07-02 9:10 ` [PATCH v7 REBASED 00/17] Improve shrink_slab() scalability (old complexity was O(n^2), new is O(n)) Kirill Tkhai
2018-07-02 21:01 ` Andrew Morton
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=152931518013.28457.11886844069560873308.stgit@localhost.localdomain \
--to=ktkhai@virtuozzo.com \
--cc=aryabinin@virtuozzo.com \
--cc=chris@chris-wilson.co.uk \
--cc=gregkh@linuxfoundation.org \
--cc=guro@fb.com \
--cc=hannes@cmpxchg.org \
--cc=jbacik@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux@roeck-us.net \
--cc=lirongqing@baidu.com \
--cc=longman@redhat.com \
--cc=mgorman@techsingularity.net \
--cc=mhocko@kernel.org \
--cc=minchan@kernel.org \
--cc=mka@chromium.org \
--cc=penguin-kernel@I-love.SAKURA.ne.jp \
--cc=pombredanne@nexb.com \
--cc=sfr@canb.auug.org.au \
--cc=shakeelb@google.com \
--cc=stummala@codeaurora.org \
--cc=tglx@linutronix.de \
--cc=vdavydov.dev@gmail.com \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.org \
--cc=ying.huang@intel.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).