From nobody Tue Feb 10 04:58:54 2026 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1559E16D9AC for ; Wed, 12 Jun 2024 09:31:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.187 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718184721; cv=none; b=RXhkohqVJy2EWOlaKCe6ND0xc1FZZnYjZHy5PLsCmg9X0VZYtR9C23oV0UPUhjyX7oSy6PB+Y4BDJxVHc6k03zlxTQ5py90W1MRXh36usAopafrXFwMHMBKhFvC3xIymPg0oNbK4BYmq0lIQEBvf6O0lUds/tjVUIijvSsW2kp4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718184721; c=relaxed/simple; bh=L5xe4VaIYlJKWRqCsvQkXzFnIxKCJWxbzLAhptdoC9E=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=iLerISpLRR0o1a44wDrxOuLgFyYVKCY0LOsL90TaWNWgVleaC/CqOHv1/TzCH1YltaaItPsfdaIWbGylgOPuu6sOVrW96EBBh5vXT8DBSFFCbiwEeWuEcfeGeA3m3XnlOsoNHnQrrKSY/pn80D+vRglL4FJhF3eQHkmhKTxfHWY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.187 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.88.105]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4VzgF40XBnzxS1q; Wed, 12 Jun 2024 17:27:52 +0800 (CST) Received: from dggpeml500023.china.huawei.com (unknown [7.185.36.114]) by mail.maildlp.com (Postfix) with ESMTPS id 71552140443; Wed, 12 Jun 2024 17:31:56 +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, 12 Jun 2024 17:31:56 +0800 From: Xiu Jianfeng To: , CC: , , Subject: [PATCH v3 -next 3/3] mm/hugetlb_cgroup: switch to the new cftypes Date: Wed, 12 Jun 2024 09:24:09 +0000 Message-ID: <20240612092409.2027592-4-xiujianfeng@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240612092409.2027592-1-xiujianfeng@huawei.com> References: <20240612092409.2027592-1-xiujianfeng@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpeml500023.china.huawei.com (7.185.36.114) Content-Type: text/plain; charset="utf-8" The previous patch has already reconstructed the cftype attributes based on the templates and saved them in dfl_cftypes and legacy_cftypes. then remove the old procedure and switch to the new cftypes. Signed-off-by: Xiu Jianfeng --- include/linux/hugetlb.h | 5 -- mm/hugetlb_cgroup.c | 163 +++++----------------------------------- 2 files changed, 17 insertions(+), 151 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 279aca379b95..a951c0d06061 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -686,11 +686,6 @@ struct hstate { unsigned int nr_huge_pages_node[MAX_NUMNODES]; unsigned int free_huge_pages_node[MAX_NUMNODES]; unsigned int surplus_huge_pages_node[MAX_NUMNODES]; -#ifdef CONFIG_CGROUP_HUGETLB - /* cgroup control files */ - struct cftype cgroup_files_dfl[8]; - struct cftype cgroup_files_legacy[10]; -#endif char name[HSTATE_NAME_LEN]; }; =20 diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c index 43aae8f88d5f..2b899c4ae968 100644 --- a/mm/hugetlb_cgroup.c +++ b/mm/hugetlb_cgroup.c @@ -839,164 +839,26 @@ hugetlb_cgroup_cfttypes_init(struct hstate *h, struc= t cftype *cft, } } =20 -static void __init __hugetlb_cgroup_file_dfl_init(int idx) +static void __init __hugetlb_cgroup_file_dfl_init(struct hstate *h) { - char buf[32]; - struct cftype *cft; - struct hstate *h =3D &hstates[idx]; + int idx =3D hstate_index(h); =20 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)); - - /* Add the limit file */ - cft =3D &h->cgroup_files_dfl[0]; - snprintf(cft->name, MAX_CFTYPE_NAME, "%s.max", buf); - cft->private =3D MEMFILE_PRIVATE(idx, RES_LIMIT); - cft->seq_show =3D hugetlb_cgroup_read_u64_max; - cft->write =3D hugetlb_cgroup_write_dfl; - cft->flags =3D CFTYPE_NOT_ON_ROOT; - - /* Add the reservation limit file */ - cft =3D &h->cgroup_files_dfl[1]; - snprintf(cft->name, MAX_CFTYPE_NAME, "%s.rsvd.max", buf); - cft->private =3D MEMFILE_PRIVATE(idx, RES_RSVD_LIMIT); - cft->seq_show =3D hugetlb_cgroup_read_u64_max; - cft->write =3D hugetlb_cgroup_write_dfl; - cft->flags =3D CFTYPE_NOT_ON_ROOT; - - /* Add the current usage file */ - cft =3D &h->cgroup_files_dfl[2]; - snprintf(cft->name, MAX_CFTYPE_NAME, "%s.current", buf); - cft->private =3D MEMFILE_PRIVATE(idx, RES_USAGE); - cft->seq_show =3D hugetlb_cgroup_read_u64_max; - cft->flags =3D CFTYPE_NOT_ON_ROOT; - - /* Add the current reservation usage file */ - cft =3D &h->cgroup_files_dfl[3]; - snprintf(cft->name, MAX_CFTYPE_NAME, "%s.rsvd.current", buf); - cft->private =3D MEMFILE_PRIVATE(idx, RES_RSVD_USAGE); - cft->seq_show =3D hugetlb_cgroup_read_u64_max; - cft->flags =3D CFTYPE_NOT_ON_ROOT; - - /* Add the events file */ - cft =3D &h->cgroup_files_dfl[4]; - snprintf(cft->name, MAX_CFTYPE_NAME, "%s.events", buf); - cft->private =3D MEMFILE_PRIVATE(idx, 0); - cft->seq_show =3D hugetlb_events_show; - cft->file_offset =3D offsetof(struct hugetlb_cgroup, events_file[idx]); - cft->flags =3D CFTYPE_NOT_ON_ROOT; - - /* Add the events.local file */ - cft =3D &h->cgroup_files_dfl[5]; - snprintf(cft->name, MAX_CFTYPE_NAME, "%s.events.local", buf); - cft->private =3D MEMFILE_PRIVATE(idx, 0); - cft->seq_show =3D hugetlb_events_local_show; - cft->file_offset =3D offsetof(struct hugetlb_cgroup, - events_local_file[idx]); - cft->flags =3D CFTYPE_NOT_ON_ROOT; - - /* Add the numa stat file */ - cft =3D &h->cgroup_files_dfl[6]; - snprintf(cft->name, MAX_CFTYPE_NAME, "%s.numa_stat", buf); - cft->private =3D MEMFILE_PRIVATE(idx, 0); - cft->seq_show =3D hugetlb_cgroup_read_numa_stat; - cft->flags =3D CFTYPE_NOT_ON_ROOT; - - /* NULL terminate the last cft */ - cft =3D &h->cgroup_files_dfl[7]; - memset(cft, 0, sizeof(*cft)); - - WARN_ON(cgroup_add_dfl_cftypes(&hugetlb_cgrp_subsys, - h->cgroup_files_dfl)); } =20 -static void __init __hugetlb_cgroup_file_legacy_init(int idx) +static void __init __hugetlb_cgroup_file_legacy_init(struct hstate *h) { - char buf[32]; - struct cftype *cft; - struct hstate *h =3D &hstates[idx]; + int idx =3D hstate_index(h); =20 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)); - - /* Add the limit file */ - cft =3D &h->cgroup_files_legacy[0]; - snprintf(cft->name, MAX_CFTYPE_NAME, "%s.limit_in_bytes", buf); - cft->private =3D MEMFILE_PRIVATE(idx, RES_LIMIT); - cft->read_u64 =3D hugetlb_cgroup_read_u64; - cft->write =3D hugetlb_cgroup_write_legacy; - - /* Add the reservation limit file */ - cft =3D &h->cgroup_files_legacy[1]; - snprintf(cft->name, MAX_CFTYPE_NAME, "%s.rsvd.limit_in_bytes", buf); - cft->private =3D MEMFILE_PRIVATE(idx, RES_RSVD_LIMIT); - cft->read_u64 =3D hugetlb_cgroup_read_u64; - cft->write =3D hugetlb_cgroup_write_legacy; - - /* Add the usage file */ - cft =3D &h->cgroup_files_legacy[2]; - snprintf(cft->name, MAX_CFTYPE_NAME, "%s.usage_in_bytes", buf); - cft->private =3D MEMFILE_PRIVATE(idx, RES_USAGE); - cft->read_u64 =3D hugetlb_cgroup_read_u64; - - /* Add the reservation usage file */ - cft =3D &h->cgroup_files_legacy[3]; - snprintf(cft->name, MAX_CFTYPE_NAME, "%s.rsvd.usage_in_bytes", buf); - cft->private =3D MEMFILE_PRIVATE(idx, RES_RSVD_USAGE); - cft->read_u64 =3D hugetlb_cgroup_read_u64; - - /* Add the MAX usage file */ - cft =3D &h->cgroup_files_legacy[4]; - snprintf(cft->name, MAX_CFTYPE_NAME, "%s.max_usage_in_bytes", buf); - cft->private =3D MEMFILE_PRIVATE(idx, RES_MAX_USAGE); - cft->write =3D hugetlb_cgroup_reset; - cft->read_u64 =3D hugetlb_cgroup_read_u64; - - /* Add the MAX reservation usage file */ - cft =3D &h->cgroup_files_legacy[5]; - snprintf(cft->name, MAX_CFTYPE_NAME, "%s.rsvd.max_usage_in_bytes", buf); - cft->private =3D MEMFILE_PRIVATE(idx, RES_RSVD_MAX_USAGE); - cft->write =3D hugetlb_cgroup_reset; - cft->read_u64 =3D hugetlb_cgroup_read_u64; - - /* Add the failcntfile */ - cft =3D &h->cgroup_files_legacy[6]; - snprintf(cft->name, MAX_CFTYPE_NAME, "%s.failcnt", buf); - cft->private =3D MEMFILE_PRIVATE(idx, RES_FAILCNT); - cft->write =3D hugetlb_cgroup_reset; - cft->read_u64 =3D hugetlb_cgroup_read_u64; - - /* Add the reservation failcntfile */ - cft =3D &h->cgroup_files_legacy[7]; - snprintf(cft->name, MAX_CFTYPE_NAME, "%s.rsvd.failcnt", buf); - cft->private =3D MEMFILE_PRIVATE(idx, RES_RSVD_FAILCNT); - cft->write =3D hugetlb_cgroup_reset; - cft->read_u64 =3D hugetlb_cgroup_read_u64; - - /* Add the numa stat file */ - cft =3D &h->cgroup_files_legacy[8]; - snprintf(cft->name, MAX_CFTYPE_NAME, "%s.numa_stat", buf); - cft->private =3D MEMFILE_PRIVATE(idx, 0); - cft->seq_show =3D hugetlb_cgroup_read_numa_stat; - - /* NULL terminate the last cft */ - cft =3D &h->cgroup_files_legacy[9]; - memset(cft, 0, sizeof(*cft)); - - WARN_ON(cgroup_add_legacy_cftypes(&hugetlb_cgrp_subsys, - h->cgroup_files_legacy)); } =20 -static void __init __hugetlb_cgroup_file_init(int idx) +static void __init __hugetlb_cgroup_file_init(struct hstate *h) { - __hugetlb_cgroup_file_dfl_init(idx); - __hugetlb_cgroup_file_legacy_init(idx); + __hugetlb_cgroup_file_dfl_init(h); + __hugetlb_cgroup_file_legacy_init(h); } =20 static void __init __hugetlb_cgroup_file_pre_init(void) @@ -1011,13 +873,22 @@ static void __init __hugetlb_cgroup_file_pre_init(vo= id) BUG_ON(!legacy_files); } =20 +static void __init __hugetlb_cgroup_file_post_init(void) +{ + WARN_ON(cgroup_add_dfl_cftypes(&hugetlb_cgrp_subsys, + dfl_files)); + WARN_ON(cgroup_add_legacy_cftypes(&hugetlb_cgrp_subsys, + legacy_files)); +} + void __init hugetlb_cgroup_file_init(void) { struct hstate *h; =20 __hugetlb_cgroup_file_pre_init(); for_each_hstate(h) - __hugetlb_cgroup_file_init(hstate_index(h)); + __hugetlb_cgroup_file_init(h); + __hugetlb_cgroup_file_post_init(); } =20 /* --=20 2.34.1