Commit 32ada3b9 authored by Xiaochen Shen's avatar Xiaochen Shen Committed by Borislav Petkov
Browse files

x86/resctrl: Clean up unused function parameter in mkdir path 



Commit

  334b0f4e ("x86/resctrl: Fix a deadlock due to inaccurate reference")

changed the argument to rdtgroup_kn_lock_live()/rdtgroup_kn_unlock()
within mkdir_rdt_prepare(). That change resulted in an unused function
parameter to mkdir_rdt_prepare().

Clean up the unused function parameter in mkdir_rdt_prepare() and its
callers rdtgroup_mkdir_mon() and rdtgroup_mkdir_ctrl_mon().

Signed-off-by: default avatarXiaochen Shen <xiaochen.shen@intel.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Reviewed-by: default avatarTony Luck <tony.luck@intel.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/1578500886-21771-5-git-send-email-xiaochen.shen@intel.com
parent 334b0f4e

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

+5 −11
Original line number Diff line number Diff line
@@ -2644,7 +2644,6 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp) 
}



static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,

			     struct kernfs_node *prgrp_kn,

			     const char *name, umode_t mode,

			     enum rdt_group_type rtype, struct rdtgroup **r)

{
@@ -2754,15 +2753,12 @@ static void mkdir_rdt_prepare_clean(struct rdtgroup *rgrp) 
 * to monitor a subset of tasks and cpus in its parent ctrl_mon group.

 */

static int rdtgroup_mkdir_mon(struct kernfs_node *parent_kn,

			      struct kernfs_node *prgrp_kn,

			      const char *name,

			      umode_t mode)

			      const char *name, umode_t mode)

{

	struct rdtgroup *rdtgrp, *prgrp;

	int ret;



	ret = mkdir_rdt_prepare(parent_kn, prgrp_kn, name, mode, RDTMON_GROUP,

				&rdtgrp);

	ret = mkdir_rdt_prepare(parent_kn, name, mode, RDTMON_GROUP, &rdtgrp);

	if (ret)

		return ret;
@@ -2784,7 +2780,6 @@ static int rdtgroup_mkdir_mon(struct kernfs_node *parent_kn, 
 * to allocate and monitor resources.

 */

static int rdtgroup_mkdir_ctrl_mon(struct kernfs_node *parent_kn,

				   struct kernfs_node *prgrp_kn,

				   const char *name, umode_t mode)

{

	struct rdtgroup *rdtgrp;
@@ -2792,8 +2787,7 @@ static int rdtgroup_mkdir_ctrl_mon(struct kernfs_node *parent_kn, 
	u32 closid;

	int ret;



	ret = mkdir_rdt_prepare(parent_kn, prgrp_kn, name, mode, RDTCTRL_GROUP,

				&rdtgrp);

	ret = mkdir_rdt_prepare(parent_kn, name, mode, RDTCTRL_GROUP, &rdtgrp);

	if (ret)

		return ret;
@@ -2867,14 +2861,14 @@ static int rdtgroup_mkdir(struct kernfs_node *parent_kn, const char *name, 
	 * subdirectory

	 */

	if (rdt_alloc_capable && parent_kn == rdtgroup_default.kn)

		return rdtgroup_mkdir_ctrl_mon(parent_kn, parent_kn, name, mode);

		return rdtgroup_mkdir_ctrl_mon(parent_kn, name, mode);



	/*

	 * If RDT monitoring is supported and the parent directory is a valid

	 * "mon_groups" directory, add a monitoring subdirectory.

	 */

	if (rdt_mon_capable && is_mon_groups(parent_kn, name))

		return rdtgroup_mkdir_mon(parent_kn, parent_kn->parent, name, mode);

		return rdtgroup_mkdir_mon(parent_kn, name, mode);



	return -EPERM;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE