| Message ID | 20201019215229.225386-1-chaithco@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [net-next] mm, oom: keep oom_adj under or at upper limit when printing | expand |
On Mon, Oct 19, 2020 at 03:52:29PM -0600, 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. > --- a/fs/proc/base.c > +++ b/fs/proc/base.c > @@ -1048,6 +1048,8 @@ static ssize_t oom_adj_read(struct file *file, char __user *buf, size_t count, > else > oom_adj = (task->signal->oom_score_adj * -OOM_DISABLE) / > OOM_SCORE_ADJ_MAX; > + if (oom_adj > OOM_ADJUST_MAX) > + oom_adj = OOM_ADJUST_MAX; > put_task_struct(task); Should be done after PUT so that task is put as early as possible. > len = snprintf(buffer, sizeof(buffer), "%d\n", oom_adj); > return simple_read_from_buffer(buf, count, ppos, buffer, len);
diff --git a/fs/proc/base.c b/fs/proc/base.c index 617db4e0faa0..37e57b21dbe5 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1048,6 +1048,8 @@ static ssize_t oom_adj_read(struct file *file, char __user *buf, size_t count, else oom_adj = (task->signal->oom_score_adj * -OOM_DISABLE) / OOM_SCORE_ADJ_MAX; + if (oom_adj > OOM_ADJUST_MAX) + oom_adj = OOM_ADJUST_MAX; put_task_struct(task); len = snprintf(buffer, sizeof(buffer), "%d\n", oom_adj); return simple_read_from_buffer(buf, count, ppos, buffer, len);
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. Signed-off-by: Charles Haithcock <chaithco@redhat.com> --- fs/proc/base.c | 2 ++ 1 file changed, 2 insertions(+)