From: Michal Hocko <mhocko@suse.com>
To: Charles Haithcock <chaithco@redhat.com>
Cc: adobriyan@gmail.com, trivial@kernel.org,
akpm@linux-foundation.org, linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH net-next] mm, oom: keep oom_adj under or at upper limit when printing [v2]
Date: Mon, 26 Oct 2020 08:33:44 +0100 [thread overview]
Message-ID: <20201026073344.GA20500@dhcp22.suse.cz> (raw)
In-Reply-To: <20201020165130.33927-1-chaithco@redhat.com>
On Tue 20-10-20 10:51:30, Charles Haithcock wrote:
> For oom_score_adj values in the range [942,999], the current
> calculations will print 16 for oom_adj. This patch simply limits the
> output so output is inline with docs.
>
> v2: moved the change to after put task to make sure the task is
> released asap
> Signed-off-by: Charles Haithcock <chaithco@redhat.com>
OK, this seems to be broken since the scaling has been introduced.
oom_score is deprecated but it is true that the fix is trivial.
Now that you have added this clamping we can drop the oom_score_adj ==
OOM_SCORE_ADJ_MAX branch as well.
Have you found out this by code inspeciton or some userspace actually
cares?
Anyway
Acked-by: Michal Hocko <mhocko@suse.com>
> ---
> fs/proc/base.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/fs/proc/base.c b/fs/proc/base.c
> index 617db4e0faa0..eafabeaf21d1 100644
> --- a/fs/proc/base.c
> +++ b/fs/proc/base.c
> @@ -1049,6 +1049,8 @@ static ssize_t oom_adj_read(struct file *file, char __user *buf, size_t count,
> oom_adj = (task->signal->oom_score_adj * -OOM_DISABLE) /
> OOM_SCORE_ADJ_MAX;
> put_task_struct(task);
> + if (oom_adj > OOM_ADJUST_MAX)
> + oom_adj = OOM_ADJUST_MAX;
> len = snprintf(buffer, sizeof(buffer), "%d\n", oom_adj);
> return simple_read_from_buffer(buf, count, ppos, buffer, len);
> }
> --
> 2.25.1
>
--
Michal Hocko
SUSE Labs
prev parent reply other threads:[~2020-10-26 7:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-20 16:51 [PATCH net-next] mm, oom: keep oom_adj under or at upper limit when printing [v2] Charles Haithcock
2020-10-26 7:33 ` Michal Hocko [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201026073344.GA20500@dhcp22.suse.cz \
--to=mhocko@suse.com \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=chaithco@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=trivial@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).