From mboxrd@z Thu Jan 1 00:00:00 1970 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 C8377C77B7E for ; Thu, 1 Jun 2023 19:01:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232504AbjFATBw (ORCPT ); Thu, 1 Jun 2023 15:01:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232524AbjFATBq (ORCPT ); Thu, 1 Jun 2023 15:01:46 -0400 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2085.outbound.protection.outlook.com [40.107.212.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7A1818D; Thu, 1 Jun 2023 12:01:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UtfrsZjWS+/mb8WOyPmqoGBEj73z6WJQNy1ilI9kxiAaX5Br9RakQ5dBA5Vkf4+fALZqqIG7PNDxsoboh4STTRmvZ2NNUvEUuXjzkFgOSNgBayRWMUYbpm/CmajIrjD1hob+f+4GpKOKqoMl+hSc4APC/gUCTT1zUU10se8npA/q6VeHs8urer0FNYMJG1rtkqIeDMDoha15gSXAmmhuYfDfHPTi8gAvp3jsAI+fthVD1i7c15Ht63M20LTNG7GNemhp7uf5nvZusqTTIBKwEtKSGJ7WDRXr9gjGWKg/ID0bz81ci1kMbIMObq9ZZVNgH8ZdiDrME48Fa+hj6iJaSg== 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=uX88MpTyUE+PNaifsspcaB6+7j91LsUzb3hkIMAJ6K8=; b=nXLRMTIcV42nC/Yrz3wUKm/ufSyrNDHu1NOLrL/nYWKJXcoGJMp/+w+UMfnXaFMWvcbZCkGj6IVYUGfHjFjJLQ7FBzl22K/ErrWRQaaDV5mNdB9tLaHNDx3rp1dKV0dHP9gXohKMy56gtFhOj6c5oWciEdXGKxOkTqjIpNLnBp5WhOAPX3VI2is7xR/fZdUggFv/542G6PEhsEWECrqA0z30N5e2roI3H0wLBt3/XGG/sguZWUZKDTATu5NnJnsvDGf/e4Je9YpaNe+6Jls9hmAPOns2AD8LtEHMgVRXmSz6dUMrH0e2pgSvW1RbPRMZjHktfP2ouvTnPnju0EaOJw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=intel.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=uX88MpTyUE+PNaifsspcaB6+7j91LsUzb3hkIMAJ6K8=; b=Jt8GS9vzXZVThvcEYdE4KB97caUQ7YXlHzUPv2FT9bzppEA3OxMVuXVaSaVw8lqHRWZUBx43/2P+TH5mwhMOHaaG5sRUCL+FIMhidL76m7piFmYKcGi2Cksu/bxMClPSphEO/Yfm4uU1cHSq2ToQk4gS97FwYMuWP6ec7hfiHhA= Received: from BN9PR03CA0608.namprd03.prod.outlook.com (2603:10b6:408:106::13) by DM4PR12MB7744.namprd12.prod.outlook.com (2603:10b6:8:100::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.26; Thu, 1 Jun 2023 19:01:27 +0000 Received: from BN8NAM11FT008.eop-nam11.prod.protection.outlook.com (2603:10b6:408:106:cafe::76) by BN9PR03CA0608.outlook.office365.com (2603:10b6:408:106::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.31 via Frontend Transport; Thu, 1 Jun 2023 19:01: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 BN8NAM11FT008.mail.protection.outlook.com (10.13.177.95) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6455.24 via Frontend Transport; Thu, 1 Jun 2023 19:01:27 +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, 1 Jun 2023 14:01:14 -0500 Subject: [PATCH v5 3/8] x86/resctrl: Rename rftype flags for consistency From: Babu Moger To: , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Date: Thu, 1 Jun 2023 14:01:12 -0500 Message-ID: <168564607296.527584.16017427105138548499.stgit@bmoger-ubuntu> In-Reply-To: <168564586603.527584.10518315376465080920.stgit@bmoger-ubuntu> References: <168564586603.527584.10518315376465080920.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: BN8NAM11FT008:EE_|DM4PR12MB7744:EE_ X-MS-Office365-Filtering-Correlation-Id: b0bd7900-fa28-473d-69bc-08db62d29a6a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uiTidZZ+o2ceNqrcrBRY+TirvkDi7o4bL2e5DZjE7KszIYL9VvgVkalfiLCRu9KSerGo49V2Yf4I0F9CEQNqjsdg7jX7/ho/A3+dE6dAdG/+RoRZTWdCUpI+bNIANiSy0FXY9v2Feeq9QLdOa198DMFhYPMot9kD4GTdis5SypVJBn9PdUOIbGb/oAxC0ZgkkrJbrvJH8M1YIINyU+7e3mcbIfPxSVJD1wynEXbQwtfhc3imH3KuuI1kfjYdaV8AJgQoMu4NXZ6cdGu5315XGU3iLLIyiaNATPzVJQC2mlbCUXykyShnZNiPuJ+twtcUl2rcgCstpHhGE8fxCqYA0OjLiPJos0Ce3y7Dua+oisE8aOfzjHAoRWgBSMaBkPYsJiF0uJ6vyoGQz0WEfORCV7LB+8PL/LVx2cmd6AydRd6Djdpfe6LPL3N6JbmzHgZgD0j3+PoRePtSPdLtOpusQRuc3X3ApuU1MwmbI5G59iquzcvD5QsJ6UuxzoINdE2z9435XFbCyaFVnN8bBlBzlMRUOtqE/tiATZPlulB8x9KLJGTqXz709Wrhzycric0MYJE64k+0MVonWbQl88dbmVzqcCyn8j6keqPCcnz2a9EQF47+dtdnI0sHHNu6je6HO28R+ThyGTbAkkUwd5IMizcbAOoDVQMBFdIi2TSz1+PJLlMB0YEl22RmSGnMqRmJU+amoICMoCSAVGsqmcZkT97s7EbZo5sbNTQW+7MyB/6JTqjygaf+q051XCQKqxrWuDUIXjnq8ihQ68g/KCvHWI8N3DRHFWd4Qk7B0ZBupBw= 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)(376002)(346002)(39860400002)(451199021)(40470700004)(36840700001)(46966006)(81166007)(336012)(356005)(82740400003)(26005)(83380400001)(9686003)(40480700001)(426003)(186003)(16526019)(47076005)(36860700001)(103116003)(8676002)(2906002)(7406005)(7416002)(5660300002)(8936002)(44832011)(478600001)(316002)(40460700003)(4326008)(110136005)(41300700001)(16576012)(70206006)(70586007)(54906003)(86362001)(33716001)(82310400005)(71626016)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2023 19:01:27.5907 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b0bd7900-fa28-473d-69bc-08db62d29a6a 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: BN8NAM11FT008.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7744 Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org resctrl associates rftype flags with its files so that files can be chosen= =0A= based on the resource, whether it is info or base, and if it is control=0A= or monitor type file. These flags use the RF_ as well as RFTYPE_ prefixes.= =0A= =0A= Change the prefix to RFTYPE_ for all these flags to be consistent.=0A= =0A= Signed-off-by: Babu Moger =0A= ---=0A= arch/x86/kernel/cpu/resctrl/internal.h | 10 ++++----=0A= arch/x86/kernel/cpu/resctrl/rdtgroup.c | 42 ++++++++++++++++------------= ----=0A= 2 files changed, 26 insertions(+), 26 deletions(-)=0A= =0A= diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/r= esctrl/internal.h=0A= index 62767774810d..2051179a3b91 100644=0A= --- a/arch/x86/kernel/cpu/resctrl/internal.h=0A= +++ b/arch/x86/kernel/cpu/resctrl/internal.h=0A= @@ -248,10 +248,10 @@ struct rdtgroup {=0A= #define RFTYPE_TOP BIT(6)=0A= #define RFTYPE_RES_CACHE BIT(8)=0A= #define RFTYPE_RES_MB BIT(9)=0A= -#define RF_CTRL_INFO (RFTYPE_INFO | RFTYPE_CTRL)=0A= -#define RF_MON_INFO (RFTYPE_INFO | RFTYPE_MON)=0A= -#define RF_TOP_INFO (RFTYPE_INFO | RFTYPE_TOP)=0A= -#define RF_CTRL_BASE (RFTYPE_BASE | RFTYPE_CTRL)=0A= +#define RFTYPE_CTRL_INFO (RFTYPE_INFO | RFTYPE_CTRL)=0A= +#define RFTYPE_MON_INFO (RFTYPE_INFO | RFTYPE_MON)=0A= +#define RFTYPE_TOP_INFO (RFTYPE_INFO | RFTYPE_TOP)=0A= +#define RFTYPE_CTRL_BASE (RFTYPE_BASE | RFTYPE_CTRL)=0A= =0A= /* List of all resource groups */=0A= extern struct list_head rdt_all_groups;=0A= @@ -267,7 +267,7 @@ void __exit rdtgroup_exit(void);=0A= * @mode: Access mode=0A= * @kf_ops: File operations=0A= * @flags: File specific RFTYPE_FLAGS_* flags=0A= - * @fflags: File specific RF_* or RFTYPE_* flags=0A= + * @fflags: File specific RFTYPE_* flags=0A= * @seq_show: Show content of the file=0A= * @write: Write to the file=0A= */=0A= diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c=0A= index 181612d2c84b..baed20b2d788 100644=0A= --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c=0A= +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c=0A= @@ -1692,77 +1692,77 @@ static struct rftype res_common_files[] =3D {=0A= .mode =3D 0444,=0A= .kf_ops =3D &rdtgroup_kf_single_ops,=0A= .seq_show =3D rdt_last_cmd_status_show,=0A= - .fflags =3D RF_TOP_INFO,=0A= + .fflags =3D RFTYPE_TOP_INFO,=0A= },=0A= {=0A= .name =3D "num_closids",=0A= .mode =3D 0444,=0A= .kf_ops =3D &rdtgroup_kf_single_ops,=0A= .seq_show =3D rdt_num_closids_show,=0A= - .fflags =3D RF_CTRL_INFO,=0A= + .fflags =3D RFTYPE_CTRL_INFO,=0A= },=0A= {=0A= .name =3D "mon_features",=0A= .mode =3D 0444,=0A= .kf_ops =3D &rdtgroup_kf_single_ops,=0A= .seq_show =3D rdt_mon_features_show,=0A= - .fflags =3D RF_MON_INFO,=0A= + .fflags =3D RFTYPE_MON_INFO,=0A= },=0A= {=0A= .name =3D "num_rmids",=0A= .mode =3D 0444,=0A= .kf_ops =3D &rdtgroup_kf_single_ops,=0A= .seq_show =3D rdt_num_rmids_show,=0A= - .fflags =3D RF_MON_INFO,=0A= + .fflags =3D RFTYPE_MON_INFO,=0A= },=0A= {=0A= .name =3D "cbm_mask",=0A= .mode =3D 0444,=0A= .kf_ops =3D &rdtgroup_kf_single_ops,=0A= .seq_show =3D rdt_default_ctrl_show,=0A= - .fflags =3D RF_CTRL_INFO | RFTYPE_RES_CACHE,=0A= + .fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE,=0A= },=0A= {=0A= .name =3D "min_cbm_bits",=0A= .mode =3D 0444,=0A= .kf_ops =3D &rdtgroup_kf_single_ops,=0A= .seq_show =3D rdt_min_cbm_bits_show,=0A= - .fflags =3D RF_CTRL_INFO | RFTYPE_RES_CACHE,=0A= + .fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE,=0A= },=0A= {=0A= .name =3D "shareable_bits",=0A= .mode =3D 0444,=0A= .kf_ops =3D &rdtgroup_kf_single_ops,=0A= .seq_show =3D rdt_shareable_bits_show,=0A= - .fflags =3D RF_CTRL_INFO | RFTYPE_RES_CACHE,=0A= + .fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE,=0A= },=0A= {=0A= .name =3D "bit_usage",=0A= .mode =3D 0444,=0A= .kf_ops =3D &rdtgroup_kf_single_ops,=0A= .seq_show =3D rdt_bit_usage_show,=0A= - .fflags =3D RF_CTRL_INFO | RFTYPE_RES_CACHE,=0A= + .fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE,=0A= },=0A= {=0A= .name =3D "min_bandwidth",=0A= .mode =3D 0444,=0A= .kf_ops =3D &rdtgroup_kf_single_ops,=0A= .seq_show =3D rdt_min_bw_show,=0A= - .fflags =3D RF_CTRL_INFO | RFTYPE_RES_MB,=0A= + .fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_MB,=0A= },=0A= {=0A= .name =3D "bandwidth_gran",=0A= .mode =3D 0444,=0A= .kf_ops =3D &rdtgroup_kf_single_ops,=0A= .seq_show =3D rdt_bw_gran_show,=0A= - .fflags =3D RF_CTRL_INFO | RFTYPE_RES_MB,=0A= + .fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_MB,=0A= },=0A= {=0A= .name =3D "delay_linear",=0A= .mode =3D 0444,=0A= .kf_ops =3D &rdtgroup_kf_single_ops,=0A= .seq_show =3D rdt_delay_linear_show,=0A= - .fflags =3D RF_CTRL_INFO | RFTYPE_RES_MB,=0A= + .fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_MB,=0A= },=0A= /*=0A= * Platform specific which (if any) capabilities are provided by=0A= @@ -1781,7 +1781,7 @@ static struct rftype res_common_files[] =3D {=0A= .kf_ops =3D &rdtgroup_kf_single_ops,=0A= .write =3D max_threshold_occ_write,=0A= .seq_show =3D max_threshold_occ_show,=0A= - .fflags =3D RF_MON_INFO | RFTYPE_RES_CACHE,=0A= + .fflags =3D RFTYPE_MON_INFO | RFTYPE_RES_CACHE,=0A= },=0A= {=0A= .name =3D "mbm_total_bytes_config",=0A= @@ -1828,7 +1828,7 @@ static struct rftype res_common_files[] =3D {=0A= .kf_ops =3D &rdtgroup_kf_single_ops,=0A= .write =3D rdtgroup_schemata_write,=0A= .seq_show =3D rdtgroup_schemata_show,=0A= - .fflags =3D RF_CTRL_BASE,=0A= + .fflags =3D RFTYPE_CTRL_BASE,=0A= },=0A= {=0A= .name =3D "mode",=0A= @@ -1836,14 +1836,14 @@ static struct rftype res_common_files[] =3D {=0A= .kf_ops =3D &rdtgroup_kf_single_ops,=0A= .write =3D rdtgroup_mode_write,=0A= .seq_show =3D rdtgroup_mode_show,=0A= - .fflags =3D RF_CTRL_BASE,=0A= + .fflags =3D RFTYPE_CTRL_BASE,=0A= },=0A= {=0A= .name =3D "size",=0A= .mode =3D 0444,=0A= .kf_ops =3D &rdtgroup_kf_single_ops,=0A= .seq_show =3D rdtgroup_size_show,=0A= - .fflags =3D RF_CTRL_BASE,=0A= + .fflags =3D RFTYPE_CTRL_BASE,=0A= },=0A= =0A= };=0A= @@ -1900,7 +1900,7 @@ void __init thread_throttle_mode_init(void)=0A= if (!rft)=0A= return;=0A= =0A= - rft->fflags =3D RF_CTRL_INFO | RFTYPE_RES_MB;=0A= + rft->fflags =3D RFTYPE_CTRL_INFO | RFTYPE_RES_MB;=0A= }=0A= =0A= void __init mbm_config_rftype_init(const char *config)=0A= @@ -1909,7 +1909,7 @@ void __init mbm_config_rftype_init(const char *config= )=0A= =0A= rft =3D rdtgroup_get_rftype_by_name(config);=0A= if (rft)=0A= - rft->fflags =3D RF_MON_INFO | RFTYPE_RES_CACHE;=0A= + rft->fflags =3D RFTYPE_MON_INFO | RFTYPE_RES_CACHE;=0A= }=0A= =0A= /**=0A= @@ -2044,21 +2044,21 @@ static int rdtgroup_create_info_dir(struct kernfs_n= ode *parent_kn)=0A= if (IS_ERR(kn_info))=0A= return PTR_ERR(kn_info);=0A= =0A= - ret =3D rdtgroup_add_files(kn_info, RF_TOP_INFO);=0A= + ret =3D rdtgroup_add_files(kn_info, RFTYPE_TOP_INFO);=0A= if (ret)=0A= goto out_destroy;=0A= =0A= /* loop over enabled controls, these are all alloc_capable */=0A= list_for_each_entry(s, &resctrl_schema_all, list) {=0A= r =3D s->res;=0A= - fflags =3D r->fflags | RF_CTRL_INFO;=0A= + fflags =3D r->fflags | RFTYPE_CTRL_INFO;=0A= ret =3D rdtgroup_mkdir_info_resdir(s, s->name, fflags);=0A= if (ret)=0A= goto out_destroy;=0A= }=0A= =0A= for_each_mon_capable_rdt_resource(r) {=0A= - fflags =3D r->fflags | RF_MON_INFO;=0A= + fflags =3D r->fflags | RFTYPE_MON_INFO;=0A= sprintf(name, "%s_MON", r->name);=0A= ret =3D rdtgroup_mkdir_info_resdir(r, name, fflags);=0A= if (ret)=0A= @@ -3559,7 +3559,7 @@ static int __init rdtgroup_setup_root(void)=0A= =0A= list_add(&rdtgroup_default.rdtgroup_list, &rdt_all_groups);=0A= =0A= - ret =3D rdtgroup_add_files(kernfs_root_to_node(rdt_root), RF_CTRL_BASE);= =0A= + ret =3D rdtgroup_add_files(kernfs_root_to_node(rdt_root), RFTYPE_CTRL_BAS= E);=0A= if (ret) {=0A= kernfs_destroy_root(rdt_root);=0A= goto out;=0A= =0A=