mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
mm/oom_kill, proc: replace magic number 1000 with OOM_SCORE_ADJ_MAX
In oom_badness() and proc_oom_score(), the oom_score_adj normalization uses a hardcoded 1000, which is the value of OOM_SCORE_ADJ_MAX defined in include/uapi/linux/oom.h. Other code in the kernel (e.g. fs/proc/base.c oom_adj handling) already uses OOM_SCORE_ADJ_MAX for the same purpose. Replace the magic number with the macro for consistency and readability. No functional change. Link: https://lore.kernel.org/[email protected] Signed-off-by: Ye Liu <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Acked-by: Michal Hocko <[email protected]> Cc: David Rientjes <[email protected]> Cc: Shakeel Butt <[email protected]> Cc: Song Hu <[email protected]>
This commit is contained in:
+2
-1
@@ -594,7 +594,8 @@ static int proc_oom_score(struct seq_file *m, struct pid_namespace *ns,
|
||||
* exporting for a long time so userspace might depend on it.
|
||||
*/
|
||||
if (badness != LONG_MIN)
|
||||
points = (1000 + badness * 1000 / (long)totalpages) * 2 / 3;
|
||||
points = (OOM_SCORE_ADJ_MAX +
|
||||
badness * OOM_SCORE_ADJ_MAX / (long)totalpages) * 2 / 3;
|
||||
|
||||
seq_printf(m, "%lu\n", points);
|
||||
|
||||
|
||||
+1
-1
@@ -230,7 +230,7 @@ long oom_badness(struct task_struct *p, unsigned long totalpages)
|
||||
task_unlock(p);
|
||||
|
||||
/* Normalize to oom_score_adj units */
|
||||
adj *= totalpages / 1000;
|
||||
adj *= totalpages / OOM_SCORE_ADJ_MAX;
|
||||
points += adj;
|
||||
|
||||
return points;
|
||||
|
||||
Reference in New Issue
Block a user