From: Yinan Zhang zhangyinan2019@email.szu.edu.cn
mainline inclusion from mainline-v5.18-rc1 commit d8b7b3fa9f9b2dc67fa1df29c4ce98eb10d62824 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I9GSSR
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
--------------------------------
The -c option is used to cull by stacktrace. Now, --cull option has been Added in page_owner_sort.c. Culling by stacktrace is one of the function of "--cull". No need to set an extra parameter. So remove -c option.
Remove parsing of -c when parse parameter and remove "-c" from usage.
This work is coauthored by Shenghong Han Yixuan Cao Chongxi Zhao Jiajian Ye Yuhong Feng Yongqiang Liu
Link: https://lkml.kernel.org/r/20220326085920.1470081-1-zhangyinan2019@email.szu.... Signed-off-by: Yinan Zhang zhangyinan2019@email.szu.edu.cn Cc: Chongxi Zhao zhaochongxi2019@email.szu.edu.cn Cc: Georgi Djakov georgi.djakov@linaro.org Cc: Jiajian Ye yejiajian2018@email.szu.edu.cn Cc: Jonathan Corbet corbet@lwn.net Cc: Sean Anderson seanga2@gmail.com Cc: Stephen Rothwell sfr@canb.auug.org.au Cc: Tang Bin tangbin@cmss.chinamobile.com Cc: Yixuan Cao caoyixuan2019@email.szu.edu.cn Cc: Yongqiang Liu liuyongqiang13@huawei.com Cc: Yuhong Feng yuhongf@szu.edu.cn Cc: Zhenliang Wei weizhenliang@huawei.com Signed-off-by: Andrew Morton akpm@linux-foundation.org Signed-off-by: Linus Torvalds torvalds@linux-foundation.org Signed-off-by: Jinjiang Tu tujinjiang@huawei.com --- tools/vm/page_owner_sort.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/tools/vm/page_owner_sort.c b/tools/vm/page_owner_sort.c index 7679335fce5b..7d98e76c2291 100644 --- a/tools/vm/page_owner_sort.c +++ b/tools/vm/page_owner_sort.c @@ -441,7 +441,6 @@ static void usage(void) "-n\t\tSort by task command name.\n" "-a\t\tSort by memory allocate time.\n" "-r\t\tSort by memory release time.\n" - "-c\t\tCull by comparing stacktrace instead of total block.\n" "-f\t\tFilter out the information of blocks whose memory has been released.\n" "--pid <PID>\tSelect by pid. This selects the information of blocks whose process ID number equals to <PID>.\n" "--tgid <TGID>\tSelect by tgid. This selects the information of blocks whose Thread Group ID number equals to <TGID>.\n" @@ -466,14 +465,11 @@ int main(int argc, char **argv) { 0, 0, 0, 0}, };
- while ((opt = getopt_long(argc, argv, "acfmnprstP", longopts, NULL)) != -1) + while ((opt = getopt_long(argc, argv, "afmnprstP", longopts, NULL)) != -1) switch (opt) { case 'a': cmp = compare_ts; break; - case 'c': - cull = cull | CULL_STACKTRACE; - break; case 'f': filter = filter | FILTER_UNRELEASE; break;