x86/intel_rdt: Support flexible data to parsing callbacks

rchatre · KAGA-KOKO · commit 7604df6e16ae · 2018-06-23T13:03:43.000+02:00
Each resource is associated with a configurable callback that should be used to parse the information provided for the particular resource from user space. In addition to the resource and domain pointers this callback is provided with just the character buffer being parsed. In support of flexible parsing the callback is modified to support a void pointer as argument. This enables resources that need more data than just the user provided data to pass its required data to the callback without affecting the signatures for the callbacks of all the other resources. Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: fenghua.yu@intel.com Cc: tony.luck@intel.com Cc: vikas.shivappa@linux.intel.com Cc: gavin.hindman@intel.com Cc: jithu.joseph@intel.com Cc: dave.hansen@intel.com Cc: hpa@zytor.com Link: https://lkml.kernel.org/r/34baacfced4d787d994ec7015e249e6c7e619053.1529706536.git.reinette.chatre@intel.com
diff --git a/arch/x86/kernel/cpu/intel_rdt.h b/arch/x86/kernel/cpu/intel_rdt.h
@@ -371,16 +371,16 @@ struct rdt_resource {
 	struct rdt_cache	cache;
 	struct rdt_membw	membw;
 	const char		*format_str;
-	int (*parse_ctrlval)	(char *buf, struct rdt_resource *r,
+	int (*parse_ctrlval)	(void *data, struct rdt_resource *r,
 				 struct rdt_domain *d);
 	struct list_head	evt_list;
 	int			num_rmid;
 	unsigned int		mon_scale;
 	unsigned long		fflags;
 };
 
-int parse_cbm(char *buf, struct rdt_resource *r, struct rdt_domain *d);
-int parse_bw(char *buf, struct rdt_resource *r,  struct rdt_domain *d);
+int parse_cbm(void *_data, struct rdt_resource *r, struct rdt_domain *d);
+int parse_bw(void *_buf, struct rdt_resource *r,  struct rdt_domain *d);
 
 extern struct mutex rdtgroup_mutex;
 
diff --git a/arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c b/arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c
@@ -64,9 +64,10 @@ static bool bw_validate(char *buf, unsigned long *data, struct rdt_resource *r)
 	return true;
 }
 
-int parse_bw(char *buf, struct rdt_resource *r, struct rdt_domain *d)
+int parse_bw(void *_buf, struct rdt_resource *r, struct rdt_domain *d)
 {
 	unsigned long data;
+	char *buf = _buf;
 
 	if (d->have_new_ctrl) {
 		rdt_last_cmd_printf("duplicate domain %d\n", d->id);
@@ -126,8 +127,9 @@ static bool cbm_validate(char *buf, u32 *data, struct rdt_resource *r)
  * Read one cache bit mask (hex). Check that it is valid for the current
  * resource type.
  */
-int parse_cbm(char *buf, struct rdt_resource *r, struct rdt_domain *d)
+int parse_cbm(void *_data, struct rdt_resource *r, struct rdt_domain *d)
 {
+	char *buf = _data;
 	u32 cbm_val;
 
 	if (d->have_new_ctrl) {

Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,10 @@ static bool bw_validate(char buf, unsigned long data, struct rdt_resource *r)`
`64`	`64`	`return true;`
`65`	`65`	`}`
`66`	`66`
`67`		`-int parse_bw(char buf, struct rdt_resource r, struct rdt_domain *d)`
	`67`	`+int parse_bw(void _buf, struct rdt_resource r, struct rdt_domain *d)`
`68`	`68`	`{`
`69`	`69`	`unsigned long data;`
	`70`	`+ char *buf = _buf;`
`70`	`71`
`71`	`72`	`if (d->have_new_ctrl) {`
`72`	`73`	`rdt_last_cmd_printf("duplicate domain %d\n", d->id);`
`@@ -126,8 +127,9 @@ static bool cbm_validate(char buf, u32 data, struct rdt_resource *r)`
`126`	`127`	`* Read one cache bit mask (hex). Check that it is valid for the current`
`127`	`128`	`* resource type.`
`128`	`129`	`*/`
`129`		`-int parse_cbm(char buf, struct rdt_resource r, struct rdt_domain *d)`
	`130`	`+int parse_cbm(void _data, struct rdt_resource r, struct rdt_domain *d)`
`130`	`131`	`{`
	`132`	`+ char *buf = _data;`
`131`	`133`	`u32 cbm_val;`
`132`	`134`
`133`	`135`	`if (d->have_new_ctrl) {`