From patchwork Fri Jun 28 21:03:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Gushchin X-Patchwork-Id: 13716625 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 9F3BBC30658 for ; Fri, 28 Jun 2024 21:03:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E61C96B0083; Fri, 28 Jun 2024 17:03:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D494D6B00A1; Fri, 28 Jun 2024 17:03:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BC54F6B00A2; Fri, 28 Jun 2024 17:03:57 -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 9240B6B0083 for ; Fri, 28 Jun 2024 17:03:57 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 21B221C0E08 for ; Fri, 28 Jun 2024 21:03:57 +0000 (UTC) X-FDA: 82281524514.18.F525E1D Received: from out-188.mta1.migadu.com (out-188.mta1.migadu.com [95.215.58.188]) by imf16.hostedemail.com (Postfix) with ESMTP id 09FB8180017 for ; Fri, 28 Jun 2024 21:03:54 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=g2NtijnZ; spf=pass (imf16.hostedemail.com: domain of roman.gushchin@linux.dev designates 95.215.58.188 as permitted sender) smtp.mailfrom=roman.gushchin@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=1719608626; 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=MPtP5N5DyF6jTL5Hfe6ZNpWs5ObKbQpWVZsP63+oajo=; b=KX3cFNsietITaZwbzo7T1hLCNRGlfGWmwJcLPtK/XXX5M/XtVruL3VnFQsiTTu2qthQEQV 8RWbguAclaZVPfXJO1rx/xjXDQa2JCObtO2laUhlMrDYdFE8SKCyiSqbQDROiu24RGAF8r bwA0u6AckjCOgln5qiaSbO/b555nMrQ= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=g2NtijnZ; spf=pass (imf16.hostedemail.com: domain of roman.gushchin@linux.dev designates 95.215.58.188 as permitted sender) smtp.mailfrom=roman.gushchin@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719608626; a=rsa-sha256; cv=none; b=3pl2GfwPGb+dO/KEnALLgb3jwTG4/8/8gbZdjoZp2bsEMq3xll433dG3/SUY+uilPU1zVO 9Ew3jdYKnhpIxxZJVjnip7aLAYeyQb7q+8gOqkO+y06/2x0O+TJFaisiCZmbYzA21KOG/z yCS733CvjDIBZm+c+XhlQGUFJqEpecg= X-Envelope-To: akpm@linux-foundation.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1719608633; 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=MPtP5N5DyF6jTL5Hfe6ZNpWs5ObKbQpWVZsP63+oajo=; b=g2NtijnZEqgSMhtqKQKM5yPBi+tG0SpRLqJ+5RYIwuiLLTSg1j+c8yL4PEB+DPR8uQ88lD yvfYsoa9kK4zLjnW9p0ZQCAJlr333gFyf6FEdei0K7YOoa7NF/B9RIZfx9vW9RJ9IrNcqN 3uYerGLOAvi0tAsd+SuVTh/1zamik4U= X-Envelope-To: linux-mm@kvack.org X-Envelope-To: linux-kernel@vger.kernel.org X-Envelope-To: hannes@cmpxchg.org X-Envelope-To: mhocko@kernel.org X-Envelope-To: shakeel.butt@linux.dev X-Envelope-To: muchun.song@linux.dev X-Envelope-To: roman.gushchin@linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Roman Gushchin To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Johannes Weiner , Michal Hocko , Shakeel Butt , Muchun Song , Roman Gushchin Subject: [PATCH v1 3/9] mm: memcg: guard cgroup v1-specific code in mem_cgroup_print_oom_meminfo() Date: Fri, 28 Jun 2024 21:03:11 +0000 Message-ID: <20240628210317.272856-4-roman.gushchin@linux.dev> In-Reply-To: <20240628210317.272856-1-roman.gushchin@linux.dev> References: <20240628210317.272856-1-roman.gushchin@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 09FB8180017 X-Stat-Signature: g3jdhid397oriufg95h7gkazd873msxu X-HE-Tag: 1719608634-960015 X-HE-Meta: U2FsdGVkX1/RCkZ/d3MJqY3TCNU6/V/xcXEIyxo2zHBPwa4NTpLd++ucXJnHpZ4vFBwe32XGhbyavoliL44G4I6AHJpVTfBlkzSMoOzzoUdpPb7vg/GbGk/vkT8dP41679KSG3lShJKo4vJX8yvp8lwfJ/egAqX7zWdqztg0ZvmE9ibG35ZMaF9jCq2lZ4TBlUa+8aTSWGjMM9H/baLmm822WTgbtOrEHmdAJnVR+GqoVbi3BZUe5LHV76j9dof8MBXbTiORpkwyoYRvh+60xy2JNBfw933a2LDlMa6SAuH83feTLQ108pEAsmK+XH9TSaVXuJv//cmE3CoVp3A04xf/dCwh7wQa0fIdPBF+cJ0jEHPpggQKXpIYZC3tLCEMTujm891mJ/S8i0fanky4J5jRNbRXTRYHqbP2lT2/ZC4AAjXJ865kos98pNZmKZktWdDF2yYXJlT+4PGDprNGi1SplnNdSELYNvee0fRu6j0ySxcFXYY/MojuPrn2cY+zkQ74uNUU1AGvWIlltScSWmHr01IY8231vA7QMu+UAZ06UwA0Rrp+qsHHE60f1gIHSQ4RkNz8vscLrFencs2eNdKXEqIjyyjUW6/gEpPTnUcTb15EJ84DiclVIkxGGme2eVAAo5VBWJCbZKRAnxAlRabNbjnXoNTk7DMXUntTC3ABaiFuqIgw70hnQ2MWhXNoh7yWtc9YHeSMrjrMNc8diCnsvLm+CRY0I1tqCuhbbJCiHqsT3TMJnBcd+fcGBGu/NkgHaxMZCbWBkrJX48Aayms+JWq8ZkRTwI8xzanS2r2L2ZJuvqfPfLOBtlB4c3DBRyNDkX61xpPmdf569NVZwL54ExzOTGFWpC5qj2iS9xrmZZb6FP3XV9e+EAAOVsE8p2kNcthPoMyyhKA8K+/HflnxybrsULszj7z5CDp7CO89Uv87wC2QEM+vYNVNWkDIkbly9NaTUGM3qDkDfdh XnA690jD yq4Lk3RZkxFcbwtfFc52Ry+bLo5n0TPly+DTkenmogxiKmZCS5Bd/MW4l9EjATgPCEDAkRaXVpb53xXNEbhcqonYjrZFcCA9yAGnwrjkEZJQ0/0aGrivBgoJ8e8LIZ0Y0veFBstUEC4er3oXgGqBy5YM1EQ== 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: Put cgroup v1-specific code in mem_cgroup_print_oom_meminfo() under CONFIG_MEMCG_V1. Signed-off-by: Roman Gushchin Acked-by: Shakeel Butt --- mm/memcontrol.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 2c0605bbbb31..b69abd327549 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1532,6 +1532,7 @@ void mem_cgroup_print_oom_meminfo(struct mem_cgroup *memcg) pr_info("swap: usage %llukB, limit %llukB, failcnt %lu\n", K((u64)page_counter_read(&memcg->swap)), K((u64)READ_ONCE(memcg->swap.max)), memcg->swap.failcnt); +#ifdef CONFIG_MEMCG_V1 else { pr_info("memory+swap: usage %llukB, limit %llukB, failcnt %lu\n", K((u64)page_counter_read(&memcg->memsw)), @@ -1540,6 +1541,7 @@ void mem_cgroup_print_oom_meminfo(struct mem_cgroup *memcg) K((u64)page_counter_read(&memcg->kmem)), K((u64)memcg->kmem.max), memcg->kmem.failcnt); } +#endif pr_info("Memory cgroup stats for "); pr_cont_cgroup_path(memcg->css.cgroup);