From nobody Thu Dec 18 22:00:45 2025 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 6F3BDC04A6A for ; Fri, 11 Aug 2023 20:08:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235935AbjHKUIk (ORCPT ); Fri, 11 Aug 2023 16:08:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230175AbjHKUIj (ORCPT ); Fri, 11 Aug 2023 16:08:39 -0400 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2089.outbound.protection.outlook.com [40.107.243.89]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C81730F8; Fri, 11 Aug 2023 13:08:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b5AYe56Fgx38hrjxYKGriijby5VoDJvb50VH8BzEh5HCIYih/eU6jBT+YJrSqUEqi/l+EaxpBtxLadHGYJ3mw9njH2Co0gSqdbrXTMsvF441IAdaYGGLmawPZ+oKUtAMQUch6gDKT48dE8fs5rjZAzL2sr7muDD8o4yFl6Mg7CGVnAB/YaJGb83vovgDLQTh/yTt3dhweovdtlKU/LvJwRRdrz43ZRfMrNzzoRfh5vu4Cc5KVgj5SwGOJiOvyn9IItUNBFIxk03KUfgX3fir7316BvvT4n9Jpx6Fg8QJxuxTQx7mByU2dHn8SzY8c5GE7yA060zxQz8ISVhFkoDfKw== 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=U5U4v7REjseNyp8szDNRtG7x0pMTTwGKkVR2CiMPjyg=; b=Zn54HZKGzJajuExXZJp9elnIf30YSGXvFWAnJOMaWFVW5bycJdXzhWBZtYy8Mnzo7jLHSCEwStc9qrXN9iKr4IOZlcf6DBX5B1ERfZAc2JjQL5brgDEX2YAJFd+MehGAdPx5+clsHxE/Ult6yk6Mv7dFxjPoQ2Hl+LO/xXmZxEkcDluJQiMclfK9K1Xl6LAPe7lANX2L0ca6aKaVKwcOdM0ftfRsl5Hm/tyr6dWOf42MRcf2qtX6LSAdg9Elu6DTxl9/I/zKyg/X7qw44el5wQ091ijKbgaqIL6bZx/sXDqoVKULsDPGbvgHAUOzTODjtbCHVnqKI2R4Oseica/9WQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=csgroup.eu 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=U5U4v7REjseNyp8szDNRtG7x0pMTTwGKkVR2CiMPjyg=; b=naBOIk9l2oHQkboehBCRR4HQzzVrq7sUII2vN8qbMgVf9kZKbmxEr4+k2Q/uejlQ2kMD0HIA7RVcbn+MIMX5gEzs6XCkyU6E/a5cwp7nhBQ1R79acZx4BR3OOJEmifiJON7UPbAlGocy1Rkgh0lWGkV4vjStI5qU627SIRiDnio= Received: from MW4PR04CA0267.namprd04.prod.outlook.com (2603:10b6:303:88::32) by DM4PR12MB5261.namprd12.prod.outlook.com (2603:10b6:5:398::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Fri, 11 Aug 2023 20:08:35 +0000 Received: from MWH0EPF000971E7.namprd02.prod.outlook.com (2603:10b6:303:88:cafe::f) by MW4PR04CA0267.outlook.office365.com (2603:10b6:303:88::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.31 via Frontend Transport; Fri, 11 Aug 2023 20:08:35 +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 MWH0EPF000971E7.mail.protection.outlook.com (10.167.243.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6652.20 via Frontend Transport; Fri, 11 Aug 2023 20:08:34 +0000 Received: from [127.0.1.1] (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; Fri, 11 Aug 2023 15:08:24 -0500 Subject: [PATCH v7 1/8] x86/resctrl: Add multiple tasks to the resctrl group at once From: Babu Moger To: , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Date: Fri, 11 Aug 2023 15:08:18 -0500 Message-ID: <169178449820.1147205.3688106607892992826.stgit@bmoger-ubuntu> In-Reply-To: <169178429591.1147205.4030367096506551808.stgit@bmoger-ubuntu> References: <169178429591.1147205.4030367096506551808.stgit@bmoger-ubuntu> User-Agent: StGit/1.1.dev103+g5369f4c MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: MWH0EPF000971E7:EE_|DM4PR12MB5261:EE_ X-MS-Office365-Filtering-Correlation-Id: 0123427f-177e-45b5-b42b-08db9aa6be0a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1U3QJXG3KnFR61H1YnxmceKnWHKg8hKLcRV9hRuFIpmgJ8OBh34Wm2ecvoOSPtfc/JMYA/Zxk63BkyJEOCCrNVJd2uj5znd+CiDtn7NnDqPePSpMvxoFwyZ9k6w2wOsWiKwHSjV9nfigKds892E75Mv5uOrpXmhP4bsQ2ZCBlBEDb1n3DCxGTNpna6eYjNuQnMFqiPugDrpWDmUH0qdLTY21PND7Tcz49iG4IVXbyPttyZdpVAHwg0CY7cM0EE6GEvJzFFePr9GoDwpsNpnjtZHLX6423GkFg+4CMc4eFBiJOpJyXj8Si9oIY4mBxmeMQA/V6Rqh2tNrpyM4H7JOgME6H5CvvGmMGzYi4kgc+ibHhjxW83yu7yTN4WSHjyMpFoLPOSms+jmwLEqKP93fBRmtzacgMKa0lxPeEM74vIbKkPQQmCyu0wo2+NhC/qTGZejJnHr+h5G/3XZS8viuYNg2TTJHbe1cjxr17VNO0S8s9tYE3hEk6CyDRkRzv+mf0xAS/68/NIEYwKsU7H9C73YZMMlbZm7zkA/G/IaUVjZG4Spj3Bp9noRVN1aNCLPxSS5+Yvi2G1NleDAgg/DgTxzwYQ25DPkzsOt4dXhMe3FeeVBBr+6C38fuNRqT8kFm4eVjqOvKOpwvgjCmV1JinaM1W10sdDIKACZLcBS2fxvdWa0F1nh4T77WjkH3Nq4Dtzd0U9VWBfJaa/4s0cp+iB6JtjXrqWInrJSE5/hiDEHVPuFK5urbUO4ST5ZATtwRXDtfmoqvUVAHM85jZhZbH361AR8DRHfS4TttwKwedK0= 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:(13230028)(7916004)(4636009)(39860400002)(376002)(136003)(396003)(346002)(451199021)(186006)(1800799006)(82310400008)(46966006)(36840700001)(40470700004)(40460700003)(66899021)(40480700001)(54906003)(110136005)(16526019)(26005)(70206006)(336012)(6666004)(478600001)(70586007)(103116003)(86362001)(426003)(47076005)(83380400001)(36860700001)(16576012)(33716001)(44832011)(316002)(41300700001)(7406005)(7416002)(4326008)(9686003)(356005)(2906002)(81166007)(8676002)(82740400003)(5660300002)(8936002)(71626016)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2023 20:08:34.4959 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0123427f-177e-45b5-b42b-08db9aa6be0a 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: MWH0EPF000971E7.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5261 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The resctrl task assignment for monitor or control group needs to be done one at a time. For example: $mount -t resctrl resctrl /sys/fs/resctrl/ $mkdir /sys/fs/resctrl/ctrl_grp1 $echo 123 > /sys/fs/resctrl/ctrl_grp1/tasks $echo 456 > /sys/fs/resctrl/ctrl_grp1/tasks $echo 789 > /sys/fs/resctrl/ctrl_grp1/tasks This is not user-friendly when dealing with hundreds of tasks. Support multiple task assignment in one command with tasks ids separated by commas. For example: $echo 123,456,789 > /sys/fs/resctrl/ctrl_grp1/tasks Reviewed-by: Tan Shaopeng Tested-by: Tan Shaopeng Signed-off-by: Babu Moger Reviewed-by: Reinette Chatre --- Documentation/arch/x86/resctrl.rst | 8 +++++++- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 25 ++++++++++++++++++++++--- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/Documentation/arch/x86/resctrl.rst b/Documentation/arch/x86/re= sctrl.rst index cb05d90111b4..af234681756e 100644 --- a/Documentation/arch/x86/resctrl.rst +++ b/Documentation/arch/x86/resctrl.rst @@ -299,7 +299,13 @@ All groups contain the following files: "tasks": Reading this file shows the list of all tasks that belong to this group. Writing a task id to the file will add a task to the - group. If the group is a CTRL_MON group the task is removed from + group. Multiple tasks can be added by separating the task ids + with commas. Tasks will be assigned sequentially. Multiple + failures are not supported. A single failure encountered while + attempting to assign a task will cause the operation to abort. + Failures will be logged to /sys/fs/resctrl/info/last_cmd_status. + + If the group is a CTRL_MON group the task is removed from whichever previous CTRL_MON group owned the task and also from any MON group that owned the task. If the group is a MON group, then the task must already belong to the CTRL_MON parent of this diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index 725344048f85..8c91c333f9b3 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -696,11 +696,10 @@ static ssize_t rdtgroup_tasks_write(struct kernfs_ope= n_file *of, char *buf, size_t nbytes, loff_t off) { struct rdtgroup *rdtgrp; + char *pid_str; int ret =3D 0; pid_t pid; =20 - if (kstrtoint(strstrip(buf), 0, &pid) || pid < 0) - return -EINVAL; rdtgrp =3D rdtgroup_kn_lock_live(of->kn); if (!rdtgrp) { rdtgroup_kn_unlock(of->kn); @@ -715,7 +714,27 @@ static ssize_t rdtgroup_tasks_write(struct kernfs_open= _file *of, goto unlock; } =20 - ret =3D rdtgroup_move_task(pid, rdtgrp, of); + while (buf && buf[0] !=3D '\0' && buf[0] !=3D '\n') { + pid_str =3D strim(strsep(&buf, ",")); + + if (kstrtoint(pid_str, 0, &pid)) { + rdt_last_cmd_puts("Task list parsing error\n"); + ret =3D -EINVAL; + break; + } + + if (pid < 0) { + rdt_last_cmd_printf("Invalid pid %d\n", pid); + ret =3D -EINVAL; + break; + } + + ret =3D rdtgroup_move_task(pid, rdtgrp, of); + if (ret) { + rdt_last_cmd_printf("Error while processing task %d\n", pid); + break; + } + } =20 unlock: rdtgroup_kn_unlock(of->kn); From nobody Thu Dec 18 22:00:45 2025 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 34B6FC04A6A for ; Fri, 11 Aug 2023 20:09:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233587AbjHKUJk (ORCPT ); Fri, 11 Aug 2023 16:09:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235819AbjHKUJi (ORCPT ); Fri, 11 Aug 2023 16:09:38 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2063.outbound.protection.outlook.com [40.107.94.63]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E54B30FF; Fri, 11 Aug 2023 13:09:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S+bp3fXyqCw10ZW5/w8MIodCPuJKrrvdF53hjmDXDSVoLIaeoG2lpbI24uMHHb9yQ3bQkiF9jq30nM13uKnEkCgQ0WY6yZ6VLLoatCtdbygdEbK7dqMWmXDomk5M3RaWGMMcQhUpPQG0BX0gF8eyWaHd77ZDmhtCOCQNhwFfCeFWjscKFu5pLzyUq5V92fGFNTAST7Jn4KxvTWgeXzJact+yuHVjIOMAcmcfCnFCUkvAhs+ISDlWfFEFTu95rczbc3fw9LYhG+OS8eRn3kra6qQum3YioWam5GcVIMN3pPJ81LR/AValq56mLvBqt4mkuhC3wRK9APS3iW1dT1cRnw== 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=g8el2da/9RO2c6hM6AU3CGQgm/f4ArVbL9fHz+gLBZU=; b=hhi/5KiGKjYcVUT1Bj8jyLDH7X5fHIHxHuDKpqzKtheE2oqc3R57VuXnUcZFEEkAtnrCIX1XkYpRB0rLmlLSkCaxOk8U6oCMQmP0SXkTGRDs+Ut83Y6eHn7m4w59zX1PhwzdS2gtBtmiCmD2/+yFRgREXkeRepvEsmPTH3TC4p49Pd3CCI+3qbzS1grbQHId5ZmAWvoY4dORHhnp9bWyKM8GPubh52Vj2yCGcewQXBoJcQ5aDy3jwrm1RHEZjHfPaVajDnR0ND5Gl9O2MGSmYFXBVcquEK4wO64c5q2rBdXvvp1CqEvx6BwFZmewxFKmeuic7C5KLE0snTOsPFkvtg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=csgroup.eu 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=g8el2da/9RO2c6hM6AU3CGQgm/f4ArVbL9fHz+gLBZU=; b=P2E474/jnqtM2/CuFvVrzUdveAp2K2BsefhEXGic1sB7D0RAWZzbQawLvVENz7vdRDSHNlSH8aRkq0in5DAo1ipVYNRB3umSSqfC+rZlEJqhJZsA/37th0p/d58Qki7J9pZVJIdW7Xc1c1wW9HBB8pVctzKvc7K6yIfidjowUL4= Received: from MW4PR04CA0256.namprd04.prod.outlook.com (2603:10b6:303:88::21) by DS7PR12MB5984.namprd12.prod.outlook.com (2603:10b6:8:7f::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Fri, 11 Aug 2023 20:09:35 +0000 Received: from MWH0EPF000971E7.namprd02.prod.outlook.com (2603:10b6:303:88:cafe::92) by MW4PR04CA0256.outlook.office365.com (2603:10b6:303:88::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.31 via Frontend Transport; Fri, 11 Aug 2023 20:09:35 +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 MWH0EPF000971E7.mail.protection.outlook.com (10.167.243.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6652.20 via Frontend Transport; Fri, 11 Aug 2023 20:09:34 +0000 Received: from [127.0.1.1] (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; Fri, 11 Aug 2023 15:08:39 -0500 Subject: [PATCH v7 2/8] x86/resctrl: Simplify rftype flag definitions From: Babu Moger To: , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Date: Fri, 11 Aug 2023 15:08:37 -0500 Message-ID: <169178451786.1147205.17416534865851883140.stgit@bmoger-ubuntu> In-Reply-To: <169178429591.1147205.4030367096506551808.stgit@bmoger-ubuntu> References: <169178429591.1147205.4030367096506551808.stgit@bmoger-ubuntu> User-Agent: StGit/1.1.dev103+g5369f4c MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: MWH0EPF000971E7:EE_|DS7PR12MB5984:EE_ X-MS-Office365-Filtering-Correlation-Id: b5d58944-47ba-4a67-1806-08db9aa6e200 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hcUzEqBjQyX/US9pHIt1DFet3ho2/P1Di9T6KLUH+SgmOvyOObJ2mdnE0nGXOw52Dda4tavjXTPkfFCRl1JOFtuMOYrOvK5WM9ZpqXyHZG6Qj0vz3UfmIc9x4hk4hUoRXKOngS2nxPXZvtmikfpTy5JfG3UXWb3e5HNvLTXgdtZVF/aad7vWuNuTqvY1kAtPgXdArnElBxMrXeb+tCM9z2OEcYuRRbqZing8xejlAoc9nBxKCspMtrWfdQ7TPQ+8ktE9nqcoDjVb1IvyDXqztlpc7Ee/Wb4sjHzkCHUFR+L9Gogj0+xjPov7XfoqnNI/7O8FjYq6VzCcfSk9RSSgOmay1rzJb2otTl5lcsSpA4/BxYZEmydCPSoqqKoow1KcunqWpi5KK+XqXBU6RAl/QcrOe3LAysnHTlB6uhsHNC3+vFya6WZ3MQSCNKgRGtJKLjik9Yr0azAie9c/4JTheKr2YNvw+k6zUNDXMSh7z8MsSi6vvtOHdpDJsmar56/WYdA/9ZCFEG2YYKRZupWy+0r93qtVhlbUrmxyqrwmgY6gGBt0OXg+ZS3qnZV9zktoeOLS5Zabw7LHmFRD9my3zjX/Uti5fkDcWobtGAfebVwX90gPs4nwIvuUScujtcXscGp8oQ8tQ9mRo68PjLUB1i1B/kGjrC3GUkxCXItpcmbaY1StkcHnsSqa0sR4EzAi1AUnRsDTyye2UbkSZtRpL4MHbEW6096N4PPYKzPW09jPKw3B9v4+iUPxOh+HjDCUm1G8J5DVvzTWbn8cuDZ2kBHuB1I84UEy5VZPSum8oHw= 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:(13230028)(4636009)(7916004)(39860400002)(376002)(136003)(346002)(396003)(451199021)(186006)(82310400008)(1800799006)(36840700001)(40470700004)(46966006)(40460700003)(40480700001)(336012)(70206006)(26005)(54906003)(478600001)(110136005)(103116003)(70586007)(16526019)(47076005)(36860700001)(83380400001)(426003)(44832011)(8676002)(41300700001)(33716001)(7406005)(316002)(4326008)(9686003)(2906002)(7416002)(86362001)(16576012)(81166007)(5660300002)(82740400003)(8936002)(356005)(71626016)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2023 20:09:34.8400 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b5d58944-47ba-4a67-1806-08db9aa6e200 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: MWH0EPF000971E7.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5984 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The rftype flags are bitmaps used for adding files under resctrl filesystem. Some of these bitmaps have one extra level of indirection which is not necessary. Make them all direct definition to be consistent and easier to read. Reviewed-by: Shaopeng Tan Tested-by: Shaopeng Tan Reviewed-by: Reinette Chatre Signed-off-by: Babu Moger --- arch/x86/kernel/cpu/resctrl/internal.h | 9 +++------ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 6 +++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/r= esctrl/internal.h index 85ceaf9a31ac..62767774810d 100644 --- a/arch/x86/kernel/cpu/resctrl/internal.h +++ b/arch/x86/kernel/cpu/resctrl/internal.h @@ -243,12 +243,9 @@ struct rdtgroup { */ #define RFTYPE_INFO BIT(0) #define RFTYPE_BASE BIT(1) -#define RF_CTRLSHIFT 4 -#define RF_MONSHIFT 5 -#define RF_TOPSHIFT 6 -#define RFTYPE_CTRL BIT(RF_CTRLSHIFT) -#define RFTYPE_MON BIT(RF_MONSHIFT) -#define RFTYPE_TOP BIT(RF_TOPSHIFT) +#define RFTYPE_CTRL BIT(4) +#define RFTYPE_MON BIT(5) +#define RFTYPE_TOP BIT(6) #define RFTYPE_RES_CACHE BIT(8) #define RFTYPE_RES_MB BIT(9) #define RF_CTRL_INFO (RFTYPE_INFO | RFTYPE_CTRL) diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index 8c91c333f9b3..2f1b9f69326f 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -3242,7 +3242,11 @@ static int mkdir_rdt_prepare(struct kernfs_node *par= ent_kn, goto out_destroy; } =20 - files =3D RFTYPE_BASE | BIT(RF_CTRLSHIFT + rtype); + if (rtype =3D=3D RDTCTRL_GROUP) + files =3D RFTYPE_BASE | RFTYPE_CTRL; + else + files =3D RFTYPE_BASE | RFTYPE_MON; + ret =3D rdtgroup_add_files(kn, files); if (ret) { rdt_last_cmd_puts("kernfs fill error\n"); From nobody Thu Dec 18 22:00:45 2025 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 E7112C41513 for ; Fri, 11 Aug 2023 20:09:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236616AbjHKUJu (ORCPT ); Fri, 11 Aug 2023 16:09:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235650AbjHKUJs (ORCPT ); Fri, 11 Aug 2023 16:09:48 -0400 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0533E30F8; Fri, 11 Aug 2023 13:09:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AoHDhCgztulUx2EgSOSvA35bxwgf0Y/cDSCEpfGhwC3lDbG9OTDg/kW/gMRCdZKfXgNwl6Bbb6Qc0f06SEoR/ADH+oyMHhpuOn35AR/RWt2gJS9JdezLfDXMN+C1zx9ZNVD3C5rqslk4afNJguewyKap0lNRC0NTC9CWfB2enGIVgv6iaRsLwiY0ALXiw5hLwoilRR0QgWNbdRUvd/F7AviUKg/vcj/a0bbKkYPPvyl/JRBHRlBpW68NOt2MOxoNfVa8z+3XOdcGHvSASG+s5p1JFI5C1AUlJucoE2Q3LvgJBfKx8bFT8kWPyaFyKnLveqHVhHOzmgL3/LbcMcSokg== 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=NuEnOFEyu1DSfIuALeQr57ZKwBzWcxoQIVgTeYOQnyk=; b=CfLuaH380dVwwIcmUKbePDChvrHaxA2zGy0uhfRUa5srFTAb6Teu/FMqitH9/TyDVU9kr9O8vTYdAoy1209+wXOEm3DHMri0VjjJ/ZKIVIil6JDK9R6R7hEC1YAOKZ+4EUhqXy8Ecr1KSReAJA/0CUyRluqIf4p0KYFjx6J0vk10yK7bA3SdvCeDnJh2HKC1WaTiTsRXTg/nM0CN0wfYI1s6mrZIS3vAKs8D+a3MTrj5nDvMDVDCz4DoTV/wSAwfCc9zc0YwEyawckBSHrvpysUFqaLS+0+OnbuLeFirRcWW+VaBLeYHDt2Zu5OFqT4/+ev9VAK8A52Rh8a7J0gfVg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=csgroup.eu 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=NuEnOFEyu1DSfIuALeQr57ZKwBzWcxoQIVgTeYOQnyk=; b=GIuYvvsCWnXttqDgDjDaciH5GHFHSB3WoC5rln0NKbNhg098lYOhDYXQSYQ+FlQ4o5kqvocuZYB8HRS8S19hgPVwCX7yl8kdWegXS/R80VQbzayh38U1B9pJ/Sfvkbo2Hr7BzH7zs9j5OYOlJzcEqEz/7oISH2mO1W0mZSIjAms= Received: from BYAPR04CA0033.namprd04.prod.outlook.com (2603:10b6:a03:40::46) by DM6PR12MB4497.namprd12.prod.outlook.com (2603:10b6:5:2a5::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.19; Fri, 11 Aug 2023 20:09:43 +0000 Received: from MWH0EPF000971E8.namprd02.prod.outlook.com (2603:10b6:a03:40:cafe::f7) by BYAPR04CA0033.outlook.office365.com (2603:10b6:a03:40::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27 via Frontend Transport; Fri, 11 Aug 2023 20:09:43 +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 MWH0EPF000971E8.mail.protection.outlook.com (10.167.243.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6652.20 via Frontend Transport; Fri, 11 Aug 2023 20:09:42 +0000 Received: from [127.0.1.1] (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; Fri, 11 Aug 2023 15:09:39 -0500 Subject: [PATCH v7 3/8] x86/resctrl: Rename rftype flags for consistency From: Babu Moger To: , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Date: Fri, 11 Aug 2023 15:09:38 -0500 Message-ID: <169178457798.1147205.16211900713494712341.stgit@bmoger-ubuntu> In-Reply-To: <169178429591.1147205.4030367096506551808.stgit@bmoger-ubuntu> References: <169178429591.1147205.4030367096506551808.stgit@bmoger-ubuntu> User-Agent: StGit/1.1.dev103+g5369f4c MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: MWH0EPF000971E8:EE_|DM6PR12MB4497:EE_ X-MS-Office365-Filtering-Correlation-Id: f3002ab3-6210-46ef-0da0-08db9aa6e6b4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7K8/aklYzRx966TjkJXqndQ5SkFDknEi3RtuE1/d0j1/J8CMeSEUy+NuxYqBcWDcGK16BCIA+YwWT257kHPwWv++wtMhaEXuQx1Xw7wbQ+mT4vX375v+4JBrrNDmXd+LcJeF31TaYGeVHGXGgRtKyeKcyzh1WCYMZ31ypJgnX714rnN4lXfQjRaGaoE6X4RsvbMu+yD7Ve7R4Qa+G/IyV9+pwNPTm6e2tWM+9vbHTY9Fl6ycluxJRswC43sjooSTBMMmKttrd88JEVI0QChhMBiaQJMnPqvel2eYy7GFxS3+7ouPtUuubguMJah1yKTJRVKb/O/KDC45NQCgcDfZrG+FEH5sYafd0IV+dYgYfUyzNozaNOwSVx8PWgvS3Pqri/PSjjkmbQ6oicjVN3Bpeud1kjUk1cqUZxH7TUzRUuKqqkjYoimzuA+MY9rFqkRQRo1Wq3BZslq1iATdmmavDOA4ptmG8z7UlvN/NqldoC2zh5uTaOTgW+G6b7CjvEF7giwpjbRlBrjW9EkAI11x7bMt30W0+Cr5uf+s/r0XGAwNzr/OCx7Jetk2JYXZjnsHzF5GIRQGvcqI7dslB01KLMTF+BK9dvPLtyNpnGYaSnNv3+JKwfErts4xCls3ASd9ydb8ONNNoCVLlUSp3Fd8cu84pnxKrhSpN/BWPV8qOiN1AbUNzEO4a2kBJH34+Pc244K74IPjR2IvXL6FghxNwlbVwaAFUFhXhCrUbMnJzq6PqsuhnUtL7rCDJ+mbTksuztWMxHjk7geD9XYRbDkt7uNQ7OW0nA/7RdZ9pWUKcF8= 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:(13230028)(4636009)(7916004)(136003)(376002)(39860400002)(396003)(346002)(451199021)(82310400008)(1800799006)(186006)(46966006)(36840700001)(40470700004)(44832011)(40460700003)(2906002)(16576012)(316002)(8936002)(8676002)(7406005)(7416002)(5660300002)(41300700001)(103116003)(33716001)(40480700001)(86362001)(4326008)(9686003)(26005)(16526019)(82740400003)(356005)(81166007)(83380400001)(47076005)(336012)(110136005)(36860700001)(426003)(54906003)(478600001)(70586007)(70206006)(71626016)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2023 20:09:42.7459 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f3002ab3-6210-46ef-0da0-08db9aa6e6b4 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: MWH0EPF000971E8.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4497 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org resctrl associates rftype flags with its files so that files can be chosen based on the resource, whether it is info or base, and if it is control or monitor type file. These flags use the RF_ as well as RFTYPE_ prefixes. Change the prefix to RFTYPE_ for all these flags to be consistent. Reviewed-by: Shaopeng Tan Tested-by: Shaopeng Tan Reviewed-by: Reinette Chatre Signed-off-by: Babu Moger --- arch/x86/kernel/cpu/resctrl/internal.h | 10 ++++---- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 42 ++++++++++++++++------------= ---- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/r= esctrl/internal.h index 62767774810d..2051179a3b91 100644 --- a/arch/x86/kernel/cpu/resctrl/internal.h +++ b/arch/x86/kernel/cpu/resctrl/internal.h @@ -248,10 +248,10 @@ struct rdtgroup { #define RFTYPE_TOP BIT(6) #define RFTYPE_RES_CACHE BIT(8) #define RFTYPE_RES_MB BIT(9) -#define RF_CTRL_INFO (RFTYPE_INFO | RFTYPE_CTRL) -#define RF_MON_INFO (RFTYPE_INFO | RFTYPE_MON) -#define RF_TOP_INFO (RFTYPE_INFO | RFTYPE_TOP) -#define RF_CTRL_BASE (RFTYPE_BASE | RFTYPE_CTRL) +#define RFTYPE_CTRL_INFO (RFTYPE_INFO | RFTYPE_CTRL) +#define RFTYPE_MON_INFO (RFTYPE_INFO | RFTYPE_MON) +#define RFTYPE_TOP_INFO (RFTYPE_INFO | RFTYPE_TOP) +#define RFTYPE_CTRL_BASE (RFTYPE_BASE | RFTYPE_CTRL) =20 /* List of all resource groups */ extern struct list_head rdt_all_groups; @@ -267,7 +267,7 @@ void __exit rdtgroup_exit(void); * @mode: Access mode * @kf_ops: File operations * @flags: File specific RFTYPE_FLAGS_* flags - * @fflags: File specific RF_* or RFTYPE_* flags + * @fflags: File specific RFTYPE_* flags * @seq_show: Show content of the file * @write: Write to the file */ diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index 2f1b9f69326f..3010e3a1394d 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -1705,77 +1705,77 @@ static struct rftype res_common_files[] =3D { .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdt_last_cmd_status_show, - .fflags =3D RF_TOP_INFO, + .fflags =3D RFTYPE_TOP_INFO, }, { .name =3D "num_closids", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdt_num_closids_show, - .fflags =3D RF_CTRL_INFO, + .fflags =3D RFTYPE_CTRL_INFO, }, { .name =3D "mon_features", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdt_mon_features_show, - .fflags =3D RF_MON_INFO, + .fflags =3D RFTYPE_MON_INFO, }, { .name =3D "num_rmids", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdt_num_rmids_show, - .fflags =3D RF_MON_INFO, + .fflags =3D RFTYPE_MON_INFO, }, { .name =3D "cbm_mask", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdt_default_ctrl_show, - .fflags =3D RF_CTRL_INFO | RFTYPE_RES_CACHE, + .fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE, }, { .name =3D "min_cbm_bits", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdt_min_cbm_bits_show, - .fflags =3D RF_CTRL_INFO | RFTYPE_RES_CACHE, + .fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE, }, { .name =3D "shareable_bits", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdt_shareable_bits_show, - .fflags =3D RF_CTRL_INFO | RFTYPE_RES_CACHE, + .fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE, }, { .name =3D "bit_usage", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdt_bit_usage_show, - .fflags =3D RF_CTRL_INFO | RFTYPE_RES_CACHE, + .fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE, }, { .name =3D "min_bandwidth", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdt_min_bw_show, - .fflags =3D RF_CTRL_INFO | RFTYPE_RES_MB, + .fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_MB, }, { .name =3D "bandwidth_gran", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdt_bw_gran_show, - .fflags =3D RF_CTRL_INFO | RFTYPE_RES_MB, + .fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_MB, }, { .name =3D "delay_linear", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdt_delay_linear_show, - .fflags =3D RF_CTRL_INFO | RFTYPE_RES_MB, + .fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_MB, }, /* * Platform specific which (if any) capabilities are provided by @@ -1794,7 +1794,7 @@ static struct rftype res_common_files[] =3D { .kf_ops =3D &rdtgroup_kf_single_ops, .write =3D max_threshold_occ_write, .seq_show =3D max_threshold_occ_show, - .fflags =3D RF_MON_INFO | RFTYPE_RES_CACHE, + .fflags =3D RFTYPE_MON_INFO | RFTYPE_RES_CACHE, }, { .name =3D "mbm_total_bytes_config", @@ -1841,7 +1841,7 @@ static struct rftype res_common_files[] =3D { .kf_ops =3D &rdtgroup_kf_single_ops, .write =3D rdtgroup_schemata_write, .seq_show =3D rdtgroup_schemata_show, - .fflags =3D RF_CTRL_BASE, + .fflags =3D RFTYPE_CTRL_BASE, }, { .name =3D "mode", @@ -1849,14 +1849,14 @@ static struct rftype res_common_files[] =3D { .kf_ops =3D &rdtgroup_kf_single_ops, .write =3D rdtgroup_mode_write, .seq_show =3D rdtgroup_mode_show, - .fflags =3D RF_CTRL_BASE, + .fflags =3D RFTYPE_CTRL_BASE, }, { .name =3D "size", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdtgroup_size_show, - .fflags =3D RF_CTRL_BASE, + .fflags =3D RFTYPE_CTRL_BASE, }, =20 }; @@ -1913,7 +1913,7 @@ void __init thread_throttle_mode_init(void) if (!rft) return; =20 - rft->fflags =3D RF_CTRL_INFO | RFTYPE_RES_MB; + rft->fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_MB; } =20 void __init mbm_config_rftype_init(const char *config) @@ -1922,7 +1922,7 @@ void __init mbm_config_rftype_init(const char *config) =20 rft =3D rdtgroup_get_rftype_by_name(config); if (rft) - rft->fflags =3D RF_MON_INFO | RFTYPE_RES_CACHE; + rft->fflags =3D RFTYPE_MON_INFO | RFTYPE_RES_CACHE; } =20 /** @@ -2057,21 +2057,21 @@ static int rdtgroup_create_info_dir(struct kernfs_n= ode *parent_kn) if (IS_ERR(kn_info)) return PTR_ERR(kn_info); =20 - ret =3D rdtgroup_add_files(kn_info, RF_TOP_INFO); + ret =3D rdtgroup_add_files(kn_info, RFTYPE_TOP_INFO); if (ret) goto out_destroy; =20 /* loop over enabled controls, these are all alloc_capable */ list_for_each_entry(s, &resctrl_schema_all, list) { r =3D s->res; - fflags =3D r->fflags | RF_CTRL_INFO; + fflags =3D r->fflags | RFTYPE_CTRL_INFO; ret =3D rdtgroup_mkdir_info_resdir(s, s->name, fflags); if (ret) goto out_destroy; } =20 for_each_mon_capable_rdt_resource(r) { - fflags =3D r->fflags | RF_MON_INFO; + fflags =3D r->fflags | RFTYPE_MON_INFO; sprintf(name, "%s_MON", r->name); ret =3D rdtgroup_mkdir_info_resdir(r, name, fflags); if (ret) @@ -3709,7 +3709,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), RF_CTRL_BASE); + ret =3D rdtgroup_add_files(kernfs_root_to_node(rdt_root), RFTYPE_CTRL_BAS= E); if (ret) { kernfs_destroy_root(rdt_root); goto out; From nobody Thu Dec 18 22:00:45 2025 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 C0438C04A6A for ; Fri, 11 Aug 2023 20:09:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236539AbjHKUJ6 (ORCPT ); Fri, 11 Aug 2023 16:09:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236323AbjHKUJ4 (ORCPT ); Fri, 11 Aug 2023 16:09:56 -0400 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2068.outbound.protection.outlook.com [40.107.220.68]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 905E230FC; Fri, 11 Aug 2023 13:09:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QZXKwQ+o6JoTEB3dmwmEJ25zOc6KtmG7D3RJeBX3QMUXEx5Pyon+V3tjMkLRp3ITL7B4PTEFtaAuU7FjGxGgA8RLx7vsPjSxShMW2+7ZenQ7v9r20lF/AN+x/Lm5nFS3AfCTKMDGxeGQQ7GozKz/0CGFPp65On2JPo/Ec4Llcq9ue0cBrLHmXZk3xhtcxxqNZ03STw4B43NcMy5vDRFxXZrhb7gb6McTx7xKsvSaxeT0RagiWzH/FpiTtqZJTixNA0ymdQD43MCdX1yEuqLQvhZiyFTZdnwMrU0yEGaGR53D9wPSZjtyssrJKXHylHfR13+KE52MlAgjzfcPtjbJRg== 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=P+DSIBfIYdaBQQoN1Aahql3oHTBoBm0oXqwHDD+PRts=; b=l0Y9+VoZTclE328xGP2QOrM03dPy+aH6B54dfXKZPDK/gJ48vdyE1qSkmCoromS0UR92aqIEOLgNjNavDvnXAG7DRr84nlvoX3NvOg8SVSa6n8LzmR4yfqNuskPwJwCl5MpZL0GRZ4IyxWUdk7bH5mCSVEzGGnXek7u46yqlchi/xKXt/71MipjTkmDlDozT8AVea9oViIeBgs6BFb0wzA1c3Jv73+YiMVicxsHYru9Pa6bVL2g/naYIofwUHE0q2pMIISyn8ZnqdFAVi+wbiwHunlVsSrykcEKbKgDtE9kbQ/cN8XgUJxZO1++m/rnlL3gzQeWc1XCwbcaQ9N+OzA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=csgroup.eu 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=P+DSIBfIYdaBQQoN1Aahql3oHTBoBm0oXqwHDD+PRts=; b=ggcPmUjcXT9UBnB0uFRBTReUfM6kfZ0BdDwr4E3orfGV4MiyqEVMddJaRcrW8yzyvZS2Z5ldWiRL8dKmnEqc0cIvDjeGAobhilejVTWTHLZkuUfVR5LXwm8Z/QqTN9Jn3uwl7VFulZdM1KCNn0DMJiAYTUF40/Bcm9vQAxVmhFA= Received: from BYAPR04CA0025.namprd04.prod.outlook.com (2603:10b6:a03:40::38) by SA1PR12MB7040.namprd12.prod.outlook.com (2603:10b6:806:24f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Fri, 11 Aug 2023 20:09:51 +0000 Received: from MWH0EPF000971E8.namprd02.prod.outlook.com (2603:10b6:a03:40:cafe::69) by BYAPR04CA0025.outlook.office365.com (2603:10b6:a03:40::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27 via Frontend Transport; Fri, 11 Aug 2023 20:09:51 +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 MWH0EPF000971E8.mail.protection.outlook.com (10.167.243.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6652.20 via Frontend Transport; Fri, 11 Aug 2023 20:09:51 +0000 Received: from [127.0.1.1] (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; Fri, 11 Aug 2023 15:09:46 -0500 Subject: [PATCH v7 4/8] x86/resctrl: Add comments on RFTYPE flags hierarchy From: Babu Moger To: , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Date: Fri, 11 Aug 2023 15:09:45 -0500 Message-ID: <169178458575.1147205.16331131496340363561.stgit@bmoger-ubuntu> In-Reply-To: <169178429591.1147205.4030367096506551808.stgit@bmoger-ubuntu> References: <169178429591.1147205.4030367096506551808.stgit@bmoger-ubuntu> User-Agent: StGit/1.1.dev103+g5369f4c MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: MWH0EPF000971E8:EE_|SA1PR12MB7040:EE_ X-MS-Office365-Filtering-Correlation-Id: 13ef6f07-2d4c-4b0d-bdea-08db9aa6ebd5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZHxqMyMD2TTB9H4BOc/NHLiiWk87PIiZ4izraOSNKOykEiA2IzUp++w548om+e4D99zFEnOPjKRNRwHzDA5vVjoy6uOgIRcmlgyGkeIrSO50f+LQPqL8k1+MkfF9V6MMsv9SrIcdDJFUPFpgX5xfyz3aEwdBXuhsiqWG/QOUWfma+4EF6GMWB9533NblXNiHoS1EiDE2SMt8ZmdT/eJ9q8WtGb10JWU8Wv68EQjqkIzTWPOITG6ElWb3I5XPlG1QKB3odWm+SCK+ueVz/IC+DbRYC7Rp/LWW7hNyynZmgp8cbB0MnGbFnTKLLzOgsJ8ClbzooYG0gQ+uMBGZDlXibyv9Yo10eNYE3HPfTkvFU7PTx137V/RskZHOEVIWwoCNcMsKLe7xiMDuS4oKtj5KPtejJcvW2STbiO1c7R7OZFsZhVKF3uwS+ftNT+WF/T/4MIW7YEUi90O7dGptdtg1i4J+4Bms+984uLtcVpbbWV89mkcjQ3s2s5SqIcaLGGmyeTrICFOdyYKtOsAuumZk1kMX3EbTDsDhIavRAJdeY0RQzGvmfnwv7KwDU9HfKf7IaDIH/y6ylBEMezT3B4iKgxmxfXeUImRO6XK11acomJFFvmqdX3q1d2o4aT2gXNE1HUJznxhcn2y3ROxEOcvJT4BRPYdMbC+1463wXZVYWKuKrs0WjTdbvlAUziAvvv78hR9pnXCoo4ZKRLPqorCRWriIAGcP3hB2nuz0PRsLuc9sFGgTbULiIUCzWf3gxIQVd4y6rdMWC4T+UlSS0FDHJgR93x8aP23eQCEOxv6Rlm4= 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:(13230028)(7916004)(4636009)(39860400002)(136003)(346002)(376002)(396003)(186006)(82310400008)(1800799006)(451199021)(46966006)(36840700001)(40470700004)(40480700001)(9686003)(54906003)(110136005)(4326008)(5660300002)(70586007)(70206006)(316002)(16576012)(478600001)(41300700001)(40460700003)(82740400003)(8676002)(26005)(8936002)(44832011)(86362001)(7416002)(33716001)(336012)(7406005)(16526019)(103116003)(47076005)(36860700001)(356005)(81166007)(2906002)(426003)(71626016)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2023 20:09:51.3396 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 13ef6f07-2d4c-4b0d-bdea-08db9aa6ebd5 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: MWH0EPF000971E8.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7040 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org resctrl uses RFTYPE flags for creating resctrl directory structure. Definitions and directory structures are not documented. Add comments to improve the readability and help future additions. Signed-off-by: Babu Moger --- arch/x86/kernel/cpu/resctrl/internal.h | 49 ++++++++++++++++++++++++++++= ++++ 1 file changed, 49 insertions(+) diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/r= esctrl/internal.h index 2051179a3b91..37800724e002 100644 --- a/arch/x86/kernel/cpu/resctrl/internal.h +++ b/arch/x86/kernel/cpu/resctrl/internal.h @@ -240,6 +240,55 @@ struct rdtgroup { =20 /* * Define the file type flags for base and info directories. + * + * RESCTRL filesystem has two main components + * a. info + * b. base + * + * /sys/fs/resctrl/ + * | + * --> info (Top level directory named "info". Contains files that + * | provide details on control and monitoring resources.) + * | + * --> base (Root directory associated with default resource group + * as well as directories created by user for MON and CTRL + * groups. Contains files to interact with MON and CTRL + * groups.) + * + * info directory structure + * ------------------------------------------------------------------ + * --> RFTYPE_INFO + * --> directory + * --> RFTYPE_TOP_INFO + * Files: last_cmd_status + * + * --> RFTYPE_MON_INFO + * --> directory + * Files: max_threshold_occupancy, mon_features, + * num_rmids, mbm_total_bytes_config, + * mbm_local_bytes_config + * + * --> RFTYPE_CTRL_INFO + * Files: num_closids + * + * --> RFTYPE_RES_CACHE + * --> directories + * Files: bit_usage, cbm_mask, min_cbm_bits, + * shareable_bits + * + * --> RFTYPE_RES_MB + * --> directories + * Files: bandwidth_gran, delay_linear, + * min_bandwidth, thread_throttle_mode + * + * base directory structure + * ------------------------------------------------------------------ + * --> RFTYPE_BASE (Files common for both MON and CTRL groups) + * Files: cpus, cpus_list, tasks + * + * --> RFTYPE_CTRL_BASE (Files only for CTRL group) + * Files: mode, schemata, size + * */ #define RFTYPE_INFO BIT(0) #define RFTYPE_BASE BIT(1) From nobody Thu Dec 18 22:00:45 2025 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 7491FC04A6A for ; Fri, 11 Aug 2023 20:10:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236677AbjHKUKl (ORCPT ); Fri, 11 Aug 2023 16:10:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234770AbjHKUKj (ORCPT ); Fri, 11 Aug 2023 16:10:39 -0400 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2077.outbound.protection.outlook.com [40.107.237.77]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD57430C8; Fri, 11 Aug 2023 13:10:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SyR8FrULCpaLzDAgp9009e993JSMiJT7+GIvNvGOiYTm1Yc/c82WPwMFV+J5v0sogRwd+be6xoPjJ9Nu77U0ydNZXxNmlroMCTi52VSHVDtu14MYT+KQFku3GNN9LTGhj/AkYsKyYnSZHiS/RqMvKni5xh5zYxbsva4cS/H0peoItVUZDdY4ikGW6erhE5WMVCLJFyb9Rf2iMmBbOwCz8a4qV99W3hVTkbyN/2Cx2qjiAgDo5GAY0tH6mkEzJZfoEgk9Zsas2qgPy49jYLctoYuKagUGclt9IJrxrxvh5LVWXiTl7QF1jC/Splp3Jj9VBWIpbgFll94Bac7U+bexMw== 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=pmP59P+VoRcJuuAk9hmDW41PRaO7VF5n6xJW5fOcJVc=; b=nX3UH1q60ldgTKrVid3NR9UJbRRYJ5TFJ0yNpS/6TBfsifCNLjeNWh761VX7m/81FAg0xIrj6Xqi318Pr+KQOShoutqKEigS8VKaRGpdj8VeSdD7MxPdooNtJcvBQF2HGtqYXJFM2TN4njDK22ZMhR8eDaJwcdUjCwux8FR/a4JLJzgc/4V3vlsGl+ZtZeI7sI4b2y28YaOUuUCWpaeSoz/aI2dEnG6vnwBpea+SiMwhKK8nTnbvlkCgAMVM3yh4VNHd+nysacLyzcbYTFw9cZdMgdGH8CJr6GGdt211xlYu2EGNIiK3j2wq8mZHta07R6hwmx35KD7d83qCCSwAiw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=csgroup.eu 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=pmP59P+VoRcJuuAk9hmDW41PRaO7VF5n6xJW5fOcJVc=; b=mGsAvfZpdab+ye+vdFOfeCwCSTnQRyo50QHACx/r6lMZl6TfPoWgORoV6TEH1IG/AkCYezh8/HAjwybiyu8dF349WPZuSUrHFCY8jCTjzWNqjd38HlzVBCEzT0uZbmowVich+XHVbvT3T8YFPuptv6PpP4tJSZh8sH8yWHTNTeU= Received: from SJ0PR05CA0109.namprd05.prod.outlook.com (2603:10b6:a03:334::24) by PH7PR12MB7330.namprd12.prod.outlook.com (2603:10b6:510:20d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Fri, 11 Aug 2023 20:10:36 +0000 Received: from MWH0EPF000971E7.namprd02.prod.outlook.com (2603:10b6:a03:334:cafe::7) by SJ0PR05CA0109.outlook.office365.com (2603:10b6:a03:334::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.18 via Frontend Transport; Fri, 11 Aug 2023 20:10:36 +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 MWH0EPF000971E7.mail.protection.outlook.com (10.167.243.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6652.20 via Frontend Transport; Fri, 11 Aug 2023 20:10:36 +0000 Received: from [127.0.1.1] (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; Fri, 11 Aug 2023 15:10:29 -0500 Subject: [PATCH v7 5/8] x86/resctrl: Unwind the errors inside rdt_enable_ctx() From: Babu Moger To: , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Date: Fri, 11 Aug 2023 15:09:53 -0500 Message-ID: <169178459367.1147205.14975628669652538089.stgit@bmoger-ubuntu> In-Reply-To: <169178429591.1147205.4030367096506551808.stgit@bmoger-ubuntu> References: <169178429591.1147205.4030367096506551808.stgit@bmoger-ubuntu> User-Agent: StGit/1.1.dev103+g5369f4c MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: MWH0EPF000971E7:EE_|PH7PR12MB7330:EE_ X-MS-Office365-Filtering-Correlation-Id: 668a550d-66f6-4143-7546-08db9aa70690 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ePde88xC62ieSkVvBG/8kIyM+Cr73Hyld77lRL+o5sWzV3eISpiW0DBM7BvhFYUdOAVbnWkNhslhMzx03olQP7CCw5DGGsE0I7oeCGUn97eBy0rM0b6/7bIenHtYb2dobEgHzJsZAG1Vx+xGbSd+mKVk/cze44Z4LjcRCdKLI7R2Z6V4ZVDtlBy1wzzu8zd3VzmQjeHclsHL0OXRgr1ws6y5JLcjQwTLhZkKk2/Zq1OT2P9h8PYw5J2KsrljXpn7ruHxCne4eoCIl0i3Zs/y2trPaj0YRMUAPiAzHgUj8HlMTaBVx/DlZ0rt0y3P99UikfuVwFSzVUfTi6dQBJLJWIFYpW5vXIHMWhmQ4FxnuYTaH0g6voVTMyxFg61zDs6Gdm8twBieXJyzSh4zeGAQw/V6RetFO6uKc4ju+eDWWPMCBTZBOwsApTYn36+wjoXtT0+QFw8uCOuaSjxKa9z+YHPq1W5Gvk8l4NMBPq70Wit+cyJlo09UnzGS5eETYcaXPx7yR07BcMzziSxHvde9abRMaKkcey9djLpY5Mtcc4pV9sHvNFi7giD0g9Skjbe30q3wKQhrFshsBgcmv3HIFZxjgvsLYbhX/WcP7TDxhmIX6mGgWcU8s4517DzkLRflfzw9C9G74GVy9imo3NKBqWK0cJQQe1MTp9uYVT/A5+xS9lSp0p8ZofK9zWyxYBv4wYCIY2QHo3XE8oKfA7ONncnae5n6l2sSlAYwv/rWxLASN8BvMBzz4Kqhlb3hALtX+PtywZrewTvXtUQ97PJvsJmwUvwnBc/W12KTHX+5Zqs= 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:(13230028)(7916004)(4636009)(39860400002)(136003)(376002)(346002)(396003)(451199021)(82310400008)(1800799006)(186006)(36840700001)(46966006)(40470700004)(40460700003)(4326008)(7416002)(356005)(16526019)(7406005)(81166007)(336012)(33716001)(41300700001)(44832011)(426003)(70206006)(36860700001)(47076005)(70586007)(40480700001)(5660300002)(82740400003)(83380400001)(6666004)(316002)(54906003)(110136005)(103116003)(8936002)(8676002)(2906002)(86362001)(16576012)(26005)(478600001)(9686003)(71626016)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2023 20:10:36.1997 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 668a550d-66f6-4143-7546-08db9aa70690 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: MWH0EPF000971E7.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7330 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org rdt_enable_ctx() enables the features provided during resctrl mount. Additions to rdt_enable_ctx() are required to also modify error paths of rdt_enable_ctx() callers to ensure correct unwinding if errors are encountered after calling rdt_enable_ctx(). This is error prone. Introduce rdt_disable_ctx() to refactor the error unwinding of rdt_enable_ctx() to simplify future additions. Suggested-by: Reinette Chatre Signed-off-by: Babu Moger --- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 44 ++++++++++++++++++++++++----= ---- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index 3010e3a1394d..0805fac04401 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -2377,19 +2377,44 @@ static int mkdir_mondata_all(struct kernfs_node *pa= rent_kn, struct rdtgroup *prgrp, struct kernfs_node **mon_data_kn); =20 +static void rdt_disable_ctx(struct rdt_fs_context *ctx) +{ + if (ctx->enable_cdpl2) + resctrl_arch_set_cdp_enabled(RDT_RESOURCE_L2, false); + + if (ctx->enable_cdpl3) + resctrl_arch_set_cdp_enabled(RDT_RESOURCE_L3, false); + + if (ctx->enable_mba_mbps) + set_mba_sc(false); +} + static int rdt_enable_ctx(struct rdt_fs_context *ctx) { int ret =3D 0; =20 - if (ctx->enable_cdpl2) + if (ctx->enable_cdpl2) { ret =3D resctrl_arch_set_cdp_enabled(RDT_RESOURCE_L2, true); + if (ret) + goto out_disable; + } =20 - if (!ret && ctx->enable_cdpl3) + if (ctx->enable_cdpl3) { ret =3D resctrl_arch_set_cdp_enabled(RDT_RESOURCE_L3, true); + if (ret) + goto out_disable; + } =20 - if (!ret && ctx->enable_mba_mbps) + if (ctx->enable_mba_mbps) { ret =3D set_mba_sc(true); + if (ret) + goto out_disable; + } + + return 0; =20 +out_disable: + rdt_disable_ctx(ctx); return ret; } =20 @@ -2497,13 +2522,13 @@ static int rdt_get_tree(struct fs_context *fc) } =20 ret =3D rdt_enable_ctx(ctx); - if (ret < 0) - goto out_cdp; + if (ret) + goto out; =20 ret =3D schemata_list_create(); if (ret) { schemata_list_destroy(); - goto out_mba; + goto out_ctx; } =20 closid_init(); @@ -2562,11 +2587,8 @@ static int rdt_get_tree(struct fs_context *fc) kernfs_remove(kn_info); out_schemata_free: schemata_list_destroy(); -out_mba: - if (ctx->enable_mba_mbps) - set_mba_sc(false); -out_cdp: - cdp_disable_all(); +out_ctx: + rdt_disable_ctx(ctx); out: rdt_last_cmd_clear(); mutex_unlock(&rdtgroup_mutex); From nobody Thu Dec 18 22:00:45 2025 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 0C9C0C0015E for ; Fri, 11 Aug 2023 20:10:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236299AbjHKUKx (ORCPT ); Fri, 11 Aug 2023 16:10:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229709AbjHKUKu (ORCPT ); Fri, 11 Aug 2023 16:10:50 -0400 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2041.outbound.protection.outlook.com [40.107.223.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 172A730C8; Fri, 11 Aug 2023 13:10:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TohYvuRzy0colFOGkylCp0sL9OPyy9kSrYi6yvsv0Q421yUZ1zwaxmYuAr0xpgnylTSgy65Mh7vJOctc9dO+5IXWgtOlqpl1+R/tO4ePKkubHOaN3J9GmjBHjQKF+4tASWDwHTAmOaUNOpNvA5HXz16yv7Glvhx1Hhj+qdWAfIzPK9c8zePBHSqUaMnN/Kt8jRMP9qDbBUxwefY6y+lb2rCkZUa/m5aJ3VUnKOOh6oT0xj1+quTYnq5OilOWRSEd5JakeQeet89DXlorMYAN/HYpBsEsV1Rz2vkMnEgEKLPibUEmOaaPeBenqcrL29d//v7yaHppoYHP4hy4oxO1zQ== 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=PfgYOsCGtiaBFc0QyKVPj6KYurATlWLcaOnrA1ibq6o=; b=OgUUG2UyfwSKOm+X05fm761f4BhumpuByLxcUyLbTUtcqWzmJnOfUlintLk58NSsLOy5c717yVTX1AqPd1+EpBQxND2sVCBT71CYoNGnMpaxp//DWTnmz/OXZR18/VhdJLWJno/ngCw6xLrSxWzhQCX5VXjd6wh7ngFiIbUF3+8xY8xLF7XDCgEzO0TZ+NAHFUPv/cnJkU5p05lBIO5gYo0iihVDMXOlG7eriBvUIv0AAVPE7aC6BqkAauLvi1WorINWtGqt9HhZeRly+VIXaMjuXwcHEzbVCa46hKoceYv9AmaJmsZSd3/8EX9UP9sMOtk3ZkFKOOoPJqw32mbFJg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=csgroup.eu 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=PfgYOsCGtiaBFc0QyKVPj6KYurATlWLcaOnrA1ibq6o=; b=cI0nl/Eq9K+c0L4uhZwq5adBLgW3qBwuAO03lbPGbJW4S0xQ8b7JsQktzXMeHybHBcFv4Ml1Y79xzYcrjMDS/j3q1ZIN3RhPYYqlH1NAvtRVzDnpdWo1Dg+RV4GXhAY7Gas+ZAfC6IL+ayeMJZZ+knImtm8VyJlQIgWlyTI6SJ4= Received: from BYAPR05CA0052.namprd05.prod.outlook.com (2603:10b6:a03:74::29) by IA1PR12MB7613.namprd12.prod.outlook.com (2603:10b6:208:42a::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Fri, 11 Aug 2023 20:10:46 +0000 Received: from MWH0EPF000971E5.namprd02.prod.outlook.com (2603:10b6:a03:74:cafe::c1) by BYAPR05CA0052.outlook.office365.com (2603:10b6:a03:74::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.15 via Frontend Transport; Fri, 11 Aug 2023 20:10: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 MWH0EPF000971E5.mail.protection.outlook.com (10.167.243.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6652.19 via Frontend Transport; Fri, 11 Aug 2023 20:10:45 +0000 Received: from [127.0.1.1] (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; Fri, 11 Aug 2023 15:10:42 -0500 Subject: [PATCH v7 6/8] x86/resctrl: Move default control group creation during mount From: Babu Moger To: , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Date: Fri, 11 Aug 2023 15:10:36 -0500 Message-ID: <169178463637.1147205.7411319721706077266.stgit@bmoger-ubuntu> In-Reply-To: <169178429591.1147205.4030367096506551808.stgit@bmoger-ubuntu> References: <169178429591.1147205.4030367096506551808.stgit@bmoger-ubuntu> User-Agent: StGit/1.1.dev103+g5369f4c MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: MWH0EPF000971E5:EE_|IA1PR12MB7613:EE_ X-MS-Office365-Filtering-Correlation-Id: 7bf14f01-f2d0-437a-a155-08db9aa70c2a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hZSUqi3/lsNHBMuA2zbvsGw6Hv/pQJEAaCthU6I+kfAebe/9PL65fDqk7NzGQaTpKchDZdXPH0kO+cW59UFlYqgiAHJF/MWpYirXGBR0h2j7eatMlNh1Hcj5ODie0WXeaGW7HNap7ZJLnd3h51NFxCeGXMt7d9AYVKGuAdA4gEeqR+exDW3rRZ4b2L3FoMaIL9FPEyhVFjZ66SajdErOBZP6JBb6HrZLnbxrWL7vcoeWd+D6BB4WhgCG8U8AUKfeEt4vNbXeCtCMnw0cVvslO543S2mFmcacOg0Vg7x1TGPaVAhTpnzp9WDGUJVYAiVgtECUiUzY8/6iHWSSBsu6DP5d3MNwCwi8CKx+9AG/6bW+WRj+MLBRoCrzUST5PQTq4dbl1mOVh/P6i0d/aROFHW9+x0BC5zD0EkgOKhevENr8RJpOkO77hfvvABralwKg+fqX28n+FkfIU0+3RdT0wLl0sc+/FEWBksApV67B3Jp1LX4h0Coq0toXyDUOHd6jA4Z3XplRW1N4tEZplg+FdLZztpfqB/oU1KzQLXxbcv/WxLuyt8xN/d+Fgdep6MEuApvBQe2PApCy06fBKLEzd3TIEDQJziFjzdOak+yp7UFTP8OHj3ly6/PSu2KykdzONvjfkNwvoPGyCmyENSdSgWzgKe51plIp3ABZGRoiPJOCR6Qg8rEtyup+n8ikzqFlmr4+p1r0/ktVTPZMU4LzRWmvlWA1g/gyhvxHWnhKNAonvzAvOkLEo+kleKXiTNZRVrBueKdbOdLg80mOi2OzjRu6lqcXSFkLcbNFz3nt9DE= 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:(13230028)(4636009)(7916004)(396003)(136003)(39860400002)(346002)(376002)(82310400008)(451199021)(186006)(1800799006)(46966006)(40470700004)(36840700001)(36860700001)(2906002)(54906003)(7406005)(7416002)(9686003)(4326008)(47076005)(70206006)(70586007)(110136005)(83380400001)(478600001)(86362001)(426003)(356005)(82740400003)(40460700003)(81166007)(40480700001)(316002)(103116003)(8676002)(8936002)(5660300002)(41300700001)(44832011)(16576012)(336012)(16526019)(6666004)(33716001)(26005)(71626016)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2023 20:10:45.5674 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7bf14f01-f2d0-437a-a155-08db9aa70c2a 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: MWH0EPF000971E5.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7613 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The resctrl default control group is created during kernel init time. If the new files are to be added to the default group based on the mount option, then each file needs to be created separately and call kernfs_activate() again. This can be avoided if all the files are created during the mount and destroyed during the umount. So, move the default group creation in rdt_get_tree() and removal in rdt_kill_sb(). Suggested-by: Reinette Chatre Signed-off-by: Babu Moger --- arch/x86/kernel/cpu/resctrl/internal.h | 1 + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 50 +++++++++++++++++-----------= ---- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/r= esctrl/internal.h index 37800724e002..2bd92c0c3b0c 100644 --- a/arch/x86/kernel/cpu/resctrl/internal.h +++ b/arch/x86/kernel/cpu/resctrl/internal.h @@ -602,5 +602,6 @@ void rdt_domain_reconfigure_cdp(struct rdt_resource *r); void __init thread_throttle_mode_init(void); void __init mbm_config_rftype_init(const char *config); void rdt_staged_configs_clear(void); +int rdtgroup_setup_root(struct rdt_fs_context *ctx); =20 #endif /* _ASM_X86_RESCTRL_INTERNAL_H */ diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index 0805fac04401..a7453c93bad4 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -2521,10 +2521,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(); @@ -2533,6 +2537,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; @@ -2589,6 +2599,8 @@ static int rdt_get_tree(struct fs_context *fc) schemata_list_destroy(); out_ctx: rdt_disable_ctx(ctx); +out_root: + kernfs_destroy_root(rdt_root); out: rdt_last_cmd_clear(); mutex_unlock(&rdtgroup_mutex); @@ -2659,7 +2671,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; @@ -2830,6 +2841,7 @@ static void rdt_kill_sb(struct super_block *sb) rdt_pseudo_lock_release(); rdtgroup_default.mode =3D RDT_MODE_SHAREABLE; schemata_list_destroy(); + kernfs_destroy_root(rdt_root); static_branch_disable_cpuslocked(&rdt_alloc_enable_key); static_branch_disable_cpuslocked(&rdt_mon_enable_key); static_branch_disable_cpuslocked(&rdt_enable_key); @@ -3711,10 +3723,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) +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, @@ -3722,6 +3732,15 @@ 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 __init rdtgroup_setup_default(void) +{ mutex_lock(&rdtgroup_mutex); =20 rdtgroup_default.closid =3D 0; @@ -3731,19 +3750,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) @@ -3865,13 +3872,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) @@ -3904,8 +3909,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; } @@ -3915,5 +3918,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); } From nobody Thu Dec 18 22:00:45 2025 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 ACCBCC04A6A for ; Fri, 11 Aug 2023 20:11:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229457AbjHKULB (ORCPT ); Fri, 11 Aug 2023 16:11:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235816AbjHKUK7 (ORCPT ); Fri, 11 Aug 2023 16:10:59 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2081.outbound.protection.outlook.com [40.107.244.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BBEC30FF; Fri, 11 Aug 2023 13:10:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NY21Ek9G4PuepjwBMYHgEVdC/9rSwgjcGuJdtECU6QQNFU30sElhadKQaazwuV5/nIUtVYXQC9YcO0kaCLzlUb31J8vFIheZTH+NeDm5uyHgfgZoqFtRmoEL33D5XM9ueYzSZNsqUXnXW1OADMpg4Vox4MyjnDgTKThq25/9q7Ez3x8MfYeRbGIVVCvJB4P2DNCcqboOTaLG9kVJurvsm3k/lxgNMcxTAQkWD/YvbYbQ3nGAovuPuH7Vm6hg2buseTXUAA7sO4kITk2sZ/1wQjcKsU2DnDXVlJb9S1RVq2+NNL1oKsHFOeUwc+8A3xd3JXzh1HDkMUqRPU3K5huT5Q== 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=U4IhmNsexbxxmpffLsCR8dkV/Tuq3QoG6vGiVUEFgpg=; b=TZCBHog1gUXYVI70oQ1hsYq2pPMljonPaVJe74AcQOhFpSu8maFSQJdaL7iAFl7+aZQiimMbZ9LKlCWMBZZ8dDSdPeAzuTNcOhgWAgmaftVbUtbuSvVz2vdqavxTkG/SwkTOBKV+jtocSqEXTP/mnYXGsMuEhdhfPpEM5BUtfiNkaAlYr4Xsp7qW7GIahiHIX7I/BRM/juwkJitB2NNGWCCe/zCstIQTgrzOuDuBQxZe23JcnkYYuMsLRVotjGQtJNPxYsk6uWNUzaTby63PU4H90N2yJmdwkwjnKl8udBsDbVE5zxsXoz+IC0p6RDr1ot8R2t0ebZfUz682lYR18Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=csgroup.eu 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=U4IhmNsexbxxmpffLsCR8dkV/Tuq3QoG6vGiVUEFgpg=; b=jTLi3mRCk4HPJrP1TnvLl0/U04rwk62j27lhqsfCMvAEZ8SSmHTiIupaxEkKfsy9lG/9sdmlUn/BbmRauinwbome0pOWaOryMqd3Z9DrQfBYRh0P5Umdn9fKSyJbri8OiarzLNEooWz8geIlBFrklkNNz7/uyYsgJOdfsmdeGGs= Received: from BYAPR05CA0047.namprd05.prod.outlook.com (2603:10b6:a03:74::24) by SN7PR12MB7835.namprd12.prod.outlook.com (2603:10b6:806:328::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Fri, 11 Aug 2023 20:10:52 +0000 Received: from MWH0EPF000971E5.namprd02.prod.outlook.com (2603:10b6:a03:74:cafe::b8) by BYAPR05CA0047.outlook.office365.com (2603:10b6:a03:74::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.16 via Frontend Transport; Fri, 11 Aug 2023 20:10:52 +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 MWH0EPF000971E5.mail.protection.outlook.com (10.167.243.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6652.19 via Frontend Transport; Fri, 11 Aug 2023 20:10:52 +0000 Received: from [127.0.1.1] (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; Fri, 11 Aug 2023 15:10:50 -0500 Subject: [PATCH v7 7/8] x86/resctrl: Introduce "-o debug" mount option From: Babu Moger To: , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Date: Fri, 11 Aug 2023 15:10:49 -0500 Message-ID: <169178464934.1147205.6915303244307989200.stgit@bmoger-ubuntu> In-Reply-To: <169178429591.1147205.4030367096506551808.stgit@bmoger-ubuntu> References: <169178429591.1147205.4030367096506551808.stgit@bmoger-ubuntu> User-Agent: StGit/1.1.dev103+g5369f4c MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: MWH0EPF000971E5:EE_|SN7PR12MB7835:EE_ X-MS-Office365-Filtering-Correlation-Id: ce2fc9e5-e71e-44c5-b156-08db9aa71024 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WFf5qI3QWM9N7faX3miY5cREpsG4x8hX/2AaHehbR47evfCb0Ug2LWH76FuAYy0qV1PEBAAtURfHby1EZF4PwSZYO1bYeIF9njR2qSxmh6/YajvJoQ6xUlyhvrl5RYgTdYjpDkRH+ALBUjcSlSAiSGmlspytiYYlOnAapL2TYam4zfgToG566sj/csDNgesTeYX3iz0fEvrLlj7Qn522LtfJd8mL9Njk2hm5OGvLBPEN95IbToqOzmvxijFSLaLEXvSI7KdJUjTtKBLvMVW5oSQfLFgbevBJjRBEFgxUNZoc0zMNYZ/ezNtmXHfJytWW6QmaP7flmi7TUfBnPVjeIORpjY/74P+u5ygrwD3s3FRaTgvXWx/cKicmcX3PJH6j8yaHMzROeKniz4F6UgqOAloKlNGKRqohn4BJYA3a1/+2AmJKxMGMt/Sd9AblIRFHiAveGmwOsemUBf2SBo1hEEzSRYPgSXT3Z9wx5zeGOkIzL2ZWX/aZBPUE5lwg2DWI9lXo2P87jTOS7MojVKX2tv2+S7956mA+0V5+kTHiW2oVPhg6nJzqh+bmP0+PiIhMnec9cEmMZRPXwf3dtBZ2ud/gJlfi+b5sk/qUx7OqjJBQAYZ0v6tnEJaJrKjWoisGq6hMh/k0ZHBg+ct635q8gKVdPxlm9a4YnWJ50XOBRqWM9bWKf3xaZw3JIWy6EYTz9YRn76DTCXBW1WxP/IDbNIKI5R2r1ArooxoxK5mK57UVF7z7qcClYnCcSuTEMw4l+x0CZ5kd/P8/aLTAec5KbJrTxO66WIv0fXFVRmMWW9I= 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:(13230028)(4636009)(7916004)(136003)(396003)(346002)(376002)(39860400002)(1800799006)(82310400008)(186006)(451199021)(36840700001)(40470700004)(46966006)(4326008)(9686003)(478600001)(54906003)(110136005)(70586007)(316002)(70206006)(16576012)(5660300002)(40480700001)(41300700001)(40460700003)(8936002)(8676002)(26005)(86362001)(33716001)(82740400003)(336012)(7416002)(7406005)(44832011)(16526019)(103116003)(36860700001)(47076005)(81166007)(356005)(2906002)(426003)(83380400001)(71626016)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2023 20:10:52.2394 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ce2fc9e5-e71e-44c5-b156-08db9aa71024 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: MWH0EPF000971E5.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7835 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add "-o debug" option to mount resctrl filesystem in debug mode. This option is used for adding extra files to help resctrl debugging. Signed-off-by: Babu Moger --- Documentation/arch/x86/resctrl.rst | 5 ++++- arch/x86/kernel/cpu/resctrl/internal.h | 2 ++ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 21 +++++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/Documentation/arch/x86/resctrl.rst b/Documentation/arch/x86/re= sctrl.rst index af234681756e..5a2346d2c561 100644 --- a/Documentation/arch/x86/resctrl.rst +++ b/Documentation/arch/x86/resctrl.rst @@ -35,7 +35,7 @@ about the feature from resctrl's info directory. =20 To use the feature mount the file system:: =20 - # mount -t resctrl resctrl [-o cdp[,cdpl2][,mba_MBps]] /sys/fs/resctrl + # mount -t resctrl resctrl [-o cdp[,cdpl2][,mba_MBps][,debug]] /sys/fs/re= sctrl =20 mount options are: =20 @@ -46,6 +46,9 @@ mount options are: "mba_MBps": Enable the MBA Software Controller(mba_sc) to specify MBA bandwidth in MBps +"debug": + Make debug files accessible. Available debug files are annotated with + "Available only with debug option". =20 L2 and L3 CDP are controlled separately. =20 diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/r= esctrl/internal.h index 2bd92c0c3b0c..4689e87ec638 100644 --- a/arch/x86/kernel/cpu/resctrl/internal.h +++ b/arch/x86/kernel/cpu/resctrl/internal.h @@ -59,6 +59,7 @@ struct rdt_fs_context { bool enable_cdpl2; bool enable_cdpl3; bool enable_mba_mbps; + bool enable_debug; }; =20 static inline struct rdt_fs_context *rdt_fc2context(struct fs_context *fc) @@ -297,6 +298,7 @@ struct rdtgroup { #define RFTYPE_TOP BIT(6) #define RFTYPE_RES_CACHE BIT(8) #define RFTYPE_RES_MB BIT(9) +#define RFTYPE_DEBUG BIT(10) #define RFTYPE_CTRL_INFO (RFTYPE_INFO | RFTYPE_CTRL) #define RFTYPE_MON_INFO (RFTYPE_INFO | RFTYPE_MON) #define RFTYPE_TOP_INFO (RFTYPE_INFO | RFTYPE_TOP) diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index a7453c93bad4..6b7e914657fa 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -56,6 +56,8 @@ static char last_cmd_status_buf[512]; =20 struct dentry *debugfs_resctrl; =20 +static bool resctrl_debug; + void rdt_last_cmd_clear(void) { lockdep_assert_held(&rdtgroup_mutex); @@ -1871,6 +1873,9 @@ static int rdtgroup_add_files(struct kernfs_node *kn,= unsigned long fflags) =20 lockdep_assert_held(&rdtgroup_mutex); =20 + if (resctrl_debug) + fflags |=3D RFTYPE_DEBUG; + for (rft =3D rfts; rft < rfts + len; rft++) { if (rft->fflags && ((fflags & rft->fflags) =3D=3D rft->fflags)) { ret =3D rdtgroup_add_file(kn, rft); @@ -2387,6 +2392,9 @@ static void rdt_disable_ctx(struct rdt_fs_context *ct= x) =20 if (ctx->enable_mba_mbps) set_mba_sc(false); + + if (ctx->enable_debug) + resctrl_debug =3D false; } =20 static int rdt_enable_ctx(struct rdt_fs_context *ctx) @@ -2411,6 +2419,9 @@ static int rdt_enable_ctx(struct rdt_fs_context *ctx) goto out_disable; } =20 + if (ctx->enable_debug) + resctrl_debug =3D true; + return 0; =20 out_disable: @@ -2612,6 +2623,7 @@ enum rdt_param { Opt_cdp, Opt_cdpl2, Opt_mba_mbps, + Opt_debug, nr__rdt_params }; =20 @@ -2619,6 +2631,7 @@ static const struct fs_parameter_spec rdt_fs_paramete= rs[] =3D { fsparam_flag("cdp", Opt_cdp), fsparam_flag("cdpl2", Opt_cdpl2), fsparam_flag("mba_MBps", Opt_mba_mbps), + fsparam_flag("debug", Opt_debug), {} }; =20 @@ -2644,6 +2657,9 @@ static int rdt_parse_param(struct fs_context *fc, str= uct fs_parameter *param) return -EINVAL; ctx->enable_mba_mbps =3D true; return 0; + case Opt_debug: + ctx->enable_debug =3D true; + return 0; } =20 return -EINVAL; @@ -2833,6 +2849,8 @@ static void rdt_kill_sb(struct super_block *sb) =20 set_mba_sc(false); =20 + resctrl_debug =3D false; + /*Put everything back to default values. */ for_each_alloc_capable_rdt_resource(r) reset_all_ctrls(r); @@ -3713,6 +3731,9 @@ static int rdtgroup_show_options(struct seq_file *seq= , struct kernfs_root *kf) if (is_mba_sc(&rdt_resources_all[RDT_RESOURCE_MBA].r_resctrl)) seq_puts(seq, ",mba_MBps"); =20 + if (resctrl_debug) + seq_puts(seq, ",debug"); + return 0; } =20 From nobody Thu Dec 18 22:00:45 2025 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 70484C04A6A for ; Fri, 11 Aug 2023 20:11:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235776AbjHKULv (ORCPT ); Fri, 11 Aug 2023 16:11:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231132AbjHKULt (ORCPT ); Fri, 11 Aug 2023 16:11:49 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2069.outbound.protection.outlook.com [40.107.94.69]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9EB0335AF; Fri, 11 Aug 2023 13:11:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YBo31yxoPSaMc/zKkzNVHq8Uc0E0qusfn1PQ+N9qiVsaaXhnfiHEiGwRbkwo2rdiNYZfkAx9B1Org0dUhHfYrImOQUlWbnvU7Bxk9gZk5rvtqf2eTeYTthjjdOGSGxL/gXDCfdTHfKFR5sjMRDn2Bp9nG+CccczPW/pz8kq9CczzL/ngiKozpPF66AIDafPzyv8XoZ6QrmDxHBFbtceEj+EumlBJyMcKfh9eKHUI3Ewk40NA+xSXAKe0yRorr4UaweBgO0wJBtyWy8kXoJBdfjaf3q/f9vfs03zKB/+vHmqII1OWyk6F+xGdri+rG/yCMk12m8kDNxyHhRad536Ecg== 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=W9WOWk3ZVA3KLqDN7eazTkBRKFW3gnVqyDdAPi+QCf4=; b=ls6QMqTiDUcCZ6M6QL+JSxSID+dF8oaMruE4KSbGcz2ByyUUELJQ4qX4Sdu9SztUkryGpK8Sct5gJDrGN6b/P5hiEaB1iq3FoTzA681IvM66kE9QTCmuz2w7MHdIqU5tPSs4JFGFpPmPcn+BmRHgAY8O/KjCWhW+AxgLTa+WSfiLKuPYTyXMHmizQCfpIc4dNjOm36BFcSyIvzcs6bxTmX0/53QxhWmX1CLwEdoc9G7J7WlmH9Zgf16znsvGLt0/PvObVKQ6jgatr2/GvKIgMwXPVBG6kWp+gwGo2WwtJKZFazDqfokDHUX5GY3A7ZuW2rnSkVEQTiSQxTFAO/BrfQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=csgroup.eu 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=W9WOWk3ZVA3KLqDN7eazTkBRKFW3gnVqyDdAPi+QCf4=; b=yEPVgkdq5Lz5lRs94IdeHNZoTzdhPw7sPdrghntjVjIFJcjJHEEFNVdAqfFT+FLTS++B565fD9AKPDau2mY1jf6eAEi/ocUfCLCPS38oH4iXkvAKkIxe9XPpfRRNz7lrcr7ZqfqwuXClbLgmjZRrjMsG5KoDueYtWFtjhTBsVSk= Received: from DM6PR06CA0076.namprd06.prod.outlook.com (2603:10b6:5:336::9) by CH2PR12MB4311.namprd12.prod.outlook.com (2603:10b6:610:a8::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.20; Fri, 11 Aug 2023 20:11:29 +0000 Received: from CY4PEPF0000E9DA.namprd05.prod.outlook.com (2603:10b6:5:336:cafe::13) by DM6PR06CA0076.outlook.office365.com (2603:10b6:5:336::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.31 via Frontend Transport; Fri, 11 Aug 2023 20:11:29 +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 CY4PEPF0000E9DA.mail.protection.outlook.com (10.167.241.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6652.20 via Frontend Transport; Fri, 11 Aug 2023 20:11:29 +0000 Received: from [127.0.1.1] (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; Fri, 11 Aug 2023 15:11:26 -0500 Subject: [PATCH v7 8/8] x86/resctrl: Display hardware ids of resource groups From: Babu Moger To: , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Date: Fri, 11 Aug 2023 15:10:57 -0500 Message-ID: <169178465701.1147205.1483883019768336774.stgit@bmoger-ubuntu> In-Reply-To: <169178429591.1147205.4030367096506551808.stgit@bmoger-ubuntu> References: <169178429591.1147205.4030367096506551808.stgit@bmoger-ubuntu> User-Agent: StGit/1.1.dev103+g5369f4c MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: CY4PEPF0000E9DA:EE_|CH2PR12MB4311:EE_ X-MS-Office365-Filtering-Correlation-Id: cb5cf2a6-0a15-47cb-8d20-08db9aa72648 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: F7qLwyJUzorPqWRvP0fiwyF9nIZeEE9t4kQ/m4PUCli2/Y5z5UXeLNylBwXikBGQyGkIRCHjcv2laljk1OsvZDziE0oe15mm8fhdUXwiJSVsKOyjeK77Trm67ruXFXPOVl3KSmq7p/dkCDRnotR3yP5Us8UZRZOM6mf9N7rxRIQdpo+iw9/jO2GTKyDfQ1QOkEica8mKwpTxkS3LI3E4DeZKPSuMpmeGxRLGU0RWDNJ6IovTM4x4ftMSQVnFIF1IqQRYqqe///guTqd+mAtRN5cNiYQnI0AbDeHpzgBIPZGIbrvEKwqpfNFtfbQdg2Gum4RFnL4oU56dUktaL2ymV++EEg+DvXeujCOcbBwfPhFicxpMh0cI5m3OJeyUctkmKUy5Y0vIVa4O1LH17svAkcEOmSWejye4lgjN86tVxjxX2qy7YjSfw/MB1JMy0YOOnO918zyjK0dYg+rHfPzMwfzKAylVsJyXACvkvVWzA5y8IZOQUbyJKeEo6Em72i5FPY1Y8LpXTCSY9WzLiABwa8YaLLUPCH+6fL3YS1vBYq5wFC9R2bgMI16ExRZQ29uxIxC3vPR8MDqM5v+/EqJGtbW8qyHW+l0e+ixQyu5JNCCSOnvLfGCrCtaBOTwRD3+SYWz/nj42y/czW+Ci5fxwdLy7PcoOXpqoy/Tg/rTbO6Lok0jG+pqw/hKM4EH7CJ9MnqwQKnSeacHS67Q+c+uz/yJOlU3t3BYOuk37q6cvJ3qdwQNgnb07x1r1F0z+84KAauIfh5Gvla475lXg/tA/E9caEznL/0JS/Sqv5qmDp3Q= 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:(13230028)(4636009)(7916004)(396003)(39860400002)(376002)(136003)(346002)(186006)(1800799006)(451199021)(82310400008)(46966006)(36840700001)(40470700004)(40460700003)(33716001)(6666004)(5660300002)(356005)(8676002)(4326008)(8936002)(82740400003)(81166007)(40480700001)(9686003)(110136005)(70586007)(86362001)(70206006)(47076005)(478600001)(103116003)(7406005)(7416002)(83380400001)(16526019)(26005)(16576012)(2906002)(54906003)(316002)(36860700001)(41300700001)(426003)(336012)(44832011)(71626016)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2023 20:11:29.4624 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cb5cf2a6-0a15-47cb-8d20-08db9aa72648 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: CY4PEPF0000E9DA.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4311 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In x86, hardware uses CLOSID and an RMID to identify a control group and a monitoring group respectively. When a user creates a control or monitor group these details are not visible to the user. These details can help debugging. Add CLOSID(ctrl_hw_id) and RMID(mon_hw_id) to the control/monitor groups display in resctrl interface. Users can see these details when resctrl is mounted with "-o debug" option. Other architectures do not use "CLOSID" and "RMID". Use the names ctrl_hw_id and mon_hw_id to refer "CLOSID" and "RMID" respectively in an effort to keep the naming generic. For example: $cat /sys/fs/resctrl/ctrl_grp1/ctrl_hw_id 1 $cat /sys/fs/resctrl/mon_groups/mon_grp1/mon_hw_id 3 Reviewed-by: Shaopeng Tan Tested-by: Shaopeng Tan Signed-off-by: Babu Moger --- Documentation/arch/x86/resctrl.rst | 8 ++++++ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 46 ++++++++++++++++++++++++++++= ++++ 2 files changed, 54 insertions(+) diff --git a/Documentation/arch/x86/resctrl.rst b/Documentation/arch/x86/re= sctrl.rst index 5a2346d2c561..41ad9b1f0c6a 100644 --- a/Documentation/arch/x86/resctrl.rst +++ b/Documentation/arch/x86/resctrl.rst @@ -351,6 +351,10 @@ When control is enabled all CTRL_MON groups will also = contain: file. On successful pseudo-locked region creation the mode will automatically change to "pseudo-locked". =20 +"ctrl_hw_id": + Available only with debug option. The identifier used by hardware + for the control group. On x86 this is the CLOSID. + When monitoring is enabled all MON groups will also contain: =20 "mon_data": @@ -364,6 +368,10 @@ When monitoring is enabled all MON groups will also co= ntain: the sum for all tasks in the CTRL_MON group and all tasks in MON groups. Please see example section for more details on usage. =20 +"mon_hw_id": + Available only with debug option. The identifier used by hardware + for the monitor group. On x86 this is the RMID. + Resource allocation rules ------------------------- =20 diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index 6b7e914657fa..94471ad9d905 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -776,6 +776,38 @@ static int rdtgroup_tasks_show(struct kernfs_open_file= *of, return ret; } =20 +static int rdtgroup_closid_show(struct kernfs_open_file *of, + struct seq_file *s, void *v) +{ + struct rdtgroup *rdtgrp; + int ret =3D 0; + + rdtgrp =3D rdtgroup_kn_lock_live(of->kn); + if (rdtgrp) + seq_printf(s, "%u\n", rdtgrp->closid); + else + ret =3D -ENOENT; + rdtgroup_kn_unlock(of->kn); + + return ret; +} + +static int rdtgroup_rmid_show(struct kernfs_open_file *of, + struct seq_file *s, void *v) +{ + struct rdtgroup *rdtgrp; + int ret =3D 0; + + rdtgrp =3D rdtgroup_kn_lock_live(of->kn); + if (rdtgrp) + seq_printf(s, "%u\n", rdtgrp->mon.rmid); + else + ret =3D -ENOENT; + rdtgroup_kn_unlock(of->kn); + + return ret; +} + #ifdef CONFIG_PROC_CPU_RESCTRL =20 /* @@ -1837,6 +1869,13 @@ static struct rftype res_common_files[] =3D { .seq_show =3D rdtgroup_tasks_show, .fflags =3D RFTYPE_BASE, }, + { + .name =3D "mon_hw_id", + .mode =3D 0444, + .kf_ops =3D &rdtgroup_kf_single_ops, + .seq_show =3D rdtgroup_rmid_show, + .fflags =3D RFTYPE_BASE | RFTYPE_DEBUG, + }, { .name =3D "schemata", .mode =3D 0644, @@ -1860,6 +1899,13 @@ static struct rftype res_common_files[] =3D { .seq_show =3D rdtgroup_size_show, .fflags =3D RFTYPE_CTRL_BASE, }, + { + .name =3D "ctrl_hw_id", + .mode =3D 0444, + .kf_ops =3D &rdtgroup_kf_single_ops, + .seq_show =3D rdtgroup_closid_show, + .fflags =3D RFTYPE_CTRL_BASE | RFTYPE_DEBUG, + }, =20 }; =20