From patchwork Fri Feb 28 07:58:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 13995826 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 828ADC282C5 for ; Fri, 28 Feb 2025 07:58:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EE33D280001; Fri, 28 Feb 2025 02:58:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E927B6B008A; Fri, 28 Feb 2025 02:58:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D3312280001; Fri, 28 Feb 2025 02:58:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id B3C636B0088 for ; Fri, 28 Feb 2025 02:58:34 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 3CD55A016A for ; Fri, 28 Feb 2025 07:58:34 +0000 (UTC) X-FDA: 83168601348.02.C97ECE5 Received: from out-175.mta1.migadu.com (out-175.mta1.migadu.com [95.215.58.175]) by imf20.hostedemail.com (Postfix) with ESMTP id 8CE581C000D for ; Fri, 28 Feb 2025 07:58:32 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=pKGhwYIy; spf=pass (imf20.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.175 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740729512; 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=4VCEGjyZe+NN0DZWtHUpr5+jCBnuJyJ0VIJUe5VXlq8=; b=KBIRFXEXyIt510j97nLJhhcGIYLXukVRARQB9+CkSDQVC+B/cveQUoesnuFIZ2i8PFAFkk e9Enox1VbfE6siUkpy40QHZbdARSYlMbZUjNqivc2G62QYKi+uRKCja5RtucW5sisCa12i IiNqPOPT8byIOJ4bHZrCRCc7ageGHCk= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=pKGhwYIy; spf=pass (imf20.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.175 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740729512; a=rsa-sha256; cv=none; b=lQRDEGLK2PGox8RqHbbb4YI3fHabgdZXDEUwKxOWaq9hboubE+JWLQrSJyqbfiXXulA/ka Ti+50gCUXITaicqPa64mbXssQosVWNz9UJoX25gB6NhmaevfUg0y/J6qlp9ze0T5PS1tWJ mmX0oGyVDZB8cQm04Cd4x5+fd77tO5w= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1740729511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4VCEGjyZe+NN0DZWtHUpr5+jCBnuJyJ0VIJUe5VXlq8=; b=pKGhwYIythzfPZUUvu9WlOfs4j0TLxTYveugs6VVz6vtAmEdqTKcfPp3JrH0JyMA0ymAC4 hX0Qdr6CY54uCEink45UtRfouqr3vp5DvPqBt9JxhObqqgUcqXSLkl1G7truPbl8j0SF+i YVXLPk+zopZiy6Wrq9/L+SrnXUM7cjg= From: Shakeel Butt To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: [PATCH 1/3] memcg: don't call propagate_protected_usage() for v1 Date: Thu, 27 Feb 2025 23:58:06 -0800 Message-ID: <20250228075808.207484-2-shakeel.butt@linux.dev> In-Reply-To: <20250228075808.207484-1-shakeel.butt@linux.dev> References: <20250228075808.207484-1-shakeel.butt@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Stat-Signature: d6rq87szsnj1t84jxgbwohngmj9q4g11 X-Rspamd-Queue-Id: 8CE581C000D X-Rspamd-Server: rspam07 X-HE-Tag: 1740729512-300467 X-HE-Meta: U2FsdGVkX19q7K65agqFZ6mXh/6HbKXZWnPY6+R8ENmNcDfoEivb5zMDgIDSg74YwQCs8yB+vOBZSjIpyTIo46ye5BMvD4OSt6nypnLTHGXV+WfRfpcPTzYyN759n0B88Tb/MQpn3ja9micg7wlCGsGoneeZZhCIEk6/M/MJccvH11Al3BWcLAOnGk3kD6UQ9ZtdO/O4KqGCW5xD6jFgekKYbHhquKU1PzE4yl3w4xOKSKV6Bpry4/6QcivFEghADszPgOHJi2uSnHL86Rh9Kkw3xcU3wLRGcIDkIlfx/7k9ltMJoa+xjCfxEqtPTS62WycTtGyD8efbXPfnF/1QTI0HfCEJv6Gi0zpBoZgmoRe9TXZcK6AZ4438M0Asn+oeESXc1wArLPQTTAelhxmdEhQRuUD+ex7XLmwgiZHH2fcsF4u2QCNJeDnkUn43vX+0FYaAzj7WcdJGACFYSgxBCuT5HRv7+4RDegBo7f/uO/+W38XwNP2iDhbWcx1QgFn+2DnWKt0qUq6UsROPKouE+AHU0iGYCgknQxe2a8/6N1qEDRimSWHEftxXYj3/iOl+r+QoqMSzZZqsFICQ6/qdvyc/cJkoHHDaDq6g7cmj+yl4+qTIFUeW/NnlTszeIGPWl8eib3WI5efEEN8CW4xrR+jf81uCNwFgLLb+PtOHfa690r+qwDXsLPKe0KIGuXY97wWz5TCqwYCcoDNQ5Se2eoz/NzWpWIXXu0ltQiS0U6KoOaIcUYnsjAJ5FUmp5yRbRVwdPMg4Y9nP/yKh0eGdv+2KeAxomRSXNMF0LHh56A8tOa6GKUaTlnatSPLr0iIIZpD8HUC0SmvRqgmCVTEZDWQNBB5pjxx3GGyucqFyCe9zKNZiXatSUgU8RAyo/MVokmKBlTCK9VXGhwS8SaNdm84Dcr1HZ1f2X7U9hCjLilWIpOeEzQMRufNn+pqNmS8ixC0ymfLw3NuQmY9TyMx JIbVvkwH fb7dOzV00V77C/5lnpbwFc0IKNeucr1ErVH5NvC/wqFaAE7O0BYceQLk+pJGB2mtamfCct17ESZ3QTf+DDBgccl6UghHatrcOHrnDNIKeSQEfMrUFwlrqLu4FV5sxQh1cYPZ9IAJLGvurEy2P6Za1/syuJpDWv3i/rnYTL/AXcP5pAlvlmQZGtmzjg0yQMu43ehLI55TeJ06FWD2nhh7TjQhMmg== 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: Memcg-v1 does not support memory protection (min/low) and thus there is no need to track protected memory usage for it. Signed-off-by: Shakeel Butt --- mm/memcontrol.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 55b0e9482c00..36b2dfbc86c0 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3601,6 +3601,7 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css) { struct mem_cgroup *parent = mem_cgroup_from_css(parent_css); struct mem_cgroup *memcg, *old_memcg; + bool memcg_on_dfl = cgroup_subsys_on_dfl(memory_cgrp_subsys); old_memcg = set_active_memcg(parent); memcg = mem_cgroup_alloc(parent); @@ -3618,7 +3619,7 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css) if (parent) { WRITE_ONCE(memcg->swappiness, mem_cgroup_swappiness(parent)); - page_counter_init(&memcg->memory, &parent->memory, true); + page_counter_init(&memcg->memory, &parent->memory, memcg_on_dfl); page_counter_init(&memcg->swap, &parent->swap, false); #ifdef CONFIG_MEMCG_V1 WRITE_ONCE(memcg->oom_kill_disable, READ_ONCE(parent->oom_kill_disable)); @@ -3638,7 +3639,7 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css) return &memcg->css; } - if (cgroup_subsys_on_dfl(memory_cgrp_subsys) && !cgroup_memory_nosocket) + if (memcg_on_dfl && !cgroup_memory_nosocket) static_branch_inc(&memcg_sockets_enabled_key); if (!cgroup_memory_nobpf)