6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yanteng Si <siyanteng@xxxxxxxxxxx> [ Upstream commit 6ab587e8e8b434ffc2decdd6db17dff0ef2b13ab ] Update to commit f347c9d2697f ("filemap: make the accounting of thrashing more consistent"). Commit 662ce1dc9caf ("delayacct: track delays from write-protect copy"). Signed-off-by: Yanteng Si <siyanteng@xxxxxxxxxxx> Link: https://lore.kernel.org/r/798990521e991697f9f2b75f4dc4a485d31c1311.1670642548.git.siyanteng@xxxxxxxxxxx Signed-off-by: Jonathan Corbet <corbet@xxxxxxx> Stable-dep-of: 3840cbe24cf0 ("sched: psi: fix bogus pressure spikes from aggregation race") Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> --- .../translations/zh_CN/accounting/delay-accounting.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Documentation/translations/zh_CN/accounting/delay-accounting.rst b/Documentation/translations/zh_CN/accounting/delay-accounting.rst index f1849411018e9..a01dc3d5b0dbb 100644 --- a/Documentation/translations/zh_CN/accounting/delay-accounting.rst +++ b/Documentation/translations/zh_CN/accounting/delay-accounting.rst @@ -17,8 +17,9 @@ a) 等待一个CPU(任务为可运行) b) 完成由该任务发起的块I/O同步请求 c) 页面交换 d) 内存回收 -e) 页缓存抖动 +e) 抖动 f) 直接规整 +g) 写保护复制 并将这些统计信息通过taskstats接口提供给用户空间。 @@ -42,7 +43,7 @@ f) 直接规整 include/uapi/linux/taskstats.h 其描述了延时计数相关字段。系统通常以计数器形式返回 CPU、同步块 I/O、交换、内存 -回收、页缓存抖动、直接规整等的累积延时。 +回收、页缓存抖动、直接规整、写保护复制等的累积延时。 取任务某计数器两个连续读数的差值,将得到任务在该时间间隔内等待对应资源的总延时。 @@ -100,6 +101,8 @@ getdelays命令的一般格式:: 0 0 0ms COMPACT count delay total delay average 0 0 0ms + WPCOPY count delay total delay average + 0 0 0ms 获取pid为1的IO计数,它只和-p一起使用:: # ./getdelays -i -p 1 -- 2.43.0