linux-kernel - Re: [PATCH 1/2] docs/zh_CN: sync with original text Documentation/vm/page

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite for Android: free password hash cracker in your pocket
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Sun, 24 Apr 2022 10:56:52 +0800
From:   baihaowen <baihaowen@...zu.com>
To:     Alex Shi <seakeel@...il.com>, <siyanteng01@...il.com>
CC:     <alexs@...nel.org>, <corbet@....net>, <linux-doc@...r.kernel.org>,
        <linux-kernel@...r.kernel.org>, <siyanteng@...ngson.cn>
Subject: Re: [PATCH 1/2] docs/zh_CN: sync with original text
 Documentation/vm/page_owner.rst

在 4/23/22 6:27 PM, Alex Shi 写道:
> Hi Haowen,
>
> I hit the mistake again while apply your patch:
> $git am your_patch
> error: cannot convert from N to UTF-8
>
> fatal: could not parse patch
>
>
> You have to try apply it before sending out your patch.
> and this patch is better be to be 2nd patch in series.
>
> Thanks
> Alex
>
> On 4/20/22 11:06, Haowen Bai wrote:
>> As the tools/vm/page_owner_sort added some feature and original text
>> updated, sync the translation of zh_CN as below.
>>
>> Commit 8bd16bc0a081 ("tools/vm/page_owner_sort.c: support sorting blocks
>> by multiple keys") add sorting blocks by multiple keys usage
>> description.
>>
>> Commit 78a0b94f3829 ("tools/vm/page_owner_sort.c: support for multi-value
>> selection in single argument") add multi-value selection in single
>> argument usage description.
>>
>> Commit c89b3ad2dea2 ("doc/vm/page_owner.rst: remove content related to -c
>> option") remove  -c option usage description.
>>
>> Commit 9c8a0a8e599f ("tools/vm/page_owner_sort.c: support for user-defined
>> culling rules") add user-defined culling rules usage description.
>>
>> Commit 8ea8613a616a ("tools/vm/page_owner_sort.c: support for selecting by
>> PID, TGID or task command name") add selecting by PID, TGID or task
>> command name usage description.
>>
>> Commit 194d52d771b8 ("tools/vm/page_owner_sort: support for sorting by
>> task command name") add sorting by task command name usage description.
>>
>> Signed-off-by: Haowen Bai <baihaowen@...zu.com>
>> ---
>>  Documentation/translations/zh_CN/vm/page_owner.rst | 61 +++++++++++++++++++++-
>>  1 file changed, 60 insertions(+), 1 deletion(-)
>>
>> diff --git a/Documentation/translations/zh_CN/vm/page_owner.rst b/Documentation/translations/zh_CN/vm/page_owner.rst
>> index 9e951fabba9d..c692e81c724e 100644
>> --- a/Documentation/translations/zh_CN/vm/page_owner.rst
>> +++ b/Documentation/translations/zh_CN/vm/page_owner.rst
>> @@ -103,14 +103,73 @@ page owner在默认情况下是禁用的。所以，如果你想使用它，你
>>  		-m		按总内存排序
>>  		-p		按pid排序。
>>  		-P		按tgid排序。
>> +		-n		按任务名称排序。
>>  		-r		按内存释放时间排序。
>>  		-s		按堆栈跟踪排序。
>>  		-t		按时间排序（默认）。
>> +		--sort <order>	指定排序顺序。排序语法是 [+|-]key[,[+|-]key[,...]]. 从
>> +						**标准格式说明符** 部分选择一个键。"+" 是可选的，因为默认方向是增加数字或字典顺序。
>> +						允许混合使用缩写键和全称键。
>> +
>> +		Examples:
>> +				./page_owner_sort <input> <output> --sort=n,+pid,-tgid
>> +				./page_owner_sort <input> <output> --sort=at
>>  
>>     其它函数:
>>  
>>  	Cull:
>> -		-c		通过比较堆栈跟踪而不是总块来进行剔除。
>> +		--cull <rules>
>> +				指定筛选规则。筛选语法是 key[,key[,...]]。在**标准格式说明符**部分选择一个多字母键
>> +
>> +		<rules> 是逗号分隔列表形式的单个参数，它提供了一种指定单个筛选规则的方法。下面的**标准格式说明
>> +				符**部分描述了可识别的关键字。<rules> 可以由键 k1,k2, ... 顺序指定，如下面的
>> +				STANDARD SORT KEYS 部分所述。允许混合使用缩写形式和完整形式的键。
>>  
>> +		Examples:
>> +				./page_owner_sort <input> <output> --cull=stacktrace
>> +				./page_owner_sort <input> <output> --cull=st,pid,name
>> +				./page_owner_sort <input> <output> --cull=n,f
>>  	Filter:
>>  		-f		过滤掉内存已被释放的块的信息。
>> +
>> +	Select:
>> +		--pid <pidlist>		通过 pid 进行选择。这将选择进程 ID 号出现在 <pidlist> 中的块。
>> +		--tgid <tgidlist>	通过 tgid 进行选择。这将选择线程组 ID 号出现在 <tgidlist> 中的块。
>> +		--name <cmdlist>	按任务名称选择。这将选择任务名称出现在 <cmdlist> 中的块。
>> +
>> +		<pidlist>、<tgidlist>、<cmdlist>是逗号分隔列表形式的单参数，它提供了一种指定单个选择规则的方法。
>> +
>> +
>> +		Examples:
>> +				./page_owner_sort <input> <output> --pid=1
>> +				./page_owner_sort <input> <output> --tgid=1,2,3
>> +				./page_owner_sort <input> <output> --name name1,name2
>> +
>> +标准格式说明符
>> +==============
>> +
>> +--sort 选项:
>> +
>> +        ======          ==========      ===================
>> +        缩写键          全称键          描述
>> +        ======          ==========      ===================
>> +        p               pid             进程 ID
>> +        tg              tgid            线程组 ID
>> +        n               name            任务名称
>> +        st              stacktrace      页面分配的调用栈
>> +        T               txt             块的全文
>> +        ft              free_ts         页面被释放的时间戳
>> +        at              alloc_ts        页面分配的时间戳
>> +        ======          ==========      ===================
>> +
>> +--curl 选项:
>> +
>> +        ======          ==========      ==================
>> +        缩写键          全称键          描述
>> +        ======          ==========      ==================
>> +        p               pid             进程 ID
>> +        tg              tgid            线程组 ID
>> +        n               name            任务名称
>> +        f               free            该页面是否已被释放
>> +        st              stacktrace      页面分配的调用栈
>> +        ======          ==========      ==================
hi, Alex
I can apply local.
➜  linux-next git:(heads/next-20220421) ✗ git am doc_pageonwer_patches/0001-docs-zh_CN-sync-with-original-text-Documentation-vm-.patch
应用：docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
➜  linux-next git:(heads/next-20220421) ✗ git am doc_pageonwer_patches/0002-doc-vm-page_owner.rst-Fix-table-display-confusion.patch   
应用：doc/vm/page_owner.rst: Fix table display confusion

I think git send-email will change format by my select. I'll try to resend.

-- 
Haowen Bai