* [PATCH v2] mm: memcontrol: replace the loop with a list_for_each_entry()
@ 2021-02-04 16:30 Muchun Song
2021-02-04 17:43 ` Johannes Weiner
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Muchun Song @ 2021-02-04 16:30 UTC (permalink / raw)
To: hannes, mhocko, vdavydov.dev, akpm
Cc: cgroups, linux-mm, linux-kernel, Muchun Song
The rule of list walk has gone since:
commit a9d5adeeb4b2 ("mm/memcontrol: allow to uncharge page without using page->lru field")
So remove the strange comment and replace the loop with a
list_for_each_entry().
There is only one caller of the uncharge_list(). So just fold it into
mem_cgroup_uncharge_list() and remove it.
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
---
v2:
- Fold uncharge_list() to mem_cgroup_uncharge_list().
mm/memcontrol.c | 35 ++++++++---------------------------
1 file changed, 8 insertions(+), 27 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index ed5cc78a8dbf..8c035846c7a4 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -6862,31 +6862,6 @@ static void uncharge_page(struct page *page, struct uncharge_gather *ug)
css_put(&ug->memcg->css);
}
-static void uncharge_list(struct list_head *page_list)
-{
- struct uncharge_gather ug;
- struct list_head *next;
-
- uncharge_gather_clear(&ug);
-
- /*
- * Note that the list can be a single page->lru; hence the
- * do-while loop instead of a simple list_for_each_entry().
- */
- next = page_list->next;
- do {
- struct page *page;
-
- page = list_entry(next, struct page, lru);
- next = page->lru.next;
-
- uncharge_page(page, &ug);
- } while (next != page_list);
-
- if (ug.memcg)
- uncharge_batch(&ug);
-}
-
/**
* mem_cgroup_uncharge - uncharge a page
* @page: page to uncharge
@@ -6918,11 +6893,17 @@ void mem_cgroup_uncharge(struct page *page)
*/
void mem_cgroup_uncharge_list(struct list_head *page_list)
{
+ struct uncharge_gather ug;
+ struct page *page;
+
if (mem_cgroup_disabled())
return;
- if (!list_empty(page_list))
- uncharge_list(page_list);
+ uncharge_gather_clear(&ug);
+ list_for_each_entry(page, page_list, lru)
+ uncharge_page(page, &ug);
+ if (ug.memcg)
+ uncharge_batch(&ug);
}
/**
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] mm: memcontrol: replace the loop with a list_for_each_entry()
2021-02-04 16:30 [PATCH v2] mm: memcontrol: replace the loop with a list_for_each_entry() Muchun Song
@ 2021-02-04 17:43 ` Johannes Weiner
2021-02-04 18:37 ` Roman Gushchin
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Johannes Weiner @ 2021-02-04 17:43 UTC (permalink / raw)
To: Muchun Song; +Cc: mhocko, vdavydov.dev, akpm, cgroups, linux-mm, linux-kernel
On Fri, Feb 05, 2021 at 12:30:55AM +0800, Muchun Song wrote:
> The rule of list walk has gone since:
>
> commit a9d5adeeb4b2 ("mm/memcontrol: allow to uncharge page without using page->lru field")
>
> So remove the strange comment and replace the loop with a
> list_for_each_entry().
>
> There is only one caller of the uncharge_list(). So just fold it into
> mem_cgroup_uncharge_list() and remove it.
>
> Signed-off-by: Muchun Song <songmuchun@bytedance.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Thank you, Muchun!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] mm: memcontrol: replace the loop with a list_for_each_entry()
2021-02-04 16:30 [PATCH v2] mm: memcontrol: replace the loop with a list_for_each_entry() Muchun Song
2021-02-04 17:43 ` Johannes Weiner
@ 2021-02-04 18:37 ` Roman Gushchin
2021-02-05 2:53 ` Miaohe Lin
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Roman Gushchin @ 2021-02-04 18:37 UTC (permalink / raw)
To: Muchun Song
Cc: hannes, mhocko, vdavydov.dev, akpm, cgroups, linux-mm, linux-kernel
On Fri, Feb 05, 2021 at 12:30:55AM +0800, Muchun Song wrote:
> The rule of list walk has gone since:
>
> commit a9d5adeeb4b2 ("mm/memcontrol: allow to uncharge page without using page->lru field")
>
> So remove the strange comment and replace the loop with a
> list_for_each_entry().
>
> There is only one caller of the uncharge_list(). So just fold it into
> mem_cgroup_uncharge_list() and remove it.
>
> Signed-off-by: Muchun Song <songmuchun@bytedance.com>
> ---
> v2:
> - Fold uncharge_list() to mem_cgroup_uncharge_list().
>
> mm/memcontrol.c | 35 ++++++++---------------------------
> 1 file changed, 8 insertions(+), 27 deletions(-)
Nice cleanup!
Acked-by: Roman Gushchin <guro@fb.com>
Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] mm: memcontrol: replace the loop with a list_for_each_entry()
2021-02-04 16:30 [PATCH v2] mm: memcontrol: replace the loop with a list_for_each_entry() Muchun Song
2021-02-04 17:43 ` Johannes Weiner
2021-02-04 18:37 ` Roman Gushchin
@ 2021-02-05 2:53 ` Miaohe Lin
2021-02-05 15:27 ` Michal Hocko
2021-02-06 1:00 ` Shakeel Butt
4 siblings, 0 replies; 6+ messages in thread
From: Miaohe Lin @ 2021-02-05 2:53 UTC (permalink / raw)
To: Muchun Song
Cc: cgroups, linux-mm, linux-kernel, hannes, mhocko, vdavydov.dev, akpm
Hi:
On 2021/2/5 0:30, Muchun Song wrote:
> The rule of list walk has gone since:
>
> commit a9d5adeeb4b2 ("mm/memcontrol: allow to uncharge page without using page->lru field")
>
> So remove the strange comment and replace the loop with a
> list_for_each_entry().
>
> There is only one caller of the uncharge_list(). So just fold it into
> mem_cgroup_uncharge_list() and remove it.
>
> Signed-off-by: Muchun Song <songmuchun@bytedance.com>
LGTM. Thanks.
Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
> ---
> v2:
> - Fold uncharge_list() to mem_cgroup_uncharge_list().
>
> mm/memcontrol.c | 35 ++++++++---------------------------
> 1 file changed, 8 insertions(+), 27 deletions(-)
>
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index ed5cc78a8dbf..8c035846c7a4 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -6862,31 +6862,6 @@ static void uncharge_page(struct page *page, struct uncharge_gather *ug)
> css_put(&ug->memcg->css);
> }
>
> -static void uncharge_list(struct list_head *page_list)
> -{
> - struct uncharge_gather ug;
> - struct list_head *next;
> -
> - uncharge_gather_clear(&ug);
> -
> - /*
> - * Note that the list can be a single page->lru; hence the
> - * do-while loop instead of a simple list_for_each_entry().
> - */
> - next = page_list->next;
> - do {
> - struct page *page;
> -
> - page = list_entry(next, struct page, lru);
> - next = page->lru.next;
> -
> - uncharge_page(page, &ug);
> - } while (next != page_list);
> -
> - if (ug.memcg)
> - uncharge_batch(&ug);
> -}
> -
> /**
> * mem_cgroup_uncharge - uncharge a page
> * @page: page to uncharge
> @@ -6918,11 +6893,17 @@ void mem_cgroup_uncharge(struct page *page)
> */
> void mem_cgroup_uncharge_list(struct list_head *page_list)
> {
> + struct uncharge_gather ug;
> + struct page *page;
> +
> if (mem_cgroup_disabled())
> return;
>
> - if (!list_empty(page_list))
> - uncharge_list(page_list);
> + uncharge_gather_clear(&ug);
> + list_for_each_entry(page, page_list, lru)
> + uncharge_page(page, &ug);
> + if (ug.memcg)
> + uncharge_batch(&ug);
> }
>
> /**
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] mm: memcontrol: replace the loop with a list_for_each_entry()
2021-02-04 16:30 [PATCH v2] mm: memcontrol: replace the loop with a list_for_each_entry() Muchun Song
` (2 preceding siblings ...)
2021-02-05 2:53 ` Miaohe Lin
@ 2021-02-05 15:27 ` Michal Hocko
2021-02-06 1:00 ` Shakeel Butt
4 siblings, 0 replies; 6+ messages in thread
From: Michal Hocko @ 2021-02-05 15:27 UTC (permalink / raw)
To: Muchun Song; +Cc: hannes, vdavydov.dev, akpm, cgroups, linux-mm, linux-kernel
On Fri 05-02-21 00:30:55, Muchun Song wrote:
> The rule of list walk has gone since:
>
> commit a9d5adeeb4b2 ("mm/memcontrol: allow to uncharge page without using page->lru field")
>
> So remove the strange comment and replace the loop with a
> list_for_each_entry().
>
> There is only one caller of the uncharge_list(). So just fold it into
> mem_cgroup_uncharge_list() and remove it.
>
> Signed-off-by: Muchun Song <songmuchun@bytedance.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Thanks!
> ---
> v2:
> - Fold uncharge_list() to mem_cgroup_uncharge_list().
>
> mm/memcontrol.c | 35 ++++++++---------------------------
> 1 file changed, 8 insertions(+), 27 deletions(-)
>
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index ed5cc78a8dbf..8c035846c7a4 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -6862,31 +6862,6 @@ static void uncharge_page(struct page *page, struct uncharge_gather *ug)
> css_put(&ug->memcg->css);
> }
>
> -static void uncharge_list(struct list_head *page_list)
> -{
> - struct uncharge_gather ug;
> - struct list_head *next;
> -
> - uncharge_gather_clear(&ug);
> -
> - /*
> - * Note that the list can be a single page->lru; hence the
> - * do-while loop instead of a simple list_for_each_entry().
> - */
> - next = page_list->next;
> - do {
> - struct page *page;
> -
> - page = list_entry(next, struct page, lru);
> - next = page->lru.next;
> -
> - uncharge_page(page, &ug);
> - } while (next != page_list);
> -
> - if (ug.memcg)
> - uncharge_batch(&ug);
> -}
> -
> /**
> * mem_cgroup_uncharge - uncharge a page
> * @page: page to uncharge
> @@ -6918,11 +6893,17 @@ void mem_cgroup_uncharge(struct page *page)
> */
> void mem_cgroup_uncharge_list(struct list_head *page_list)
> {
> + struct uncharge_gather ug;
> + struct page *page;
> +
> if (mem_cgroup_disabled())
> return;
>
> - if (!list_empty(page_list))
> - uncharge_list(page_list);
> + uncharge_gather_clear(&ug);
> + list_for_each_entry(page, page_list, lru)
> + uncharge_page(page, &ug);
> + if (ug.memcg)
> + uncharge_batch(&ug);
> }
>
> /**
> --
> 2.11.0
--
Michal Hocko
SUSE Labs
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] mm: memcontrol: replace the loop with a list_for_each_entry()
2021-02-04 16:30 [PATCH v2] mm: memcontrol: replace the loop with a list_for_each_entry() Muchun Song
` (3 preceding siblings ...)
2021-02-05 15:27 ` Michal Hocko
@ 2021-02-06 1:00 ` Shakeel Butt
4 siblings, 0 replies; 6+ messages in thread
From: Shakeel Butt @ 2021-02-06 1:00 UTC (permalink / raw)
To: Muchun Song
Cc: Johannes Weiner, Michal Hocko, Vladimir Davydov, Andrew Morton,
Cgroups, Linux MM, LKML
On Thu, Feb 4, 2021 at 8:39 AM Muchun Song <songmuchun@bytedance.com> wrote:
>
> The rule of list walk has gone since:
>
> commit a9d5adeeb4b2 ("mm/memcontrol: allow to uncharge page without using page->lru field")
>
> So remove the strange comment and replace the loop with a
> list_for_each_entry().
>
> There is only one caller of the uncharge_list(). So just fold it into
> mem_cgroup_uncharge_list() and remove it.
>
> Signed-off-by: Muchun Song <songmuchun@bytedance.com>
Reviewed-by: Shakeel Butt <shakeelb@google.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-02-06 4:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-04 16:30 [PATCH v2] mm: memcontrol: replace the loop with a list_for_each_entry() Muchun Song
2021-02-04 17:43 ` Johannes Weiner
2021-02-04 18:37 ` Roman Gushchin
2021-02-05 2:53 ` Miaohe Lin
2021-02-05 15:27 ` Michal Hocko
2021-02-06 1:00 ` Shakeel Butt
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).