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 243F7C7EE2E for ; Wed, 24 May 2023 18:18:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 86B056B007B; Wed, 24 May 2023 14:18:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7F41D6B007D; Wed, 24 May 2023 14:18:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 694C4900002; Wed, 24 May 2023 14:18:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 53FAB6B007B for ; Wed, 24 May 2023 14:18:08 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 28B9E1202B2 for ; Wed, 24 May 2023 18:18:08 +0000 (UTC) X-FDA: 80825957856.06.54FC0D4 Received: from smtp-lb.pixar.com (smtp-lb.pixar.com [138.72.247.109]) by imf19.hostedemail.com (Postfix) with ESMTP id EC0031A001F for ; Wed, 24 May 2023 18:18:05 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=pixar.com header.s=dkimdefault header.b=qVvnW8n0; dmarc=none; spf=pass (imf19.hostedemail.com: domain of "prvs=501542f71=lars@pixar.com" designates 138.72.247.109 as permitted sender) smtp.mailfrom="prvs=501542f71=lars@pixar.com" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684952286; 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:references:dkim-signature; bh=hp53HsbSat/HqUtfRJFJJ94+MNrKNC0dRxDcTJPFGPk=; b=vgoSU1y7+0kwYnB5iUt4tWqnWVbLuHUqvFRMlynfLbNzITJc8xjdmeJVb7lsmhWM6C5gQZ D+FGpEDVrJsig41acY0bUeKeprcglpwz8S2IVcMzJxaEHK1zlFhUWcfSpGmv/lrdDELb41 SBOQJ/2eEmVkicFKEN7vzaU5JLNT3LA= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=pixar.com header.s=dkimdefault header.b=qVvnW8n0; dmarc=none; spf=pass (imf19.hostedemail.com: domain of "prvs=501542f71=lars@pixar.com" designates 138.72.247.109 as permitted sender) smtp.mailfrom="prvs=501542f71=lars@pixar.com" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684952286; a=rsa-sha256; cv=none; b=LDMkLeNwPP2esqlqqa+Jdkhe9Eab0Kx3jzn2NYE/W6VGsmRg0+rEJdC9uZWDeuhjomHy7l XI2PZpcs1bdDqPgk61CjIFnyB5haELsUdUZ60LnFy8/pv+Jqbsv2kTkOi8RfEo2/RyrrDr t3u5PtefF9sOp+j6IQiqgCge5o1Z91I= DomainKey-Signature: s=emeryville; d=pixar.com; c=nofws; q=dns; h=Authentication-Results:IronPort-SDR:X-PixarMID: X-PixarRecvListener:X-PixarRemoteIP:X-PixarMailFlowPolicy: Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer: MIME-Version:Content-Transfer-Encoding; b=d1j/4YnC+mVvTtW7b3uSZjWpcsNFVh9Y3rggMUxn2rnE5NbtE8FOGnS5 aPNPzIeAjIRempRcFZuZY6VwxgLEE0UnLG3wONdp9wIVUQV58Qc390y6Z UG7OSoYO9ovNreTTkE4Yn7zCEKoFXj8p6aKbh5VVXenaPUz21+C2fWn23 NhWMv71pmHsyius6Tw5G6y4OjhkilIzzXG/REuYzB0Vsq7FBCIqtJTZij lsRG16OuY3JZqKJGyWlEAv52k237aDVlaOU8uDs8ITJegU6U59ZY4y6Hm 41Nj7gYunXZx+ae6iwc7VgeJ0n+HZqjUmw0+bnSQRmas8i61Eap7gxCSy w==; DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=pixar.com; i=@pixar.com; q=dns/txt; s=dkimdefault; t=1684952285; x=1716488285; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=ww88k/sRfXor8CGXgyhHTr6O6My3nfazkW6nHTYMUoE=; b=qVvnW8n0f/aEMQem4l2hiY2BJgyyW9n4bZSuzWMSAnRzaWFmT1W2FVXm Xi9SydiSH5a9dXZNGaNrfvMpQ8lgFxCOq9z97TQItRmcmx0gCnEBC+z+g vVs2GP4F6iosy/eZbn0Imu4BcokRjOkQ8BAI82wQ4Urbs8derwMgNpf9q p4ZEb3fsens0wEB2QUJQBYnl6MBi63BiVmCAFLNVF3CSs6XfFByhzhQSU YPhw2D8I7KhHiD/JgebsSPqzLLNqaIXqO4N01lqzs1lBF9KVQK5a0LOST mBP5HgXoHorATtDkgBQ08XeT6Ee/yawLujeTGVo7IG4lxaCvHQcDt+LCI A==; IronPort-SDR: Uzb3RSa/vzGo8sU7GYm5MeSjCugi8B7FA1VjUyt3kXYw31N9HCzMXHDZpzskXLstM8+drU6fYk jblJdBUQLRRw== X-PixarMID: 33424248 X-PixarRecvListener: OutboundMail X-PixarRemoteIP: 138.72.53.70 X-PixarMailFlowPolicy: $RELAYED Received: by belboz.pixar.com (Postfix, from userid 1690) id 63EC8601DB34; Wed, 24 May 2023 11:18:04 -0700 (PDT) From: "Lars R. Damerow" To: mhocko@kernel.org, roman.gushchin@linux.dev, shakeelb@google.com Cc: tj@kernel.org, lizefan.x@bytedance.com, hannes@cmpxchg.org, corbet@lwn.net, muchun.song@linux.dev, akpm@linux-foundation.org, cgroups@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, lars@pixar.com Subject: [PATCH] mm/memcontrol: export memcg.swap watermark via sysfs for v2 memcg Date: Wed, 24 May 2023 11:17:33 -0700 Message-Id: <20230524181734.125696-1-lars@pixar.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: EC0031A001F X-Stat-Signature: 5gikpjfh145ekza6jy9zb33ruz49itrm X-Rspam-User: X-HE-Tag: 1684952285-969846 X-HE-Meta: U2FsdGVkX18zCCJ8mZpsXY9zWu1/G7TY3i26onNH/3xuKtPLDFP6VTuayUiDz1/VYTsye+WRtLxhhAVPTOBrhlcHmC4lGAts7zzY2blOJ5qtASoz6sUKtawijlkzPXLQ1QJXmVzfVAjvOWonmO7J+9vCgmjoJFOw0TxtZ/V1qm9LbWLuEFF9hQdaJUDeImYcgQDzLmfwjxAabpfVlcU4NPAgDTPXFnwuzhU3WRevut0yjNPmNfZy18yigvp0QxmhTuizas/Rs/uF5ka+pycp4HxeFBFDuYqlOsTVEdvgkZfegFbQqnb82vypoygjXQy91HCtdRwxS6N7TyBEGYhFcb8ysm9yHTJrhfmnpzdNdzaxWn//pwuP2ePdHPaXFx4S+nOZC1GawqcdvO7a079bEA4ETbv2G/Lp0ISrhkNf4t2KuKOdPhqlXgme9suRVNq++aQYK3jXbgDwgRF6Erw+xytVaqo/L3CLXmLWZ5WUcLqM7AL3OIl2LLHvYoJOv/6Wo4uS6QNUy0iqCMjfhN4806syvG78k1mNAAJKL7RyeIn1hOaWU54GcFPUaVFXIgYOULe5/Z0FbfisX+3nN0yUJLezD4QaOi5QQZGjoO7K2jNIQ1ehjBPzU4wH+GEHBiv/wiJzt6zg81mYQeisOb7zJWHh7kCD+m7JqsKs3vVj2pCZfpbDxdmUcQ6+SNu28Res2ZwVZ+Pqg18kLLm7Y2EfY8NMGcwLFFYM4msqdpYRzqup7PgSQSHURl4h8BIGTXCKJnMsIu5BW9v7ErkWS3GRcIJyjJURcnNBtZ3LCbJG+hkkDfdlflNHYhR+PAle66hF5uGaF/C84twMXfrwQrrrjsQN96hd8tn8r1zaaVwngq8XJ1idStJcy0WSqVYLUvGjSVqDFa+2a9anBsW/MsN3n/uXoqaHJk7OEeT6BBG5oLgukPwSWy+RRc32TDZCVEuuk9sXidpor0rLHatx1RR +4q3ck/o /9BHaGI+mkIxakMdxz7CBLIJMmb9dHyJaOR8vvgBQUFSX35tThbKgJw8w+DYq989QTY3yfZiQPjumF4TtbOGKqe0VS3sF40cakmLJjdTYPXH3fAIos6GIBRxBinR5d1kg02VIZy8um5b1ohZpIPNhWpF8DzGA0GZm1/IzgBLYe6SDiUl+PGr4ZJt7mB58Y4gS7jZ4Mlgpmp8JRGa3qqF/YNwOymeOKepFImhcVMdtAYlusXHRFVHNV8NpmnqESH7XVMnH9jmybCKZ7gGoUXJt5hfETw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This patch is similar to commit 8e20d4b33266 ("mm/memcontrol: export memcg->watermark via sysfs for v2 memcg"), but exports the swap counter's watermark. We allocate jobs to our compute farm using heuristics determined by memory and swap usage from previous jobs. Tracking the peak swap usage for new jobs is important for determining when jobs are exceeding their expected bounds, or when our baseline metrics are getting outdated. Our toolset was written to use the "memory.memsw.max_usage_in_bytes" file in cgroups v1, and altering it to poll cgroups v2's "memory.swap.current" would give less accurate results as well as add complication to the code. Having this watermark exposed in sysfs is much preferred. Signed-off-by: Lars R. Damerow --- Documentation/admin-guide/cgroup-v2.rst | 7 +++++++ mm/memcontrol.c | 13 +++++++++++++ 2 files changed, 20 insertions(+) diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst index f67c0829350b..1ffe019483ac 100644 --- a/Documentation/admin-guide/cgroup-v2.rst +++ b/Documentation/admin-guide/cgroup-v2.rst @@ -1582,6 +1582,13 @@ PAGE_SIZE multiple when read back. Healthy workloads are not expected to reach this limit. + memory.swap.peak + A read-only single value file which exists on non-root + cgroups. + + The max swap usage recorded for the cgroup and its + descendants since the creation of the cgroup. + memory.swap.max A read-write single value file which exists on non-root cgroups. The default is "max". diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 4b27e245a055..1862fee15274 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -7656,6 +7656,14 @@ static u64 swap_current_read(struct cgroup_subsys_state *css, return (u64)page_counter_read(&memcg->swap) * PAGE_SIZE; } +static u64 swap_peak_read(struct cgroup_subsys_state *css, + struct cftype *cft) +{ + struct mem_cgroup *memcg = mem_cgroup_from_css(css); + + return (u64)memcg->swap.watermark * PAGE_SIZE; +} + static int swap_high_show(struct seq_file *m, void *v) { return seq_puts_memcg_tunable(m, @@ -7734,6 +7742,11 @@ static struct cftype swap_files[] = { .seq_show = swap_max_show, .write = swap_max_write, }, + { + .name = "swap.peak", + .flags = CFTYPE_NOT_ON_ROOT, + .read_u64 = swap_peak_read, + }, { .name = "swap.events", .flags = CFTYPE_NOT_ON_ROOT, base-commit: 9d646009f65d62d32815f376465a3b92d8d9b046 -- 2.39.2