* [PATCH] mm, memcg: prevent missed memory.low load tears
@ 2020-06-12 17:44 Chris Down
2020-06-15 6:42 ` Michal Hocko
0 siblings, 1 reply; 2+ messages in thread
From: Chris Down @ 2020-06-12 17:44 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, linux-mm, Michal Koutný
Looks like one of these got missed when massaging in f86b810c2610 ("mm,
memcg: prevent memory.low load/store tearing") with other linux-mm
changes.
Reported-by: Michal Koutný <mkoutny@suse.com>
Signed-off-by: Chris Down <chris@chrisdown.name>
---
mm/memcontrol.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 0b38b6ad547d..f7cc66a80348 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -6416,7 +6416,7 @@ enum mem_cgroup_protection mem_cgroup_protected(struct mem_cgroup *root,
if (parent == root) {
memcg->memory.emin = READ_ONCE(memcg->memory.min);
- memcg->memory.elow = memcg->memory.low;
+ memcg->memory.elow = READ_ONCE(memcg->memory.low);
goto out;
}
@@ -6428,7 +6428,8 @@ enum mem_cgroup_protection mem_cgroup_protected(struct mem_cgroup *root,
atomic_long_read(&parent->memory.children_min_usage)));
WRITE_ONCE(memcg->memory.elow, effective_protection(usage, parent_usage,
- memcg->memory.low, READ_ONCE(parent->memory.elow),
+ READ_ONCE(memcg->memory.low),
+ READ_ONCE(parent->memory.elow),
atomic_long_read(&parent->memory.children_low_usage)));
out:
--
2.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mm, memcg: prevent missed memory.low load tears
2020-06-12 17:44 [PATCH] mm, memcg: prevent missed memory.low load tears Chris Down
@ 2020-06-15 6:42 ` Michal Hocko
0 siblings, 0 replies; 2+ messages in thread
From: Michal Hocko @ 2020-06-15 6:42 UTC (permalink / raw)
To: Chris Down; +Cc: Andrew Morton, linux-kernel, linux-mm, Michal Koutný
On Fri 12-06-20 18:44:37, Chris Down wrote:
> Looks like one of these got missed when massaging in f86b810c2610 ("mm,
> memcg: prevent memory.low load/store tearing") with other linux-mm
> changes.
>
> Reported-by: Michal Koutný <mkoutny@suse.com>
> Signed-off-by: Chris Down <chris@chrisdown.name>
Acked-by: Michal Hocko <mhocko@suse.com>
> ---
> mm/memcontrol.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 0b38b6ad547d..f7cc66a80348 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -6416,7 +6416,7 @@ enum mem_cgroup_protection mem_cgroup_protected(struct mem_cgroup *root,
>
> if (parent == root) {
> memcg->memory.emin = READ_ONCE(memcg->memory.min);
> - memcg->memory.elow = memcg->memory.low;
> + memcg->memory.elow = READ_ONCE(memcg->memory.low);
> goto out;
> }
>
> @@ -6428,7 +6428,8 @@ enum mem_cgroup_protection mem_cgroup_protected(struct mem_cgroup *root,
> atomic_long_read(&parent->memory.children_min_usage)));
>
> WRITE_ONCE(memcg->memory.elow, effective_protection(usage, parent_usage,
> - memcg->memory.low, READ_ONCE(parent->memory.elow),
> + READ_ONCE(memcg->memory.low),
> + READ_ONCE(parent->memory.elow),
> atomic_long_read(&parent->memory.children_low_usage)));
>
> out:
> --
> 2.27.0
>
--
Michal Hocko
SUSE Labs
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-15 6:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-12 17:44 [PATCH] mm, memcg: prevent missed memory.low load tears Chris Down
2020-06-15 6:42 ` 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).