* [PATCH] swap: cond_resched in swap_cgroup_prepare()
@ 2017-06-01 19:56 Yu Zhao
2017-06-02 8:18 ` Michal Hocko
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Yu Zhao @ 2017-06-01 19:56 UTC (permalink / raw)
To: Johannes Weiner, Michal Hocko, Vladimir Davydov
Cc: cgroups, linux-mm, linux-kernel, Yu Zhao
Saw need_resched() warnings when swapping on large swapfile (TBs)
because page allocation in swap_cgroup_prepare() took too long.
We already cond_resched when freeing page in swap_cgroup_swapoff().
Do the same for the page allocation.
Signed-off-by: Yu Zhao <yuzhao@google.com>
---
mm/swap_cgroup.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/mm/swap_cgroup.c b/mm/swap_cgroup.c
index ac6318a064d3..3405b4ee1757 100644
--- a/mm/swap_cgroup.c
+++ b/mm/swap_cgroup.c
@@ -48,6 +48,9 @@ static int swap_cgroup_prepare(int type)
if (!page)
goto not_enough_page;
ctrl->map[idx] = page;
+
+ if (!(idx % SWAP_CLUSTER_MAX))
+ cond_resched();
}
return 0;
not_enough_page:
--
2.13.0.219.gdb65acc882-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] swap: cond_resched in swap_cgroup_prepare()
2017-06-01 19:56 [PATCH] swap: cond_resched in swap_cgroup_prepare() Yu Zhao
@ 2017-06-02 8:18 ` Michal Hocko
2017-06-04 19:38 ` Yu Zhao
2017-06-03 14:58 ` Vladimir Davydov
2017-06-04 20:01 ` [PATCH v2] " Yu Zhao
2 siblings, 1 reply; 6+ messages in thread
From: Michal Hocko @ 2017-06-02 8:18 UTC (permalink / raw)
To: Yu Zhao
Cc: Johannes Weiner, Vladimir Davydov, cgroups, linux-mm, linux-kernel
On Thu 01-06-17 12:56:35, Yu Zhao wrote:
> Saw need_resched() warnings when swapping on large swapfile (TBs)
> because page allocation in swap_cgroup_prepare() took too long.
Hmm, but the page allocator makes sure to cond_resched for sleeping
allocations. I guess what you mean is something different. It is not the
allocation which took too look but there are too many of them and none
of them sleeps because there is enough memory and the allocator doesn't
sleep in that case. Right?
> We already cond_resched when freeing page in swap_cgroup_swapoff().
> Do the same for the page allocation.
>
> Signed-off-by: Yu Zhao <yuzhao@google.com>
The patch itself makes sense to me, the changelog could see some
clarification but other than that
Acked-by: Michal Hocko <mhocko@suse.com>
> ---
> mm/swap_cgroup.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/mm/swap_cgroup.c b/mm/swap_cgroup.c
> index ac6318a064d3..3405b4ee1757 100644
> --- a/mm/swap_cgroup.c
> +++ b/mm/swap_cgroup.c
> @@ -48,6 +48,9 @@ static int swap_cgroup_prepare(int type)
> if (!page)
> goto not_enough_page;
> ctrl->map[idx] = page;
> +
> + if (!(idx % SWAP_CLUSTER_MAX))
> + cond_resched();
> }
> return 0;
> not_enough_page:
> --
> 2.13.0.219.gdb65acc882-goog
--
Michal Hocko
SUSE Labs
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] swap: cond_resched in swap_cgroup_prepare()
2017-06-01 19:56 [PATCH] swap: cond_resched in swap_cgroup_prepare() Yu Zhao
2017-06-02 8:18 ` Michal Hocko
@ 2017-06-03 14:58 ` Vladimir Davydov
2017-06-04 20:01 ` [PATCH v2] " Yu Zhao
2 siblings, 0 replies; 6+ messages in thread
From: Vladimir Davydov @ 2017-06-03 14:58 UTC (permalink / raw)
To: Yu Zhao; +Cc: Johannes Weiner, Michal Hocko, cgroups, linux-mm, linux-kernel
On Thu, Jun 01, 2017 at 12:56:35PM -0700, Yu Zhao wrote:
> Saw need_resched() warnings when swapping on large swapfile (TBs)
> because page allocation in swap_cgroup_prepare() took too long.
>
> We already cond_resched when freeing page in swap_cgroup_swapoff().
> Do the same for the page allocation.
>
> Signed-off-by: Yu Zhao <yuzhao@google.com>
Acked-by: Vladimir Davydov <vdavydov.dev@gmail.com>
> ---
> mm/swap_cgroup.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/mm/swap_cgroup.c b/mm/swap_cgroup.c
> index ac6318a064d3..3405b4ee1757 100644
> --- a/mm/swap_cgroup.c
> +++ b/mm/swap_cgroup.c
> @@ -48,6 +48,9 @@ static int swap_cgroup_prepare(int type)
> if (!page)
> goto not_enough_page;
> ctrl->map[idx] = page;
> +
> + if (!(idx % SWAP_CLUSTER_MAX))
> + cond_resched();
> }
> return 0;
> not_enough_page:
We should probably do the same on the error path.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] swap: cond_resched in swap_cgroup_prepare()
2017-06-02 8:18 ` Michal Hocko
@ 2017-06-04 19:38 ` Yu Zhao
0 siblings, 0 replies; 6+ messages in thread
From: Yu Zhao @ 2017-06-04 19:38 UTC (permalink / raw)
To: Michal Hocko
Cc: Johannes Weiner, Vladimir Davydov, cgroups, linux-mm, linux-kernel
On Fri, Jun 02, 2017 at 10:18:57AM +0200, Michal Hocko wrote:
> On Thu 01-06-17 12:56:35, Yu Zhao wrote:
> > Saw need_resched() warnings when swapping on large swapfile (TBs)
> > because page allocation in swap_cgroup_prepare() took too long.
>
> Hmm, but the page allocator makes sure to cond_resched for sleeping
> allocations. I guess what you mean is something different. It is not the
> allocation which took too look but there are too many of them and none
> of them sleeps because there is enough memory and the allocator doesn't
> sleep in that case. Right?
>
> > We already cond_resched when freeing page in swap_cgroup_swapoff().
> > Do the same for the page allocation.
> >
> > Signed-off-by: Yu Zhao <yuzhao@google.com>
>
> The patch itself makes sense to me, the changelog could see some
> clarification but other than that
> Acked-by: Michal Hocko <mhocko@suse.com>
Thanks, I'll clarify the problem in the commit message and resend the
patch.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] swap: cond_resched in swap_cgroup_prepare()
2017-06-01 19:56 [PATCH] swap: cond_resched in swap_cgroup_prepare() Yu Zhao
2017-06-02 8:18 ` Michal Hocko
2017-06-03 14:58 ` Vladimir Davydov
@ 2017-06-04 20:01 ` Yu Zhao
2017-06-05 5:12 ` Michal Hocko
2 siblings, 1 reply; 6+ messages in thread
From: Yu Zhao @ 2017-06-04 20:01 UTC (permalink / raw)
To: Johannes Weiner, Michal Hocko, Vladimir Davydov
Cc: cgroups, linux-mm, linux-kernel, Yu Zhao
Saw need_resched() warnings when swapping on large swapfile (TBs)
because continuously allocating many pages in swap_cgroup_prepare()
took too long.
We already cond_resched when freeing page in swap_cgroup_swapoff().
Do the same for the page allocation.
Signed-off-by: Yu Zhao <yuzhao@google.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Vladimir Davydov <vdavydov.dev@gmail.com>
---
Changelog since v1:
* clarify the problem in the commit message
mm/swap_cgroup.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/mm/swap_cgroup.c b/mm/swap_cgroup.c
index ac6318a064d3..3405b4ee1757 100644
--- a/mm/swap_cgroup.c
+++ b/mm/swap_cgroup.c
@@ -48,6 +48,9 @@ static int swap_cgroup_prepare(int type)
if (!page)
goto not_enough_page;
ctrl->map[idx] = page;
+
+ if (!(idx % SWAP_CLUSTER_MAX))
+ cond_resched();
}
return 0;
not_enough_page:
--
2.13.0.506.g27d5fe0cd-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] swap: cond_resched in swap_cgroup_prepare()
2017-06-04 20:01 ` [PATCH v2] " Yu Zhao
@ 2017-06-05 5:12 ` Michal Hocko
0 siblings, 0 replies; 6+ messages in thread
From: Michal Hocko @ 2017-06-05 5:12 UTC (permalink / raw)
To: Yu Zhao
Cc: Johannes Weiner, Vladimir Davydov, cgroups, linux-mm,
linux-kernel, Andrew Morton
[CC Andrew]
On Sun 04-06-17 13:01:09, Yu Zhao wrote:
> Saw need_resched() warnings when swapping on large swapfile (TBs)
> because continuously allocating many pages in swap_cgroup_prepare()
> took too long.
>
> We already cond_resched when freeing page in swap_cgroup_swapoff().
> Do the same for the page allocation.
>
> Signed-off-by: Yu Zhao <yuzhao@google.com>
> Acked-by: Michal Hocko <mhocko@suse.com>
> Acked-by: Vladimir Davydov <vdavydov.dev@gmail.com>
> ---
> Changelog since v1:
> * clarify the problem in the commit message
>
> mm/swap_cgroup.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/mm/swap_cgroup.c b/mm/swap_cgroup.c
> index ac6318a064d3..3405b4ee1757 100644
> --- a/mm/swap_cgroup.c
> +++ b/mm/swap_cgroup.c
> @@ -48,6 +48,9 @@ static int swap_cgroup_prepare(int type)
> if (!page)
> goto not_enough_page;
> ctrl->map[idx] = page;
> +
> + if (!(idx % SWAP_CLUSTER_MAX))
> + cond_resched();
> }
> return 0;
> not_enough_page:
> --
> 2.13.0.506.g27d5fe0cd-goog
--
Michal Hocko
SUSE Labs
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-06-05 5:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-01 19:56 [PATCH] swap: cond_resched in swap_cgroup_prepare() Yu Zhao
2017-06-02 8:18 ` Michal Hocko
2017-06-04 19:38 ` Yu Zhao
2017-06-03 14:58 ` Vladimir Davydov
2017-06-04 20:01 ` [PATCH v2] " Yu Zhao
2017-06-05 5:12 ` Michal Hocko
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).