From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11011C4332F for ; Fri, 27 May 2022 16:35:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346616AbiE0QfP (ORCPT ); Fri, 27 May 2022 12:35:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354163AbiE0QfI (ORCPT ); Fri, 27 May 2022 12:35:08 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80CCF3B2AE for ; Fri, 27 May 2022 09:35:07 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1D99361C36 for ; Fri, 27 May 2022 16:35:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73D1AC34113; Fri, 27 May 2022 16:35:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1653669306; bh=YfWHK1oqZlAMmQUXoC9KkeTaruRGnUcwNR2owHNAe6I=; h=Date:To:From:Subject:From; b=pvwzPewljpJFURh2p9SrXGE1AUfCRo0elp/TvBik0NmK888pP+Y6e7HsXfXCB0ozI 7cXwkGPwln+wuQQOluH9Cjxwleobe3//xtLb+e8zrKfo3NyRzrdw5itnPzPdXA2CuG P4YsEAtDCyPk8IJ/hSElGgqOKJS6ta3cXCcCqxHM= Date: Fri, 27 May 2022 09:35:05 -0700 To: mm-commits@vger.kernel.org, void@manifault.com, shakeelb@google.com, rpalethorpe@suse.de, roman.gushchin@linux.dev, mhocko@kernel.org, hannes@cmpxchg.org, mkoutny@suse.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] selftests-memcg-remove-protection-from-top-level-memcg.patch removed from -mm tree Message-Id: <20220527163506.73D1AC34113@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: selftests: memcg: remove protection from top level memcg has been removed from the -mm tree. Its filename was selftests-memcg-remove-protection-from-top-level-memcg.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Michal Koutný Subject: selftests: memcg: remove protection from top level memcg Date: Wed, 18 May 2022 18:18:58 +0200 The reclaim is triggered by memory limit in a subtree, therefore the testcase does not need configured protection against external reclaim. Also, correct respective comments. Link: https://lkml.kernel.org/r/20220518161859.21565-5-mkoutny@suse.com Signed-off-by: Michal Koutný Acked-by: Roman Gushchin Cc: David Vernet Cc: Johannes Weiner Cc: Michal Hocko Cc: Richard Palethorpe Cc: Shakeel Butt Signed-off-by: Andrew Morton --- tools/testing/selftests/cgroup/test_memcontrol.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) --- a/tools/testing/selftests/cgroup/test_memcontrol.c~selftests-memcg-remove-protection-from-top-level-memcg +++ a/tools/testing/selftests/cgroup/test_memcontrol.c @@ -247,7 +247,7 @@ static int cg_test_proc_killed(const cha /* * First, this test creates the following hierarchy: - * A memory.min = 50M, memory.max = 200M + * A memory.min = 0, memory.max = 200M * A/B memory.min = 50M * A/B/C memory.min = 75M, memory.current = 50M * A/B/D memory.min = 25M, memory.current = 50M @@ -257,7 +257,7 @@ static int cg_test_proc_killed(const cha * Usages are pagecache, but the test keeps a running * process in every leaf cgroup. * Then it creates A/G and creates a significant - * memory pressure in it. + * memory pressure in A. * * Then it checks actual memory usages and expects that: * A/B memory.current ~= 50M @@ -338,8 +338,6 @@ static int test_memcg_min(const char *ro (void *)(long)fd); } - if (cg_write(parent[0], "memory.min", "50M")) - goto cleanup; if (cg_write(parent[1], "memory.min", "50M")) goto cleanup; if (cg_write(children[0], "memory.min", "75M")) @@ -407,7 +405,7 @@ cleanup: /* * First, this test creates the following hierarchy: - * A memory.low = 50M, memory.max = 200M + * A memory.low = 0, memory.max = 200M * A/B memory.low = 50M * A/B/C memory.low = 75M, memory.current = 50M * A/B/D memory.low = 25M, memory.current = 50M @@ -495,8 +493,6 @@ static int test_memcg_low(const char *ro goto cleanup; } - if (cg_write(parent[0], "memory.low", "50M")) - goto cleanup; if (cg_write(parent[1], "memory.low", "50M")) goto cleanup; if (cg_write(children[0], "memory.low", "75M")) _ Patches currently in -mm which might be from mkoutny@suse.com are