From patchwork Wed Jun 12 09:24:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiu Jianfeng X-Patchwork-Id: 13694700 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 D9669C27C53 for ; Wed, 12 Jun 2024 09:32:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D61756B00A0; Wed, 12 Jun 2024 05:32:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C4B7D6B00A2; Wed, 12 Jun 2024 05:32:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A9EE86B00A3; Wed, 12 Jun 2024 05:32:03 -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 718166B00A0 for ; Wed, 12 Jun 2024 05:32:03 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 239C41A1254 for ; Wed, 12 Jun 2024 09:32:03 +0000 (UTC) X-FDA: 82221720126.09.040A390 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by imf27.hostedemail.com (Postfix) with ESMTP id C734540016 for ; Wed, 12 Jun 2024 09:32:00 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf27.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=1718184721; 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=+HvMAvryFgbVgtRXqNMEocR+Z+cyn1cMRoVrw6+UdJ0=; b=77Ysh0GChVpZXUe7g41TV8Ed4M5M8z3pqNUwDkOcqaCvbB618/Zr5QC9BIEb1a1RXuP0VD Re6aNRggaYiGv0cgjR49NrQce8SAiCNn11o6CYdrqypwZQTjUUn2O0WpKKI6MTQnxLPCOP VPBT7amcJNiOWnGZOMtKkfWEnHo4zWY= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf27.hostedemail.com: domain of xiujianfeng@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=xiujianfeng@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718184721; a=rsa-sha256; cv=none; b=2K7gUMNTNpgNbgmR1+LU+piTIQi4m5fU8ytkMuqWKCBjSVBQhZxNHQFquokbi7pAPy0zZD 2x/lzjgoy++n8hbHP9cb6nPrHxdX/10IZJnM8MTywCQ8ukR9vCZ8FXMDQri9XsEt/bHpE7 C5ibu62nOF/7yqgPI7PKgDMP/XMMzNc= Received: from mail.maildlp.com (unknown [172.19.163.48]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4VzgF13h0Hz1JCj6; Wed, 12 Jun 2024 17:27:49 +0800 (CST) Received: from dggpeml500023.china.huawei.com (unknown [7.185.36.114]) by mail.maildlp.com (Postfix) with ESMTPS id 217F318007C; Wed, 12 Jun 2024 17:31:55 +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:54 +0800 From: Xiu Jianfeng To: , CC: , , Subject: [PATCH v3 -next 1/3] mm/hugetlb_cgroup: identify the legacy using cgroup_subsys_on_dfl() Date: Wed, 12 Jun 2024 09:24:07 +0000 Message-ID: <20240612092409.2027592-2-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> 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: C734540016 X-Stat-Signature: 5akjs4mxaxbcub8ep46ksjhb3mxg8efd X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1718184720-370706 X-HE-Meta: U2FsdGVkX18bnhCZTcUcnX5ato36/tadnHvFKtNpeUstvwyV5UO33enb2b8/Q6IS2hjvhhPMK4vsjbbwNvdma/IKEWfZH1hUtaeU7WksaeUv0kVcrwcpEYYVbkW0vbinXXAXTryMKbQsu9K78cv40m+n1hHOTfr6TwtLaW1S/kHFF/lNIszqXtzso5zydpQj9769dz6bMlNcd4OIq9aV9ptU7ihCisN34wwq+yv6zqok+8Gz+x7F+Rjx3h+I1LVB0EosiGVq5kU2gEFR9whxSpuvrUxvYywBbpxYgcVuKUHt7wnMCYJ0Ap8Eb1uJVnZ/ns6Miu1uFoIH83gW5JS+fCXd3EbMg0aTNC1OZD+YGqflLgBkzinXxzE/CIM7l4l5WQGUVlWedqtNcpbHGzgIlTiu4+t2v6HjNCquY1lPZ+wj4kin+VyajN3lCSTsT/xyqNKjfjPOWZgIgDXry6NmbOK0QYcz0jzqljOVGsKF6M9QXXc5xNz8j7wLh4/e095ZZN0vIPo668VYWlQ3/0UE/vAf68yVe471B04DTXlb3qKptFQGiLDR7Qfll65MeOx2LqoYHh/0r8/eU4Jye9gxZHGYnmrSaPpCcXRyx3e0h3nczTyzQMnz4aW8OA8ENCQ5Ooa/LdqWwtbdve0c2TPiDwVB91V8Nbul2XF07Cq7WZGMRwt+XyKLYcJuy8txJuJGjl+vf9NQtcoIJ6xFqSvvOwyFYl9bJ7Tj6iG6X3wLUv0RveCqcO+3Xp+zPHOpYkzysba3fnSINMrn0ZmfPZ7ernCKaWyiFCFL9daGNOpNlh2Al+qevcKjrBK99PADbt0FF5no7dBIB76v6xZJva6yNjfMaczJ3WHpVUMT6QBlqW6uRmEuiH9eCW5lNoU4gabX/gJqBZsRCT0Ql6Do1G5pU/kPMvC7wBfMYXe5YxFvN0f6rGxYXvIHrspDLNFBWEdBE0iaFEWQldaZ/7SO/HR 9Tsc/W+p JTpF943Pfo0N+8Wo6ZS5fv+MVXU5hTOkTITVKoOcIijSFcTvzXCOLPlQdJ/HMA8c7GSHz2KLK4hDOYndMbKYCBXrg0oWmFPcRXOr6spS/LYLZwuSj5wWn8p2AOjMCYklBrbSVBsQy5nVoZoSe92pradviiMGPfB7m3VoT4cvGM29vyVxgnQ8uDBi+yN+k2iuYxjf2 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000003, 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 templates in the next patch. Reviewed-by: Oscar Salvador 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 */