Unverified Commit 5b44083b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3785 【OLK-6.6】PSI cgroupv1 and PSI fine grained 

Merge Pull Request from: @lujialin2 
 
1) enable psi in cgroupv1 binding cpuacct subsystem;
2) enable fine grained psi, which will record pressure from cgroup direct reclaim/aysnc reclaim/compact/global reclaim/swap under memory psi; cpu bandwidth/qos under cpu psi. 
 
Link:https://gitee.com/openeuler/kernel/pulls/3785

 

Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents a59ffde9 c36bfe97

arch/arm64/configs/openeuler_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -113,6 +113,8 @@ CONFIG_TASK_XACCT=y 
CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_PSI=y

CONFIG_PSI_DEFAULT_DISABLED=y

CONFIG_PSI_CGROUP_V1=y

CONFIG_PSI_FINE_GRAINED=y

# end of CPU/Task time and stats accounting



CONFIG_CPU_ISOLATION=y

arch/x86/configs/openeuler_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ CONFIG_TASK_XACCT=y 
CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_PSI=y

CONFIG_PSI_DEFAULT_DISABLED=y

CONFIG_PSI_CGROUP_V1=y

CONFIG_PSI_FINE_GRAINED=y

# end of CPU/Task time and stats accounting



CONFIG_CPU_ISOLATION=y

block/blk-cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -1834,7 +1834,7 @@ static void blkcg_scale_delay(struct blkcg_gq *blkg, u64 now) 
 */

static void blkcg_maybe_throttle_blkg(struct blkcg_gq *blkg, bool use_memdelay)

{

	unsigned long pflags;

	unsigned long pflags = 0;

	bool clamp;

	u64 now = ktime_to_ns(ktime_get());

	u64 exp;

fs/btrfs/compression.c

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ void btrfs_submit_compressed_read(struct btrfs_bio *bbio) 
	u64 em_len;

	u64 em_start;

	struct extent_map *em;

	unsigned long pflags;

	unsigned long pflags = 0;

	int memstall = 0;

	blk_status_t ret;

	int ret2;

fs/erofs/zdata.c

+1 −1
Original line number Diff line number Diff line
@@ -1636,7 +1636,7 @@ static void z_erofs_submit_queue(struct z_erofs_decompress_frontend *f, 
	struct block_device *last_bdev;

	unsigned int nr_bios = 0;

	struct bio *bio = NULL;

	unsigned long pflags;

	unsigned long pflags = 0;

	int memstall = 0;



	/*