Commit 4156b8ba authored by James Morse's avatar James Morse Committed by Zeng Heng
Browse files

x86/resctrl: Move the filesystem bits to headers visible to fs/resctrl 

maillist inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8T2RT

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/morse/linux.git/log/?h=mpam/snapshot/v6.7-rc2



---------------------------

Once the filsystem parts of resctrl move to fs/resctrl, it cannot rely
on definitions in x86's internal.h.

Move definitions in internal.h that need to be shared between the filesystem
and architecture code to header files that fs/resctrl can include.

Doing this separately means the filesystem code only moves between files
of the same name, instead of having these changes mixed in too.

Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Signed-off-by: default avatarZeng Heng <zengheng4@huawei.com>
parent 5b93852a

arch/x86/include/asm/resctrl.h

+3 −0
Original line number Diff line number Diff line
@@ -218,6 +218,9 @@ int resctrl_arch_measure_l2_residency(void *_plr); 
int resctrl_arch_measure_l3_residency(void *_plr);

void resctrl_cpu_detect(struct cpuinfo_x86 *c);



bool resctrl_arch_get_cdp_enabled(enum resctrl_res_level l);

int resctrl_arch_set_cdp_enabled(enum resctrl_res_level l, bool enable);



#else



static inline void resctrl_sched_in(struct task_struct *tsk) {}

arch/x86/kernel/cpu/resctrl/core.c

+5 −0
Original line number Diff line number Diff line
@@ -308,6 +308,11 @@ static void rdt_get_cdp_l2_config(void) 
	rdt_get_cdp_config(RDT_RESOURCE_L2);

}



bool resctrl_arch_get_cdp_enabled(enum resctrl_res_level l)

{

	return rdt_resources_all[l].cdp_enabled;

}



static void

mba_wrmsr_amd(struct rdt_domain *d, struct msr_param *m, struct rdt_resource *r)

{

arch/x86/kernel/cpu/resctrl/internal.h

+0 −36
Original line number Diff line number Diff line
@@ -15,12 +15,6 @@ 


#define L2_QOS_CDP_ENABLE		0x01ULL



#define CQM_LIMBOCHECK_INTERVAL	1000



#define MBM_CNTR_WIDTH_BASE		24

#define MBM_OVERFLOW_INTERVAL		1000

#define MAX_MBA_BW			100u

#define MBA_IS_LINEAR			0x4

#define MAX_MBA_BW_AMD			0x800

#define MBM_CNTR_WIDTH_OFFSET_AMD	20
@@ -211,29 +205,6 @@ struct rdtgroup { 
	struct pseudo_lock_region	*plr;

};



/* rdtgroup.flags */

#define	RDT_DELETED		1



/* rftype.flags */

#define RFTYPE_FLAGS_CPUS_LIST	1



/*

 * Define the file type flags for base and info directories.

 */

#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_DEBUG			BIT(10)

#define RFTYPE_CTRL_INFO		(RFTYPE_INFO | RFTYPE_CTRL)

#define RFTYPE_MON_INFO			(RFTYPE_INFO | RFTYPE_MON)

#define RFTYPE_TOP_INFO			(RFTYPE_INFO | RFTYPE_TOP)

#define RFTYPE_CTRL_BASE		(RFTYPE_BASE | RFTYPE_CTRL)

#define RFTYPE_MON_BASE			(RFTYPE_BASE | RFTYPE_MON)



/* List of all resource groups */

extern struct list_head rdt_all_groups;
@@ -386,13 +357,6 @@ static inline struct rdt_resource *resctrl_inc(struct rdt_resource *res) 
	return &hw_res->r_resctrl;

}



static inline bool resctrl_arch_get_cdp_enabled(enum resctrl_res_level l)

{

	return rdt_resources_all[l].cdp_enabled;

}



int resctrl_arch_set_cdp_enabled(enum resctrl_res_level l, bool enable);



/*

 * To return the common struct rdt_resource, which is contained in struct

 * rdt_hw_resource, walk the resctrl member of struct rdt_hw_resource.

include/linux/resctrl.h

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ int proc_resctrl_show(struct seq_file *m, 
 */

#define RESCTRL_MAX_CBM			32



extern unsigned int resctrl_rmid_realloc_limit;

extern unsigned int resctrl_rmid_realloc_threshold;



/**

 * struct pseudo_lock_region - pseudo-lock region information

 * @s:			Resctrl schema for the resource to which this

include/linux/resctrl_types.h

+30 −0
Original line number Diff line number Diff line
@@ -7,6 +7,36 @@ 
#ifndef __LINUX_RESCTRL_TYPES_H

#define __LINUX_RESCTRL_TYPES_H



#define CQM_LIMBOCHECK_INTERVAL	1000



#define MBM_CNTR_WIDTH_BASE		24

#define MBM_OVERFLOW_INTERVAL		1000

#define MAX_MBA_BW			100u

#define MBA_IS_LINEAR			0x4



/* rdtgroup.flags */

#define	RDT_DELETED		1



/* rftype.flags */

#define RFTYPE_FLAGS_CPUS_LIST	1



/*

 * Define the file type flags for base and info directories.

 */

#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_DEBUG			BIT(10)

#define RFTYPE_CTRL_INFO		(RFTYPE_INFO | RFTYPE_CTRL)

#define RFTYPE_MON_INFO			(RFTYPE_INFO | RFTYPE_MON)

#define RFTYPE_TOP_INFO			(RFTYPE_INFO | RFTYPE_TOP)

#define RFTYPE_CTRL_BASE		(RFTYPE_BASE | RFTYPE_CTRL)

#define RFTYPE_MON_BASE			(RFTYPE_BASE | RFTYPE_MON)



/* Reads to Local DRAM Memory */

#define READS_TO_LOCAL_MEM		BIT(0)