From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 34B853822B1 for ; Thu, 30 Apr 2026 20:11:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777579913; cv=none; b=SJm7NxGfxTInU7fyNYtqwK6qD3NXKS4LBmTcKqzDSD5aK05QdvKYRpZCLwcjv3jqkOg55sH4wYOOpg5VSjozlwCXrxx8k7/femWGR3Q7P2pHf6dXo4AxSGv4WV7znaRZ5s4POtvc/jQmyoGCIxbXR7bov2nO6rLY0pJ42euVn2k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777579913; c=relaxed/simple; bh=1+hpSCCKz9Tr5wIL77vj24aX2y/HLkl7RxaMJT3XcQ4=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=ShVvg4zsEwyWvTVC2SXCz/yPUZgBKICVBzLXUOoc4BY3qEqwuRPkgk6JhoyhzpU7/sUEWD7KBhBm8EyPdrMu7liJbJGzvN0DlOyyYDs5xLunJnImJvkzpkpxQUUh66aAMKtMdjEQETw4HNfu5L5r1ZMIWIp0Y7HO0mA8MlveSxc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--tjmercier.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=gVIHnFv1; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--tjmercier.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="gVIHnFv1" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2b9a3c3c4eeso11943605ad.3 for ; Thu, 30 Apr 2026 13:11:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777579911; x=1778184711; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=jBnnijQoTJ0z094ImigPUqqRjs6fvQAetKUiJNmcMt8=; b=gVIHnFv1VYt4zTIZ9ztr10F9Isk+M0I0mWLzNo1ChB1vGM1o+cFam5+jUn249HGGKF bR3NNq+KjKIKcmvT016BvdaH1HVpH4YsrMwqxGNNzNXNsezBkONwqHI17EwJ61vt73BX MZPF82FUbyZJ1ot6GAa6ux09CNe+ma9L4+FnIP2Ugzq2LiHyB/crGH+JcEFnBqGG4vIM RTdCMMprFsaSrRDwWPt0jlraHs/PpJ/AGMG1UYsjvsA9SmshTAv2mTh2ECCi5U2EUifJ zNNzKpRGaPdGaTR7rAMCWWWQY1gIEBXK+hH9SpQjQMt7la5bQxo7NiYpcxM9SisFFXrk R8Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777579911; x=1778184711; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=jBnnijQoTJ0z094ImigPUqqRjs6fvQAetKUiJNmcMt8=; b=WAF3iAr0fti9pejXJg2n7V38nhJD0bIhP8MII6UyqhAcVu26eZrIipnf8eCqe01WXa /mlXhn3DH17g8o3BYY6/ASv3q6txRQRhn5SMiJ370Jp/4rVg4AiNd5DGxA5SfPgNjSMc Fif5UIOI6tA665tnCXxbhnhwW2rLOC7vYENEx+KvZGZpPyguIe2B0tOzlIsiOKCjN2+M Hbd5vQRYxb6EziPejimsS5fg0UX9NFM3CKXsfnVCtvgvryV/X1VVkvwI++1FC2/Fg6RB ZJPQRqz6TeroqXDTD60iEDXfDjhp4qrYfa40+yLqnm9LgE7PNxztZbcis0fB8ODCwnq1 w2lw== X-Forwarded-Encrypted: i=1; AFNElJ+4eFexCZZSQMQkrQKZ+IZW5PKYh3a4mB/Dw18ces/eS5a2O1LzeNYW7SxJOspDwcUJc3zTiD9jrU/PmFE=@vger.kernel.org X-Gm-Message-State: AOJu0Yzy0W3QPFugF6zE6rmrZtqvxRRPsl/zJMYy/HPvsixPyhKILuFN xZm9obnWQvIK2mrrgRUV0Tf5Pn86VamSlLe/Ipbw0J86mAjpCcqgiYeS+MQO/DmTPs0tv/BxuYz 6sXhXPfBwawmMAd8Idw== X-Received: from plhi13.prod.google.com ([2002:a17:903:2ecd:b0:2b2:3f89:e9d2]) (user=tjmercier job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:be0d:b0:2b4:5ff5:e51f with SMTP id d9443c01a7336-2b9a252be1amr35053285ad.36.1777579911404; Thu, 30 Apr 2026 13:11:51 -0700 (PDT) Date: Thu, 30 Apr 2026 13:11:42 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog Message-ID: <20260430201142.240387-1-tjmercier@google.com> Subject: [PATCH] docs: cgroup-v1: Update charge-commit section From: "T.J. Mercier" To: tj@kernel.org, hannes@cmpxchg.org, mkoutny@suse.com, cgroups@vger.kernel.org Cc: corbet@lwn.net, skhan@linuxfoundation.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, "T.J. Mercier" Content-Type: text/plain; charset="UTF-8" Commit 1d8f136a421f ("memcg/hugetlb: remove memcg hugetlb try-commit-cancel protocol") removed mem_cgroup_commit_charge() and mem_cgroup_cancel_charge(), but the docs still refer to those functions. There is no longer any charge cancellation. Update the docs to match the code. Signed-off-by: T.J. Mercier --- Documentation/admin-guide/cgroup-v1/memcg_test.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Documentation/admin-guide/cgroup-v1/memcg_test.rst b/Documentation/admin-guide/cgroup-v1/memcg_test.rst index 9f8e27355cba..7c7cd457cf69 100644 --- a/Documentation/admin-guide/cgroup-v1/memcg_test.rst +++ b/Documentation/admin-guide/cgroup-v1/memcg_test.rst @@ -47,21 +47,19 @@ Please note that implementation details can be changed. Called when swp_entry's refcnt goes down to 0. A charge against swap disappears. -3. charge-commit-cancel +3. charge-commit ======================= Memcg pages are charged in two steps: - mem_cgroup_try_charge() - - mem_cgroup_commit_charge() or mem_cgroup_cancel_charge() + - commit_charge() At try_charge(), there are no flags to say "this page is charged". at this point, usage += PAGE_SIZE. At commit(), the page is associated with the memcg. - At cancel(), simply usage -= PAGE_SIZE. - Under below explanation, we assume CONFIG_SWAP=y. 4. Anonymous -- 2.54.0.545.g6539524ca2-goog