From nobody Sat Sep 13 11:17:15 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 04114C61DA4 for ; Thu, 2 Feb 2023 21:47:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233001AbjBBVrD (ORCPT ); Thu, 2 Feb 2023 16:47:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230173AbjBBVrA (ORCPT ); Thu, 2 Feb 2023 16:47:00 -0500 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2067.outbound.protection.outlook.com [40.107.93.67]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E971A2E0D0; Thu, 2 Feb 2023 13:46:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cLEL++sS1OoSpsWl2yJXG5lL1eZ3NqynSltY3QgbU6QwyxzxfZT2uLhu6HwcbGtXMS8LwtfM6R8pQEShts+sBDVRqarIvB8odNNXByRsiBpoTIA9qX5FKK9KqIIFrUrrSswbJoKPMOmmhUtSjB7uf3op87jWWOuFzvADRhkEGV6LtPmieRf3F6pHcqYq6+k3j3cAgHQ+zHU6wKnAnOXkAdT88FgNU63PDcS0x495eo4CrPvqfy7OwSmlf7MFqUA+mnlimcL4gUQImX8BN2z2J1KQPta2H4ybsWBpKaajJymMe18D5HUuffrR4oRGRUu3XkFvBz2TWTDbIiBlb3Wyzg== 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=WR4r95AImEpVKDY27H8FWcKXZoDuUBWDqDRBgxdMk0w=; b=e3TItXas0ebGvbYQGUu76R2C28Ztirx228QlzOMTboXlWJzCEZSKOfpzn0mgUbgNr+vXSniGyZT8emYraCpf6eKPtWRFUB9zWHS4/OH6mHwpumGGZEPPPhg93KaVLmN3DQS3FCAol5njbRApw5G91fbOYkVdp8E8CS0UDMqVH7erZ9KkT5OWEBBt6prVwlcNTFKnDVW0acmbxD0DPdTmq/+KtW9nTUEYkuokqTUXfVXVIxxVX+bWcP74YZX1AVG+G3PxzTSgwEwG/hihviAx7//yZcVo166IiX7PxwTiBlCnYGRP15J6rwiDlgRDy0dYw8mb4YwqlIbGrZiTkGJqFQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=zytor.com 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=WR4r95AImEpVKDY27H8FWcKXZoDuUBWDqDRBgxdMk0w=; b=2loNNyYGMEzYL98NH+BIMgruMWbiV5tLdaXDNsQRsfRxMs4VXNCOoYM5af8YA87XXrCJL62iAm/gcLN7PU8Ncx+4Lpmu+Feh4OjF8UQ1qTnNZHirOsZxVmd0hAhUA+rEwhw8AQ9Fxx+O9t9aArRfJm6+TeNBcSxlHM7geq4WS3o= Received: from MW4PR03CA0083.namprd03.prod.outlook.com (2603:10b6:303:b6::28) by IA1PR12MB6355.namprd12.prod.outlook.com (2603:10b6:208:3e1::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.27; Thu, 2 Feb 2023 21:46:56 +0000 Received: from CO1PEPF00001A63.namprd05.prod.outlook.com (2603:10b6:303:b6:cafe::c3) by MW4PR03CA0083.outlook.office365.com (2603:10b6:303:b6::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.27 via Frontend Transport; Thu, 2 Feb 2023 21:46:56 +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 CO1PEPF00001A63.mail.protection.outlook.com (10.167.241.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6064.20 via Frontend Transport; Thu, 2 Feb 2023 21:46:56 +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.2375.34; Thu, 2 Feb 2023 15:46:54 -0600 Subject: [RFC v2 PATCH 1/7] x86/resctrl: Add multiple tasks to the resctrl group at once From: Babu Moger To: , CC: , , , , , , , , , , , Date: Thu, 2 Feb 2023 15:46:54 -0600 Message-ID: <167537441417.647488.18261538242584692230.stgit@bmoger-ubuntu> In-Reply-To: <167537433143.647488.9641864719195184123.stgit@bmoger-ubuntu> References: <167537433143.647488.9641864719195184123.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: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF00001A63:EE_|IA1PR12MB6355:EE_ X-MS-Office365-Filtering-Correlation-Id: a13a78c9-2064-438e-ec87-08db05670159 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5Q9bxvvJiXKj5uED9s/g9jIFYc5b/XXpXiXN9mJGHN9wOjfpkAlhpUT4Bpwx1+G8CAzKMVpKej2j2qDFUXvMaHTKBtJsC+7y7q7tUsPVapTLRIWUUGgu/Rhj8l7dZalKoeRz7hI3CRzCzeyjExO/YU9SDXAFXn/LlD9RuEmxWx8H8XMHW1ooEBr0hwJZnJq+NR2+Lfl5pgZp0t66TFGIBR1a9z8kbFVPNIsZ0v1SiNCgkg7vhp858EVKpCSx/DEAlFRSbSZB2vIY64mjxZMYpKOdSs+P3GmdxNPK5Jsw99THWOt4V7AgCVzMCJcIxNn/uvg+wX0Bg4F2AcF7vLTzs6eHwNb4iNyXu3A66cHTR8GCcR082vHNuOSZ9vu1VgKjBn/CdNteXJIIZZ34Z1LgONsCHVkrEzrRrq0dnxMUPPMHXpC0M9qfE5mEls2ZvucryglF5PqFzGwxianeffQxihYkbAe7aqBrVcOSp3hTDN6rB1FPVXadKQykq/lM57ddH8E4blxvlZPKl5MLE74MWZAgFkEQG9+6IPyZ7A6OSDMMPDZehlEjdBpLM1DDfGLfd5Wwly6fxrRn2FG4fcjvFyRqpDbWiV/C3KIYY3ov6WC2QXsLXb8e9w9OiXD3CmKAGLofaq9PnnWkbAWEgc99wZAE6RNgr0Xq5gmiVovEYnhtSYFmgyF0nuEr0KnKx211xUbZHrpagQiYCnbiozeimpAMGeBJ3pya9DleWIKtSIaLM3GlWtuV0gA9ftBQ0Xjx 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:(13230025)(7916004)(4636009)(136003)(376002)(39860400002)(346002)(396003)(451199018)(46966006)(40470700004)(36840700001)(66899018)(5660300002)(86362001)(81166007)(356005)(70586007)(70206006)(40480700001)(103116003)(44832011)(7416002)(2906002)(8936002)(426003)(41300700001)(478600001)(33716001)(36860700001)(40460700003)(82740400003)(8676002)(83380400001)(336012)(26005)(9686003)(316002)(110136005)(16526019)(186003)(54906003)(16576012)(82310400005)(47076005)(4326008)(71626013)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2023 21:46:56.3935 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a13a78c9-2064-438e-ec87-08db05670159 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: CO1PEPF00001A63.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6355 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/clos1 $echo 123 > /sys/fs/resctrl/clos1/tasks $echo 456 > /sys/fs/resctrl/clos1/tasks $echo 789 > /sys/fs/resctrl/clos1/tasks This is not user-friendly when dealing with hundreds of tasks. Improve the user experience by supporting the multiple task assignment in one command with the tasks separated by commas. For example: $echo 123,456,789 > /sys/fs/resctrl/clos1/tasks Signed-off-by: Babu Moger --- Documentation/x86/resctrl.rst | 9 +++++++-- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 24 +++++++++++++++++++++++- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/Documentation/x86/resctrl.rst b/Documentation/x86/resctrl.rst index 058257dc56c8..58b76fc75cb7 100644 --- a/Documentation/x86/resctrl.rst +++ b/Documentation/x86/resctrl.rst @@ -292,13 +292,18 @@ 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 assigned together in one command by + inputting the tasks separated by commas. Tasks will be assigned + sequentially in the order it is provided. Failure while assigning + the tasks will be aborted immediately and tasks next in the + sequence will not be assigned. Users may need to retry them again. + + 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 group. The task is removed from any previous MON group. =20 - "cpus": Reading this file shows a bitmask of the logical CPUs owned by this group. Writing a mask to this file will add and remove diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index e2c1599d1b37..13b7c5f3a27c 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -683,16 +683,34 @@ 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) + /* Valid input requires a trailing newline */ + if (nbytes =3D=3D 0 || buf[nbytes - 1] !=3D '\n') return -EINVAL; + + buf[nbytes - 1] =3D '\0'; + rdtgrp =3D rdtgroup_kn_lock_live(of->kn); if (!rdtgrp) { rdtgroup_kn_unlock(of->kn); return -ENOENT; } + +next: + if (!buf || buf[0] =3D=3D '\0') + goto unlock; + + pid_str =3D strim(strsep(&buf, ",")); + + if (kstrtoint(pid_str, 0, &pid) || pid < 0) { + rdt_last_cmd_puts("Invalid pid value\n"); + ret =3D -EINVAL; + goto unlock; + } + rdt_last_cmd_clear(); =20 if (rdtgrp->mode =3D=3D RDT_MODE_PSEUDO_LOCKED || @@ -703,6 +721,10 @@ static ssize_t rdtgroup_tasks_write(struct kernfs_open= _file *of, } =20 ret =3D rdtgroup_move_task(pid, rdtgrp, of); + if (ret) + goto unlock; + else + goto next; =20 unlock: rdtgroup_kn_unlock(of->kn); From nobody Sat Sep 13 11:17:15 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 DDFC2C05027 for ; Thu, 2 Feb 2023 21:47:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229881AbjBBVrV (ORCPT ); Thu, 2 Feb 2023 16:47:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229712AbjBBVrT (ORCPT ); Thu, 2 Feb 2023 16:47:19 -0500 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2069.outbound.protection.outlook.com [40.107.92.69]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 905EB8626C; Thu, 2 Feb 2023 13:47:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kGN7EAbVJNPLRV9stZy6ECmNrqQt/0HvwIueOlBC+hIzQNCGXejZ7XXz0+4f7rBngq8N6gK9oIbhO8RHaERJZuIbr3+TrIgvvJ5jtewRBsOXoqEqOe8JR2fY/cFkRzioEmiCKg04/LHuWLU1eYXeL1GS+SNE0fvfUCkmj0YM+3J+u+lpQXcRUgkGo8NmLxeHsDHb2KGUaHFKCqbxBz9mGhBkFYm+olaySXrO2htO5dQefJiJ7z4//ZFmSTDVgd4uGrUHtyKa7ZxnS1GoPhjvDlRM2HVrqoFCP+/3cfbmBZmVQKez+/wTWssRJrW02ilNJDJUy74Favv7NbR3+zDUtw== 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=gBTajpA0WH7bgpLB6DtWgGNNgryYV5eQZMQu51zpt5Q=; b=fhHV9gZXNOBRYcpfiNMzIoWuUm2sV54XdrvYXeURaPTdVMx4NAmI4dt6JR94t0Tr9jhSX3Y8bupnKGYsDR4JurOF87dA7BmUoHyW/T7m/2F9Sz+6+0nI3+G+dY2zk0wViPJA6SvYIWiV1mth1nB6Hr9dOJgFh9xkefn/BQXUG+0LhY1Mh9KpjPCzHUk2To2gniH9m/7/O8yv0/Qf9IrWSRERV6asfaEEXG6rGyiMaUXBnN4bMmqrBdmwMpqigqqrBtPWUWHLDR6dLjec9NdNoUCvizoIuDenBcv0ZWi/eGMElLXLHafjkD4d/45ZYc20axgjyb/Tep+0pPokW30SxA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=zytor.com 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=gBTajpA0WH7bgpLB6DtWgGNNgryYV5eQZMQu51zpt5Q=; b=OJQY0Rx5b2i+6LTBvv4rBtgu7Nn8XwVv4fQSaSUvgUxz7uU/laqLq1C8cRaH6UpedWfxVLxujdspq8INwC9BecgUg/MIbQgMXsnn/rtIJT7FW2GwMa4RbCLaClyRqxuckY/9JIBaXzMXwx3kdnhKIaveFlQd6cx1HbMQTBXRv2I= Received: from BYAPR03CA0032.namprd03.prod.outlook.com (2603:10b6:a02:a8::45) by CY8PR12MB7122.namprd12.prod.outlook.com (2603:10b6:930:61::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.22; Thu, 2 Feb 2023 21:47:08 +0000 Received: from CO1PEPF00001A64.namprd05.prod.outlook.com (2603:10b6:a02:a8:cafe::56) by BYAPR03CA0032.outlook.office365.com (2603:10b6:a02:a8::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.27 via Frontend Transport; Thu, 2 Feb 2023 21:47:08 +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 CO1PEPF00001A64.mail.protection.outlook.com (10.167.241.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6064.17 via Frontend Transport; Thu, 2 Feb 2023 21:47:07 +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.2375.34; Thu, 2 Feb 2023 15:47:06 -0600 Subject: [RFC v2 PATCH 2/7] x86/resctrl: Remove few unnecessary rftype flags From: Babu Moger To: , CC: , , , , , , , , , , , Date: Thu, 2 Feb 2023 15:47:00 -0600 Message-ID: <167537442064.647488.11274211283317010424.stgit@bmoger-ubuntu> In-Reply-To: <167537433143.647488.9641864719195184123.stgit@bmoger-ubuntu> References: <167537433143.647488.9641864719195184123.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: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF00001A64:EE_|CY8PR12MB7122:EE_ X-MS-Office365-Filtering-Correlation-Id: ae607a50-c2ed-486a-1bbf-08db05670834 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QFU9+XLh02dT1QRSDFnKL8fOYFlDvkUYtpRJinDQv2vq058r6lVcyKmpT66GdW9LZhYVquQ8jf7v2LrGKOc7yQA/Q+v3cS3cszY/aQGeDNHrCQ45kqViqYUec56m0imS4n6FwWxpNXO6WBOdJEWZ5KR04nH9CbKCrFnrhvNO0GqK4/A+dgFpkZsagb39QT5GSdTMi08XkJFEpuxp4cHSHzsVAR0pFQ7NZMKlXQ1XVVIxEM9n6uFcpB2cNcksTP1ns+tAl/T0US5RKmoTScGWX18yEzmI4ZvyISDS2OxHJdm+d02YGVRfKi0sm/1Wyh67xJCB6anmVVpfqSlXZ+K0X+d+/aEQ58GW5yl8aWN1MKBSIqBOCAhBUjk4IsAkGol3SW77vVyP9oFnMb4AggnO/QwHk2RGV67xJ0eiKxiNRqNTo6l7p3eOpha+WdkA7jS3CSex2SYAUFgTIERatYEvm8NDRZq9yYvsUJnD8w3DwhgxTmFALp0Mml3Lmoge9GfFIrd8LF2UrZRXFAqWfsNNWz7ddPIn4UWbPlGobxUdz0FEVQPYjctbBF1Uocz9wVSnPDY/yYE3AEYMfe+EQFaS0sUtZPaPIipvIS3nWYWcwqEdesQLQvk72repGEVBl2pbYuF3YQlbCvGOodpQtAn+JZ7fqftJb4nIrtmLuxjBxyO777AkLUqUYkg/k6iFnuhjOaSKGzPL/hCtzK9OGSqIDrJUydQ5kDONlBusKBU+h371Ju3x2xUE//4p3NTi4RUnEJ6ba/V8gL2fVFCRRIg1KA== 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:(13230025)(4636009)(7916004)(376002)(39860400002)(136003)(346002)(396003)(451199018)(46966006)(36840700001)(40470700004)(103116003)(81166007)(86362001)(82310400005)(356005)(83380400001)(6666004)(186003)(82740400003)(36860700001)(33716001)(336012)(426003)(9686003)(47076005)(26005)(16526019)(44832011)(316002)(2906002)(478600001)(110136005)(54906003)(8676002)(40480700001)(70586007)(16576012)(4326008)(70206006)(7416002)(5660300002)(41300700001)(40460700003)(8936002)(71626013)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2023 21:47:07.8897 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ae607a50-c2ed-486a-1bbf-08db05670834 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: CO1PEPF00001A64.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7122 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove few unnecessary rftype flags and simplify the code. This is done to further cleanup the code eventually. Signed-off-by: Babu Moger --- arch/x86/kernel/cpu/resctrl/internal.h | 9 +++------ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 10 +++++++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/r= esctrl/internal.h index 8edecc5763d8..571145d75d29 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 13b7c5f3a27c..cccf3fb84b26 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -3163,7 +3163,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *pare= nt_kn, { struct rdtgroup *prdtgrp, *rdtgrp; struct kernfs_node *kn; - uint files =3D 0; + uint fflags =3D 0; int ret; =20 prdtgrp =3D rdtgroup_kn_lock_live(parent_kn); @@ -3215,8 +3215,12 @@ static int mkdir_rdt_prepare(struct kernfs_node *par= ent_kn, goto out_destroy; } =20 - files =3D RFTYPE_BASE | BIT(RF_CTRLSHIFT + rtype); - ret =3D rdtgroup_add_files(kn, files); + if (rtype =3D=3D RDTCTRL_GROUP) + fflags =3D RFTYPE_BASE | RFTYPE_CTRL; + else + fflags =3D RFTYPE_BASE | RFTYPE_MON; + + ret =3D rdtgroup_add_files(kn, fflags); if (ret) { rdt_last_cmd_puts("kernfs fill error\n"); goto out_destroy; From nobody Sat Sep 13 11:17:15 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 E665EC05027 for ; Thu, 2 Feb 2023 21:47:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233002AbjBBVra (ORCPT ); Thu, 2 Feb 2023 16:47:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229712AbjBBVr0 (ORCPT ); Thu, 2 Feb 2023 16:47:26 -0500 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2073.outbound.protection.outlook.com [40.107.220.73]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BCBF86615; Thu, 2 Feb 2023 13:47:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JKFKqhaPmyEliPWHszF7EmlUiWTSMqRi9YrKNOqoWYo1Hrc1w4OMNlRV+D98I1lYDbRHQDOB8u3eIbL71sk2fKQjdFcZ4/TsP1qdzYyRf3rK1tQFXT62nwzmP+QLBdpah7m1ohBTYDuvbu38aVTMCKc0X5jYEB+iNY+IE/CXHkDY9Q2+NVWtzVhX4IqnZSuP8LOwhujmvwtd30Bi7DepOIz2yRKiiAdeSB91PQ8R1WC0es568+g5ifg1i7MsEb2FiehRFWmnj820MvpmTbq9F86jwvaCKEPJVMLqlPyjTFn4stQzWT9lxjZKnRgQwwEErwKHvhWICA3jNfqUtack1g== 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=1ovAuZpiTt1LtCVS4njkKI3b17HTdRLm1SUu+c4lkvo=; b=Zuht6BLAk13NPPdiAB0Tbym3GcAd/eWb/qkz5rboeWLqEBvD1DIo9IM/v+jKLZU1aG4OReg7cdCCPpEVVFR1joRvK45TptcYEANsxa9o4Tum/em5T8E/P8/RQmzQQrDf2L0GlkdE4nw4JuEYOPFUnzJHAyU4u1pEDCc99NYC0fGtaGE10jk84F2K/kzDyKsMc2DJ18tOCHlqSmL/hbGRgoVxMpg1NNn/wetsvgk/bGqscdU60KlwK6H/+ndxxAgvupZPUjwTdXakqwYJ0YAEDUhkwhO7Ot2vxPCFiD6f+4z+KKTi4BERKZ7qYAhEzqjEZnQ8rYnv4kQqgVLW1+Ebcw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=zytor.com 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=1ovAuZpiTt1LtCVS4njkKI3b17HTdRLm1SUu+c4lkvo=; b=nNUl5Jh9samnXi9aSO2ZtBhJlIptZ0Gyd4lCapvxmxiHqowuMZQT7FfjKpUSXrwV3z2FKy1nhaV3QBfkyojjfdjvQrDtCEsnibUrRst56ds+LC3Gml8IIKLKZKcvfbf/rohgueXBnDWQwBToHZFIvh2PCa1kZtUGEX7YYsn3HhI= Received: from MW2PR2101CA0007.namprd21.prod.outlook.com (2603:10b6:302:1::20) by DM8PR12MB5479.namprd12.prod.outlook.com (2603:10b6:8:38::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.24; Thu, 2 Feb 2023 21:47:14 +0000 Received: from CO1PEPF00001A60.namprd05.prod.outlook.com (2603:10b6:302:1:cafe::64) by MW2PR2101CA0007.outlook.office365.com (2603:10b6:302:1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.7 via Frontend Transport; Thu, 2 Feb 2023 21:47:14 +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 CO1PEPF00001A60.mail.protection.outlook.com (10.167.241.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6064.21 via Frontend Transport; Thu, 2 Feb 2023 21:47:14 +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.2375.34; Thu, 2 Feb 2023 15:47:12 -0600 Subject: [RFC v2 PATCH 3/7] x86/resctrl: Rename rftype flags for consistency From: Babu Moger To: , CC: , , , , , , , , , , , Date: Thu, 2 Feb 2023 15:47:12 -0600 Message-ID: <167537443207.647488.2343865571652545811.stgit@bmoger-ubuntu> In-Reply-To: <167537433143.647488.9641864719195184123.stgit@bmoger-ubuntu> References: <167537433143.647488.9641864719195184123.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: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF00001A60:EE_|DM8PR12MB5479:EE_ X-MS-Office365-Filtering-Correlation-Id: 40599279-a371-4446-dc3d-08db05670c09 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lUH6fObmYkzPpjUlqdyHrEZfQ4YOEN068tMe46qu3LqZI2ZzFIA+jX7XHA13b4/IRNUKUsKKFRdj08C9Tz4Yf7GP5TTYOwiqGFvNmlv6Ggm83RMLDhoYjZncwwQYldbPd1P4h0gvIe8+Dgtb1mlE+pXDHQXWshqnjtT1r9BUbGWH9HZfjd8aYYyNWzWz4zYFunEo9zssXQylZIT/BBpH+C6ZchNTn4IPU2eYOEcwpvy2/Rupc7AGadBvRyo0hn7m5qtIweH93jfnb122m8na42rEpcYD73SZrSyfqkjhU5+3awNJYJMkaJsb8bWRH/9oDEFKHqPAWepfBxAsI0T/u93DfGK3d0S9umCZU4oqrp+OMqqFfZ7RlCPwKNgH6Gf2RyqUuGXD/fse9eWLRgH1lKVQTiYFPMhrtLJzEgCXO8hzc8y17w/58ysytee7eHpMPJroV4xBogIsnWCPa+wjfsOdODXNfRfv0KK10VQ1UqXV94CsohJKAPHoBgpbmkSuZXxCT50a4vm2oSYpCQ4MRy51d0j2dkSQ77KsGmioGff52N3MceplmACjRUgr4r0makV9YIKYIu+M9csXcdCXEVonIoR4qxnL5CHJM/o6SJAExanuGeT4SllndcZ3Y45nHLa1rIT/8IYPXcvXetfb6M9gmEBLUDTfFNoZn4T4vqUCiEj8WsnZP9n4Xd+5vqLsQguG+kLQNOrNcGG9B0O3V2pqjgNMGmPpW/uaarhbs6LF0dVJftKf1hSzDr7S1DWit18MAdTjo2HzUqNnreuKzw== 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:(13230025)(7916004)(4636009)(396003)(346002)(376002)(39860400002)(136003)(451199018)(46966006)(40470700004)(36840700001)(47076005)(356005)(81166007)(82310400005)(103116003)(86362001)(40460700003)(40480700001)(36860700001)(82740400003)(33716001)(16576012)(44832011)(5660300002)(54906003)(110136005)(316002)(2906002)(4326008)(8676002)(41300700001)(70586007)(70206006)(7416002)(9686003)(16526019)(26005)(8936002)(83380400001)(336012)(478600001)(426003)(186003)(71626013)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2023 21:47:14.3081 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 40599279-a371-4446-dc3d-08db05670c09 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: CO1PEPF00001A60.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR12MB5479 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The rftype flags have two different prefixes even though they are used for the same purpose. Change the prefix to RFTYPE_ for all the flags. Signed-off-by: Babu Moger --- arch/x86/kernel/cpu/resctrl/internal.h | 8 +++--- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 42 ++++++++++++++++------------= ---- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/r= esctrl/internal.h index 571145d75d29..2cfc3c431d5b 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; diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index cccf3fb84b26..018a26b58154 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -1691,77 +1691,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 @@ -1780,7 +1780,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", @@ -1827,7 +1827,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", @@ -1835,14 +1835,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 }; @@ -1899,7 +1899,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) @@ -1908,7 +1908,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 /** @@ -2043,21 +2043,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) @@ -3554,7 +3554,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 Sat Sep 13 11:17:15 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 E14D6C636D7 for ; Thu, 2 Feb 2023 21:47:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229712AbjBBVro (ORCPT ); Thu, 2 Feb 2023 16:47:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233046AbjBBVrk (ORCPT ); Thu, 2 Feb 2023 16:47:40 -0500 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2068.outbound.protection.outlook.com [40.107.101.68]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5097686255; Thu, 2 Feb 2023 13:47:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mncR11tgbfKFNANlf+TVIgr7WmgBdr2BKbJVa0lMrpNktfyNCkQ3d2zF95spYPx9cHUtc4vAOHbfqK91/tTkG1TQe8YCscokahbTA3xBcoSTyywV8miyynsodpL9IKd1SUh2DVQ4NDcMRn0R3X2oH+KGmeCwy4gxcmaRIWRf8jFfNQ+DgOpbdvsyZauQXnsBI99CeEnrpLfvaIxCmhGyVp8vYbBgA1FWyGB34B6sJAZlW2Z/eOKRQNjy3FPI5gncj793AQjYzaMaDsXXmE/dBnJvh1nuFaNMDcECao48/gBmA1DonBFUdzjjN+tHDkWeWMxDzd7g7MYTSebNBmsEYw== 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=bnAN7k5e6XsUD4VWgunnxWbcjaSIjDkBs/wXuwv16Tg=; b=jNwwj41I3rMFrYuulGI9PWQj4n0ileSICUsmalDcvbR+KHv8PVDYExrWQYpqinRYYAj4cAu2ethDI80a335pPO7ha7frBFFEkHy7FrmkViIN1rCZBgiyXBo7sgvGLkj/G61W7RXJX0zhaDEfw4BZ2n4GlAOExnPM76Xd4S5WwVaOkgbVr8jRkHuzLq3DguzhW65A+uZTLDyryc8jxSYnPo9n0xgy2fx+59yfxX7er5hZepl0huXFdi6K8oaL04grgMlSC5byyHiOKWAlJOZ0piU3kyhJOUUU40SPacEcg+eV0lHIJVbm2LfwDP+u+9qAGQMHlIcDbpDQG7lneHdBMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=zytor.com 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=bnAN7k5e6XsUD4VWgunnxWbcjaSIjDkBs/wXuwv16Tg=; b=x7GXY/hJx58jFEC3+yq+hcRLXRPpdhzvxt/C6vVrL3+/xrbwMzlWHe3EIK2XXrWUMPpuGPYMoiounMQC/4/04bRIkwua6sFJRh5GiMUifSPiPnKAhpP7ufNo5WKvRbfmWtgWdT8L3SrW1lITi/xTlkLC9UhGSJRledHcjDx75TQ= Received: from BY5PR16CA0013.namprd16.prod.outlook.com (2603:10b6:a03:1a0::26) by MW4PR12MB7484.namprd12.prod.outlook.com (2603:10b6:303:212::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.27; Thu, 2 Feb 2023 21:47:21 +0000 Received: from CO1PEPF00001A5E.namprd05.prod.outlook.com (2603:10b6:a03:1a0:cafe::88) by BY5PR16CA0013.outlook.office365.com (2603:10b6:a03:1a0::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.25 via Frontend Transport; Thu, 2 Feb 2023 21:47:20 +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 CO1PEPF00001A5E.mail.protection.outlook.com (10.167.241.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6064.17 via Frontend Transport; Thu, 2 Feb 2023 21:47:20 +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.2375.34; Thu, 2 Feb 2023 15:47:19 -0600 Subject: [RFC v2 PATCH 4/7] x86/resctrl: Re-arrange RFTYPE flags based on hierarchy From: Babu Moger To: , CC: , , , , , , , , , , , Date: Thu, 2 Feb 2023 15:47:18 -0600 Message-ID: <167537443852.647488.1158619967633364811.stgit@bmoger-ubuntu> In-Reply-To: <167537433143.647488.9641864719195184123.stgit@bmoger-ubuntu> References: <167537433143.647488.9641864719195184123.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: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF00001A5E:EE_|MW4PR12MB7484:EE_ X-MS-Office365-Filtering-Correlation-Id: bfaeb5af-5729-4522-1f5d-08db05670fc9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vecUbxAoJeBL57azhKk4h5NvhSyizgIBjOBR9GvLqot6tEhmUpmzFq6mFkP3WpuORJHntHFV3FrlWxeDsFQY6BN9SqZiCE+bGzOR++HUcwfawS8Lu0hqtF6z5WN9WhHiid+HQkY3SQ3hgC/rkN8gVkgYcDdTvDGeb3DzhZyXpsNDin2X1n/9PO9IIk4oRx1LqKeKDwGCdgBn0KRgh6uwB5S+mRDJlqNM92B0lTc2jsE94N8vpWyAj5T2zLSx0NF5XOVFW2MlC+BQJk7engQh/hDjhTc6PvoYnFEFEqmAP04ljVkD8Ga6GvF6uv3epnXb/yvE60N/I5DH820+lffmVkWBeA+1lE/oalC/xq4TgmdmAAgvUf5GYA+zlHE630RJe30StM62gOnm+63CHBpjDfZDCbriAJoTiHPSoK17BbrbmmyPofYlv03727vPUC+Av7PnT7nZR/K7mKtpa30Um95URe+tvpWT/gaX5EktzFAYMkWE7/K8ny8qrBrFk6lfpOz9ToTb6tgzmSdF6TEDturAA5tVICUQMrdhorcYo/zk6TcNiqiSWabt0iznsfBUNHf2ex6FYKXTvm9rtzZSYbob2cndEnRAPng/WmA5LdJI6hNIprDeGZRUkM2kGN00uEEQrlJSMDN02ESqQgUXJqU0JX4WTY0nTcausDWu6Pes/7A6nQxIkMLVaG12pqWui01bddiZDb+KcmlZ8nmkUeM6ImdpIvoi4WDP9XudfpEoMUgcgleGhWkbHlwuTHJ25/ow5CU+yA3ECUWySHlxQQ== 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:(13230025)(4636009)(7916004)(376002)(39860400002)(346002)(396003)(136003)(451199018)(40470700004)(46966006)(36840700001)(82740400003)(426003)(44832011)(40460700003)(8936002)(478600001)(336012)(83380400001)(33716001)(186003)(26005)(103116003)(16526019)(70586007)(110136005)(4326008)(7416002)(316002)(41300700001)(16576012)(8676002)(70206006)(2906002)(5660300002)(9686003)(54906003)(86362001)(40480700001)(47076005)(82310400005)(36860700001)(356005)(81166007)(71626013)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2023 21:47:20.6103 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bfaeb5af-5729-4522-1f5d-08db05670fc9 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: CO1PEPF00001A5E.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7484 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org RESCTRL filesystem has two main components: a. info (Details on resources and monitoring) b. base (Details on CONTROL and MON groups) The rftype flags can be renamed accordingly for better understanding. For example: RFTYPE_INFO : Files with these flags go in info directory RFTYPE_INFO_MON : Files with these flags go in info/L3_MON RFTYPE_BASE : Files with these flags go in group's(control or mon) base directory RFTYPE_BASE_CTRL: Files with these flags go in only CONTROL groups Add comments to make it easy for future additions. Signed-off-by: Babu Moger --- arch/x86/kernel/cpu/resctrl/core.c | 8 ++-- arch/x86/kernel/cpu/resctrl/internal.h | 64 ++++++++++++++++++++++++++++= ---- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 42 +++++++++++---------- 3 files changed, 80 insertions(+), 34 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resct= rl/core.c index 030d3b409768..d1c6b2cc8611 100644 --- a/arch/x86/kernel/cpu/resctrl/core.c +++ b/arch/x86/kernel/cpu/resctrl/core.c @@ -69,7 +69,7 @@ struct rdt_hw_resource rdt_resources_all[] =3D { .domains =3D domain_init(RDT_RESOURCE_L3), .parse_ctrlval =3D parse_cbm, .format_str =3D "%d=3D%0*x", - .fflags =3D RFTYPE_RES_CACHE, + .fflags =3D RFTYPE_CACHE, }, .msr_base =3D MSR_IA32_L3_CBM_BASE, .msr_update =3D cat_wrmsr, @@ -83,7 +83,7 @@ struct rdt_hw_resource rdt_resources_all[] =3D { .domains =3D domain_init(RDT_RESOURCE_L2), .parse_ctrlval =3D parse_cbm, .format_str =3D "%d=3D%0*x", - .fflags =3D RFTYPE_RES_CACHE, + .fflags =3D RFTYPE_CACHE, }, .msr_base =3D MSR_IA32_L2_CBM_BASE, .msr_update =3D cat_wrmsr, @@ -97,7 +97,7 @@ struct rdt_hw_resource rdt_resources_all[] =3D { .domains =3D domain_init(RDT_RESOURCE_MBA), .parse_ctrlval =3D parse_bw, .format_str =3D "%d=3D%*u", - .fflags =3D RFTYPE_RES_MB, + .fflags =3D RFTYPE_MB, }, }, [RDT_RESOURCE_SMBA] =3D @@ -109,7 +109,7 @@ struct rdt_hw_resource rdt_resources_all[] =3D { .domains =3D domain_init(RDT_RESOURCE_SMBA), .parse_ctrlval =3D parse_bw, .format_str =3D "%d=3D%*u", - .fflags =3D RFTYPE_RES_MB, + .fflags =3D RFTYPE_MB, }, }, }; diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/r= esctrl/internal.h index 2cfc3c431d5b..6767c85b9699 100644 --- a/arch/x86/kernel/cpu/resctrl/internal.h +++ b/arch/x86/kernel/cpu/resctrl/internal.h @@ -240,18 +240,64 @@ 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 (Displays information about control and monitoring) + * | + * --> base (Displays the details on resctrl groups) + * + * ------------------------------------------------------------- + * info directory structure + * --> INFO + * --> TOP + * last_cmd_status + * + * --> MON + * --> (L2_MON) + * --> (L3_MON) + * max_threshold_occupancy, mbm_local_bytes_config, + * mbm_total_bytes_config, mon_features, num_rmids + * + * --> RES + * --> CACHE (L2, L3) + * bit_usage, cbm_mask, min_cbm_bits, num_closids, + * shareable_bits + * + * --> MB (MB, SMBA) + * bandwidth_gran, delay_linear, min_bandwidth, + * num_closids + * + * group structure + * ----------------------------------------------------------- + * --> BASE (Files common for both MON and CTRL groups) + * cpus, cpus_list, tasks + * + * --> CTRL (Files only for CTRL group) + * mode, schemata, size + * */ #define RFTYPE_INFO BIT(0) #define RFTYPE_BASE BIT(1) -#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 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) + +#define RFTYPE_TOP BIT(2) +#define RFTYPE_MON BIT(3) +#define RFTYPE_RES BIT(4) + +#define RFTYPE_CACHE BIT(5) +#define RFTYPE_MB BIT(6) + +#define RFTYPE_CTRL BIT(8) + +#define RFTYPE_INFO_TOP (RFTYPE_INFO | RFTYPE_TOP) +#define RFTYPE_INFO_MON (RFTYPE_INFO | RFTYPE_MON) +#define RFTYPE_INFO_RES (RFTYPE_INFO | RFTYPE_RES) + +#define RFTYPE_BASE_CTRL (RFTYPE_BASE | RFTYPE_CTRL) =20 /* List of all resource groups */ extern struct list_head rdt_all_groups; diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index 018a26b58154..18d458a3cba6 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -1691,77 +1691,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 RFTYPE_TOP_INFO, + .fflags =3D RFTYPE_INFO_TOP, }, { .name =3D "num_closids", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdt_num_closids_show, - .fflags =3D RFTYPE_CTRL_INFO, + .fflags =3D RFTYPE_INFO_RES, }, { .name =3D "mon_features", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdt_mon_features_show, - .fflags =3D RFTYPE_MON_INFO, + .fflags =3D RFTYPE_INFO_MON, }, { .name =3D "num_rmids", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdt_num_rmids_show, - .fflags =3D RFTYPE_MON_INFO, + .fflags =3D RFTYPE_INFO_MON, }, { .name =3D "cbm_mask", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdt_default_ctrl_show, - .fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE, + .fflags =3D RFTYPE_INFO_RES | RFTYPE_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 RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE, + .fflags =3D RFTYPE_INFO_RES | RFTYPE_CACHE, }, { .name =3D "shareable_bits", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdt_shareable_bits_show, - .fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE, + .fflags =3D RFTYPE_INFO_RES | RFTYPE_CACHE, }, { .name =3D "bit_usage", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdt_bit_usage_show, - .fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE, + .fflags =3D RFTYPE_INFO_RES | RFTYPE_CACHE, }, { .name =3D "min_bandwidth", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdt_min_bw_show, - .fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_MB, + .fflags =3D RFTYPE_INFO_RES | RFTYPE_MB, }, { .name =3D "bandwidth_gran", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdt_bw_gran_show, - .fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_MB, + .fflags =3D RFTYPE_INFO_RES | RFTYPE_MB, }, { .name =3D "delay_linear", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdt_delay_linear_show, - .fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_MB, + .fflags =3D RFTYPE_INFO_RES | RFTYPE_MB, }, /* * Platform specific which (if any) capabilities are provided by @@ -1780,7 +1780,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 RFTYPE_MON_INFO | RFTYPE_RES_CACHE, + .fflags =3D RFTYPE_INFO_MON | RFTYPE_CACHE, }, { .name =3D "mbm_total_bytes_config", @@ -1827,7 +1827,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 RFTYPE_CTRL_BASE, + .fflags =3D RFTYPE_BASE_CTRL, }, { .name =3D "mode", @@ -1835,14 +1835,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 RFTYPE_CTRL_BASE, + .fflags =3D RFTYPE_BASE_CTRL, }, { .name =3D "size", .mode =3D 0444, .kf_ops =3D &rdtgroup_kf_single_ops, .seq_show =3D rdtgroup_size_show, - .fflags =3D RFTYPE_CTRL_BASE, + .fflags =3D RFTYPE_BASE_CTRL, }, =20 }; @@ -1899,7 +1899,7 @@ void __init thread_throttle_mode_init(void) if (!rft) return; =20 - rft->fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_MB; + rft->fflags =3D RFTYPE_INFO_RES | RFTYPE_MB; } =20 void __init mbm_config_rftype_init(const char *config) @@ -1908,7 +1908,7 @@ void __init mbm_config_rftype_init(const char *config) =20 rft =3D rdtgroup_get_rftype_by_name(config); if (rft) - rft->fflags =3D RFTYPE_MON_INFO | RFTYPE_RES_CACHE; + rft->fflags =3D RFTYPE_INFO_MON | RFTYPE_CACHE; } =20 /** @@ -2043,21 +2043,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, RFTYPE_TOP_INFO); + ret =3D rdtgroup_add_files(kn_info, RFTYPE_INFO_TOP); 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 | RFTYPE_CTRL_INFO; + fflags =3D r->fflags | RFTYPE_INFO_RES; 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 | RFTYPE_MON_INFO; + fflags =3D r->fflags | RFTYPE_INFO_MON; sprintf(name, "%s_MON", r->name); ret =3D rdtgroup_mkdir_info_resdir(r, name, fflags); if (ret) @@ -3554,7 +3554,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); + ret =3D rdtgroup_add_files(kernfs_root_to_node(rdt_root), RFTYPE_BASE_CTR= L); if (ret) { kernfs_destroy_root(rdt_root); goto out; From nobody Sat Sep 13 11:17:15 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 38E62C05027 for ; Thu, 2 Feb 2023 21:47:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233084AbjBBVrs (ORCPT ); Thu, 2 Feb 2023 16:47:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233067AbjBBVrk (ORCPT ); Thu, 2 Feb 2023 16:47:40 -0500 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2053.outbound.protection.outlook.com [40.107.102.53]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A633163857; Thu, 2 Feb 2023 13:47:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dBzGt556nL+fzq9a1EeDbOxN2Qiog/IcIor/DypOV8Tmr9MXY3j6qvEcS1cnivMz5Td6uRbayQh0Sa81U/AZZQGq33w0N8w0JD9Fk32bM0GplxCIsJzkkjRJT/sNhlUXnF+E0rqG1aDboI68d0sUee5VrC/eJH4r2sWiqu2s/QndWYBY2XH1fxHMR1FIeZatLaVvZva0oCzOz/szQjXhFkcr3fEkkxNpmL3AuqBw3FIqeYdivXtlOPfiRXcgJWUFXjvFY3QpLsdrw/FRSErzyARjTWKb6I4xgmOKYhugFjfLh6Jnudm0KI0O0Plonvls/YEW8y2AAKk2d0QBpJGzLA== 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=VYuMDmsod6qrAXR4MZtDY2ef7GMEydcm5u/0TIGk89I=; b=J+/JyF5qC04kKYgsDR6uttYncnMbVNaxJgtkFUXq8BIznqdS5bUEUV3OJIRQnCRvd6lEoS7VDIfuIw1asTojVQzIfwCKZ+vDjXHlZ7fNwgJgTCW0uv3HXXtiq3WfOeYrSKMy8uucjbcmV92i/1tXmIiUbm28d3uWPcJA21fHXOuBSBaOs7VKq0E7m7XMgvhaAdYJYjigTpWt/CEIwmf+efQP7XjT9VYm6apSlNhRqmifuLS7KCgp90PNwKEeorl24VOmdYQoXIs9ENMKvXKUX6xSbcaPjffR3Pyz4cSm5PFiP5WaUq/eFUJi57Ju4gOM1zt1Szm35sQYT/aNxzNeDA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=zytor.com 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=VYuMDmsod6qrAXR4MZtDY2ef7GMEydcm5u/0TIGk89I=; b=Hfqc8VibCgEQ/uh04P5hEB00bKsWBd6XFvmIdiCaDziSYeBalisRsbxODyy8OZcRVQVtpnMsVxmubOiaa7Kl6uqZAl20JytVGyP/7NUX44LphmQiYYIlQ3WSTUwhKMFtrsLlSH7aZuUuhBKPgnd4TCc+Ig5rCtK4KpYksa2mesY= Received: from MW4P222CA0015.NAMP222.PROD.OUTLOOK.COM (2603:10b6:303:114::20) by LV2PR12MB6016.namprd12.prod.outlook.com (2603:10b6:408:14e::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36; Thu, 2 Feb 2023 21:47:27 +0000 Received: from CO1PEPF00001A63.namprd05.prod.outlook.com (2603:10b6:303:114:cafe::f9) by MW4P222CA0015.outlook.office365.com (2603:10b6:303:114::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.23 via Frontend Transport; Thu, 2 Feb 2023 21:47:27 +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 CO1PEPF00001A63.mail.protection.outlook.com (10.167.241.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6064.20 via Frontend Transport; Thu, 2 Feb 2023 21:47:26 +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.2375.34; Thu, 2 Feb 2023 15:47:25 -0600 Subject: [RFC v2 PATCH 5/7] x86/resctrl: Introduce -o debug mount option From: Babu Moger To: , CC: , , , , , , , , , , , Date: Thu, 2 Feb 2023 15:47:24 -0600 Message-ID: <167537444491.647488.11815488030989406143.stgit@bmoger-ubuntu> In-Reply-To: <167537433143.647488.9641864719195184123.stgit@bmoger-ubuntu> References: <167537433143.647488.9641864719195184123.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: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF00001A63:EE_|LV2PR12MB6016:EE_ X-MS-Office365-Filtering-Correlation-Id: 4ac4023d-c985-4fa9-1185-08db0567138f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Snn7oB1VtKuVQU/2DodpY1ynsi9NWhAEuW/jhLxrPDG14dJwVFOLz1CT2Z5ILdaG49vQkaDFr+1x2q/kyfUheE3GNnsdfQjc7RLuQbzSVaXu0zlsh1A+J68gZsPPkI3DS1QWYJjy+sFiPjFLPTLgeGZ0FWgh/9V8OzrJMdddGd+hLmJT3T8QBf+QSo7xesEI6JvncnmLs190KVmuPqc6cHdOPpNOXgGWOPE/tSL5w7J0MAFNQQLGWS3P82IkESQACCFpmWNvSwQK5iX9+O0Z3nWCVKd0TTEBlaAnqtNdsjoQGQpt7CKObhXdEpkSPef6TdMgDxuNgnKVyhvd8c/MRbIHxNjvgfHQ6tjwJtIw9gdIxBTnnZNKtUclQ4FTNYsxd0AvT5OmBQA9FMeSw+5bUju30pf5Np3ATsDtesflnR2gnPlBlisgcs3JgQsvNm8VqCvTNva5C8wuIVOqTaqIiNIMi4JE463BYUvpKnw1B3/uA/s2WHM4uZWWpEuIw8PrsAnQibbQQKYg/pOupu6tDzBml42+Z/Io+2VKidBRBAbfJa3dS2uCFrP2jIdlg8MV7oG+6pKelClE4w77axGiOjFf+kFc9Ajx4u4d1YbAvO0VRIfpKrCuYTIkvJcEmxJrGSUJPs7WBmxK4uYZf8AaLdTSz5tnV5fREPewDtGx0rt/uehbavnmUvSV6We0bvMtKLyU+Pat4FIG/rRacIltWfxLsBMibN5EKJ3M6F0F2vC5hGp+F5TozWCJShLc+6hn7u5ltIChtUTifRAwOClpgw== 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:(13230025)(7916004)(4636009)(39860400002)(396003)(136003)(346002)(376002)(451199018)(46966006)(40470700004)(36840700001)(70586007)(4326008)(41300700001)(70206006)(8676002)(40480700001)(8936002)(16576012)(110136005)(316002)(5660300002)(54906003)(103116003)(44832011)(356005)(7416002)(186003)(81166007)(2906002)(9686003)(36860700001)(478600001)(40460700003)(16526019)(26005)(426003)(86362001)(82310400005)(47076005)(33716001)(82740400003)(336012)(71626013)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2023 21:47:26.9252 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4ac4023d-c985-4fa9-1185-08db0567138f 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: CO1PEPF00001A63.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB6016 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add -o debug option to mount resctrl filesystem in debug mode. Debug option adds the files for debug purposes. Signed-off-by: Babu Moger --- Documentation/x86/resctrl.rst | 2 ++ arch/x86/kernel/cpu/resctrl/internal.h | 1 + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 7 +++++++ 3 files changed, 10 insertions(+) diff --git a/Documentation/x86/resctrl.rst b/Documentation/x86/resctrl.rst index 58b76fc75cb7..2c013c5d45fd 100644 --- a/Documentation/x86/resctrl.rst +++ b/Documentation/x86/resctrl.rst @@ -46,6 +46,8 @@ mount options are: "mba_MBps": Enable the MBA Software Controller(mba_sc) to specify MBA bandwidth in MBps +"debug": + Lists the debug files in resctrl interface =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 6767c85b9699..35a9ee343fe0 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 debug; }; =20 static inline struct rdt_fs_context *rdt_fc2context(struct fs_context *fc) diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index 18d458a3cba6..9b7813aa6baf 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -2555,6 +2555,7 @@ enum rdt_param { Opt_cdp, Opt_cdpl2, Opt_mba_mbps, + Opt_debug, nr__rdt_params }; =20 @@ -2562,6 +2563,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 @@ -2587,6 +2589,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->debug =3D true; + return 0; } =20 return -EINVAL; @@ -3525,6 +3530,8 @@ 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 + seq_puts(seq, ",debug"); + return 0; } =20 From nobody Sat Sep 13 11:17:15 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 AF2A8C05027 for ; Thu, 2 Feb 2023 21:48:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232602AbjBBVsA (ORCPT ); Thu, 2 Feb 2023 16:48:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233048AbjBBVrn (ORCPT ); Thu, 2 Feb 2023 16:47:43 -0500 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2084.outbound.protection.outlook.com [40.107.237.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7DF78627D; Thu, 2 Feb 2023 13:47:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ENRfhL+H6Loax3Y7mMO1QQlXqFEZ7bgmpOP/lZsYbBNtl3WNNjjq0Cx/3Ajinu8jh5oIVIqSfL5o+vOEcKZgt1kEk/4tAhSi4Zc3M6bwGemARcKmSiB/d/+LflAvNCPHS3zCa6ntf73cOWNUEdwUUgMv4qTIa9sDt99QHNUrYQ2OwEYDB6c1eOeFdCLUs2BPqwxW2bazODV/3lwiVVyWcVDRNq85CfrYflQ6t567KdxzfTpmpu3kbOk9G+9MmLbyYx/zex2HmbUVFufYBmudjDhRMvP6C/k1fZpqlYKICF37enLjK7DFZ+Ped/1hKjRT/wrlooouOQGZEXmWUMLN0w== 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=0smFb+avJ9Wx8MwUlb3vlWOOpjCo4cU5/TxwWHUvKKU=; b=SO92bjjO9/tcZ4ZQVVoK0Fv+hA1oN4oTnwqP3waZrEkdY0n3tkDQqtjRGf9PG/1xwPjJA6raslJ5/g4/9pa/n37iLe2FpfLj5U+h6AjUwpz8Ac+3q5vfUfAuyDvOkesF3LS2i/8K59XCIZzgRh+n/gAKxzfYTKyNWrxnVvPw53Qu57VFq7CRWY5LuoG4MSzFqbKNrqLObms43t5wr4sjrOmbi/4WvpclieOsrn0L+QqdExye0Zv4XtaARAfHL7KAuntOnGS+YslPX7y486VTGO4PH3Bp2MW8/paE88ohi5I30AAf90dFYYnXNmWLpZT93eKpHqBGKX75DzthSx1glA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=zytor.com 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=0smFb+avJ9Wx8MwUlb3vlWOOpjCo4cU5/TxwWHUvKKU=; b=ALeSD0xRoaohhiNwy7yIUuXH8vCuvm2ZK9iv+Ms3x/5wIKQHosrvrKn0N9QhsfRhvOQ4iYqr6nKA+Z62IoJcswuEO0kKN26BO0KFPEc+/c4wowFkiP8sE3Fey6WGOQ/qMK4D7Utkedm2frCStmc8/4okqGbXtQV0elLrZh9oXRQ= Received: from MW2PR2101CA0007.namprd21.prod.outlook.com (2603:10b6:302:1::20) by MN0PR12MB5932.namprd12.prod.outlook.com (2603:10b6:208:37f::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.27; Thu, 2 Feb 2023 21:47:33 +0000 Received: from CO1PEPF00001A60.namprd05.prod.outlook.com (2603:10b6:302:1:cafe::a0) by MW2PR2101CA0007.outlook.office365.com (2603:10b6:302:1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.7 via Frontend Transport; Thu, 2 Feb 2023 21:47:33 +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 CO1PEPF00001A60.mail.protection.outlook.com (10.167.241.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6064.21 via Frontend Transport; Thu, 2 Feb 2023 21:47:33 +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.2375.34; Thu, 2 Feb 2023 15:47:31 -0600 Subject: [RFC v2 PATCH 6/7] x86/resctrl: Display the RMID and COSID for resctrl groups From: Babu Moger To: , CC: , , , , , , , , , , , Date: Thu, 2 Feb 2023 15:47:31 -0600 Message-ID: <167537445137.647488.9039585071837467840.stgit@bmoger-ubuntu> In-Reply-To: <167537433143.647488.9641864719195184123.stgit@bmoger-ubuntu> References: <167537433143.647488.9641864719195184123.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: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF00001A60:EE_|MN0PR12MB5932:EE_ X-MS-Office365-Filtering-Correlation-Id: 6ab6f7a6-91ef-40a5-60e3-08db0567178a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NPnuE0iPcCQTEWwTgu+oy4Jh+5Sa6R+vafp6fkgkdPdDZZgwAgjbDsBcmX2Ltuf9ke46yyPExxLcx86Gx3R0vlRYMMBjDjOVZ4c7ShpZ3rJmrhb0ywOcaRaauNs+fybIExHQ6Jjz4MTo6bsj3Tg5Y2/tl6QPd6PCnb1obdxQKeptaR71mTGVYX2t0fr5ZrmGq2cyY6rzfyCSN4PyT4c79HIUXMIaupTb9JMpam3EHbbpoUqsuZVKfXxSlEtWE5WgyyOewkp4z/PVTwdefj6MWlae/AROcWvdNCzZ+0f9x+3Ujm2LmyGYNjHkktcIq4n+AZb8sub2x4iYMzh0FDrSLOAPr+N+TBxtq4Ie7Y9OzJA/W6p70F7mHrQ4jJ+JyL8rG/+wvohYwPwr5eYw7+Xw3z2JzNU0Z+P5ZBZplS6NCxM7nco39Y/Tq4l8s32GBf3b0dVGhIeHFGqtjOdyit/yj4ps/ZcwSesLCVAGkle7Oda6XdOI0kxxW8YIedPYtFUJS3JAdtH6HTrkDk+FMmkFVSAQoCguNWM7/qn+Fn880/Vi9Wf+Dnnjn8CgM0CnNG/WlBph35qHhx+wB/jUvUlpD+ddAQiL+c0+W7/jI0dwjbYzA+9+g8+Pr2d5LDtp87JDWdytF7ZL6hlB3rSCDGa1ArFEIDYJ8xXqvOOIrTJjXaE5LwDtuWRgcPy60tzOpfn4hp0rRx+K8CmgOHMnknYJQ7u/rN3Y3rxBpYAW2OYlxfDYDX3tyNMkuR3hSI39ofSuAcwJpzOdUW2DnYXrFSN1FQ== 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:(13230025)(7916004)(4636009)(396003)(136003)(346002)(39860400002)(376002)(451199018)(46966006)(36840700001)(40470700004)(356005)(40480700001)(36860700001)(47076005)(82310400005)(81166007)(40460700003)(82740400003)(44832011)(426003)(2906002)(8676002)(41300700001)(7416002)(4326008)(16576012)(54906003)(70586007)(316002)(110136005)(8936002)(70206006)(5660300002)(86362001)(26005)(16526019)(9686003)(186003)(478600001)(103116003)(33716001)(83380400001)(336012)(71626013)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2023 21:47:33.6053 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6ab6f7a6-91ef-40a5-60e3-08db0567178a 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: CO1PEPF00001A60.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5932 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When a user creates a control or monitor group, the CLOSID or RMID are not visible to the user. These are architecturally defined entities. There is no harm in displaying these in resctrl groups. Sometimes it can help to debug the issues. Add CLOSID and RMID to the control/monitor groups display in resctrl interface. $cat /sys/fs/resctrl/clos1/closid 1 $cat /sys/fs/resctrl/mon_groups/mon1/rmid 3 Signed-off-by: Babu Moger --- Documentation/x86/resctrl.rst | 17 ++++++++++++ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 44 ++++++++++++++++++++++++++++= ++++ 2 files changed, 61 insertions(+) diff --git a/Documentation/x86/resctrl.rst b/Documentation/x86/resctrl.rst index 2c013c5d45fd..de332c242523 100644 --- a/Documentation/x86/resctrl.rst +++ b/Documentation/x86/resctrl.rst @@ -321,6 +321,15 @@ All groups contain the following files: Just like "cpus", only using ranges of CPUs instead of bitmasks. =20 =20 +"rmid": + Available only with debug option.Reading this file shows the + resource monitoring id (RMID) for monitoring the resource + utilization. Monitoring is performed by tagging each core(or + thread) or process via a Resource Monitoring ID (RMID). Kernel + assigns a new RMID when a group is created depending on the + available RMIDs. Multiple cores(or threads) or processes can + share a same RMID in a resctrl domain. + When control is enabled all CTRL_MON groups will also contain: =20 "schemata": @@ -342,6 +351,14 @@ 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 +"closid": + Available only with debug option. Reading this file shows the + Class of Service (CLOS) id which acts as a resource control tag + on which the resources can be throttled. Kernel assigns a new + CLOSID a control group is created depending on the available + CLOSIDs. Multiple cores(or threads) or processes can share a + same CLOSID in a resctrl domain. + When monitoring is enabled all MON groups will also contain: =20 "mon_data": diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index 9b7813aa6baf..c35d91b04de6 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -760,6 +760,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 /* @@ -1844,6 +1876,18 @@ static struct rftype res_common_files[] =3D { .seq_show =3D rdtgroup_size_show, .fflags =3D RFTYPE_BASE_CTRL, }, + { + .name =3D "closid", + .mode =3D 0444, + .kf_ops =3D &rdtgroup_kf_single_ops, + .seq_show =3D rdtgroup_closid_show, + }, + { + .name =3D "rmid", + .mode =3D 0444, + .kf_ops =3D &rdtgroup_kf_single_ops, + .seq_show =3D rdtgroup_rmid_show, + }, =20 }; =20 From nobody Sat Sep 13 11:17:15 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 DAEA8C05027 for ; Thu, 2 Feb 2023 21:48:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233131AbjBBVsK (ORCPT ); Thu, 2 Feb 2023 16:48:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233090AbjBBVrs (ORCPT ); Thu, 2 Feb 2023 16:47:48 -0500 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2070.outbound.protection.outlook.com [40.107.92.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A5366A313; Thu, 2 Feb 2023 13:47:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HDMAh42Vp6xpjchYl/prMtl9S2d1bU6nNOcAjIenKP06kh7iqD0X8uABLnUBOz3S1o91GLutYxLL2EM3nk+ayM9PX7EBPCrIEN44EGR6eVZ/wxaJb0xMgqhTMRMWv2fqffQB66+njPrO/FA8pVs9/kQKvHfWHa+9J2sZvznPUT7NE81kfG01scOYh6nYkD96nDLZNFC5/Et5Ki3QGR/bQo2o22CMsvWcWfo603LXcP7czfGekqluQXviftfHqDYNPwc2noCHVfSWhrIkC892yvuRQiI+IpeIaC4/2t3aT3kekB0/Xy+4giNCCnFBe7ZXp4couhV8DSe5E1qiHZhuuA== 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=5lbQnT64KQPvkuOiU+KLSzU7ho039kXH4xuvrICmMgc=; b=af0xT8JQaunrZGFcDI8VlW8uyKj8GbMCg/dnEfjj4f1piaaCMEF6aSZwgjGV9MXd+X5kcqtOoiqZFhq6S89T3JNXTygWxDXEHjVOOT1V6TYqKqwwS/a+lwdHoCdMqJ5KyNgzeAR1JEB0XYEyxWBI+Uha0dNT7sYW8vwytA4gBkQwk1D/ShDie+E6gbSEYUQX4zIT2r15E4i3HTo+4pY+I5lPOj7wneCaQcDQXd6NsAH+b97d+etgeVmNBdDWDpd9j3Z2vFilB5BcPKnRVkQ0JcNWdp7kXG9cF5KRkIyUYk7bjnhxa3s8+OgZwBb9ENllEivZZ0ikp4GBSpcN2avSGA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=zytor.com 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=5lbQnT64KQPvkuOiU+KLSzU7ho039kXH4xuvrICmMgc=; b=tErftWnYaNo060vGkCtXViR+ThnokInVwUl4T/k7fR0TRGo2Ca1LSKB5oIAqsuTINYMfoIT+ER9GfyNJ4vXDdBm53QBCBywFOYkd0SeRft+7DcvqiMEt2yh2p7L8CemzECTtRL2ykPql2L4H95H1qfFP1HN96+oL48rGIkarDHY= Received: from MW2PR2101CA0013.namprd21.prod.outlook.com (2603:10b6:302:1::26) by PH8PR12MB6891.namprd12.prod.outlook.com (2603:10b6:510:1cb::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.25; Thu, 2 Feb 2023 21:47:40 +0000 Received: from CO1PEPF00001A60.namprd05.prod.outlook.com (2603:10b6:302:1:cafe::6e) by MW2PR2101CA0013.outlook.office365.com (2603:10b6:302:1::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.4 via Frontend Transport; Thu, 2 Feb 2023 21:47:40 +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 CO1PEPF00001A60.mail.protection.outlook.com (10.167.241.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6064.21 via Frontend Transport; Thu, 2 Feb 2023 21:47:39 +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.2375.34; Thu, 2 Feb 2023 15:47:38 -0600 Subject: [RFC v2 PATCH 7/7] x86/resctrl: Add debug files when mounted with debug option From: Babu Moger To: , CC: , , , , , , , , , , , Date: Thu, 2 Feb 2023 15:47:37 -0600 Message-ID: <167537445777.647488.12333202522131465679.stgit@bmoger-ubuntu> In-Reply-To: <167537433143.647488.9641864719195184123.stgit@bmoger-ubuntu> References: <167537433143.647488.9641864719195184123.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: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF00001A60:EE_|PH8PR12MB6891:EE_ X-MS-Office365-Filtering-Correlation-Id: ddb0c058-55f1-4fde-c252-08db05671b54 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yoR4CUaAHVQELfevWWeOF1Z6bU0t9UAL0t/66a4wQjU5lLUwfpfZA0ii6sdF/RR8bIipUVDnGCwVm8kmOPzfh54z99nI88qWO1agZRvZO5etzlG3VOspdUMvosK0zQLz5YYGOYgcGAqOxAOblLAJ1vP3gdehBH2s8dkkqP/0sS+CnyA5imzfrO8Qc74lcKChZb2YXZZDn0CaxMl2h34leJyHdte0DbA++R9eLus5GINZX0HqNkVYnv0ub1ZbOa872anHdEvmwlJmDM23iwmvLfjPG4rFhWAfaPUUvID4715KrAaLv6ikFTwsK1Qkh2ScADGNieL3BHEd800CsjPQnxwMyEzsDeLanzA5Bl0cqZ9FVm7cFsNyBRlQQRPPKCPNetUXkf57/wGFwfFVy4c/Dlzh3GGlBm7IIda3xOrkbp5yrLC1OKA2XBoHjhsxR5/GvpgKD9apr+1g0y5SJMb8JayXzu9ZfTDQziWeD1nIoPfpaJZkFnf7R3228ysiUtC9hsshBePx7yarwuk2WnZGhXm+kVNR7dyrzHWR6ZllE21b9jnm+xcwjCi+yOtz5O9xVRB3JiRIyWE9T4t59cay5IsV2r5Rl7e3QI2eUrDvykSPlCerVlj1mLbhPpbaUzFgIxGFTTfM93zrbdN+bmeXfpsk2tZQZl5ZsCfHb8hUwFtE2W77fhTHqzyON/7Y3A16YvKm9FHWxfkSFZ+pKrJKcS4T+xzuo7P2P1xKHOLesG21g6IH7llO3AAy2U6DizTG 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:(13230025)(4636009)(7916004)(346002)(39860400002)(396003)(136003)(376002)(451199018)(36840700001)(40470700004)(46966006)(83380400001)(26005)(82740400003)(103116003)(40460700003)(81166007)(86362001)(40480700001)(36860700001)(336012)(186003)(82310400005)(426003)(356005)(33716001)(47076005)(9686003)(16526019)(478600001)(316002)(54906003)(16576012)(110136005)(70586007)(41300700001)(5660300002)(4326008)(8936002)(7416002)(2906002)(44832011)(8676002)(70206006)(71626013)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2023 21:47:39.9960 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ddb0c058-55f1-4fde-c252-08db05671b54 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: CO1PEPF00001A60.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6891 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add the debug files to the resctrl hierarchy. Signed-off-by: Babu Moger --- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index c35d91b04de6..b7c72b011264 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -2398,6 +2398,31 @@ static int mkdir_mondata_all(struct kernfs_node *par= ent_kn, struct rdtgroup *prgrp, struct kernfs_node **mon_data_kn); =20 +void resctrl_add_debug_file(struct kernfs_node *parent_kn, + const char *config, unsigned long fflags, + bool debug) +{ + struct rftype *rft; + + rft =3D rdtgroup_get_rftype_by_name(config); + if (debug && rft) { + rft->fflags |=3D fflags; + rdtgroup_add_file(parent_kn, rft); + } else if (rft) { + rft->fflags &=3D ~fflags; + kernfs_remove_by_name(parent_kn, config); + } +} + +static void resctrl_add_debug_files(bool debug) +{ + resctrl_add_debug_file(rdtgroup_default.kn, "rmid", + RFTYPE_BASE, debug); + resctrl_add_debug_file(rdtgroup_default.kn, "closid", + RFTYPE_BASE_CTRL, debug); + kernfs_activate(rdtgroup_default.kn); +} + static int rdt_enable_ctx(struct rdt_fs_context *ctx) { int ret =3D 0; @@ -2411,6 +2436,8 @@ static int rdt_enable_ctx(struct rdt_fs_context *ctx) if (!ret && ctx->enable_mba_mbps) ret =3D set_mba_sc(true); =20 + resctrl_add_debug_files(ctx->debug); + return ret; } =20