From patchwork Mon Jun 3 12:05:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiu Jianfeng X-Patchwork-Id: 13683727 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 C6F41C25B75 for ; Mon, 3 Jun 2024 12:12:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 51F826B0095; Mon, 3 Jun 2024 08:12:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4D0786B0096; Mon, 3 Jun 2024 08:12:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3705F6B0099; Mon, 3 Jun 2024 08:12:52 -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 1BFF06B0096 for ; Mon, 3 Jun 2024 08:12:52 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id BD7DE80DE7 for ; Mon, 3 Jun 2024 12:12:51 +0000 (UTC) X-FDA: 82189466142.06.BF50E95 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by imf14.hostedemail.com (Postfix) with ESMTP id 805CA100014 for ; Mon, 3 Jun 2024 12:12:49 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.hostedemail.com: domain of xiujianfeng@huawei.com designates 45.249.212.255 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=1717416770; 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=70EliohaERBf7VAU1Ekt+wf6hOHMooOBNdpsZ2TcaMg=; b=l37biMasVbW6WlE/pMP2ZkV+deFTeGywPDX9P3JDIAN/u4XOXPG2tZjkF8HFClILzS0mEC JCim0ZCmV74A4gGuz7rlJ7xoamFks7oqt+V2ja2jb5ScZfTq4mcKnCGXpkXkudOsAJcbvR Pvu27k258C0an/D2EXoj0sAai4K3Z5Q= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717416770; a=rsa-sha256; cv=none; b=LHTfLsW+k0BsK5Ea+5wXBeIxU4gD4vWwyj6ckOx41Ijc2Vfwk0VWRoS6cFDzG5p9NVrR7p 7fk9f/gqjazQlOS2uM4W+3kLJyL0UewwgFskumaCoOOH6b6BbkyXh//GQjJ68uBEM/dQ4F djvo9Z5JryyXA4xcJFLFw71IG08pwlg= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.hostedemail.com: domain of xiujianfeng@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=xiujianfeng@huawei.com Received: from mail.maildlp.com (unknown [172.19.88.194]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4VtCDz2xwGz1S91k; Mon, 3 Jun 2024 20:08:51 +0800 (CST) Received: from dggpeml500023.china.huawei.com (unknown [7.185.36.114]) by mail.maildlp.com (Postfix) with ESMTPS id 55926140109; Mon, 3 Jun 2024 20:12:45 +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; Mon, 3 Jun 2024 20:12:45 +0800 From: Xiu Jianfeng To: , CC: , Subject: [PATCH -next 1/3] mm/hugetlb_cgroup: identify the legacy using cgroup_subsys_on_dfl() Date: Mon, 3 Jun 2024 12:05:04 +0000 Message-ID: <20240603120506.1837322-2-xiujianfeng@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240603120506.1837322-1-xiujianfeng@huawei.com> References: <20240603120506.1837322-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-Stat-Signature: zn784g6urgfsjkedwffcwd99gtndmkfz X-Rspamd-Queue-Id: 805CA100014 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1717416769-848734 X-HE-Meta: U2FsdGVkX1+K1Kla6+niA2tbnb09vKp+EZ84nem/2vO1SCrUUoXmpnb8Je3GAQ8tkLINrLqr0sVZHtC2SduwrXiOY6jhBadIiEXIA7D6IjghQV6vNRUzfiYh2wzDSW8F3Gw1A8+44+6VREx0BSxgGgiX3JHdM2pbqExNcGwJoaVObetVGpte76nevtUSBVvhid6NyWdX8wPXV37OZM2yLWBsne//tCGd5vfRvwFMAeIA1o8RVI5gNnDRWckkB2k30Rpnn0qwnJsU2L3082jTRcBRwGgCGyMRTvp9vUJwjZYPuqRSuovgdt8mX8pDpEXiTEr1N0+QJ8DtYwXlXLbAmqsUWzKPkG7jHkXOV/xtaOVLUTWsXKqLWW6UYynT7tbsukBhXMU07ebqZ+JG5Q57zdHYMAJROfrvqqCA5emFAnmhcFOCVOvmv3N4K6fvDuqMCySF1TdP9t1RieGXkxyxjbMxqv28TNVRf/R+3tWX1yPVZICt2PQ67Ymd3cCUDOsLNN8crzg31CB9eU8HSYuLzBzsb+CxsqkYnDXCoXqUwpJXPN0Us4FPKVWgZHo4nGgB8tYL6JZcQVD+jNzu4qUOQbh3oVONxOJNEkUic01TUAlpUB6p2IvD2qZmELliEd0mov9AZptMxCKRcQmgtpiaaArVlgJWyCjmJmpN4uth4cn0Ccpx3a+VM9wYvH2P4NqhdPNpvr0GKWU4uyDq+39pBNDP8wA0Hil5Uikr65GclUEU+Q8+oaRJCwnR6SdmLBqHjsEyIyZZjeHMLUdzq4B2H5YSPeoiYGY+TS0YJQj1AbMwY4jO8gCAw5utoP9k93IBEHnUmJexkYxovMQIZHd5kFWkxXP6TjT5LqmL6gu0SE1qhPxjyNrHZIUIck4Z6DTiD7kqdT9t16pNe8t2nOApHqwE55IArQ/yRnc8G4oKTBPPAg5ecW9s3n7As08iU2cLOOirE6/rF4WHEZcIKIE V7y2ErZ3 UVziKY8RFBrLCnH62RKIQzrLtNMfFObfJKflmekxAIoFHXliSQKQg8YVvKauzvp3rU9mj4d6L89+KaGzOcY9B1tdOvdq7q+aPSuU8Up2EipR/TdPrmxLAedc7e3LMpcbED+6xp0v6ufO3ZRoHBGAdfyUR3W0pYnPYUNLv/s4bRGD/3MR/hSZGxuXj7qvjwYdw4kmk 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: Currently the numa_stat file encodes 1 into .private using the micro MEMFILE_PRIVATE() to identify the legacy. Actually, we can use cgroup_subsys_on_dfl() instead. This is helpful to handle .private in the static array in the next patch. Signed-off-by: Xiu Jianfeng --- mm/hugetlb_cgroup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c index e20339a346b9..45f94a869776 100644 --- a/mm/hugetlb_cgroup.c +++ b/mm/hugetlb_cgroup.c @@ -460,7 +460,7 @@ static int hugetlb_cgroup_read_numa_stat(struct seq_file *seq, void *dummy) int nid; struct cftype *cft = seq_cft(seq); int idx = MEMFILE_IDX(cft->private); - bool legacy = MEMFILE_ATTR(cft->private); + bool legacy = !cgroup_subsys_on_dfl(hugetlb_cgrp_subsys); struct hugetlb_cgroup *h_cg = hugetlb_cgroup_from_css(seq_css(seq)); struct cgroup_subsys_state *css; unsigned long usage; @@ -839,7 +839,7 @@ static void __init __hugetlb_cgroup_file_legacy_init(int idx) /* Add the numa stat file */ cft = &h->cgroup_files_legacy[8]; snprintf(cft->name, MAX_CFTYPE_NAME, "%s.numa_stat", buf); - cft->private = MEMFILE_PRIVATE(idx, 1); + cft->private = MEMFILE_PRIVATE(idx, 0); cft->seq_show = hugetlb_cgroup_read_numa_stat; /* NULL terminate the last cft */