Commit c08228ed authored by Chen Wandun's avatar Chen Wandun Committed by Lu Jialin
Browse files

mm: disable psi cgroup v1 by default 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8BCV4



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

Feature of psi cgroup v1 should only enable when open
CONFIG_PSI_CGROUP_V1.

Signed-off-by: default avatarChen Wandun <chenwandun@huawei.com>
Signed-off-by: default avatarLu Jialin <lujialin4@huawei.com>
parent 620ccc99

include/linux/psi.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ struct css_set; 
extern struct static_key_false psi_disabled;

extern struct psi_group psi_system;



extern struct static_key_false psi_v1_disabled;

extern struct static_key_true psi_v1_disabled;



void psi_init(void);

kernel/sched/cpuacct.c

+2 −2
Original line number Diff line number Diff line
@@ -383,8 +383,8 @@ static int __init setup_psi_v1(char *str) 
	int ret;



	ret = kstrtobool(str, &psi_v1_enable);

	if (!psi_v1_enable)

		static_branch_enable(&psi_v1_disabled);

	if (psi_v1_enable)

		static_branch_disable(&psi_v1_disabled);



	return ret == 0;

}

kernel/sched/psi.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ 
static int psi_bug __read_mostly;



DEFINE_STATIC_KEY_FALSE(psi_disabled);

DEFINE_STATIC_KEY_FALSE(psi_v1_disabled);

DEFINE_STATIC_KEY_TRUE(psi_v1_disabled);



#ifdef CONFIG_PSI_DEFAULT_DISABLED

static bool psi_enable;