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

!3087 psi irq in cgroupv1 and psi fine grained 

Merge Pull Request from: @ci-robot 
 
PR sync from: Lu Jialin <lujialin4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CGQGIUTDJA5BGAX5ABVQRTNCKUSSJGKZ/ 
Chen Wandun (3):
  mm: disable psi cgroup v1 by default
  mm: add config isolation for psi under cgroup v1
  psi: dont alloc memory for psi by default

Chengming Zhou (3):
  sched/psi: Fix periodic aggregation shut off
  sched/psi: Optimize task switch inside shared cgroups again
  sched/psi: Add PSI_IRQ to track IRQ/SOFTIRQ pressure

Haifeng Xu (1):
  sched/psi: Bail out early from irq time accounting

Hao Jia (1):
  sched/psi: Zero the memory of struct psi_group

Johannes Weiner (1):
  sched/psi: Remove NR_ONCPU task accounting

Lu Jialin (11):
  psi: support irq.pressure under cgroup v1
  psi: enable CONFIG_PSI_CGROUP_V1 in openeuler_defconfig
  psi: update psi irqtime when the irq delta is nozero
  memcg: Modify memcg async reclaim
  psi: add struct psi_group_ext
  PSI: Introduce fine grained stall time collect for cgroup reclaim
  PSI: Introduce avgs and total calculation for cgroup reclaim
  PSI: Introduce pressure.stat in psi
  PSI: add more memory fine grained stall tracking in pressure.stat
  add cpu fine grained stall tracking in pressure.stat
  PSI: enable CONFIG_PSI_FINE_GRAINED in openeuler_defconfig

Suren Baghdasaryan (1):
  psi: Fix "defined but not used" warnings when CONFIG_PROC_FS=n


-- 
2.34.1
 
https://gitee.com/openeuler/kernel/issues/I8BCV4 
 
Link:https://gitee.com/openeuler/kernel/pulls/3087

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents da35ba99 4693ad27

Documentation/admin-guide/cgroup-v2.rst

+6 −0
Original line number Diff line number Diff line
@@ -951,6 +951,12 @@ All cgroup core files are prefixed with "cgroup." 
	it's possible to delete a frozen (and empty) cgroup, as well as

	create new sub-cgroups.



irq.pressure

        A read-write nested-keyed file.



        Shows pressure stall information for IRQ/SOFTIRQ. See

        :ref:`Documentation/accounting/psi.rst <psi>` for details.



Controllers

===========

arch/arm64/configs/openeuler_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,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
@@ -108,6 +108,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
@@ -1689,7 +1689,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;

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1116,7 +1116,7 @@ blk_qc_t submit_bio(struct bio *bio) 
	 */

	if (unlikely(bio_op(bio) == REQ_OP_READ &&

	    bio_flagged(bio, BIO_WORKINGSET))) {

		unsigned long pflags;

		unsigned long pflags = 0;

		blk_qc_t ret;



		psi_memstall_enter(&pflags);