From patchwork Wed Mar 19 06:41:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jingxiang zeng X-Patchwork-Id: 14022139 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 C0516C35FF1 for ; Wed, 19 Mar 2025 06:42:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C1649280008; Wed, 19 Mar 2025 02:42:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BF468280001; Wed, 19 Mar 2025 02:42:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A8E9D280008; Wed, 19 Mar 2025 02:42:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 89ADE280001 for ; Wed, 19 Mar 2025 02:42:43 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B09551CD3C9 for ; Wed, 19 Mar 2025 06:42:44 +0000 (UTC) X-FDA: 83237357448.23.79B2A19 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf27.hostedemail.com (Postfix) with ESMTP id D7B9940005 for ; Wed, 19 Mar 2025 06:42:42 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=iUxk0UKi; spf=pass (imf27.hostedemail.com: domain of jingxiangzeng.cas@gmail.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=jingxiangzeng.cas@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=1742366562; h=from:from:sender:reply-to: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=5ZzC6AyENx2PETrsetwCdLxJEkubtTVJB70KlJ4iY4o=; b=PcIMYZZS67xwcyBNU2xNfYRkdZ91M5VbLc3ySV/z9pzNKNwVPaKgJ1tC2NcBeyNmcVeHFI tWyK3pfao343zaVPD4vGh2Q2Jd4Z9lVUzZc0+b4rkLLRy0vKPvWS2ECe9OTsdJzZdoUXUO Ye7gT+3gW4x9bG25Zb/RlVoIxeWKdNE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742366562; a=rsa-sha256; cv=none; b=KbDrh+BCvY4LmuZQnh9wq8L4G2X+AatUN2RzazUniUVZ+VQd+ddfO7D8eCnvfP+OUfh8RW 9rpI7TdBtgEYKvSJiA9vhgqBLaeKEiuLEF/uFt0gRg2OAPy3V81HUW4g5r8/Og7JcSFVax /6iu0+xLIQTogH5seKMAFaE8LhNlpio= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=iUxk0UKi; spf=pass (imf27.hostedemail.com: domain of jingxiangzeng.cas@gmail.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=jingxiangzeng.cas@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-22580c9ee0aso112419465ad.2 for ; Tue, 18 Mar 2025 23:42:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742366562; x=1742971362; darn=kvack.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=5ZzC6AyENx2PETrsetwCdLxJEkubtTVJB70KlJ4iY4o=; b=iUxk0UKiDRR3prmPYGGfEyztpsB7O2j/2TbDZf/8MPkS4J+37sFyr64mUkJSBvTrzS nPnIrURlGdGfe2leG9mASWyYQLPc7m/TfYeuUpx5LNrc5OEmUbfHEgJhYQmuNdyJRED9 0hCOMyXW8xS0WF9MMTybnTpgaaSUOoaw+O0nioCRq+AX1NwsS7AjARRbVfdRtY6dfyGw WYw4RbAJtGb4HOzXO1UlZ79jldfTeJwA3NF2scRFc+zD6VJSnZa9s6gQmJmsORl94vWy BMNHaXuThCEUFelLbFT4UPEe/bGwmhtP0hG+yT9ct5HIcGq8aMYgH6zBwPhsr5yYUUnx 7jXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742366562; x=1742971362; h=content-transfer-encoding:mime-version:reply-to: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=5ZzC6AyENx2PETrsetwCdLxJEkubtTVJB70KlJ4iY4o=; b=vEO5fCEM2fQFTSQyIM1pWbkuYmzbVRXdgx342e5R2EQHZ4EvSp6zPcKcbRSonIeYvM C5UGMwpSpjltX9/cgrGRH8WBLdDhT2LINNpsF50aC9rL0r+A5dCqMtzDiRDlgxhh/G0D Av60skZLPqHlCueyQcU8ZAdJGMl10lt0PKvF6p9uV9kVvznJAnKR1ftNBWb2Fjhoguzl bYO2L5uy6QUJmEOBDB6BLvERi/FzFNY/4yCij6kIEiWf/zylzbM92JXUNhSs/Degg7V5 3biyU0R2XbZr7tjWMN0sNopbpZXi4oIjhZeygcp4ElSOXK5Z+XduVGfeKWOWYxe4ot9E KLvQ== X-Gm-Message-State: AOJu0YzwACxOCeDCuOBF2iwDjjb5BYR5xqGVkUX/TD/8FUcjLqu+NGFl Y2jSIw+OzdZuwYG+RRSV5/JZH+Qgwn/PBXtok0gdnXQX3q2WreR1d/7PCNvL X-Gm-Gg: ASbGncva/sM7EiSUFenjg1n2TrlKpvDH/ihQ1G2AUaSnwUKV1CyJuS7+YigcwupU2t+ LiUzX5pIsShDPSkgU8BXgX4ICM/81gSRPIjYAeoYK+purnctyXuL7fIY/AXlxCmTV+elnw8aN/k CBexAbPS2lR2FIZDppdr+ERnxdagOnwrwBMuZgS/il+8ExMD8NhgGH8rbgjHBD78b4gSQFO2GxQ wLy6rc4ltALZJ7PZOTSU+RP3ELk+pDswEnSneXtpg2SgL9pkkjWLzV/ZsigmcfnYHYmNOn0JLxL x2tU64uoyOn3BK7Ew5utZnRWGvdtRexTQqRnKyg+LioBaJNanPFsJWhFzj8QEMya6/4D4kW10NA jFresmbt9x6rkSw== X-Google-Smtp-Source: AGHT+IGbMABhlmC/SfmCbNUIYnojPpflkLr+r17wa1mHNPi8StcJmSNkJieATMTXfn0TSct3XkdwOw== X-Received: by 2002:a17:902:dac5:b0:226:30f6:1639 with SMTP id d9443c01a7336-22649cbf81amr20878435ad.51.1742366561776; Tue, 18 Mar 2025 23:42:41 -0700 (PDT) Received: from localhost.localdomain ([14.116.239.35]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a4876sm106191835ad.70.2025.03.18.23.42.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Mar 2025 23:42:41 -0700 (PDT) From: Jingxiang Zeng To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev, kasong@tencent.com, Zeng Jingxiang Subject: [RFC 5/5] Docs/cgroup-v2: add cgroup.memsw_account_on_dfl Documentation Date: Wed, 19 Mar 2025 14:41:48 +0800 Message-ID: <20250319064148.774406-6-jingxiangzeng.cas@gmail.com> X-Mailer: git-send-email 2.41.1 In-Reply-To: <20250319064148.774406-1-jingxiangzeng.cas@gmail.com> References: <20250319064148.774406-1-jingxiangzeng.cas@gmail.com> Reply-To: Jingxiang Zeng MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: D7B9940005 X-Stat-Signature: efweh4bdegy39nn6ok7wifji95kqyyii X-HE-Tag: 1742366562-385068 X-HE-Meta: U2FsdGVkX1+LZllCBDnwQt8LF07WH/sppNI7OKhaLdhURHcYyQjo7Ob7Tc0SstFRrLG1Y/EtZUFRTg8Mav8pbLcKH2WaYlyAH6PH00rBhOuODfyEogWcAp7Xpfc4nSvreT65lCGx8q20uPI/++XvsUI7+87wChH2DfA/VRz3AQWOBZUWqaHs187hVcCXQ3705ru6DGYw/aHgmKvt43+b5T0XEsy3550NGB8HsAMVDdQFSxhtUTwe0PLtP5Tpd1Py0O37IHEvDCPP51nwGRqMJNfk30LQaUmN62Nr5Aac6x4kvnLSX56VcUbLN7IKBD1eyuCZ03LFRDs+p04miz0B+Nmp3kD6iCi6QD5kO/WGWnDH4eYDthLXuHA3C5VMBoYkbnlk68izGnmG5FXm3muakYFHDrdzIHWCUdgho5QUdoT1ikGG7Vd/cyWW1hgKIU0s2gRZZ9wU2JnHk/9nCJQ8uPhG/DRGoXe+xye2gqO6Bu7HDvqCdhI/CUFm3Ag/8LhigR4B/QA9YVlTCEW9/BE6e5wyf8YiuLCC3Hl6Q6F6JVnzm8Sxtp/5FwXCcLal4pr2mfX845t3Ma5B3pR4hAi8//o6NDDLiIyY9sMDT095xOyeRsCQGzXjP55doKhUsyyI/wKC0fRt/8iUpFGJePiwIe+ONTBJjKpYK6FQxSIs7ATTa0btGTW7Mmj9grXq5UtsSL0vXRY341f7CPcNM/QDCyDlBXp2F6KVLBqe+pQ1veflce2iUvIFXiJ8LTauxPYKIKhPxxcEoHl1sbDPb8uST+WyGSQdxfXFM+bRT7QZan1hWbq3VcUR21PxqA+RZEq+asyApLEK8In/MwYU9h23sUhZKGnzkJJr8p+iv18CH9VHXnWxEXxWk7WbxhN89henYOV8Ma37NQa529wSHlQtjAPXbBz/HtGg9m619L9lzSKYM0Jj/omQ4/GBlLuSAJCWA10J0VaAOx1p+gV2Zps Yzb0lmhl GZEamR0oCxTCbh8CY8hnd+jYBTuwueeOkA/vXpTHAFiIVvBGamKzkgSLyIo9zp8N/Wnyo9CejSKNw8kC9tuGzq/1nHyJrdgTxC0Tf/DHJZXgJ+6+MP1F4N/wTgOTqxiQiPfdLnVtogauh4mo9zo9lGcHvfj6c7YHxYS1O3lLP4ayxJlwSaJ+z2zv8ARf2aMGHd43SjHTDGu7JV8X3ivCoDIeWehOAJUE9/Xy//2uNQmlp93trvF6lD83BFc+FUbk8UDR4qLBgRaOStnfzdN8sfUZGsheoN0WP1QdgMA/oVflGePen5apL6XONKtqGBeqVLhkEo/EuKeVssJYY2nMBx/jTt8gROow0IY68Dm/YygXTcyjJLonLfdQd7ODKQvB6o0uQ31pH247RvOY2GFcb759weYIZrf2oAMKrjYnXUoxIUxBYq3aetIpQ9pInbIk3ftnAmw86uFiwxmB5Pj3yZ11lB07IF+0i09DFhXm/ylPkaKbQqADsKbsOQ8oYiSnyLRqYZSiygN1fhhEV9Hu3xzx/8MU6c3yjB2dpBlFckiKsaIjKCAARrmjpv54zv2Kt8yWEk2IjxuKJHuHgGfITd4Stv6sLiuGRGQY8jQgCAxY2fRaM4Q54ttx/LfXohW9UxxRiVKzlCMVpjz6T1ZcS2dx7Iw== 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: List-Subscribe: List-Unsubscribe: From: Zeng Jingxiang Add documentation descriptions for cgroup.memsw_account_on_dfl and CONFIG_MEMSW_ACCOUNT_ON_DFL. Signed-off-by: Zeng Jingxiang --- Documentation/admin-guide/cgroup-v2.rst | 21 +++++++++++++++---- .../admin-guide/kernel-parameters.txt | 7 +++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst index 53ada5c2620a..58869279f0a9 100644 --- a/Documentation/admin-guide/cgroup-v2.rst +++ b/Documentation/admin-guide/cgroup-v2.rst @@ -1704,8 +1704,14 @@ The following nested keys are defined. A read-only single value file which exists on non-root cgroups. - The total amount of swap currently being used by the cgroup - and its descendants. + If memsw_account_on_dfl and CONFIG_MEMSW_ACCOUNT_ON_DFL is not + enabled (the default), this interface represents the total + amount of swap currently being used by the cgroup and its + descendants. + + If memsw_account_on_dfl or CONFIG_MEMSW_ACCOUNT_ON_DFL is enabled, + this interface represents the total amount of memory+swap + currently being used by the cgroup and its descendants. memory.swap.high A read-write single value file which exists on non-root @@ -1737,8 +1743,15 @@ The following nested keys are defined. A read-write single value file which exists on non-root cgroups. The default is "max". - Swap usage hard limit. If a cgroup's swap usage reaches this - limit, anonymous memory of the cgroup will not be swapped out. + If memsw_account_on_dfl and CONFIG_MEMSW_ACCOUNT_ON_DFL is not + enabled (the default), this interface represents the hard limit + of swap usage. If a cgroup's swap usage reaches this limit, + anonymous memory of the cgroup will not be swapped out. + + If memsw_account_on_dfl or CONFIG_MEMSW_ACCOUNT_ON_DFL is enabled, + this interface represents the hard limit of memory+swap usage. + If a cgroup's memory+swap usage reaches this limit, anonymous + memory of the cgroup will not be swapped out. memory.swap.max.effective A read-only single value file which exists on non-root cgroups. diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 2758bc124f16..0aa9e4f85b51 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -644,6 +644,13 @@ nokmem -- Disable kernel memory accounting. nobpf -- Disable BPF memory accounting. + cgroup.memsw_account_on_dfl= [KNL] Enable memory+swap account on cgroupv2. + Format: { "0" | "1" } + 0 - memory.swap.current and memory.swap.max represents the + usage/limit of swap. + 1 - memory.swap.current and memory.swap.max represents the + usage/limit of memory+swap. + checkreqprot= [SELINUX] Set initial checkreqprot flag value. Format: { "0" | "1" } See security/selinux/Kconfig help text.