From patchwork Tue May 28 20:20:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Gushchin X-Patchwork-Id: 13677349 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 7C256C25B7E for ; Tue, 28 May 2024 20:21:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 09F376B0098; Tue, 28 May 2024 16:21:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F40F36B0099; Tue, 28 May 2024 16:21:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E09826B009A; Tue, 28 May 2024 16:21:34 -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 C1FF66B0098 for ; Tue, 28 May 2024 16:21:34 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 7992BA0593 for ; Tue, 28 May 2024 20:21:34 +0000 (UTC) X-FDA: 82168924908.14.DE6816F Received: from out-179.mta1.migadu.com (out-179.mta1.migadu.com [95.215.58.179]) by imf06.hostedemail.com (Postfix) with ESMTP id 5E7C6180008 for ; Tue, 28 May 2024 20:21:32 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="kXZSc8P/"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf06.hostedemail.com: domain of roman.gushchin@linux.dev designates 95.215.58.179 as permitted sender) smtp.mailfrom=roman.gushchin@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716927692; 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=skdB+ennJA28iFKwvEIuJBTK1zA9kQ9+RV54OQgd+d4=; b=T6MjsKivais+DFRQqTGsan3SBYlLtgfNvyaGw0RSbgwQhyHvZU4AlRmfHgtQODug0squc3 culq4xaSEbjZ/lJ5Ul3lKZlBojcJGUBoG4f4dok9tD6nkmE5z+/R5IpP/ebeJZqcjOwRGd rz0aoEvIriFon3mXHa7Ov7nqkiCd5xM= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="kXZSc8P/"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf06.hostedemail.com: domain of roman.gushchin@linux.dev designates 95.215.58.179 as permitted sender) smtp.mailfrom=roman.gushchin@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716927692; a=rsa-sha256; cv=none; b=qqyQ4WGcawFkoGRLUzPzNkiqQFpif11srncTFsGKVT11u0SNA/dcCdYgSmzTPhftDM4FOY 7tPMqOrG0EOsp2ymelxYjiHWr8/tqe7ylfT1PFAZrLyQu7fMRXWnGoafPeKYfHx7V3GG44 GrSvXHuSeUb4aT34MKQY39tN3vkkqxQ= X-Envelope-To: akpm@linux-foundation.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1716927690; 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=skdB+ennJA28iFKwvEIuJBTK1zA9kQ9+RV54OQgd+d4=; b=kXZSc8P/l1zrFGRit40gHI3whujSvruQH3YhSlwEZ1uUMcCozwIdWfL6qDEkcRm9QzDSVc UHRXLckf864TfJOmD04sKC+D6vsPTG6HnILGtUgBzBbnRKJRSLW+ud56nXyAeDqTjFyNeV B/HrZW4NnMEMOrjHq8VMrBAJkpsXtPo= X-Envelope-To: muchun.song@linux.dev X-Envelope-To: hannes@cmpxchg.org X-Envelope-To: mhocko@kernel.org X-Envelope-To: shakeel.butt@linux.dev X-Envelope-To: willy@infradead.org X-Envelope-To: linux-mm@kvack.org X-Envelope-To: linux-kernel@vger.kernel.org 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: Muchun Song , Johannes Weiner , Michal Hocko , Shakeel Butt , Matthew Wilcox , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Roman Gushchin Subject: [PATCH v1 01/14] mm: memcg: introduce memcontrol-v1.c Date: Tue, 28 May 2024 13:20:53 -0700 Message-ID: <20240528202101.3099300-2-roman.gushchin@linux.dev> In-Reply-To: <20240528202101.3099300-1-roman.gushchin@linux.dev> References: <20240528202101.3099300-1-roman.gushchin@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 5E7C6180008 X-Stat-Signature: ingqdbjm6y1wfw37jioyjpe483uctn1r X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1716927692-774268 X-HE-Meta: U2FsdGVkX1/RbzmXbJdLpUH9v7RSC9h3bEKUarF9zOKOq1LRfQ7ZFID6sOa2dlrW/qkCmHe/n2HJoFlx9bCDBt54NjHE3dVrypTvsPhG2g7SVz+thhEjz70U+nHn675WY4eMTXWaFnXI4R4OWQM/k8nnXCpfYE4MSUrwbMSeaMAeJGqvJksxgQrKf50WKADEvyr6KqQBV2vBTfBMVKS9saiUjYsHC8YHNRRZ/bWIdoOnBqFV8wezjgpGdSnkxvOFoxzWmwDN+slJn/WPzkYqGhRCiPYDE8lAW8wZj/wZaMvCSU8phVesIRg8uQHXku8rryJp0cfsgDVcytCYZ8uI9r7rnOG1MEI5QBX+3Y3ZML9iwdtUX+rxQAQXjQypvPEWBBvwEnAKl+KUBJ9D12yzuI0ABarFDKhx1nylr+0U/3ichUIsBCrp+qauh7YTHqqnFnltmUcwQ7S4kLCxwTtUgafHcBBFoVfJEG3sBRm4QR/5g3mt9gskcKiccnqplG/cV1txZ8UrqRNKTf3XWkxQut4bSSGwj/vxmeJXAm6OscNs+Nr2ELqib1UXBCIRXkpVaNjU6TFAB7I3dHHoF7l5IgDw3bE4lYU4NCDUYG2WVvMkYuYQ0VOxj1G9beahVQJPK1SXgqyOFS+gNEBvXhDF8HNKEvWx2omBE67p3jR1/z+NXyai0URuP0dAeTu6Y1ZRWz2JHBVyXkt5BOvDTxUaByWXlmJVg2r/cYQpZqrx30ghUcxUfVHs6hFKVIXCU+22j494iYlBsHLzjbx0vqm30HQCKJ0feJWbbMimD6Oc+Qc6MxYZdRPc2p7aLtHJ8mcnT7WXsGnN0Rw/wsMk3qEULkHyol0TZgsrs4NLKUPvCMs4FcOOSjaiAIQytUZmptIkqGO63iXI9Hde7T6AMBVRR3DHDBS9Fh7ZlZCQIqDw0M6Fhx1Og5wr1zWxtju8vqBIM+v1q9vvme6q/M2uSNR /XvZp7cI Ny3by8RqCNHj+pL39oc0aCe1L1agwMWKulVD7PLiDnpNm3wfHIp6TbVImAIo2dCRhHod5ZKSOXldB2yM= 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: This patch introduces the mm/memcontrol-v1.c source file which will be used for all legacy (cgroup v1) memory cgroup code. It also introduces mm/memcontrol-v1.h to keep declarations shared between mm/memcontrol.c and mm/memcontrol-v1.c. As of now, let's compile it if CONFIG_MEMCG is set, similar to mm/memcontrol.c. Later on it can be switched to use a separate config option, so that the legacy code won't be compiled if not required. Signed-off-by: Roman Gushchin Acked-by: Shakeel Butt --- mm/Makefile | 3 ++- mm/memcontrol-v1.c | 3 +++ mm/memcontrol-v1.h | 7 +++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 mm/memcontrol-v1.c create mode 100644 mm/memcontrol-v1.h diff --git a/mm/Makefile b/mm/Makefile index 8fb85acda1b1c..124d4dea20351 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -26,6 +26,7 @@ KCOV_INSTRUMENT_page_alloc.o := n KCOV_INSTRUMENT_debug-pagealloc.o := n KCOV_INSTRUMENT_kmemleak.o := n KCOV_INSTRUMENT_memcontrol.o := n +KCOV_INSTRUMENT_memcontrol-v1.o := n KCOV_INSTRUMENT_mmzone.o := n KCOV_INSTRUMENT_vmstat.o := n KCOV_INSTRUMENT_failslab.o := n @@ -95,7 +96,7 @@ obj-$(CONFIG_NUMA) += memory-tiers.o obj-$(CONFIG_DEVICE_MIGRATION) += migrate_device.o obj-$(CONFIG_TRANSPARENT_HUGEPAGE) += huge_memory.o khugepaged.o obj-$(CONFIG_PAGE_COUNTER) += page_counter.o -obj-$(CONFIG_MEMCG) += memcontrol.o vmpressure.o +obj-$(CONFIG_MEMCG) += memcontrol.o memcontrol-v1.o vmpressure.o ifdef CONFIG_SWAP obj-$(CONFIG_MEMCG) += swap_cgroup.o endif diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c new file mode 100644 index 0000000000000..a941446ba575b --- /dev/null +++ b/mm/memcontrol-v1.c @@ -0,0 +1,3 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "memcontrol-v1.h" diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h new file mode 100644 index 0000000000000..7c5f094755ff8 --- /dev/null +++ b/mm/memcontrol-v1.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef __MM_MEMCONTROL_V1_H +#define __MM_MEMCONTROL_V1_H + + +#endif /* __MM_MEMCONTROL_V1_H */