diff for duplicates of <20180406122132.GA7185@castle> diff --git a/a/1.txt b/N1/1.txt index 5fcd25e..6fdb0ee 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -50,65 +50,3 @@ Perfect catch! Thanks, Johannes! Updated version below. -- - -From 466c35c36cae392cfee5e54a2884792972e789ee Mon Sep 17 00:00:00 2001 -From: Roman Gushchin <guro@fb.com> -Date: Thu, 5 Apr 2018 19:31:35 +0100 -Subject: [PATCH v4 3/4] mm: treat memory.low value inclusive - -If memcg's usage is equal to the memory.low value, avoid reclaiming -from this cgroup while there is a surplus of reclaimable memory. - -This sounds more logical and also matches memory.high and memory.max -behavior: both are inclusive. - -Empty cgroups are not considered protected, so MEMCG_LOW events -are not emitted for empty cgroups, if there is no more reclaimable -memory in the system. - -Signed-off-by: Roman Gushchin <guro@fb.com> -Cc: Andrew Morton <akpm@linux-foundation.org> -Cc: Johannes Weiner <hannes@cmpxchg.org> -Cc: Michal Hocko <mhocko@kernel.org> -Cc: Vladimir Davydov <vdavydov.dev@gmail.com> -Cc: Tejun Heo <tj@kernel.org> -Cc: kernel-team@fb.com -Cc: linux-mm@kvack.org -Cc: cgroups@vger.kernel.org -Cc: linux-kernel@vger.kernel.org ---- - mm/memcontrol.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mm/memcontrol.c b/mm/memcontrol.c -index 78cf21f2a943..3d039fa1a8f5 100644 ---- a/mm/memcontrol.c -+++ b/mm/memcontrol.c -@@ -5608,14 +5608,14 @@ struct cgroup_subsys memory_cgrp_subsys = { - }; - - /** -- * mem_cgroup_low - check if memory consumption is below the normal range -+ * mem_cgroup_low - check if memory consumption is in the normal range - * @root: the top ancestor of the sub-tree being checked - * @memcg: the memory cgroup to check - * - * WARNING: This function is not stateless! It can only be used as part - * of a top-down tree iteration, not for isolated queries. - * -- * Returns %true if memory consumption of @memcg is below the normal range. -+ * Returns %true if memory consumption of @memcg is in the normal range. - * - * @root is exclusive; it is never low when looked at directly - * -@@ -5709,7 +5709,7 @@ bool mem_cgroup_low(struct mem_cgroup *root, struct mem_cgroup *memcg) - elow = min(elow, parent_elow * low_usage / siblings_low_usage); - exit: - memcg->memory.elow = elow; -- return usage < elow; -+ return usage && usage <= elow; - } - - /** --- -2.14.3 diff --git a/a/content_digest b/N1/content_digest index 6377602..43d4cc1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -66,68 +66,6 @@ "\n" "Updated version below.\n" "\n" - "--\n" - "\n" - "From 466c35c36cae392cfee5e54a2884792972e789ee Mon Sep 17 00:00:00 2001\n" - "From: Roman Gushchin <guro@fb.com>\n" - "Date: Thu, 5 Apr 2018 19:31:35 +0100\n" - "Subject: [PATCH v4 3/4] mm: treat memory.low value inclusive\n" - "\n" - "If memcg's usage is equal to the memory.low value, avoid reclaiming\n" - "from this cgroup while there is a surplus of reclaimable memory.\n" - "\n" - "This sounds more logical and also matches memory.high and memory.max\n" - "behavior: both are inclusive.\n" - "\n" - "Empty cgroups are not considered protected, so MEMCG_LOW events\n" - "are not emitted for empty cgroups, if there is no more reclaimable\n" - "memory in the system.\n" - "\n" - "Signed-off-by: Roman Gushchin <guro@fb.com>\n" - "Cc: Andrew Morton <akpm@linux-foundation.org>\n" - "Cc: Johannes Weiner <hannes@cmpxchg.org>\n" - "Cc: Michal Hocko <mhocko@kernel.org>\n" - "Cc: Vladimir Davydov <vdavydov.dev@gmail.com>\n" - "Cc: Tejun Heo <tj@kernel.org>\n" - "Cc: kernel-team@fb.com\n" - "Cc: linux-mm@kvack.org\n" - "Cc: cgroups@vger.kernel.org\n" - "Cc: linux-kernel@vger.kernel.org\n" - "---\n" - " mm/memcontrol.c | 6 +++---\n" - " 1 file changed, 3 insertions(+), 3 deletions(-)\n" - "\n" - "diff --git a/mm/memcontrol.c b/mm/memcontrol.c\n" - "index 78cf21f2a943..3d039fa1a8f5 100644\n" - "--- a/mm/memcontrol.c\n" - "+++ b/mm/memcontrol.c\n" - "@@ -5608,14 +5608,14 @@ struct cgroup_subsys memory_cgrp_subsys = {\n" - " };\n" - " \n" - " /**\n" - "- * mem_cgroup_low - check if memory consumption is below the normal range\n" - "+ * mem_cgroup_low - check if memory consumption is in the normal range\n" - " * @root: the top ancestor of the sub-tree being checked\n" - " * @memcg: the memory cgroup to check\n" - " *\n" - " * WARNING: This function is not stateless! It can only be used as part\n" - " * of a top-down tree iteration, not for isolated queries.\n" - " *\n" - "- * Returns %true if memory consumption of @memcg is below the normal range.\n" - "+ * Returns %true if memory consumption of @memcg is in the normal range.\n" - " *\n" - " * @root is exclusive; it is never low when looked at directly\n" - " *\n" - "@@ -5709,7 +5709,7 @@ bool mem_cgroup_low(struct mem_cgroup *root, struct mem_cgroup *memcg)\n" - " \telow = min(elow, parent_elow * low_usage / siblings_low_usage);\n" - " exit:\n" - " \tmemcg->memory.elow = elow;\n" - "-\treturn usage < elow;\n" - "+\treturn usage && usage <= elow;\n" - " }\n" - " \n" - " /**\n" - "-- \n" - 2.14.3 + -- -7b4dce8889405c5c575fe61f73cb7607693d3af964874a835ecc6fb448dea2ab +851dc4b8aefc811c22cf811b84f2e4d44364588fd883ec0ff987ab363874f300
diff --git a/a/1.txt b/N2/1.txt index 5fcd25e..4a173c9 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -51,7 +51,7 @@ Updated version below. -- -From 466c35c36cae392cfee5e54a2884792972e789ee Mon Sep 17 00:00:00 2001 +>From 466c35c36cae392cfee5e54a2884792972e789ee Mon Sep 17 00:00:00 2001 From: Roman Gushchin <guro@fb.com> Date: Thu, 5 Apr 2018 19:31:35 +0100 Subject: [PATCH v4 3/4] mm: treat memory.low value inclusive diff --git a/a/content_digest b/N2/content_digest index 6377602..d7c098d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,14 +5,14 @@ "Subject\0Re: [PATCH v3 3/4] mm: treat memory.low value inclusive\0" "Date\0Fri, 6 Apr 2018 13:21:38 +0100\0" "To\0Johannes Weiner <hannes@cmpxchg.org>\0" - "Cc\0linux-mm@kvack.org" + "Cc\0<linux-mm@kvack.org>" Andrew Morton <akpm@linux-foundation.org> Michal Hocko <mhocko@kernel.org> Vladimir Davydov <vdavydov.dev@gmail.com> Tejun Heo <tj@kernel.org> - kernel-team@fb.com - cgroups@vger.kernel.org - " linux-kernel@vger.kernel.org\0" + <kernel-team@fb.com> + <cgroups@vger.kernel.org> + " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "On Thu, Apr 05, 2018 at 03:45:26PM -0400, Johannes Weiner wrote:\n" @@ -68,7 +68,7 @@ "\n" "--\n" "\n" - "From 466c35c36cae392cfee5e54a2884792972e789ee Mon Sep 17 00:00:00 2001\n" + ">From 466c35c36cae392cfee5e54a2884792972e789ee Mon Sep 17 00:00:00 2001\n" "From: Roman Gushchin <guro@fb.com>\n" "Date: Thu, 5 Apr 2018 19:31:35 +0100\n" "Subject: [PATCH v4 3/4] mm: treat memory.low value inclusive\n" @@ -130,4 +130,4 @@ "-- \n" 2.14.3 -7b4dce8889405c5c575fe61f73cb7607693d3af964874a835ecc6fb448dea2ab +f27781cd03720f7bdf58b32f9c3aeef280aebfa71d23f98b1e51d50d6879f8fa
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.