February 2024 - Kernel - mailweb.openeuler.org

[PATCH v2 OLK-6.6 0/9] Support feature TLBI
by lishusen 05 Feb '24

05 Feb '24

Replace cpumask_t* by cpumask_var_t and rename related variables Xiang Chen (1): KVM: arm64: Translate logic cluster id to physical cluster id when updating lsudvmbm Yanan Wang (1): KVM: arm64: Only probe Hisi ncsnp feature on Hisi CPUs Zenghui Yu (2): KVM: arm64: Probe Hisi CPU TYPE from ACPI/DTB KVM: arm64: Add support for probing Hisi ncsnp capability lishusen (5): KVM: arm64: Support a new HiSi CPU type KVM: arm64: Probe and configure DVMBM capability on HiSi CPUs KVM: arm64: Add kvm_vcpu_arch::sched_cpus and pre_sched_cpus KVM: arm64: Add kvm_arch::sched_cpus and sched_lock KVM: arm64: Implement the capability of DVMBM .../admin-guide/kernel-parameters.txt | 4 + arch/arm64/configs/openeuler_defconfig | 1 + arch/arm64/include/asm/hisi_cpu_model.h | 21 + arch/arm64/include/asm/kvm_host.h | 30 +- arch/arm64/include/asm/kvm_mmu.h | 2 +- arch/arm64/kernel/image-vars.h | 5 + arch/arm64/kvm/Kconfig | 1 + arch/arm64/kvm/Makefile | 1 + arch/arm64/kvm/arm.c | 36 ++ arch/arm64/kvm/hisilicon/Kconfig | 7 + arch/arm64/kvm/hisilicon/Makefile | 2 + arch/arm64/kvm/hisilicon/hisi_virt.c | 515 ++++++++++++++++++ arch/arm64/kvm/hisilicon/hisi_virt.h | 103 ++++ arch/arm64/kvm/hyp/pgtable.c | 2 +- 14 files changed, 721 insertions(+), 9 deletions(-) create mode 100644 arch/arm64/include/asm/hisi_cpu_model.h create mode 100644 arch/arm64/kvm/hisilicon/Kconfig create mode 100644 arch/arm64/kvm/hisilicon/Makefile create mode 100644 arch/arm64/kvm/hisilicon/hisi_virt.c create mode 100644 arch/arm64/kvm/hisilicon/hisi_virt.h -- 2.33.0

2 10

[PATCH openEuler-1.0-LTS v2] fs:/dcache.c: fix negative dentry flag warning in dentry_free
by Long Li 05 Feb '24

05 Feb '24

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8WPQW CVE: NA -------------------------------- While run xfstests generic/429 on ext4, we get following report: WARNING: CPU: 4 PID: 5749 at fs/dcache.c:349 dentry_free.cold+0x20/0x76 CPU: 4 PID: 5749 Comm: t_encrypted_d_r Not tainted 4.19.90-00004-g0ec2c5ee4e0 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-0-ga698c8995f-prebuilt.qemu.org 04/01/2014 RIP: 0010:dentry_free.cold+0x20/0x76 RSP: 0018:ffffbc0944a5bdf0 EFLAGS: 00010202 RAX: 0000000000000024 RBX: ffff955f06e74f30 RCX: 0000000000000000 RDX: 0000000000000000 RSI: ffff955f3bb168f8 RDI: ffff955f3bb168f8 RBP: ffff955f06e4c6c0 R08: ffff955f3bb168f8 R09: 0000000000000005 R10: 0000000000000c27 R11: ffffffffb57d3bad R12: ffff955f06e4c718 R13: ffff955f06e4c718 R14: ffff955f06e74f30 R15: 0000000000000000 FS: 00007f4ba0307b40(0000) GS:ffff955f3bb00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f4b9bcd1ff8 CR3: 0000000123666000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: __dentry_kill+0x219/0x340 shrink_dentry_list+0xee/0x3e0 shrink_dcache_parent+0x8c/0xc0 vfs_rmdir+0x142/0x230 do_rmdir+0x1c2/0x250 __x64_sys_rmdir+0x1b/0x30 do_syscall_64+0xcb/0x370 entry_SYSCALL_64_after_hwframe+0x5c/0xc1 Look at generic/429 test case, removing the directory and accessing the file that do not exist in the directory is done concurrently here. Consider the following concurrent call flow, which triggers the warning of negative dentry flag in dentry_free(). The root cause of the problem is that lack of lock protection when determining whether the dentry needs to make a fast put, it causes that the DCACHE_NEGATIVE_ACCOUNT flag to be set incorrectly. rmdir stat file ------------------------- ------------------------- fast_dput if (d_flags == (DCACHE_REFERENCED | DCACHE_LRU_LIST) && !d_unhashed(dentry)) shrink_dentry_list spin_lock(&dentry->d_lock) d_shrink_del(dentry) <clear DCACHE_LRU_LIST> __dentry_kill(dentry) dentry_unlist(dentry, parent) dentry->d_flags &= ~DCACHE_NEGATIVE_ACCOUNT <clear DCACHE_NEGATIVE_ACCOUNT> spin_unlock(&dentry->d_lock) spin_lock(&dentry->d_lock) limit_negative_dentry(dentry) <set DCACHE_NEGATIVE_ACCOUNT> spin_unlock(&dentry->d_lock) dentry_free(dentry) WARN_ON(dentry->d_flags & DCACHE_NEGATIVE_ACCOUNT) Fix the problem by checking the dentry is dead before set neagtive flag. Fixes: 0f4e7166bfab ("fs:/dcache.c: fix negative dentry limit not complete problem") Signed-off-by: Long Li <leo.lilong(a)huawei.com> --- fs/dcache.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/dcache.c b/fs/dcache.c index 2a7eaac0c3ef..926df08eeb0c 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -643,6 +643,10 @@ static inline bool limit_negative_dentry(struct dentry *dentry) { struct dentry *parent; + /* The dentry is now unrecoverably dead, shuoldn't limit */ + if (unlikely(dentry->d_lockref.count < 0)) + return false; + parent = dentry->d_parent; if (unlikely(!parent)) return false; -- 2.31.1

2 2

[PATCH OLK-6.6] writeback: kabi: KABI reservation for writeback
by Baokun Li 05 Feb '24

05 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I9170A ---------------------------------------------------------------------- struture size reserves reserved wb_completion 16 2 32 bdi_writeback 1552 6 1600 backing_dev_info 2288 2 2304 writeback_control 104 3 128 Signed-off-by: Baokun Li <libaokun1(a)huawei.com> --- include/linux/backing-dev-defs.h | 13 +++++++++++++ include/linux/writeback.h | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/include/linux/backing-dev-defs.h b/include/linux/backing-dev-defs.h index ae12696ec492..0eb86398747a 100644 --- a/include/linux/backing-dev-defs.h +++ b/include/linux/backing-dev-defs.h @@ -63,6 +63,9 @@ enum wb_reason { struct wb_completion { atomic_t cnt; wait_queue_head_t *waitq; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; #define __WB_COMPLETION_INIT(_waitq) \ @@ -160,6 +163,13 @@ struct bdi_writeback { struct rcu_head rcu; }; #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) }; struct backing_dev_info { @@ -198,6 +208,9 @@ struct backing_dev_info { #ifdef CONFIG_DEBUG_FS struct dentry *debug_dir; #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) }; struct wb_lock_cookie { diff --git a/include/linux/writeback.h b/include/linux/writeback.h index 083387c00f0c..447662e1d76f 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h @@ -89,6 +89,10 @@ struct writeback_control { size_t wb_lcand_bytes; /* bytes written by last candidate */ size_t wb_tcand_bytes; /* bytes written by this candidate */ #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) }; static inline blk_opf_t wbc_to_write_flags(struct writeback_control *wbc) -- 2.31.1

2 1

[PATCH OLK-6.6 v3 0/4] reserve kabi space for some structures
by Li Lingfeng 05 Feb '24

05 Feb '24

Reserve kabi space for some structures in elevator/libata/libnvdimm/scsi. v2->v3: Structure aligned by cache line based on openeuler_defconfig. Li Lingfeng (4): elevator: reserve space for structures in elevator ata: libata: reserve space for structures in libata libnvdimm: reserve space for structures in libnvdimm scsi: reserve space for structures in scsi block/elevator.h | 15 +++++++++++++++ include/linux/libata.h | 31 +++++++++++++++++++++++++++++++ include/linux/libnvdimm.h | 7 +++++++ include/linux/nd.h | 13 +++++++++++++ include/scsi/fc/fc_ms.h | 5 +++++ include/scsi/libfc.h | 4 ++++ include/scsi/libfcoe.h | 4 ++++ include/scsi/libiscsi.h | 30 ++++++++++++++++++++++++++++++ include/scsi/scsi_cmnd.h | 4 ++++ include/scsi/scsi_device.h | 16 ++++++++++++++++ include/scsi/scsi_dh.h | 4 ++++ include/scsi/scsi_driver.h | 4 ++++ include/scsi/scsi_eh.h | 4 ++++ include/scsi/scsi_host.h | 10 ++++++++++ 14 files changed, 151 insertions(+) -- 2.31.1

2 5

[PATCH OLK-6.6 v2] openeuler_defconfig: enable CONFIG_PAGE_CACHE_LIMIT
by Ze Zuo 05 Feb '24

05 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8NIKC -------------------------------- Enable CONFIG_PAGE_CACHE_LIMIT for x86, arm64 by default. Signed-off-by: Ze Zuo <zuoze1(a)huawei.com> --- arch/arm64/configs/openeuler_defconfig | 2 +- arch/x86/configs/openeuler_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 2ddea5999010..e6c9474e032a 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -1161,7 +1161,7 @@ CONFIG_PER_VMA_LOCK=y CONFIG_LOCK_MM_AND_FIND_VMA=y # CONFIG_ASCEND_FEATURES is not set # CONFIG_ASCEND_OOM is not set -# CONFIG_PAGE_CACHE_LIMIT is not set +CONFIG_PAGE_CACHE_LIMIT=y # CONFIG_CLEAR_FREELIST_PAGE is not set CONFIG_MEMORY_RELIABLE=y CONFIG_DYNAMIC_POOL=y diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index d4027ab5893a..5af6488ab592 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -1171,7 +1171,7 @@ CONFIG_LRU_GEN=y CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y CONFIG_PER_VMA_LOCK=y CONFIG_LOCK_MM_AND_FIND_VMA=y -# CONFIG_PAGE_CACHE_LIMIT is not set +CONFIG_PAGE_CACHE_LIMIT=y CONFIG_DYNAMIC_POOL=y CONFIG_ETMEM_SCAN=m CONFIG_ETMEM_SWAP=m -- 2.25.1

2 1

[PATCH OLK-6.6 v3 0/4] reserve kabi space for some structures
by Li Lingfeng 05 Feb '24

05 Feb '24

Reserve kabi space for some structures in elevator/libata/libnvdimm/scsi. v2->v3: Structure aligned by cache line based on openeuler_defconfig. Li Lingfeng (4): elevator: reserve space for structures in elevator ata: libata: reserve space for structures in libata libnvdimm: reserve space for structures in libnvdimm scsi: reserve space for structures in scsi block/elevator.h | 15 +++++++++++++++ include/linux/libata.h | 31 +++++++++++++++++++++++++++++++ include/linux/libnvdimm.h | 7 +++++++ include/linux/nd.h | 13 +++++++++++++ include/scsi/fc/fc_ms.h | 5 +++++ include/scsi/libfc.h | 4 ++++ include/scsi/libfcoe.h | 4 ++++ include/scsi/libiscsi.h | 30 ++++++++++++++++++++++++++++++ include/scsi/scsi_cmnd.h | 4 ++++ include/scsi/scsi_device.h | 16 ++++++++++++++++ include/scsi/scsi_dh.h | 4 ++++ include/scsi/scsi_driver.h | 4 ++++ include/scsi/scsi_eh.h | 4 ++++ include/scsi/scsi_host.h | 10 ++++++++++ 14 files changed, 151 insertions(+) -- 2.31.1

2 5

[PATCH OLK-6.6 v2] openeuler_defconfig: enable CONFIG_PAGE_CACHE_LIMIT
by Ze Zuo 05 Feb '24

05 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8NIKC -------------------------------- Enable CONFIG_PAGE_CACHE_LIMIT for x86, arm64 by default. Signed-off-by: Ze Zuo <zuoze1(a)huawei.com> --- arch/arm64/configs/openeuler_defconfig | 2 +- arch/x86/configs/openeuler_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 2ddea5999010..e6c9474e032a 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -1161,7 +1161,7 @@ CONFIG_PER_VMA_LOCK=y CONFIG_LOCK_MM_AND_FIND_VMA=y # CONFIG_ASCEND_FEATURES is not set # CONFIG_ASCEND_OOM is not set -# CONFIG_PAGE_CACHE_LIMIT is not set +CONFIG_PAGE_CACHE_LIMIT=y # CONFIG_CLEAR_FREELIST_PAGE is not set CONFIG_MEMORY_RELIABLE=y CONFIG_DYNAMIC_POOL=y diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index d4027ab5893a..5af6488ab592 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -1171,7 +1171,7 @@ CONFIG_LRU_GEN=y CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y CONFIG_PER_VMA_LOCK=y CONFIG_LOCK_MM_AND_FIND_VMA=y -# CONFIG_PAGE_CACHE_LIMIT is not set +CONFIG_PAGE_CACHE_LIMIT=y CONFIG_DYNAMIC_POOL=y CONFIG_ETMEM_SCAN=m CONFIG_ETMEM_SWAP=m -- 2.25.1

2 1

[PATCH v2 OLK-6.6 0/9] Support feature TLBI
by lishusen 05 Feb '24

05 Feb '24

Replace cpumask_t* by cpumask_var_t and rename related variables Xiang Chen (1): KVM: arm64: Translate logic cluster id to physical cluster id when updating lsudvmbm Yanan Wang (1): KVM: arm64: Only probe Hisi ncsnp feature on Hisi CPUs Zenghui Yu (2): KVM: arm64: Probe Hisi CPU TYPE from ACPI/DTB KVM: arm64: Add support for probing Hisi ncsnp capability lishusen (5): KVM: arm64: Support a new HiSi CPU type KVM: arm64: Probe and configure DVMBM capability on HiSi CPUs KVM: arm64: Add kvm_vcpu_arch::sched_cpus and pre_sched_cpus KVM: arm64: Add kvm_arch::sched_cpus and sched_lock KVM: arm64: Implement the capability of DVMBM .../admin-guide/kernel-parameters.txt | 4 + arch/arm64/configs/openeuler_defconfig | 1 + arch/arm64/include/asm/hisi_cpu_model.h | 21 + arch/arm64/include/asm/kvm_host.h | 30 +- arch/arm64/include/asm/kvm_mmu.h | 2 +- arch/arm64/kernel/image-vars.h | 5 + arch/arm64/kvm/Kconfig | 1 + arch/arm64/kvm/Makefile | 1 + arch/arm64/kvm/arm.c | 36 ++ arch/arm64/kvm/hisilicon/Kconfig | 7 + arch/arm64/kvm/hisilicon/Makefile | 2 + arch/arm64/kvm/hisilicon/hisi_virt.c | 514 ++++++++++++++++++ arch/arm64/kvm/hisilicon/hisi_virt.h | 103 ++++ arch/arm64/kvm/hyp/pgtable.c | 2 +- 14 files changed, 720 insertions(+), 9 deletions(-) create mode 100644 arch/arm64/include/asm/hisi_cpu_model.h create mode 100644 arch/arm64/kvm/hisilicon/Kconfig create mode 100644 arch/arm64/kvm/hisilicon/Makefile create mode 100644 arch/arm64/kvm/hisilicon/hisi_virt.c create mode 100644 arch/arm64/kvm/hisilicon/hisi_virt.h -- 2.33.0

2 10

[openeuler:OLK-6.6 2377/2961] kernel/sched/psi.c:384:13: error: invalid storage class for function 'test_fine_grained_stat'
by kernel test robot 05 Feb '24

05 Feb '24

tree: https://gitee.com/openeuler/kernel.git OLK-6.6 head: 413aaa5179daf233ab0cf4c22869ac607c838236 commit: 654944510822988390470cbc5b6f914c19dd9b88 [2377/2961] sched/psi: add cpu fine grained stall tracking in pressure.stat config: loongarch-randconfig-001-20240205 (https://download.01.org/0day-ci/archive/20240205/202402051440.1AwHgCIo-lkp@…) compiler: loongarch64-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240205/202402051440.1AwHgCIo-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202402051440.1AwHgCIo-lkp@intel.com/ All errors (new ones prefixed by >>): In file included from include/linux/irq.h:23, from kernel/sched/build_utility.c:29: include/linux/nmi.h: In function 'trigger_all_cpu_backtrace': arch/loongarch/include/asm/irq.h:42:40: error: void value not ignored as it ought to be 42 | #define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace include/linux/nmi.h:160:16: note: in expansion of macro 'arch_trigger_cpumask_backtrace' 160 | return arch_trigger_cpumask_backtrace(cpu_online_mask, -1); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/linux/nmi.h: In function 'trigger_allbutcpu_cpu_backtrace': arch/loongarch/include/asm/irq.h:42:40: error: void value not ignored as it ought to be 42 | #define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace include/linux/nmi.h:165:16: note: in expansion of macro 'arch_trigger_cpumask_backtrace' 165 | return arch_trigger_cpumask_backtrace(cpu_online_mask, exclude_cpu); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/linux/nmi.h: In function 'trigger_cpumask_backtrace': arch/loongarch/include/asm/irq.h:42:40: error: void value not ignored as it ought to be 42 | #define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace include/linux/nmi.h:170:16: note: in expansion of macro 'arch_trigger_cpumask_backtrace' 170 | return arch_trigger_cpumask_backtrace(mask, -1); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/linux/nmi.h: In function 'trigger_single_cpu_backtrace': arch/loongarch/include/asm/irq.h:42:40: error: void value not ignored as it ought to be 42 | #define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace include/linux/nmi.h:175:16: note: in expansion of macro 'arch_trigger_cpumask_backtrace' 175 | return arch_trigger_cpumask_backtrace(cpumask_of(cpu), -1); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from kernel/sched/build_utility.c:97: kernel/sched/psi.c: In function 'record_stat_times': >> kernel/sched/psi.c:384:13: error: invalid storage class for function 'test_fine_grained_stat' 384 | static bool test_fine_grained_stat(unsigned int *stat_tasks, | ^~~~~~~~~~~~~~~~~~~~~~ >> kernel/sched/psi.c:419:13: error: invalid storage class for function 'psi_group_stat_change' 419 | static void psi_group_stat_change(struct psi_group *group, int cpu, | ^~~~~~~~~~~~~~~~~~~~~ >> kernel/sched/psi.c:447:13: error: invalid storage class for function 'psi_stat_flags_change' 447 | static void psi_stat_flags_change(struct task_struct *task, int *stat_set, | ^~~~~~~~~~~~~~~~~~~~~ >> kernel/sched/psi.c:469:13: error: invalid storage class for function 'get_recent_stat_times' 469 | static void get_recent_stat_times(struct psi_group *group, int cpu, | ^~~~~~~~~~~~~~~~~~~~~ >> kernel/sched/psi.c:496:13: error: invalid storage class for function 'update_throttle_type' 496 | static void update_throttle_type(struct task_struct *task, int cpu, bool next) | ^~~~~~~~~~~~~~~~~~~~ >> kernel/sched/psi.c:520:13: error: invalid storage class for function 'collect_percpu_times' 520 | static void collect_percpu_times(struct psi_group *group, | ^~~~~~~~~~~~~~~~~~~~ >> kernel/sched/psi.c:588:13: error: invalid storage class for function 'window_reset' 588 | static void window_reset(struct psi_window *win, u64 now, u64 value, | ^~~~~~~~~~~~ >> kernel/sched/psi.c:607:12: error: invalid storage class for function 'window_update' 607 | static u64 window_update(struct psi_window *win, u64 now, u64 value) | ^~~~~~~~~~~~~ >> kernel/sched/psi.c:633:12: error: invalid storage class for function 'update_triggers' 633 | static u64 update_triggers(struct psi_group *group, u64 now, bool *update_total, | ^~~~~~~~~~~~~~~ >> kernel/sched/psi.c:706:12: error: invalid storage class for function 'update_averages' 706 | static u64 update_averages(struct psi_group *group, u64 now) | ^~~~~~~~~~~~~~~ >> kernel/sched/psi.c:771:13: error: invalid storage class for function 'psi_avgs_work' 771 | static void psi_avgs_work(struct work_struct *work) | ^~~~~~~~~~~~~ >> kernel/sched/psi.c:807:13: error: invalid storage class for function 'init_rtpoll_triggers' 807 | static void init_rtpoll_triggers(struct psi_group *group, u64 now) | ^~~~~~~~~~~~~~~~~~~~ >> kernel/sched/psi.c:820:13: error: invalid storage class for function 'psi_schedule_rtpoll_work' 820 | static void psi_schedule_rtpoll_work(struct psi_group *group, unsigned long delay, | ^~~~~~~~~~~~~~~~~~~~~~~~ >> kernel/sched/psi.c:847:13: error: invalid storage class for function 'psi_rtpoll_work' 847 | static void psi_rtpoll_work(struct psi_group *group) | ^~~~~~~~~~~~~~~ >> kernel/sched/psi.c:931:12: error: invalid storage class for function 'psi_rtpoll_worker' 931 | static int psi_rtpoll_worker(void *data) | ^~~~~~~~~~~~~~~~~ >> kernel/sched/psi.c:949:13: error: invalid storage class for function 'poll_timer_fn' 949 | static void poll_timer_fn(struct timer_list *t) | ^~~~~~~~~~~~~ >> kernel/sched/psi.c:957:13: error: invalid storage class for function 'record_times' 957 | static void record_times(struct psi_group_cpu *groupc, u64 now) | ^~~~~~~~~~~~ >> kernel/sched/psi.c:990:13: error: invalid storage class for function 'psi_group_change' 990 | static void psi_group_change(struct psi_group *group, int cpu, | ^~~~~~~~~~~~~~~~ >> kernel/sched/psi.c:1106:13: error: invalid storage class for function 'task_is_in_psi_v1' 1106 | static bool task_is_in_psi_v1(void) | ^~~~~~~~~~~~~~~~~ >> kernel/sched/psi.c:1112:33: error: invalid storage class for function 'task_psi_group' 1112 | static inline struct psi_group *task_psi_group(struct task_struct *task) | ^~~~~~~~~~~~~~ kernel/sched/psi.c:1130:13: error: invalid storage class for function 'psi_flags_change' 1130 | static void psi_flags_change(struct task_struct *task, int clear, int set) | ^~~~~~~~~~~~~~~~ In file included from include/linux/linkage.h:7, from include/linux/kernel.h:17, from include/linux/cpumask.h:10, from include/linux/smp.h:13, from include/linux/sched/clock.h:5, from kernel/sched/build_utility.c:12: kernel/sched/psi.c:1338:19: error: non-static declaration of 'psi_memstall_enter' follows static declaration 1338 | EXPORT_SYMBOL_GPL(psi_memstall_enter); | ^~~~~~~~~~~~~~~~~~ include/linux/export.h:74:28: note: in definition of macro '__EXPORT_SYMBOL' 74 | extern typeof(sym) sym; \ | ^~~ include/linux/export.h:87:41: note: in expansion of macro '_EXPORT_SYMBOL' 87 | #define EXPORT_SYMBOL_GPL(sym) _EXPORT_SYMBOL(sym, "GPL") | ^~~~~~~~~~~~~~ kernel/sched/psi.c:1338:1: note: in expansion of macro 'EXPORT_SYMBOL_GPL' 1338 | EXPORT_SYMBOL_GPL(psi_memstall_enter); | ^~~~~~~~~~~~~~~~~ kernel/sched/psi.c:1306:6: note: previous definition of 'psi_memstall_enter' with type 'void(long unsigned int *)' 1306 | void psi_memstall_enter(unsigned long *flags) | ^~~~~~~~~~~~~~~~~~ kernel/sched/psi.c:1370:19: error: non-static declaration of 'psi_memstall_leave' follows static declaration 1370 | EXPORT_SYMBOL_GPL(psi_memstall_leave); | ^~~~~~~~~~~~~~~~~~ include/linux/export.h:74:28: note: in definition of macro '__EXPORT_SYMBOL' 74 | extern typeof(sym) sym; \ | ^~~ include/linux/export.h:87:41: note: in expansion of macro '_EXPORT_SYMBOL' 87 | #define EXPORT_SYMBOL_GPL(sym) _EXPORT_SYMBOL(sym, "GPL") | ^~~~~~~~~~~~~~ kernel/sched/psi.c:1370:1: note: in expansion of macro 'EXPORT_SYMBOL_GPL' 1370 | EXPORT_SYMBOL_GPL(psi_memstall_leave); | ^~~~~~~~~~~~~~~~~ kernel/sched/psi.c:1346:6: note: previous definition of 'psi_memstall_leave' with type 'void(long unsigned int *)' 1346 | void psi_memstall_leave(unsigned long *flags) | ^~~~~~~~~~~~~~~~~~ kernel/sched/psi.c:1763:12: error: invalid storage class for function 'psi_io_show' 1763 | static int psi_io_show(struct seq_file *m, void *v) | ^~~~~~~~~~~ kernel/sched/psi.c:1768:12: error: invalid storage class for function 'psi_memory_show' 1768 | static int psi_memory_show(struct seq_file *m, void *v) | ^~~~~~~~~~~~~~~ kernel/sched/psi.c:1773:12: error: invalid storage class for function 'psi_cpu_show' 1773 | static int psi_cpu_show(struct seq_file *m, void *v) | ^~~~~~~~~~~~ kernel/sched/psi.c:1778:12: error: invalid storage class for function 'psi_io_open' 1778 | static int psi_io_open(struct inode *inode, struct file *file) | ^~~~~~~~~~~ kernel/sched/psi.c:1783:12: error: invalid storage class for function 'psi_memory_open' 1783 | static int psi_memory_open(struct inode *inode, struct file *file) | ^~~~~~~~~~~~~~~ kernel/sched/psi.c:1788:12: error: invalid storage class for function 'psi_cpu_open' 1788 | static int psi_cpu_open(struct inode *inode, struct file *file) | ^~~~~~~~~~~~ kernel/sched/psi.c:1793:16: error: invalid storage class for function 'psi_write' 1793 | static ssize_t psi_write(struct file *file, const char __user *user_buf, | ^~~~~~~~~ kernel/sched/psi.c:1836:16: error: invalid storage class for function 'psi_io_write' 1836 | static ssize_t psi_io_write(struct file *file, const char __user *user_buf, | ^~~~~~~~~~~~ kernel/sched/psi.c:1842:16: error: invalid storage class for function 'psi_memory_write' 1842 | static ssize_t psi_memory_write(struct file *file, const char __user *user_buf, | ^~~~~~~~~~~~~~~~ kernel/sched/psi.c:1848:16: error: invalid storage class for function 'psi_cpu_write' 1848 | static ssize_t psi_cpu_write(struct file *file, const char __user *user_buf, | ^~~~~~~~~~~~~ kernel/sched/psi.c:1854:17: error: invalid storage class for function 'psi_fop_poll' 1854 | static __poll_t psi_fop_poll(struct file *file, poll_table *wait) | ^~~~~~~~~~~~ kernel/sched/psi.c:1861:12: error: invalid storage class for function 'psi_fop_release' 1861 | static int psi_fop_release(struct inode *inode, struct file *file) | ^~~~~~~~~~~~~~~ kernel/sched/psi.c:1870:27: error: initializer element is not constant 1870 | .proc_open = psi_io_open, | ^~~~~~~~~~~ kernel/sched/psi.c:1870:27: note: (near initialization for 'psi_io_proc_ops.proc_open') kernel/sched/psi.c:1873:27: error: initializer element is not constant 1873 | .proc_write = psi_io_write, | ^~~~~~~~~~~~ kernel/sched/psi.c:1873:27: note: (near initialization for 'psi_io_proc_ops.proc_write') kernel/sched/psi.c:1874:27: error: initializer element is not constant 1874 | .proc_poll = psi_fop_poll, | ^~~~~~~~~~~~ kernel/sched/psi.c:1874:27: note: (near initialization for 'psi_io_proc_ops.proc_poll') kernel/sched/psi.c:1875:27: error: initializer element is not constant 1875 | .proc_release = psi_fop_release, | ^~~~~~~~~~~~~~~ kernel/sched/psi.c:1875:27: note: (near initialization for 'psi_io_proc_ops.proc_release') kernel/sched/psi.c:1879:27: error: initializer element is not constant 1879 | .proc_open = psi_memory_open, | ^~~~~~~~~~~~~~~ kernel/sched/psi.c:1879:27: note: (near initialization for 'psi_memory_proc_ops.proc_open') kernel/sched/psi.c:1882:27: error: initializer element is not constant 1882 | .proc_write = psi_memory_write, | ^~~~~~~~~~~~~~~~ vim +/test_fine_grained_stat +384 kernel/sched/psi.c a65983d90bfb5e Lu Jialin 2024-01-04 383 a65983d90bfb5e Lu Jialin 2024-01-04 @384 static bool test_fine_grained_stat(unsigned int *stat_tasks, a65983d90bfb5e Lu Jialin 2024-01-04 385 unsigned int nr_running, a65983d90bfb5e Lu Jialin 2024-01-04 386 enum psi_stat_states state) a65983d90bfb5e Lu Jialin 2024-01-04 387 { a65983d90bfb5e Lu Jialin 2024-01-04 388 switch (state) { a65983d90bfb5e Lu Jialin 2024-01-04 389 case PSI_MEMCG_RECLAIM_SOME: a65983d90bfb5e Lu Jialin 2024-01-04 390 return unlikely(stat_tasks[NR_MEMCG_RECLAIM]); a65983d90bfb5e Lu Jialin 2024-01-04 391 case PSI_MEMCG_RECLAIM_FULL: a65983d90bfb5e Lu Jialin 2024-01-04 392 return unlikely(stat_tasks[NR_MEMCG_RECLAIM] && a65983d90bfb5e Lu Jialin 2024-01-04 393 nr_running == stat_tasks[NR_MEMCG_RECLAIM_RUNNING]); 25d00f6853c3c6 Lu Jialin 2024-01-04 394 case PSI_GLOBAL_RECLAIM_SOME: 25d00f6853c3c6 Lu Jialin 2024-01-04 395 return unlikely(stat_tasks[NR_GLOBAL_RECLAIM]); 25d00f6853c3c6 Lu Jialin 2024-01-04 396 case PSI_GLOBAL_RECLAIM_FULL: 25d00f6853c3c6 Lu Jialin 2024-01-04 397 return unlikely(stat_tasks[NR_GLOBAL_RECLAIM] && 25d00f6853c3c6 Lu Jialin 2024-01-04 398 nr_running == stat_tasks[NR_GLOBAL_RECLAIM_RUNNING]); 25d00f6853c3c6 Lu Jialin 2024-01-04 399 case PSI_COMPACT_SOME: 25d00f6853c3c6 Lu Jialin 2024-01-04 400 return unlikely(stat_tasks[NR_COMPACT]); 25d00f6853c3c6 Lu Jialin 2024-01-04 401 case PSI_COMPACT_FULL: 25d00f6853c3c6 Lu Jialin 2024-01-04 402 return unlikely(stat_tasks[NR_COMPACT] && 25d00f6853c3c6 Lu Jialin 2024-01-04 403 nr_running == stat_tasks[NR_COMPACT_RUNNING]); 25d00f6853c3c6 Lu Jialin 2024-01-04 404 case PSI_ASYNC_MEMCG_RECLAIM_SOME: 25d00f6853c3c6 Lu Jialin 2024-01-04 405 return unlikely(stat_tasks[NR_ASYNC_MEMCG_RECLAIM]); 25d00f6853c3c6 Lu Jialin 2024-01-04 406 case PSI_ASYNC_MEMCG_RECLAIM_FULL: 25d00f6853c3c6 Lu Jialin 2024-01-04 407 return unlikely(stat_tasks[NR_ASYNC_MEMCG_RECLAIM] && 25d00f6853c3c6 Lu Jialin 2024-01-04 408 nr_running == stat_tasks[NR_ASYNC_MEMCG_RECLAIM_RUNNING]); 25d00f6853c3c6 Lu Jialin 2024-01-04 409 case PSI_SWAP_SOME: 25d00f6853c3c6 Lu Jialin 2024-01-04 410 return unlikely(stat_tasks[NR_SWAP]); 25d00f6853c3c6 Lu Jialin 2024-01-04 411 case PSI_SWAP_FULL: 25d00f6853c3c6 Lu Jialin 2024-01-04 412 return unlikely(stat_tasks[NR_SWAP] && 25d00f6853c3c6 Lu Jialin 2024-01-04 413 nr_running == stat_tasks[NR_SWAP_RUNNING]); a65983d90bfb5e Lu Jialin 2024-01-04 414 default: a65983d90bfb5e Lu Jialin 2024-01-04 415 return false; a65983d90bfb5e Lu Jialin 2024-01-04 416 } a65983d90bfb5e Lu Jialin 2024-01-04 417 } a65983d90bfb5e Lu Jialin 2024-01-04 418 a65983d90bfb5e Lu Jialin 2024-01-04 @419 static void psi_group_stat_change(struct psi_group *group, int cpu, a65983d90bfb5e Lu Jialin 2024-01-04 420 int clear, int set) a65983d90bfb5e Lu Jialin 2024-01-04 421 { a65983d90bfb5e Lu Jialin 2024-01-04 422 int t; a65983d90bfb5e Lu Jialin 2024-01-04 423 u32 state_mask = 0; a65983d90bfb5e Lu Jialin 2024-01-04 424 enum psi_stat_states s; a65983d90bfb5e Lu Jialin 2024-01-04 425 struct psi_group_cpu *groupc = per_cpu_ptr(group->pcpu, cpu); a65983d90bfb5e Lu Jialin 2024-01-04 426 a65983d90bfb5e Lu Jialin 2024-01-04 427 write_seqcount_begin(&groupc->seq); a65983d90bfb5e Lu Jialin 2024-01-04 428 a65983d90bfb5e Lu Jialin 2024-01-04 429 for (t = 0; clear; clear &= ~(1 << t), t++) a65983d90bfb5e Lu Jialin 2024-01-04 430 if (clear & (1 << t)) a65983d90bfb5e Lu Jialin 2024-01-04 431 groupc->fine_grained_tasks[t]--; a65983d90bfb5e Lu Jialin 2024-01-04 432 for (t = 0; set; set &= ~(1 << t), t++) a65983d90bfb5e Lu Jialin 2024-01-04 433 if (set & (1 << t)) a65983d90bfb5e Lu Jialin 2024-01-04 434 groupc->fine_grained_tasks[t]++; 65494451082298 Lu Jialin 2024-01-04 435 for (s = 0; s < PSI_CPU_CFS_BANDWIDTH_FULL; s++) a65983d90bfb5e Lu Jialin 2024-01-04 436 if (test_fine_grained_stat(groupc->fine_grained_tasks, a65983d90bfb5e Lu Jialin 2024-01-04 437 groupc->tasks[NR_RUNNING], s)) a65983d90bfb5e Lu Jialin 2024-01-04 438 state_mask |= (1 << s); a65983d90bfb5e Lu Jialin 2024-01-04 439 if (unlikely(groupc->state_mask & PSI_ONCPU) && a65983d90bfb5e Lu Jialin 2024-01-04 440 cpu_curr(cpu)->memstall_type) a65983d90bfb5e Lu Jialin 2024-01-04 441 state_mask |= (1 << (cpu_curr(cpu)->memstall_type * 2 - 1)); a65983d90bfb5e Lu Jialin 2024-01-04 442 a65983d90bfb5e Lu Jialin 2024-01-04 443 groupc->fine_grained_state_mask = state_mask; a65983d90bfb5e Lu Jialin 2024-01-04 444 write_seqcount_end(&groupc->seq); a65983d90bfb5e Lu Jialin 2024-01-04 445 } a65983d90bfb5e Lu Jialin 2024-01-04 446 a65983d90bfb5e Lu Jialin 2024-01-04 @447 static void psi_stat_flags_change(struct task_struct *task, int *stat_set, a65983d90bfb5e Lu Jialin 2024-01-04 448 int *stat_clear, int set, int clear) a65983d90bfb5e Lu Jialin 2024-01-04 449 { a65983d90bfb5e Lu Jialin 2024-01-04 450 if (!task->memstall_type) a65983d90bfb5e Lu Jialin 2024-01-04 451 return; a65983d90bfb5e Lu Jialin 2024-01-04 452 a65983d90bfb5e Lu Jialin 2024-01-04 453 if (clear) { a65983d90bfb5e Lu Jialin 2024-01-04 454 if (clear & TSK_MEMSTALL) a65983d90bfb5e Lu Jialin 2024-01-04 455 *stat_clear |= 1 << (2 * task->memstall_type - 2); a65983d90bfb5e Lu Jialin 2024-01-04 456 if (clear & TSK_MEMSTALL_RUNNING) a65983d90bfb5e Lu Jialin 2024-01-04 457 *stat_clear |= 1 << (2 * task->memstall_type - 1); a65983d90bfb5e Lu Jialin 2024-01-04 458 } a65983d90bfb5e Lu Jialin 2024-01-04 459 if (set) { a65983d90bfb5e Lu Jialin 2024-01-04 460 if (set & TSK_MEMSTALL) a65983d90bfb5e Lu Jialin 2024-01-04 461 *stat_set |= 1 << (2 * task->memstall_type - 2); a65983d90bfb5e Lu Jialin 2024-01-04 462 if (set & TSK_MEMSTALL_RUNNING) a65983d90bfb5e Lu Jialin 2024-01-04 463 *stat_set |= 1 << (2 * task->memstall_type - 1); a65983d90bfb5e Lu Jialin 2024-01-04 464 } a65983d90bfb5e Lu Jialin 2024-01-04 465 if (!task->in_memstall) a65983d90bfb5e Lu Jialin 2024-01-04 466 task->memstall_type = 0; a65983d90bfb5e Lu Jialin 2024-01-04 467 } a65983d90bfb5e Lu Jialin 2024-01-04 468 0df60cce43301d Lu Jialin 2024-01-04 @469 static void get_recent_stat_times(struct psi_group *group, int cpu, 0df60cce43301d Lu Jialin 2024-01-04 470 enum psi_aggregators aggregator, u64 *stat_delta, u64 nonidle) 0df60cce43301d Lu Jialin 2024-01-04 471 { 0df60cce43301d Lu Jialin 2024-01-04 472 struct psi_group_cpu *groupc = per_cpu_ptr(group->pcpu, cpu); 0df60cce43301d Lu Jialin 2024-01-04 473 u32 times[NR_PSI_STAT_STATES] = {0}; 0df60cce43301d Lu Jialin 2024-01-04 474 enum psi_stat_states s; 0df60cce43301d Lu Jialin 2024-01-04 475 u32 delta; 0df60cce43301d Lu Jialin 2024-01-04 476 0df60cce43301d Lu Jialin 2024-01-04 477 memcpy(times, groupc->fine_grained_times, sizeof(groupc->fine_grained_times)); 0df60cce43301d Lu Jialin 2024-01-04 478 for (s = 0; s < NR_PSI_STAT_STATES; s++) { 0df60cce43301d Lu Jialin 2024-01-04 479 if (groupc->fine_grained_state_mask & (1 << s)) 0df60cce43301d Lu Jialin 2024-01-04 480 times[s] += groupc->fine_grained_times_delta; 0df60cce43301d Lu Jialin 2024-01-04 481 delta = times[s] - groupc->fine_grained_times_prev[aggregator][s]; 0df60cce43301d Lu Jialin 2024-01-04 482 groupc->fine_grained_times_prev[aggregator][s] = times[s]; 0df60cce43301d Lu Jialin 2024-01-04 483 stat_delta[s] += (u64)delta * nonidle; 0df60cce43301d Lu Jialin 2024-01-04 484 } 0df60cce43301d Lu Jialin 2024-01-04 485 } a65983d90bfb5e Lu Jialin 2024-01-04 486 #else a65983d90bfb5e Lu Jialin 2024-01-04 487 static inline void psi_group_stat_change(struct psi_group *group, int cpu, a65983d90bfb5e Lu Jialin 2024-01-04 488 int clear, int set) {} a65983d90bfb5e Lu Jialin 2024-01-04 489 static inline void psi_stat_flags_change(struct task_struct *task, a65983d90bfb5e Lu Jialin 2024-01-04 490 int *stat_set, int *stat_clear, a65983d90bfb5e Lu Jialin 2024-01-04 491 int set, int clear) {} a65983d90bfb5e Lu Jialin 2024-01-04 492 #endif a65983d90bfb5e Lu Jialin 2024-01-04 493 65494451082298 Lu Jialin 2024-01-04 494 #if defined(CONFIG_CFS_BANDWIDTH) && defined(CONFIG_CGROUP_CPUACCT) && \ 65494451082298 Lu Jialin 2024-01-04 495 defined(CONFIG_PSI_FINE_GRAINED) 65494451082298 Lu Jialin 2024-01-04 @496 static void update_throttle_type(struct task_struct *task, int cpu, bool next) 65494451082298 Lu Jialin 2024-01-04 497 { 65494451082298 Lu Jialin 2024-01-04 498 if (!cgroup_subsys_on_dfl(cpuacct_cgrp_subsys)) { 65494451082298 Lu Jialin 2024-01-04 499 struct cgroup *cpuacct_cgrp; 65494451082298 Lu Jialin 2024-01-04 500 struct psi_group_cpu *groupc; 65494451082298 Lu Jialin 2024-01-04 501 struct task_group *tsk_grp; 65494451082298 Lu Jialin 2024-01-04 502 65494451082298 Lu Jialin 2024-01-04 503 rcu_read_lock(); 65494451082298 Lu Jialin 2024-01-04 504 cpuacct_cgrp = task_cgroup(task, cpuacct_cgrp_id); 65494451082298 Lu Jialin 2024-01-04 505 if (cgroup_parent(cpuacct_cgrp)) { 65494451082298 Lu Jialin 2024-01-04 506 groupc = per_cpu_ptr(cgroup_psi(cpuacct_cgrp)->pcpu, cpu); 65494451082298 Lu Jialin 2024-01-04 507 tsk_grp = task_group(task); 65494451082298 Lu Jialin 2024-01-04 508 if (next) 65494451082298 Lu Jialin 2024-01-04 509 groupc->prev_throttle = groupc->cur_throttle; 65494451082298 Lu Jialin 2024-01-04 510 groupc->cur_throttle = tsk_grp->cfs_rq[cpu]->throttled; 65494451082298 Lu Jialin 2024-01-04 511 } 65494451082298 Lu Jialin 2024-01-04 512 rcu_read_unlock(); 65494451082298 Lu Jialin 2024-01-04 513 } 65494451082298 Lu Jialin 2024-01-04 514 } 65494451082298 Lu Jialin 2024-01-04 515 #else 65494451082298 Lu Jialin 2024-01-04 516 static inline void update_throttle_type(struct task_struct *task, int cpu, 65494451082298 Lu Jialin 2024-01-04 517 bool next) {} 65494451082298 Lu Jialin 2024-01-04 518 #endif 65494451082298 Lu Jialin 2024-01-04 519 0e94682b73bfa6 Suren Baghdasaryan 2019-05-14 @520 static void collect_percpu_times(struct psi_group *group, 0e94682b73bfa6 Suren Baghdasaryan 2019-05-14 521 enum psi_aggregators aggregator, 0e94682b73bfa6 Suren Baghdasaryan 2019-05-14 522 u32 *pchanged_states) eb414681d5a07d Johannes Weiner 2018-10-26 523 { 0df60cce43301d Lu Jialin 2024-01-04 524 #ifdef CONFIG_PSI_FINE_GRAINED 0df60cce43301d Lu Jialin 2024-01-04 525 u64 stat_delta[NR_PSI_STAT_STATES] = { 0 }; 0df60cce43301d Lu Jialin 2024-01-04 526 #endif eb414681d5a07d Johannes Weiner 2018-10-26 527 u64 deltas[NR_PSI_STATES - 1] = { 0, }; eb414681d5a07d Johannes Weiner 2018-10-26 528 unsigned long nonidle_total = 0; 333f3017c5a893 Suren Baghdasaryan 2019-05-14 529 u32 changed_states = 0; eb414681d5a07d Johannes Weiner 2018-10-26 530 int cpu; eb414681d5a07d Johannes Weiner 2018-10-26 531 int s; eb414681d5a07d Johannes Weiner 2018-10-26 532 eb414681d5a07d Johannes Weiner 2018-10-26 533 /* eb414681d5a07d Johannes Weiner 2018-10-26 534 * Collect the per-cpu time buckets and average them into a eb414681d5a07d Johannes Weiner 2018-10-26 535 * single time sample that is normalized to wallclock time. eb414681d5a07d Johannes Weiner 2018-10-26 536 * eb414681d5a07d Johannes Weiner 2018-10-26 537 * For averaging, each CPU is weighted by its non-idle time in eb414681d5a07d Johannes Weiner 2018-10-26 538 * the sampling period. This eliminates artifacts from uneven eb414681d5a07d Johannes Weiner 2018-10-26 539 * loading, or even entirely idle CPUs. eb414681d5a07d Johannes Weiner 2018-10-26 540 */ eb414681d5a07d Johannes Weiner 2018-10-26 541 for_each_possible_cpu(cpu) { eb414681d5a07d Johannes Weiner 2018-10-26 542 u32 times[NR_PSI_STATES]; eb414681d5a07d Johannes Weiner 2018-10-26 543 u32 nonidle; 333f3017c5a893 Suren Baghdasaryan 2019-05-14 544 u32 cpu_changed_states; eb414681d5a07d Johannes Weiner 2018-10-26 545 0e94682b73bfa6 Suren Baghdasaryan 2019-05-14 546 get_recent_times(group, cpu, aggregator, times, 333f3017c5a893 Suren Baghdasaryan 2019-05-14 547 &cpu_changed_states); 333f3017c5a893 Suren Baghdasaryan 2019-05-14 548 changed_states |= cpu_changed_states; eb414681d5a07d Johannes Weiner 2018-10-26 549 eb414681d5a07d Johannes Weiner 2018-10-26 550 nonidle = nsecs_to_jiffies(times[PSI_NONIDLE]); eb414681d5a07d Johannes Weiner 2018-10-26 551 nonidle_total += nonidle; eb414681d5a07d Johannes Weiner 2018-10-26 552 eb414681d5a07d Johannes Weiner 2018-10-26 553 for (s = 0; s < PSI_NONIDLE; s++) eb414681d5a07d Johannes Weiner 2018-10-26 554 deltas[s] += (u64)times[s] * nonidle; 0df60cce43301d Lu Jialin 2024-01-04 555 #ifdef CONFIG_PSI_FINE_GRAINED 0df60cce43301d Lu Jialin 2024-01-04 556 get_recent_stat_times(group, cpu, aggregator, stat_delta, nonidle); 0df60cce43301d Lu Jialin 2024-01-04 557 #endif eb414681d5a07d Johannes Weiner 2018-10-26 558 } eb414681d5a07d Johannes Weiner 2018-10-26 559 eb414681d5a07d Johannes Weiner 2018-10-26 560 /* eb414681d5a07d Johannes Weiner 2018-10-26 561 * Integrate the sample into the running statistics that are eb414681d5a07d Johannes Weiner 2018-10-26 562 * reported to userspace: the cumulative stall times and the eb414681d5a07d Johannes Weiner 2018-10-26 563 * decaying averages. eb414681d5a07d Johannes Weiner 2018-10-26 564 * eb414681d5a07d Johannes Weiner 2018-10-26 565 * Pressure percentages are sampled at PSI_FREQ. We might be eb414681d5a07d Johannes Weiner 2018-10-26 566 * called more often when the user polls more frequently than eb414681d5a07d Johannes Weiner 2018-10-26 567 * that; we might be called less often when there is no task eb414681d5a07d Johannes Weiner 2018-10-26 568 * activity, thus no data, and clock ticks are sporadic. The eb414681d5a07d Johannes Weiner 2018-10-26 569 * below handles both. eb414681d5a07d Johannes Weiner 2018-10-26 570 */ eb414681d5a07d Johannes Weiner 2018-10-26 571 eb414681d5a07d Johannes Weiner 2018-10-26 572 /* total= */ eb414681d5a07d Johannes Weiner 2018-10-26 573 for (s = 0; s < NR_PSI_STATES - 1; s++) 0e94682b73bfa6 Suren Baghdasaryan 2019-05-14 574 group->total[aggregator][s] += 0e94682b73bfa6 Suren Baghdasaryan 2019-05-14 575 div_u64(deltas[s], max(nonidle_total, 1UL)); eb414681d5a07d Johannes Weiner 2018-10-26 576 :::::: The code at line 384 was first introduced by commit :::::: a65983d90bfb5e031444fea492b32f931c83ffcf sched/psi: Introduce fine grained stall time collect for cgroup reclaim :::::: TO: Lu Jialin <lujialin4(a)huawei.com> :::::: CC: yanhaitao <yanhaitao2(a)huawei.com> -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH V4 OLK-5.10 0/2] Using smmu IIDR registers
by Zhang Zekun 05 Feb '24

05 Feb '24

Using the smmu registers to identify the problem described in commit 8544c8e14fec ("iommu/arm-smmu-v3: Add a SYNC command to avoid broken page table prefetch"). v2: Remove the commit message spell error. v3: Revert the previous patch and using a brand new patch instead. v4: Fix a judge error and change the commit message. Zhang Zekun (2): Revert "iommu/arm-smmu-v3: Add a SYNC command to avoid broken page table prefetch" iommu/arm-smmu-v3: Enable iotlb_sync_map according to SMMU_IIDR Documentation/arm64/silicon-errata.rst | 2 +- arch/arm64/Kconfig | 13 ++++++------- arch/arm64/include/asm/cpucaps.h | 1 - arch/arm64/kernel/cpu_errata.c | 14 -------------- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 10 +++++++++- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 5 +++++ 6 files changed, 21 insertions(+), 24 deletions(-) -- 2.17.1

2 3