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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED405E7F127 for ; Tue, 26 Sep 2023 20:41:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1C4CB8D0028; Tue, 26 Sep 2023 16:41:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 172A08D0002; Tue, 26 Sep 2023 16:41:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 012B78D0028; Tue, 26 Sep 2023 16:41:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id E333A8D0002 for ; Tue, 26 Sep 2023 16:41:12 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id B8CA01607ED for ; Tue, 26 Sep 2023 20:41:12 +0000 (UTC) X-FDA: 81279918384.20.BC792C7 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf23.hostedemail.com (Postfix) with ESMTP id EBB8B14000D for ; Tue, 26 Sep 2023 20:41:10 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="Cgzapf/F"; spf=pass (imf23.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695760871; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=qDGh2bfYFEdmujy/uEQ8v6m9bD4HO3qMXiBWaHUJXwQ=; b=L4rm2AJA9dLyKOqUyZHcXH7o3RgZVmZY2d+iuo9rJEBnHaKKLcaYPySAVxxIqn7nbM0jxu aSsxhukk8x5quA5EAJYJjh8JHNjgysbcvTacT9CuQXwCMktr+1SdbSye6O6W4ZfCX4nxZK aWBtJZG4uM+6rAs5ua3eYKEbT6ONuHk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695760871; a=rsa-sha256; cv=none; b=CUWdJqhCeeKNGRModyNgDraz4cXoOras8gSWSKd3COqmTZ0MeSeKNND4UFVXtymrAZ+Q7o Ol0Lb1Nf88t6OcLztwPx4iGY1mVK07uCHngdB2TJSusPytWM+9DXw28vjLrr/tx8sHzBwo 6Q0mGdm2dY1lxOVD87Upd1T0FwDfmyo= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="Cgzapf/F"; spf=pass (imf23.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1c724577e1fso923815ad.0 for ; Tue, 26 Sep 2023 13:41:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695760870; x=1696365670; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qDGh2bfYFEdmujy/uEQ8v6m9bD4HO3qMXiBWaHUJXwQ=; b=Cgzapf/FDNKpM0DzQuYNx7b14Ve+ewevrMIEGGp44s0LuqqkcYm5Hsfgo5MV96dtVA CgGsElp0iEGv5TJe06q5hnPuLIYI5D9WBkGg1+Sj6ockZ6uoQ34mYAch8MYudE+HbbIa aFAB3wx+pOONTWQSySNjmX2HanpGUizB4efMAmSLXmOyMdS/tp3f3Q4aXSPvMXOxR5HU wKfLCrS3Yvy0imR0f9YhH5zftGnpIHMCaLZgpBHGckj1j2di4mRg3xLOdhlIgRLFNk17 tkSPMRZ0xsRLHqPNgjeba+YmB2XYQH4MkNlGf8RkPJZ2t5O7Lw+af6PwB0IKcsb7CjSA yPKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695760870; x=1696365670; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qDGh2bfYFEdmujy/uEQ8v6m9bD4HO3qMXiBWaHUJXwQ=; b=c58soBk1gBppfeo07bWONP3JBew3LCbmcfjL/yysJNXNjGU4oA1WjxBUJxpPwZfz+D rjEW9bKhExnRXL31oXsIN7HY6QuQfuULhylg4ArGN8JqUTe7w4SHe80NYP2nMg5g9n02 uGLLO+oSc4iwUqMvDTvtcT2MpBUM/zK1GYdZ8TE+CHQJRofzrJVwfkZ6IrZ2P3AfPpFj Oex4ondBxzlRFqECOdBNXs0eEBiWhBQ2CWFoE06+27mnn6QEUFdTrL7SlKFYaBrbppKR UcLLxCscZDHEWnun++dvQje/ZI+b3mutWRkmKM2n2PVbSRIPZJrN7Gco3daQfXyqbjCK +Txg== X-Gm-Message-State: AOJu0Yy4J/wjnOoV2D+tV9KLoaw/NZpjagl+VoKzMXYEfTrn5FMmLbjw MlLycXBB9VkzKKW7TQVeaH8= X-Google-Smtp-Source: AGHT+IEagb5BPqw9DlNSXZX9HSucCdM4hLntye4ZbKexj1B5SxNJIHCvr/UMM1KQke88rXaG4Xu/lg== X-Received: by 2002:a17:903:110d:b0:1b8:4f93:b210 with SMTP id n13-20020a170903110d00b001b84f93b210mr12673893plh.45.1695760869764; Tue, 26 Sep 2023 13:41:09 -0700 (PDT) Received: from localhost (fwdproxy-prn-002.fbsv.net. [2a03:2880:ff:2::face:b00c]) by smtp.gmail.com with ESMTPSA id z9-20020a170903018900b001bd99fd1114sm4198499plg.288.2023.09.26.13.41.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 13:41:09 -0700 (PDT) From: Nhat Pham To: akpm@linux-foundation.org Cc: riel@surriel.com, hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeelb@google.com, muchun.song@linux.dev, tj@kernel.org, lizefan.x@bytedance.com, shuah@kernel.org, mike.kravetz@oracle.com, yosryahmed@google.com, linux-mm@kvack.org, kernel-team@meta.com, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org Subject: Re: [PATCH 2/2] selftests: add a selftest to verify hugetlb usage in memcg Date: Tue, 26 Sep 2023 13:41:08 -0700 Message-Id: <20230926204108.2931076-1-nphamcs@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230926194949.2637078-3-nphamcs@gmail.com> References: <20230926194949.2637078-3-nphamcs@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EBB8B14000D X-Rspam-User: X-Stat-Signature: t56kjaqzh6nudcjutm8x7qye1qr6modq X-Rspamd-Server: rspam03 X-HE-Tag: 1695760870-890803 X-HE-Meta: U2FsdGVkX1+4UKmLa6epKWtbNVK9ejVA24SzixpAEuaJT6i3p3FdNUkre76pbx6wtLGhq77pUqHQ6lElCjCgDywkS+rq59zKEiMOG+t9VbWLAuIYw2JVPeju/sEdrCxrJ43ubUSpgVi2YDERzSw9IlqIhXW45+OtAXvjnbojw7d6zLZXS1arIA8N8IX2qsXAbDILZtL7uBmF9zRDAUT12C4ItymT6S+pm0P7/T3rUa803spTjCuLWI5+tMXhv+FI4nVyQvs49b+IM5RgawAoN3O6+spsgJGAdR4WvmYBj0UrT+diWQF2+PH+EAK5TuuzXyFyN2SZfBBuscNjTHT4R+qBBrkbNUQ6t2tQH7lkTBhF5DMwe44vcSpE5joucaAlyxIY/kuWgxpHqgfmP9R/291WwI6szClaHirFdtgZ74acPpaDZwqdj70YwV9b44AuJMfxq9M2QrLSGBZa3ESc2lvuTbrFrVkm0zZXnlsGPtMY3xCCaX0cPZHRHZlk1Y+Y3k7el+hEjm/e5HdNS+vlhypSMkdKbkK1PUWuJ37sBBoSxkKtCoHAy9s1xCXpUH+E3YQfr6wFA8A4nNSbUlAuYZk4QGtT5x5WXbGF4ghgcE8JX7tkoBKaIWGz0t2qPNWE9pTcsu8KA8qCUpqtZeW0kFdrJnulebwRQZSZmgU0fkPQUwwAud3Id7+PzC2qPwatiTEj5eo7UbVqhZk70B+TYALlStCpKvF+svS6eGJ9sFnBtV6ICRnSbjuanI5bMu3ubag8rT9hWkI4XMbjIFIzJS3+kmsdoSvcLIbZqRJfS4B7Yti1gEMXtPLlZKt2LMgweXHlTgSP1HFHqzaTG+wPZ5lVqo61OBvVwegpn6LJ5GevQHhbNAkld0KrZr1+f22gxLYM+aKqIh5MdDiOYfcqZPc23iFd2aA7fLgfmX9TO12ZJ4pCNphzS5QQ1YzVtFtWQQ84XH9BpbHYE9PGH/5 qh3uYLfP T6m/tJILOJ7UxEnKjlIG6yP/LaqO7sdgtbMaVtGnU5Toc1akqkZj9kvDD9GCwyBRx0OFHAS1kKTiZz30YPe7Byt3MWZZiTmICra5PN6u3Is50MWk6UP4vTmk3L0gPMW9FU369s34bw9JdfFzSgJcTwl372cDBYhwpqNKHwcdPZwD6GhbEMfEq+oN32niYe6XedhHTKWjIgL/YLsqbxQel/7PtlZdemGGZPO3/umYCFMFJjh/NgNkNZHKABXqmKrRbcNxQYl7e9JNuGxPPym89hWuJRtsk0NEk5+AF239UxX4iKb5rfgycUfxSlFaHQETc12ENmTgW/5ype1RyRtFUIPp/rR5ENGDbnx0eSC3tBzE88eEwJSmPfVhww2mQ6JxcKU058xCco2xBHeCJ5bPrwnUECQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.159115, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Ooops I forgot to commit this change. Basically just moving the nr_hugepages check inside the test program run within the cgroup. This should apply cleanly: diff --git a/tools/testing/selftests/cgroup/test_hugetlb_memcg.c b/tools/testing/selftests/cgroup/test_hugetlb_memcg.c index 9651f6af6914..436522257cd2 100644 --- a/tools/testing/selftests/cgroup/test_hugetlb_memcg.c +++ b/tools/testing/selftests/cgroup/test_hugetlb_memcg.c @@ -100,6 +100,14 @@ static int hugetlb_test_program(const char *cgroup, void *arg) int ret = EXIT_FAILURE; old_current = cg_read_long(test_group, "memory.current"); + set_nr_hugepages(20); + current = cg_read_long(test_group, "memory.current"); + expected_current = old_current; + if (!values_close(expected_current, current, 10)) { + ksft_print_msg( + "memory usage should not increase after setting nr_hugepages.\n"); + return EXIT_FAILURE; + } addr = mmap(ADDR, LENGTH, PROTECTION, FLAGS, 0, 0); if (addr == MAP_FAILED) { @@ -152,10 +160,8 @@ static int test_hugetlb_memcg(char *root) { int ret = KSFT_FAIL; char *test_group; - long old_current, expected_current, current; test_group = cg_name(root, "hugetlb_memcg_test"); - if (!test_group || cg_create(test_group)) { ksft_print_msg("fail to create cgroup.\n"); goto out; @@ -171,16 +177,6 @@ static int test_hugetlb_memcg(char *root) ksft_print_msg("fail to disable swap.\n"); goto out; } - old_current = cg_read_long(test_group, "memory.current"); - - set_nr_hugepages(20); - current = cg_read_long(test_group, "memory.current"); - expected_current = old_current; - if (!values_close(expected_current, current, 10)) { - ksft_print_msg( - "memory usage should not increase after setting nr_hugepages.\n"); - goto out; - } if (!cg_run(test_group, hugetlb_test_program, (void *)test_group)) ret = KSFT_PASS;