lkml.org 
[lkml]   [2019]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] mm/oom: fix pgtables units mismatch in Killed process message
On Wed 11-12-19 21:28:30, Ilya Dryomov wrote:
> pr_err() expects kB, but mm_pgtables_bytes() returns the number of
> bytes. As everything else is printed in kB, I chose to fix the value
> rather than the string.
>
> Before:
>
> [ pid ] uid tgid total_vm rss pgtables_bytes swapents oom_score_adj name
> ...
> [ 1878] 1000 1878 217253 151144 1269760 0 0 python
> ...
> Out of memory: Killed process 1878 (python) total-vm:869012kB, anon-rss:604572kB, file-rss:4kB, shmem-rss:0kB, UID:1000 pgtables:1269760kB oom_score_adj:0
>
> After:
>
> [ pid ] uid tgid total_vm rss pgtables_bytes swapents oom_score_adj name
> ...
> [ 1436] 1000 1436 217253 151890 1294336 0 0 python
> ...
> Out of memory: Killed process 1436 (python) total-vm:869012kB, anon-rss:607516kB, file-rss:44kB, shmem-rss:0kB, UID:1000 pgtables:1264kB oom_score_adj:0
>
> Fixes: 70cb6d267790 ("mm/oom: add oom_score_adj and pgtables to Killed process message")
> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

Ups, I have missed that when reviewing 70cb6d267790.

Acked-by: Michal Hocko <mhocko@suse.com>

Thanks!
> ---
> mm/oom_kill.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/mm/oom_kill.c b/mm/oom_kill.c
> index 71e3acea7817..d58c481b3df8 100644
> --- a/mm/oom_kill.c
> +++ b/mm/oom_kill.c
> @@ -890,7 +890,7 @@ static void __oom_kill_process(struct task_struct *victim, const char *message)
> K(get_mm_counter(mm, MM_FILEPAGES)),
> K(get_mm_counter(mm, MM_SHMEMPAGES)),
> from_kuid(&init_user_ns, task_uid(victim)),
> - mm_pgtables_bytes(mm), victim->signal->oom_score_adj);
> + mm_pgtables_bytes(mm) >> 10, victim->signal->oom_score_adj);
> task_unlock(victim);
>
> /*
> --
> 2.19.2
>

--
Michal Hocko
SUSE Labs

\
 
 \ /
  Last update: 2019-12-12 11:42    [W:0.031 / U:20.860 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site