From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [to-be-updated] oom-clean-up-oom_badness.patch removed from -mm tree Date: Wed, 19 May 2010 11:48:29 -0700 Message-ID: <201005191848.o4JImTAf029511@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:34911 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751238Ab0ESS4A (ORCPT ); Wed, 19 May 2010 14:56:00 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: rientjes@google.com, kamezawa.hiroyu@jp.fujitsu.com, kosaki.motohiro@jp.fujitsu.com, oleg@redhat.com, riel@redhat.com, mm-commits@vger.kernel.org The patch titled oom: clean up oom_badness() has been removed from the -mm tree. Its filename was oom-clean-up-oom_badness.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: oom: clean up oom_badness() From: David Rientjes oom_badness() no longer uses its uptime formal, so it can be removed. Signed-off-by: David Rientjes Reported-by: Oleg Nesterov Reviewed-by: KAMEZAWA Hiroyuki Cc: KOSAKI Motohiro Cc: Rik van Riel Signed-off-by: Andrew Morton --- fs/proc/base.c | 5 +---- include/linux/oom.h | 3 +-- mm/oom_kill.c | 12 +++--------- 3 files changed, 5 insertions(+), 15 deletions(-) diff -puN fs/proc/base.c~oom-clean-up-oom_badness fs/proc/base.c --- a/fs/proc/base.c~oom-clean-up-oom_badness +++ a/fs/proc/base.c @@ -444,9 +444,7 @@ static const struct file_operations proc static int proc_oom_score(struct task_struct *task, char *buffer) { unsigned long points = 0; - struct timespec uptime; - do_posix_clock_monotonic_gettime(&uptime); read_lock(&tasklist_lock); if (pid_alive(task)) points = oom_badness(task->group_leader, @@ -454,8 +452,7 @@ static int proc_oom_score(struct task_st global_page_state(NR_ACTIVE_ANON) + global_page_state(NR_INACTIVE_FILE) + global_page_state(NR_ACTIVE_FILE) + - total_swap_pages, - uptime.tv_sec); + total_swap_pages); read_unlock(&tasklist_lock); return sprintf(buffer, "%lu\n", points); } diff -puN include/linux/oom.h~oom-clean-up-oom_badness include/linux/oom.h --- a/include/linux/oom.h~oom-clean-up-oom_badness +++ a/include/linux/oom.h @@ -40,8 +40,7 @@ enum oom_constraint { CONSTRAINT_MEMORY_POLICY, }; -extern int oom_badness(struct task_struct *p, - unsigned long totalpages, unsigned long uptime); +extern int oom_badness(struct task_struct *p, unsigned long totalpages); extern int try_set_zone_oom(struct zonelist *zonelist, gfp_t gfp_flags); extern void clear_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags); diff -puN mm/oom_kill.c~oom-clean-up-oom_badness mm/oom_kill.c --- a/mm/oom_kill.c~oom-clean-up-oom_badness +++ a/mm/oom_kill.c @@ -163,14 +163,12 @@ static unsigned long oom_forkbomb_penalt * oom_badness - heuristic function to determine which candidate task to kill * @p: task struct of which task we should calculate * @totalpages: total present RAM allowed for page allocation - * @uptime: current uptime in seconds * * The heuristic for determining which task to kill is made to be as simple and * predictable as possible. The goal is to return the highest value for the * task consuming the most memory to avoid subsequent oom conditions. */ -int oom_badness(struct task_struct *p, unsigned long totalpages, - unsigned long uptime) +int oom_badness(struct task_struct *p, unsigned long totalpages) { int points; @@ -308,10 +306,8 @@ static struct task_struct *select_bad_pr { struct task_struct *p; struct task_struct *chosen = NULL; - struct timespec uptime; *ppoints = 0; - do_posix_clock_monotonic_gettime(&uptime); for_each_process(p) { int points; @@ -358,7 +354,7 @@ static struct task_struct *select_bad_pr if (p->signal->oom_score_adj == OOM_SCORE_ADJ_MIN) continue; - points = oom_badness(p, totalpages, uptime.tv_sec); + points = oom_badness(p, totalpages); if (points >= 0 && (points > *ppoints || !chosen)) { chosen = p; *ppoints = points; @@ -462,7 +458,6 @@ static int oom_kill_process(struct task_ struct task_struct *victim = p; struct task_struct *c; unsigned int victim_points = 0; - struct timespec uptime; if (printk_ratelimit()) dump_header(p, gfp_mask, order, mem); @@ -479,7 +474,6 @@ static int oom_kill_process(struct task_ pr_err("%s: Kill process %d (%s) with score %d or sacrifice child\n", message, task_pid_nr(p), p->comm, points); - do_posix_clock_monotonic_gettime(&uptime); /* Try to sacrifice the worst child first */ list_for_each_entry(c, &p->children, sibling) { unsigned int cpoints; @@ -490,7 +484,7 @@ static int oom_kill_process(struct task_ continue; /* oom_badness() returns 0 if the thread is unkillable */ - cpoints = oom_badness(c, totalpages, uptime.tv_sec); + cpoints = oom_badness(c, totalpages); if (cpoints > victim_points) { victim = c; victim_points = cpoints; _ Patches currently in -mm which might be from rientjes@google.com are origin.patch linux-next.patch mempolicy-remove-redundant-code.patch oom-clean-up-oom_badness.patch oom-select_bad_process-never-choose-tasks-with-badness-==-0.patch oom-avoid-divide-by-zero.patch mempolicy-remove-case-mpol_interleave-from-policy_zonelist.patch mempolicy-remove-redundant-check.patch mempolicy-dont-call-mpol_set_nodemask-when-no_context.patch mempolicy-lose-unnecessary-loop-variable-in-mpol_parse_str.patch mempolicy-rename-policy_types-and-cleanup-initialization.patch mempolicy-factor-mpol_shared_policy_init-return-paths.patch mempolicy-document-cpuset-interaction-with-tmpfs-mpol-mount-option.patch mempolicy-restructure-rebinding-mempolicy-functions.patch cpusetmm-fix-no-node-to-alloc-memory-when-changing-cpusets-mems.patch cpusetmm-fix-no-node-to-alloc-memory-when-changing-cpusets-mems-fix2.patch mm-default-to-node-zonelist-ordering-when-nodes-have-only-lowmem.patch mmcompaction-memory-compaction-core-do-not-schedule-work-on-other-cpus-for-compaction.patch memcg-oom-wakeup-filter.patch memcg-oom-wakeup-filter-update.patch memcg-oom-notifier.patch memcg-oom-notifier-update.patch memcg-oom-kill-disable-and-oom-status.patch memcg-oom-kill-disable-and-oom-status-update.patch memcg-make-oom-killer-a-no-op-when-no-killable-task-can-be-found.patch numa-add-generic-percpu-var-numa_node_id-implementation.patch numa-add-generic-percpu-var-numa_node_id-implementation-fix1.patch numa-add-generic-percpu-var-numa_node_id-implementation-fix2.patch numa-x86_64-use-generic-percpu-var-numa_node_id-implementation.patch numa-x86_64-use-generic-percpu-var-numa_node_id-implementation-fix1.patch numa-x86_64-use-generic-percpu-var-numa_node_id-implementation-fix2.patch numa-ia64-use-generic-percpu-var-numa_node_id-implementation.patch numa-introduce-numa_mem_id-effective-local-memory-node-id.patch numa-introduce-numa_mem_id-effective-local-memory-node-id-fix2.patch numa-introduce-numa_mem_id-effective-local-memory-node-id-fix3.patch numa-ia64-support-numa_mem_id-for-memoryless-nodes.patch numa-slab-use-numa_mem_id-for-slab-local-memory-node.patch numa-in-kernel-profiling-use-cpu_to_mem-for-per-cpu-allocations.patch numa-update-documentation-vm-numa-add-memoryless-node-info.patch numa-update-documentation-vm-numa-add-memoryless-node-info-fix1.patch