Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4ab3320 authored by Vikas Shivappa's avatar Vikas Shivappa Committed by Thomas Gleixner
Browse files

x86/intel_rdt/cqm: Add info files for RDT monitoring 



Add info directory files specific to RDT monitoring.

 num_rmids:
    The number of RMIDs which are valid for the resource.

 mon_features:
    Lists the monitoring events if monitoring is enabled for the
    resource.

 max_threshold_occupancy:
    This is specific to llc_occupancy monitoring and is used to
    determine if an RMID can be reused. Provides an upper bound on the
    threshold and is shown to the user in bytes though the internal
    value will be rounded to the scaling factor supported by the h/w.

Signed-off-by: default avatarVikas Shivappa <vikas.shivappa@linux.intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: ravi.v.shankar@intel.com
Cc: tony.luck@intel.com
Cc: fenghua.yu@intel.com
Cc: peterz@infradead.org
Cc: eranian@google.com
Cc: vikas.shivappa@intel.com
Cc: ak@linux.intel.com
Cc: davidcc@google.com
Cc: reinette.chatre@intel.com
Link: http://lkml.kernel.org/r/1501017287-28083-12-git-send-email-vikas.shivappa@linux.intel.com
parent 5dc1d5c6

arch/x86/kernel/cpu/intel_rdt.h

+8 −0
Original line number Diff line number Diff line
@@ -68,10 +68,13 @@ struct rdtgroup { 
#define RFTYPE_INFO			BIT(0)

#define RFTYPE_BASE			BIT(1)

#define RF_CTRLSHIFT			4

#define RF_MONSHIFT			5

#define RFTYPE_CTRL			BIT(RF_CTRLSHIFT)

#define RFTYPE_MON			BIT(RF_MONSHIFT)

#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_CTRL_BASE			(RFTYPE_BASE | RFTYPE_CTRL)



/* List of all resource groups */
@@ -264,6 +267,11 @@ enum { 
	     r++)							      \

		if (r->alloc_enabled)



#define for_each_mon_enabled_rdt_resource(r)				      \

	for (r = rdt_resources_all; r < rdt_resources_all + RDT_NUM_RESOURCES;\

	     r++)							      \

		if (r->mon_enabled)



/* CPUID.(EAX=10H, ECX=ResID=1).EAX */

union cpuid_0x10_1_eax {

	struct {

arch/x86/kernel/cpu/intel_rdt_rdtgroup.c

+83 −0
Original line number Diff line number Diff line
@@ -490,6 +490,28 @@ static int rdt_min_bw_show(struct kernfs_open_file *of, 
	return 0;

}



static int rdt_num_rmids_show(struct kernfs_open_file *of,

			      struct seq_file *seq, void *v)

{

	struct rdt_resource *r = of->kn->parent->priv;



	seq_printf(seq, "%d\n", r->num_rmid);



	return 0;

}



static int rdt_mon_features_show(struct kernfs_open_file *of,

				 struct seq_file *seq, void *v)

{

	struct rdt_resource *r = of->kn->parent->priv;

	struct mon_evt *mevt;



	list_for_each_entry(mevt, &r->evt_list, list)

		seq_printf(seq, "%s\n", mevt->name);



	return 0;

}



static int rdt_bw_gran_show(struct kernfs_open_file *of,

			     struct seq_file *seq, void *v)

{
@@ -508,6 +530,35 @@ static int rdt_delay_linear_show(struct kernfs_open_file *of, 
	return 0;

}



static int max_threshold_occ_show(struct kernfs_open_file *of,

				  struct seq_file *seq, void *v)

{

	struct rdt_resource *r = of->kn->parent->priv;



	seq_printf(seq, "%u\n", intel_cqm_threshold * r->mon_scale);



	return 0;

}



static ssize_t max_threshold_occ_write(struct kernfs_open_file *of,

				       char *buf, size_t nbytes, loff_t off)

{

	struct rdt_resource *r = of->kn->parent->priv;

	unsigned int bytes;

	int ret;



	ret = kstrtouint(buf, 0, &bytes);

	if (ret)

		return ret;



	if (bytes > (boot_cpu_data.x86_cache_size * 1024))

		return -EINVAL;



	intel_cqm_threshold = bytes / r->mon_scale;



	return ret ?: nbytes;

}



/* rdtgroup information files for one cache resource. */

static struct rftype res_common_files[] = {

	{
@@ -517,6 +568,20 @@ static struct rftype res_common_files[] = { 
		.seq_show	= rdt_num_closids_show,

		.fflags		= RF_CTRL_INFO,

	},

	{

		.name		= "mon_features",

		.mode		= 0444,

		.kf_ops		= &rdtgroup_kf_single_ops,

		.seq_show	= rdt_mon_features_show,

		.fflags		= RF_MON_INFO,

	},

	{

		.name		= "num_rmids",

		.mode		= 0444,

		.kf_ops		= &rdtgroup_kf_single_ops,

		.seq_show	= rdt_num_rmids_show,

		.fflags		= RF_MON_INFO,

	},

	{

		.name		= "cbm_mask",

		.mode		= 0444,
@@ -552,6 +617,14 @@ static struct rftype res_common_files[] = { 
		.seq_show	= rdt_delay_linear_show,

		.fflags		= RF_CTRL_INFO | RFTYPE_RES_MB,

	},

	{

		.name		= "max_threshold_occupancy",

		.mode		= 0644,

		.kf_ops		= &rdtgroup_kf_single_ops,

		.write		= max_threshold_occ_write,

		.seq_show	= max_threshold_occ_show,

		.fflags		= RF_MON_INFO | RFTYPE_RES_CACHE,

	},

	{

		.name		= "cpus",

		.mode		= 0644,
@@ -642,6 +715,7 @@ static int rdtgroup_create_info_dir(struct kernfs_node *parent_kn) 
{

	struct rdt_resource *r;

	unsigned long fflags;

	char name[32];

	int ret;



	/* create the directory */
@@ -656,6 +730,15 @@ static int rdtgroup_create_info_dir(struct kernfs_node *parent_kn) 
		if (ret)

			goto out_destroy;

	}



	for_each_mon_enabled_rdt_resource(r) {

		fflags =  r->fflags | RF_MON_INFO;

		sprintf(name, "%s_MON", r->name);

		ret = rdtgroup_mkdir_info_resdir(r, name, fflags);

		if (ret)

			goto out_destroy;

	}



	/*

	 * This extra ref will be put in kernfs_remove() and guarantees

	 * that @rdtgrp->kn is always accessible.