On Fri, 15 Sep 2023, Babu Moger wrote:
> The rftype flags are bitmaps used for adding files under resctrl
> filesystem. Some of these bitmaps have one extra level of indirection
> which is not necessary.
>
> Make them all direct definition to be consistent and easier to read.
>
> Reviewed-by: Shaopeng Tan <tan.shaopeng@xxxxxxxxxxxxxx>
> Tested-by: Shaopeng Tan <tan.shaopeng@xxxxxxxxxxxxxx>
> Reviewed-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
> Reviewed-by: Fenghua Yu <fenghua.yu@xxxxxxxxx>
> Signed-off-by: Babu Moger <babu.moger@xxxxxxx>
> ---
> arch/x86/kernel/cpu/resctrl/internal.h | 9 +++------
> arch/x86/kernel/cpu/resctrl/rdtgroup.c | 6 +++++-
> 2 files changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
> index 85ceaf9a31ac..62767774810d 100644
> --- a/arch/x86/kernel/cpu/resctrl/internal.h
> +++ b/arch/x86/kernel/cpu/resctrl/internal.h
> @@ -243,12 +243,9 @@ struct rdtgroup {
> */
> #define RFTYPE_INFO BIT(0)
> #define RFTYPE_BASE BIT(1)
> -#define RF_CTRLSHIFT 4
> -#define RF_MONSHIFT 5
> -#define RF_TOPSHIFT 6
> -#define RFTYPE_CTRL BIT(RF_CTRLSHIFT)
> -#define RFTYPE_MON BIT(RF_MONSHIFT)
> -#define RFTYPE_TOP BIT(RF_TOPSHIFT)
> +#define RFTYPE_CTRL BIT(4)
> +#define RFTYPE_MON BIT(5)
> +#define RFTYPE_TOP BIT(6)
> #define RFTYPE_RES_CACHE BIT(8)
> #define RFTYPE_RES_MB BIT(9)
> #define RF_CTRL_INFO (RFTYPE_INFO | RFTYPE_CTRL)
> diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
> index f0d163950969..7ddfa4b470e6 100644
> --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
> +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
> @@ -3242,7 +3242,11 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,
> goto out_destroy;
> }
>
> - files = RFTYPE_BASE | BIT(RF_CTRLSHIFT + rtype);
> + if (rtype == RDTCTRL_GROUP)
> + files = RFTYPE_BASE | RFTYPE_CTRL;
> + else
> + files = RFTYPE_BASE | RFTYPE_MON;
> +
> ret = rdtgroup_add_files(kn, files);
> if (ret) {
> rdt_last_cmd_puts("kernfs fill error\n");
>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx>
--
i.
