From nobody Mon Feb 9 11:09:17 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A0DEEC875E for ; Thu, 7 Sep 2023 23:52:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240798AbjIGXwH (ORCPT ); Thu, 7 Sep 2023 19:52:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235529AbjIGXvz (ORCPT ); Thu, 7 Sep 2023 19:51:55 -0400 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2081.outbound.protection.outlook.com [40.107.212.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA9581BE7; Thu, 7 Sep 2023 16:51:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZmlM+qjO/Go0MdnFVFSm1wQb5NiUY9GSgPaa9fadjsXXCtrWzFYIIQFj7rAwBfwS3bSTB0gzYd+rk9p3rw/EsGbymCGePUx4PJtUsaSO6AgYdHw5jIlFt0gB9mWS+KxyymIJLV82yFrctweDFGJAL048InN0fbsEbeD7AVcqx1CxqaGXjd4A6brTIeRB9atkXHTbwK9/4xMTd2+DU8U1oUqDbb9YKCOqfJZ/XU2XPqevMv96wdy8/F86DNimAbKhfwfx0Ri3XtgfX33Wv66JQ/EWUEzTuRhJcfUJ4qCvQQ5w0/r7QBP8/pvg+HlbsuKgqtkln73Xv80IB/HXt3cIoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BTWRihApkksDxukOMwwpNICaeRdKbAM+kBwrRa7CgMo=; b=GmEw7863okOIzakjrYsK9+g3urgAUFmyPJ9U4tEvOvwK/8lwAdy4J/Tzw48jSGy1BrV7kTY8wOW+8xR9mEljL/6a6JCNtClF0vSrFWggG8R6Qa3mxARR9y5GJPuKAQ2dcicO39gxuqWtf5GYqgzXX/uOqIVJKQKBUsuHE9joCKMD9ZNB0KYm7wkz9gkXjQaDv8spTIn1syq8m5fwfRmtfHu3MLBFSDIZCmVAKb3ym0p/+ffcl/9Ab/Aoj4q4iTNSZL7u3HIiMXx+76A3CWXMe3pJ2jYy8e0NhJM1pvyPvN7iC+BcAhsw5qxXQDSW0pdoquZ3VXp3zdMex3SuJEWK3g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lwn.net smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BTWRihApkksDxukOMwwpNICaeRdKbAM+kBwrRa7CgMo=; b=i1ORs+Xk9HJ9OEksCzWl7rm/++DrQd1aj7Jqp+CmgVoEEJkhn9WzCEvjr0ETzYkLh0TMsohGVbGwVXHFg3ejJ/rUtREe4G7lT8mW2PN/7hJzpNSO77juWg9QZqUH7tW9thHR39Xxw4ziI/f7PX3M+dC7YY4RYozftdpG3HhsiEQ= Received: from DS7PR03CA0314.namprd03.prod.outlook.com (2603:10b6:8:2b::26) by DS7PR12MB5887.namprd12.prod.outlook.com (2603:10b6:8:7a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.34; Thu, 7 Sep 2023 23:51:46 +0000 Received: from CY4PEPF0000FCC1.namprd03.prod.outlook.com (2603:10b6:8:2b:cafe::f7) by DS7PR03CA0314.outlook.office365.com (2603:10b6:8:2b::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.30 via Frontend Transport; Thu, 7 Sep 2023 23:51:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CY4PEPF0000FCC1.mail.protection.outlook.com (10.167.242.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6768.25 via Frontend Transport; Thu, 7 Sep 2023 23:51:46 +0000 Received: from bmoger-ubuntu.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Thu, 7 Sep 2023 18:51:44 -0500 From: Babu Moger To: , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v9 6/9] x86/resctrl: Move default group file creation to mount Date: Thu, 7 Sep 2023 18:51:25 -0500 Message-ID: <20230907235128.19120-7-babu.moger@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230907235128.19120-1-babu.moger@amd.com> References: <20230907235128.19120-1-babu.moger@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000FCC1:EE_|DS7PR12MB5887:EE_ X-MS-Office365-Filtering-Correlation-Id: 153668bb-f358-41db-f3f6-08dbaffd653f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eAI6QmMJOGk5L0BZ4/wv/E2fZI2wPHx9UYVFpw74BFOaBudXHlzVXxDsmnsYhUv5HWR1U2F4f5G9nqiBQnbzEh7s/2o78YuEpYqiPTr3OqulJDoWeZX2k1v5Lxi/oTn5X6dQxU0FsOpk7TacG6BcfG+fud4xBnutTk1HG5/rSF6wUkG/u+rQhRU+nMjPiCuv2jeTjuTNAEtFuQ46Xa+U2NnEuE19ln42tu+j6Ou+vPfeNnKkZCrAVerAVkLQsp1P4eSCxnVpU8OpamMrUAbhK0vvG+ArNQfYK7fggsSedCFpPJ6eckMygrvKDQC2PfMoyGG8yShPnkFr7J7/v7GucGpSU0hkgghS/ByKMnxMZDvJQkVAx9SwOWq1HmmdvPGDW1A+u+pKftqpv6E7iMMwxxkZQUMhAJlEYVCtM6VDNiHcSHm399Wm4OB8q+D+fwgXUIwXWpideXuluT22lPH/p0FWy56D7RICHKWQyb7IaBuZIeOYavokBP/QzX43QOrrSg+CFpV+UeDNV7qorDH399d9y54vlBVh9ckXYgBlyLb02rKgKgNpEG2u8G1koUvBIb7N0wzyk6tgBecHWsidCOiv4GXURx1nWDELsJvkPG+gHaXYSZRs2Xep2/NpH7ROD7+TAfCWaYsjIou1BbHRGYi9kpJKvldO9jMgl0YWSfTLgLqN3HtSUI9s5UzEINdcH7SyomQslAqvGBkPKDRbxxV6yZ7xBzKggqpK4flw7XyC+JlaBk2LbDz6VXLaOgMtVz5IYcWi/cZQevzU5PFSyw== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(396003)(346002)(39860400002)(376002)(136003)(82310400011)(1800799009)(451199024)(186009)(40470700004)(46966006)(36840700001)(336012)(7416002)(2906002)(7406005)(40460700003)(70206006)(54906003)(44832011)(316002)(70586007)(41300700001)(8676002)(40480700001)(36756003)(8936002)(5660300002)(4326008)(2616005)(110136005)(6666004)(86362001)(7696005)(1076003)(83380400001)(426003)(16526019)(356005)(81166007)(82740400003)(26005)(478600001)(36860700001)(47076005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2023 23:51:46.2396 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 153668bb-f358-41db-f3f6-08dbaffd653f X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000FCC1.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5887 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The default resource group and its files are created during kernel init time. Upcoming changes will make some resctrl files optional based on a mount parameter. If optional files are to be added to the default group based on the mount option, then each new file needs to be created separately and call kernfs_activate() again. Create all files of the default resource group during resctrl mount, destroyed during unmount, to avoid scattering resctrl file addition across two separate code flows. Suggested-by: Reinette Chatre Signed-off-by: Babu Moger Reviewed-by: Fenghua Yu Reviewed-by: Reinette Chatre --- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 58 +++++++++++++++----------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index 34cb512be1de..27cae0cc25af 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -54,6 +54,9 @@ static struct kernfs_node *kn_mondata; static struct seq_buf last_cmd_status; static char last_cmd_status_buf[512]; =20 +static int rdtgroup_setup_root(struct rdt_fs_context *ctx); +static void rdtgroup_destroy_root(void); + struct dentry *debugfs_resctrl; =20 void rdt_last_cmd_clear(void) @@ -2513,10 +2516,14 @@ static int rdt_get_tree(struct fs_context *fc) goto out; } =20 - ret =3D rdt_enable_ctx(ctx); + ret =3D rdtgroup_setup_root(ctx); if (ret) goto out; =20 + ret =3D rdt_enable_ctx(ctx); + if (ret) + goto out_root; + ret =3D schemata_list_create(); if (ret) { schemata_list_destroy(); @@ -2525,6 +2532,12 @@ static int rdt_get_tree(struct fs_context *fc) =20 closid_init(); =20 + ret =3D rdtgroup_add_files(rdtgroup_default.kn, RFTYPE_CTRL_BASE); + if (ret) + goto out_schemata_free; + + kernfs_activate(rdtgroup_default.kn); + ret =3D rdtgroup_create_info_dir(rdtgroup_default.kn); if (ret < 0) goto out_schemata_free; @@ -2581,6 +2594,8 @@ static int rdt_get_tree(struct fs_context *fc) schemata_list_destroy(); out_ctx: rdt_disable_ctx(); +out_root: + rdtgroup_destroy_root(); out: rdt_last_cmd_clear(); mutex_unlock(&rdtgroup_mutex); @@ -2651,7 +2666,6 @@ static int rdt_init_fs_context(struct fs_context *fc) if (!ctx) return -ENOMEM; =20 - ctx->kfc.root =3D rdt_root; ctx->kfc.magic =3D RDTGROUP_SUPER_MAGIC; fc->fs_private =3D &ctx->kfc; fc->ops =3D &rdt_fs_context_ops; @@ -2821,6 +2835,7 @@ static void rdt_kill_sb(struct super_block *sb) rdt_pseudo_lock_release(); rdtgroup_default.mode =3D RDT_MODE_SHAREABLE; schemata_list_destroy(); + rdtgroup_destroy_root(); static_branch_disable_cpuslocked(&rdt_alloc_enable_key); static_branch_disable_cpuslocked(&rdt_mon_enable_key); static_branch_disable_cpuslocked(&rdt_enable_key); @@ -3702,10 +3717,8 @@ static struct kernfs_syscall_ops rdtgroup_kf_syscall= _ops =3D { .show_options =3D rdtgroup_show_options, }; =20 -static int __init rdtgroup_setup_root(void) +static int rdtgroup_setup_root(struct rdt_fs_context *ctx) { - int ret; - rdt_root =3D kernfs_create_root(&rdtgroup_kf_syscall_ops, KERNFS_ROOT_CREATE_DEACTIVATED | KERNFS_ROOT_EXTRA_OPEN_PERM_CHECK, @@ -3713,6 +3726,20 @@ static int __init rdtgroup_setup_root(void) if (IS_ERR(rdt_root)) return PTR_ERR(rdt_root); =20 + ctx->kfc.root =3D rdt_root; + rdtgroup_default.kn =3D kernfs_root_to_node(rdt_root); + + return 0; +} + +static void rdtgroup_destroy_root(void) +{ + kernfs_destroy_root(rdt_root); + rdtgroup_default.kn =3D NULL; +} + +static void __init rdtgroup_setup_default(void) +{ mutex_lock(&rdtgroup_mutex); =20 rdtgroup_default.closid =3D 0; @@ -3722,19 +3749,7 @@ static int __init rdtgroup_setup_root(void) =20 list_add(&rdtgroup_default.rdtgroup_list, &rdt_all_groups); =20 - ret =3D rdtgroup_add_files(kernfs_root_to_node(rdt_root), RFTYPE_CTRL_BAS= E); - if (ret) { - kernfs_destroy_root(rdt_root); - goto out; - } - - rdtgroup_default.kn =3D kernfs_root_to_node(rdt_root); - kernfs_activate(rdtgroup_default.kn); - -out: mutex_unlock(&rdtgroup_mutex); - - return ret; } =20 static void domain_destroy_mon_state(struct rdt_domain *d) @@ -3856,13 +3871,11 @@ int __init rdtgroup_init(void) seq_buf_init(&last_cmd_status, last_cmd_status_buf, sizeof(last_cmd_status_buf)); =20 - ret =3D rdtgroup_setup_root(); - if (ret) - return ret; + rdtgroup_setup_default(); =20 ret =3D sysfs_create_mount_point(fs_kobj, "resctrl"); if (ret) - goto cleanup_root; + return ret; =20 ret =3D register_filesystem(&rdt_fs_type); if (ret) @@ -3895,8 +3908,6 @@ int __init rdtgroup_init(void) =20 cleanup_mountpoint: sysfs_remove_mount_point(fs_kobj, "resctrl"); -cleanup_root: - kernfs_destroy_root(rdt_root); =20 return ret; } @@ -3906,5 +3917,4 @@ void __exit rdtgroup_exit(void) debugfs_remove_recursive(debugfs_resctrl); unregister_filesystem(&rdt_fs_type); sysfs_remove_mount_point(fs_kobj, "resctrl"); - kernfs_destroy_root(rdt_root); } --=20 2.34.1