From patchwork Thu Jun 1 19:01:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Moger, Babu" X-Patchwork-Id: 102148 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp560714vqr; Thu, 1 Jun 2023 12:20:57 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4VWAS1NfuLwjAGpcdXxqRwKXYvtw6JVbzigy9r52LlSBW+Q/xKxOg6TMR0iacu134FoIYu X-Received: by 2002:a17:90b:3c8:b0:255:b068:37c0 with SMTP id go8-20020a17090b03c800b00255b06837c0mr392988pjb.5.1685647257222; Thu, 01 Jun 2023 12:20:57 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685647257; cv=pass; d=google.com; s=arc-20160816; b=ti4ux+8DxjO5WMwr/7FM233dAksamwcBf9RUrtiVpogUd83/1pI49Mm5MKFcFevDZ/ R2vbEOQr25S2HueEgEaE73QxUB9zBdXEcxEolD9Y/bQj1fvOoGEQ1k0qG4z0FF2NMDmI fjJZfFcjn+pdC1FcWe72zhtdeesT/+YJblKXwfLRXBrUjTSJvKHxcvEZ1fvhfiK43Uh9 6LgIQ2RupKnThsIXgLv45CJG6Qr2SSvRaQbw4CWHLLnJLw6/wXbgt2yBPswDaW/fTIS3 nsCdz83RToFET2pk+nqSrUuiSKD+vwIQkV3iVbMGdzYkfg2QUb7xpDsG77BTJ7pUb6O9 t84w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject:dkim-signature; bh=uX88MpTyUE+PNaifsspcaB6+7j91LsUzb3hkIMAJ6K8=; b=ahCu3WxfJRN9DEKo9jhTQAKkEzzHEbveZiD0yeGsLAx3FtHNejEGX8xMC89ORYWNuy 78ScGNTuxxEn7e3kwo7JX/fRWQN5FNjsi0mArI/m2U9ucShkhrDOSjU2ZiILE5yfCOMb PWxaLYiwMkqnMFIt51tIsjRtKOI2LKBCX9OswIvQuChvS1YOexvSjeR4yBo80QKsSNDD ltm1bj9Z7nl/M64Jy9w4FxZEG7GATWMtzHsv/Xit5BMddC4KZuUuNDdmckYAGioWZaSM 6dNL6DGbvd1gIK6aO9WwSFFqnd0vHCspCYFxiY911agYI6Co2iW7ro6kO58Zz+A2Yefh YaPQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=Jt8GS9vz; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id rm10-20020a17090b3eca00b002508889985fsi1577922pjb.95.2023.06.01.12.20.44; Thu, 01 Jun 2023 12:20:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=Jt8GS9vz; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232616AbjFATBx (ORCPT + 99 others); Thu, 1 Jun 2023 15:01:53 -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 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 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767529258282921779?= X-GMAIL-MSGID: =?utf-8?q?1767529258282921779?= resctrl associates rftype flags with its files so that files can be chosen based on the resource, whether it is info or base, and if it is control or monitor type file. These flags use the RF_ as well as RFTYPE_ prefixes. Change the prefix to RFTYPE_ for all these flags to be consistent. Signed-off-by: Babu Moger Reviewed-by: Reinette Chatre --- arch/x86/kernel/cpu/resctrl/internal.h | 10 ++++---- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 42 ++++++++++++++++---------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h index 62767774810d..2051179a3b91 100644 --- a/arch/x86/kernel/cpu/resctrl/internal.h +++ b/arch/x86/kernel/cpu/resctrl/internal.h @@ -248,10 +248,10 @@ struct rdtgroup { #define RFTYPE_TOP BIT(6) #define RFTYPE_RES_CACHE BIT(8) #define RFTYPE_RES_MB BIT(9) -#define RF_CTRL_INFO (RFTYPE_INFO | RFTYPE_CTRL) -#define RF_MON_INFO (RFTYPE_INFO | RFTYPE_MON) -#define RF_TOP_INFO (RFTYPE_INFO | RFTYPE_TOP) -#define RF_CTRL_BASE (RFTYPE_BASE | RFTYPE_CTRL) +#define RFTYPE_CTRL_INFO (RFTYPE_INFO | RFTYPE_CTRL) +#define RFTYPE_MON_INFO (RFTYPE_INFO | RFTYPE_MON) +#define RFTYPE_TOP_INFO (RFTYPE_INFO | RFTYPE_TOP) +#define RFTYPE_CTRL_BASE (RFTYPE_BASE | RFTYPE_CTRL) /* List of all resource groups */ extern struct list_head rdt_all_groups; @@ -267,7 +267,7 @@ void __exit rdtgroup_exit(void); * @mode: Access mode * @kf_ops: File operations * @flags: File specific RFTYPE_FLAGS_* flags - * @fflags: File specific RF_* or RFTYPE_* flags + * @fflags: File specific RFTYPE_* flags * @seq_show: Show content of the file * @write: Write to the file */ diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index 181612d2c84b..baed20b2d788 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -1692,77 +1692,77 @@ static struct rftype res_common_files[] = { .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_last_cmd_status_show, - .fflags = RF_TOP_INFO, + .fflags = RFTYPE_TOP_INFO, }, { .name = "num_closids", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_num_closids_show, - .fflags = RF_CTRL_INFO, + .fflags = RFTYPE_CTRL_INFO, }, { .name = "mon_features", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_mon_features_show, - .fflags = RF_MON_INFO, + .fflags = RFTYPE_MON_INFO, }, { .name = "num_rmids", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_num_rmids_show, - .fflags = RF_MON_INFO, + .fflags = RFTYPE_MON_INFO, }, { .name = "cbm_mask", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_default_ctrl_show, - .fflags = RF_CTRL_INFO | RFTYPE_RES_CACHE, + .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE, }, { .name = "min_cbm_bits", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_min_cbm_bits_show, - .fflags = RF_CTRL_INFO | RFTYPE_RES_CACHE, + .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE, }, { .name = "shareable_bits", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_shareable_bits_show, - .fflags = RF_CTRL_INFO | RFTYPE_RES_CACHE, + .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE, }, { .name = "bit_usage", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_bit_usage_show, - .fflags = RF_CTRL_INFO | RFTYPE_RES_CACHE, + .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE, }, { .name = "min_bandwidth", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_min_bw_show, - .fflags = RF_CTRL_INFO | RFTYPE_RES_MB, + .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_MB, }, { .name = "bandwidth_gran", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_bw_gran_show, - .fflags = RF_CTRL_INFO | RFTYPE_RES_MB, + .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_MB, }, { .name = "delay_linear", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_delay_linear_show, - .fflags = RF_CTRL_INFO | RFTYPE_RES_MB, + .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_MB, }, /* * Platform specific which (if any) capabilities are provided by @@ -1781,7 +1781,7 @@ static struct rftype res_common_files[] = { .kf_ops = &rdtgroup_kf_single_ops, .write = max_threshold_occ_write, .seq_show = max_threshold_occ_show, - .fflags = RF_MON_INFO | RFTYPE_RES_CACHE, + .fflags = RFTYPE_MON_INFO | RFTYPE_RES_CACHE, }, { .name = "mbm_total_bytes_config", @@ -1828,7 +1828,7 @@ static struct rftype res_common_files[] = { .kf_ops = &rdtgroup_kf_single_ops, .write = rdtgroup_schemata_write, .seq_show = rdtgroup_schemata_show, - .fflags = RF_CTRL_BASE, + .fflags = RFTYPE_CTRL_BASE, }, { .name = "mode", @@ -1836,14 +1836,14 @@ static struct rftype res_common_files[] = { .kf_ops = &rdtgroup_kf_single_ops, .write = rdtgroup_mode_write, .seq_show = rdtgroup_mode_show, - .fflags = RF_CTRL_BASE, + .fflags = RFTYPE_CTRL_BASE, }, { .name = "size", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdtgroup_size_show, - .fflags = RF_CTRL_BASE, + .fflags = RFTYPE_CTRL_BASE, }, }; @@ -1900,7 +1900,7 @@ void __init thread_throttle_mode_init(void) if (!rft) return; - rft->fflags = RF_CTRL_INFO | RFTYPE_RES_MB; + rft->fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_MB; } void __init mbm_config_rftype_init(const char *config) @@ -1909,7 +1909,7 @@ void __init mbm_config_rftype_init(const char *config) rft = rdtgroup_get_rftype_by_name(config); if (rft) - rft->fflags = RF_MON_INFO | RFTYPE_RES_CACHE; + rft->fflags = RFTYPE_MON_INFO | RFTYPE_RES_CACHE; } /** @@ -2044,21 +2044,21 @@ static int rdtgroup_create_info_dir(struct kernfs_node *parent_kn) if (IS_ERR(kn_info)) return PTR_ERR(kn_info); - ret = rdtgroup_add_files(kn_info, RF_TOP_INFO); + ret = rdtgroup_add_files(kn_info, RFTYPE_TOP_INFO); if (ret) goto out_destroy; /* loop over enabled controls, these are all alloc_capable */ list_for_each_entry(s, &resctrl_schema_all, list) { r = s->res; - fflags = r->fflags | RF_CTRL_INFO; + fflags = r->fflags | RFTYPE_CTRL_INFO; ret = rdtgroup_mkdir_info_resdir(s, s->name, fflags); if (ret) goto out_destroy; } for_each_mon_capable_rdt_resource(r) { - fflags = r->fflags | RF_MON_INFO; + fflags = r->fflags | RFTYPE_MON_INFO; sprintf(name, "%s_MON", r->name); ret = rdtgroup_mkdir_info_resdir(r, name, fflags); if (ret) @@ -3559,7 +3559,7 @@ static int __init rdtgroup_setup_root(void) list_add(&rdtgroup_default.rdtgroup_list, &rdt_all_groups); - ret = rdtgroup_add_files(kernfs_root_to_node(rdt_root), RF_CTRL_BASE); + ret = rdtgroup_add_files(kernfs_root_to_node(rdt_root), RFTYPE_CTRL_BASE); if (ret) { kernfs_destroy_root(rdt_root); goto out;