From patchwork Wed Jun 5 07:01:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiu Jianfeng X-Patchwork-Id: 13686247 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 04DBFC27C52 for ; Wed, 5 Jun 2024 07:09:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 975CA6B0093; Wed, 5 Jun 2024 03:09:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8D6806B0092; Wed, 5 Jun 2024 03:09:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6BBEC6B0095; Wed, 5 Jun 2024 03:09:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 373AE6B008A for ; Wed, 5 Jun 2024 03:09:15 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B9D0A121351 for ; Wed, 5 Jun 2024 07:09:14 +0000 (UTC) X-FDA: 82195958628.14.28B8C6C Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) by imf28.hostedemail.com (Postfix) with ESMTP id F3365C0012 for ; Wed, 5 Jun 2024 07:09:11 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf28.hostedemail.com: domain of xiujianfeng@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=xiujianfeng@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717571352; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=13n6CPg8A5x7YnqC4PXMCysMGL4xLs7LqXVwnk6N/CU=; b=LCwVuRuO+5wBlbAVTsgZOX8EIFYma50TRjNxrDdAQMCYDi1NXiCdmt6NXFKPjUNpxaMpBF SoA8vRJTm5bdgfvFe0dGAO7WqAj6sUijov549Pih+S2gM/aOPg6Q0nGnCz4kGzB7fz2gLP slK0+9ueI2cipWqgNIxjiaCBpDUoqoQ= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf28.hostedemail.com: domain of xiujianfeng@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=xiujianfeng@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717571352; a=rsa-sha256; cv=none; b=bNIFeut6nYoAMJWpVm+MT8jDFiOrZtQdrnpElhVqVS7dNV/6op4WkoHihij749KyGYiRaT e0wCHWa/qDwtmp5E6rdYeK3Jv7cPUD5zHPe0UbmCZUZHKN5oA2xdriScICRgkivQvcQAnU gEwWjeYU0QcIgHPQKdvnTryyowEg0EY= Received: from mail.maildlp.com (unknown [172.19.88.214]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4VvJQ001tBz355cs; Wed, 5 Jun 2024 15:05:28 +0800 (CST) Received: from dggpeml500023.china.huawei.com (unknown [7.185.36.114]) by mail.maildlp.com (Postfix) with ESMTPS id 16EC11A016C; Wed, 5 Jun 2024 15:09:09 +0800 (CST) Received: from hulk-vt.huawei.com (10.67.174.26) by dggpeml500023.china.huawei.com (7.185.36.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Wed, 5 Jun 2024 15:09:08 +0800 From: Xiu Jianfeng To: , CC: , Subject: [PATCH v2 -next 2/3] mm/hugetlb_cgroup: prepare cftypes based on template Date: Wed, 5 Jun 2024 07:01:32 +0000 Message-ID: <20240605070133.1941677-3-xiujianfeng@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240605070133.1941677-1-xiujianfeng@huawei.com> References: <20240605070133.1941677-1-xiujianfeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.26] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpeml500023.china.huawei.com (7.185.36.114) X-Rspamd-Queue-Id: F3365C0012 X-Stat-Signature: usdqbhyh5hwnx14sb6c8j5isrq5fs7eb X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1717571351-572112 X-HE-Meta: U2FsdGVkX1/AMDt5mMyMUUfdwSg99FdieXpb0SUeUbNm5UzJenv+Un2mWpMDXF2+9nh2u4t0SvXjCJdNM7P25AJ9KSIPweftDldNIzoB3udGH8zXSVEBda1kWzSwrOavVGPID3+TK6uMCVmXDYEr7L/p1Joqbff0T9j8cK+9WESi6r6PxLIJXuHCNsQiR239pIiePQdRG+oPRy/oSclGrMGLcJJnaDBpTNfKPVx6aF1O+kngl1Gi4knJ43DAw2Tx3vGa7JydGtChJvgsNQzk2ZX3YpBv35rer7XfLxGlIEjsq8a+HJhc3yR1CLK1R6m9J43vT1lmMmqWg+9aVMilw8iuIabvG5azk/1i1XHLW6GgPGo0kCqG6hNnictvbKggrtW2j5EZkEXEHk5e403y+UcIGAEv2J3wgSeDtt3lffvojG+nA9XnAbCc1zYRs9q00+6n0QfGtwuDwJnlg+j0zgQx/NkxU/nWshXwoyZxpbDtv+SAjOogndRlubLn8wA/mVqNC96sY7Y5jyPzZyYEJ1+vxcAuN+gHsa+s+EmWrMTSErakb6fZ21hjGQCyaWuDYtDbkDSkXJT22L1YIx0uUzNuIQkQOuId1G8TkygVAkH78q5IEtwGVvLc78XiWuMDome3yHM7DFAli52f2MXE/WXtlPJFGWYMd2mHwTB6tuBwCuE6L/Ln9+eujqvRUzMbdmDt4bsrEIRzipNm2SwkzwhrNLio31RrBZdl7C2dEghlf4/Q8vzjEY6nMUGju9trzaqLjNoObhjtQRVupWx6ZEVlWMlnzzA7t12YpMAIfUEVOq7yY87HjmXYfDhcrr39+1L8UtNJriltfazvNDTZlDBpJ+S7VbgzJVXOmrzfwgARf/8s4RqTe8g8EZrMhKEAES2yh6+BOf6wn/Mr1h+vz3h6j2cYtm21wnnBVhD7Evt9/ivx3exrLCyvicW8fiwdcnPm2MMWunZJC1omB4r XqrwOTwV BHaStMc1nqhmbelXxNmggek+z7hlm4ZYaLHwJv4jR5IM2/nEwzBY0uNFpulT3+z1TEyyut2G4SO8C2M4A3sJ3f77whkNQAfpdJi8D4kLnyaM/JGY8tgRFZeL9X1dD3n+NNwjef6c1IUlboQe4j4KyB6XBGLdR5S3q1dDjJDB5lTyt5WkHmMFE5DYcnXyYoJ2PYEn1 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: Unlike other cgroup subsystems, the hugetlb cgroup does not provide a static array of cftype that explicitly displays the properties, handling functions, etc., of each file. Instead, it dynamically creates the attribute of cftypes based on the hstate during the startup procedure. This reduces the readability of the code. To fix this issue, introduce two templates of cftypes, and rebuild the attributes according to the hstate to make it ready to be added to cgroup framework. Signed-off-by: Xiu Jianfeng --- mm/hugetlb_cgroup.c | 155 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 155 insertions(+) diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c index 45f94a869776..56876b61027d 100644 --- a/mm/hugetlb_cgroup.c +++ b/mm/hugetlb_cgroup.c @@ -27,7 +27,16 @@ #define MEMFILE_IDX(val) (((val) >> 16) & 0xffff) #define MEMFILE_ATTR(val) ((val) & 0xffff) +#define MEMFILE_OFFSET(t, m) (((offsetof(t, m) << 16) | sizeof_field(t, m))) +#define MEMFILE_OFFSET0(val) (((val) >> 16) & 0xffff) +#define MEMFILE_FIELD_SIZE(val) ((val) & 0xffff) + +#define DFL_TMPL_SIZE ARRAY_SIZE(hugetlb_dfl_tmpl) +#define LEGACY_TMPL_SIZE ARRAY_SIZE(hugetlb_legacy_tmpl) + static struct hugetlb_cgroup *root_h_cgroup __read_mostly; +static struct cftype *dfl_files; +static struct cftype *legacy_files; static inline struct page_counter * __hugetlb_cgroup_counter_from_cgroup(struct hugetlb_cgroup *h_cg, int idx, @@ -702,12 +711,142 @@ static int hugetlb_events_local_show(struct seq_file *seq, void *v) return __hugetlb_events_show(seq, true); } +static struct cftype hugetlb_dfl_tmpl[] = { + { + .name = "max", + .private = RES_LIMIT, + .seq_show = hugetlb_cgroup_read_u64_max, + .write = hugetlb_cgroup_write_dfl, + .flags = CFTYPE_NOT_ON_ROOT, + }, + { + .name = "rsvd.max", + .private = RES_RSVD_LIMIT, + .seq_show = hugetlb_cgroup_read_u64_max, + .write = hugetlb_cgroup_write_dfl, + .flags = CFTYPE_NOT_ON_ROOT, + }, + { + .name = "current", + .private = RES_USAGE, + .seq_show = hugetlb_cgroup_read_u64_max, + .flags = CFTYPE_NOT_ON_ROOT, + }, + { + .name = "rsvd.current", + .private = RES_RSVD_USAGE, + .seq_show = hugetlb_cgroup_read_u64_max, + .flags = CFTYPE_NOT_ON_ROOT, + }, + { + .name = "events", + .seq_show = hugetlb_events_show, + .file_offset = MEMFILE_OFFSET(struct hugetlb_cgroup, events_file[0]), + .flags = CFTYPE_NOT_ON_ROOT, + }, + { + .name = "events.local", + .seq_show = hugetlb_events_local_show, + .file_offset = MEMFILE_OFFSET(struct hugetlb_cgroup, events_local_file[0]), + .flags = CFTYPE_NOT_ON_ROOT, + }, + { + .name = "numa_stat", + .seq_show = hugetlb_cgroup_read_numa_stat, + .flags = CFTYPE_NOT_ON_ROOT, + }, + /* don't need terminator here */ +}; + +static struct cftype hugetlb_legacy_tmpl[] = { + { + .name = "limit_in_bytes", + .private = RES_LIMIT, + .read_u64 = hugetlb_cgroup_read_u64, + .write = hugetlb_cgroup_write_legacy, + }, + { + .name = "rsvd.limit_in_bytes", + .private = RES_RSVD_LIMIT, + .read_u64 = hugetlb_cgroup_read_u64, + .write = hugetlb_cgroup_write_legacy, + }, + { + .name = "usage_in_bytes", + .private = RES_USAGE, + .read_u64 = hugetlb_cgroup_read_u64, + }, + { + .name = "rsvd.usage_in_bytes", + .private = RES_RSVD_USAGE, + .read_u64 = hugetlb_cgroup_read_u64, + }, + { + .name = "max_usage_in_bytes", + .private = RES_MAX_USAGE, + .write = hugetlb_cgroup_reset, + .read_u64 = hugetlb_cgroup_read_u64, + }, + { + .name = "rsvd.max_usage_in_bytes", + .private = RES_RSVD_MAX_USAGE, + .write = hugetlb_cgroup_reset, + .read_u64 = hugetlb_cgroup_read_u64, + }, + { + .name = "failcnt", + .private = RES_FAILCNT, + .write = hugetlb_cgroup_reset, + .read_u64 = hugetlb_cgroup_read_u64, + }, + { + .name = "rsvd.failcnt", + .private = RES_RSVD_FAILCNT, + .write = hugetlb_cgroup_reset, + .read_u64 = hugetlb_cgroup_read_u64, + }, + { + .name = "numa_stat", + .seq_show = hugetlb_cgroup_read_numa_stat, + }, + /* don't need terminator here */ +}; + +static void __init +hugetlb_cgroup_cfttypes_init(struct hstate *h, struct cftype *cft, + struct cftype *tmpl, int tmpl_size) +{ + char buf[32]; + int i, idx = hstate_index(h); + + /* format the size */ + mem_fmt(buf, sizeof(buf), huge_page_size(h)); + + for (i = 0; i < tmpl_size; cft++, tmpl++, i++) { + *cft = *tmpl; + /* rebuild the name */ + snprintf(cft->name, MAX_CFTYPE_NAME, "%s.%s", buf, tmpl->name); + /* rebuild the private */ + if (tmpl->private) + cft->private = MEMFILE_PRIVATE(idx, tmpl->private); + /* rebuild the file_offset */ + if (tmpl->file_offset) { + unsigned int offset = tmpl->file_offset; + cft->file_offset = MEMFILE_OFFSET0(offset) + + MEMFILE_FIELD_SIZE(offset) * idx; + } + } +} + static void __init __hugetlb_cgroup_file_dfl_init(int idx) { char buf[32]; struct cftype *cft; struct hstate *h = &hstates[idx]; + hugetlb_cgroup_cfttypes_init(h, dfl_files + idx * DFL_TMPL_SIZE, + hugetlb_dfl_tmpl, DFL_TMPL_SIZE); + /* format the size */ mem_fmt(buf, sizeof(buf), huge_page_size(h)); @@ -779,6 +918,9 @@ static void __init __hugetlb_cgroup_file_legacy_init(int idx) struct cftype *cft; struct hstate *h = &hstates[idx]; + hugetlb_cgroup_cfttypes_init(h, legacy_files + idx * LEGACY_TMPL_SIZE, + hugetlb_legacy_tmpl, LEGACY_TMPL_SIZE); + /* format the size */ mem_fmt(buf, sizeof(buf), huge_page_size(h)); @@ -856,10 +998,23 @@ static void __init __hugetlb_cgroup_file_init(int idx) __hugetlb_cgroup_file_legacy_init(idx); } +static void __init __hugetlb_cgroup_file_pre_init(void) +{ + int cft_count; + + cft_count = hugetlb_max_hstate * DFL_TMPL_SIZE + 1; /* add terminator */ + dfl_files = kcalloc(cft_count, sizeof(struct cftype), GFP_KERNEL); + BUG_ON(!dfl_files); + cft_count = hugetlb_max_hstate * LEGACY_TMPL_SIZE + 1; /* add terminator */ + legacy_files = kcalloc(cft_count, sizeof(struct cftype), GFP_KERNEL); + BUG_ON(!legacy_files); +} + void __init hugetlb_cgroup_file_init(void) { struct hstate *h; + __hugetlb_cgroup_file_pre_init(); for_each_hstate(h) __hugetlb_cgroup_file_init(hstate_index(h)); }