linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 1/6] sched/numa: fix set cpupid on page migration twice
@ 2013-12-06  9:12 Wanpeng Li
  2013-12-06  9:12 ` [PATCH v2 2/6] sched/numa: drop idx field of task_numa_env struct Wanpeng Li
                   ` (6 more replies)
  0 siblings, 7 replies; 19+ messages in thread
From: Wanpeng Li @ 2013-12-06  9:12 UTC (permalink / raw)
  To: Ingo Molnar, Andrew Morton
  Cc: Peter Zijlstra, Mel Gorman, Rik van Riel, Naoya Horiguchi,
	linux-kernel, linux-mm, Wanpeng Li

commit 7851a45cd3 (mm: numa: Copy cpupid on page migration) copy over 
the cpupid at page migration time, there is unnecessary to set it again 
in migrate_misplaced_transhuge_page, this patch fix it.

Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
---
 mm/migrate.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/mm/migrate.c b/mm/migrate.c
index bb94004..fdb70f7 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1736,8 +1736,6 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,
 	if (!new_page)
 		goto out_fail;
 
-	page_cpupid_xchg_last(new_page, page_cpupid_last(page));
-
 	isolated = numamigrate_isolate_page(pgdat, page);
 	if (!isolated) {
 		put_page(new_page);
-- 
1.7.7.6

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [PATCH v2 2/6] sched/numa: drop idx field of task_numa_env struct
  2013-12-06  9:12 [PATCH v2 1/6] sched/numa: fix set cpupid on page migration twice Wanpeng Li
@ 2013-12-06  9:12 ` Wanpeng Li
  2013-12-06  9:12 ` [PATCH v2 3/6] sched/numa: drop sysctl_numa_balancing_settle_count sysctl Wanpeng Li
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 19+ messages in thread
From: Wanpeng Li @ 2013-12-06  9:12 UTC (permalink / raw)
  To: Ingo Molnar, Andrew Morton
  Cc: Peter Zijlstra, Mel Gorman, Rik van Riel, Naoya Horiguchi,
	linux-kernel, linux-mm, Wanpeng Li

Drop unused idx field of task_numa_env struct.

Reviewed-by: Rik van Riel <riel@redhat.com>
Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
---
 kernel/sched/fair.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index fd773ad..ea3fd1e 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -1037,7 +1037,7 @@ struct task_numa_env {
 
 	struct numa_stats src_stats, dst_stats;
 
-	int imbalance_pct, idx;
+	int imbalance_pct;
 
 	struct task_struct *best_task;
 	long best_imp;
-- 
1.7.7.6

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [PATCH v2 3/6] sched/numa: drop sysctl_numa_balancing_settle_count sysctl
  2013-12-06  9:12 [PATCH v2 1/6] sched/numa: fix set cpupid on page migration twice Wanpeng Li
  2013-12-06  9:12 ` [PATCH v2 2/6] sched/numa: drop idx field of task_numa_env struct Wanpeng Li
@ 2013-12-06  9:12 ` Wanpeng Li
  2013-12-06 16:56   ` Mel Gorman
  2013-12-08  3:02   ` Rik van Riel
  2013-12-06  9:12 ` [PATCH v2 4/6] sched/numa: use wrapper function task_node to get node which task is on Wanpeng Li
                   ` (4 subsequent siblings)
  6 siblings, 2 replies; 19+ messages in thread
From: Wanpeng Li @ 2013-12-06  9:12 UTC (permalink / raw)
  To: Ingo Molnar, Andrew Morton
  Cc: Peter Zijlstra, Mel Gorman, Rik van Riel, Naoya Horiguchi,
	linux-kernel, linux-mm, Wanpeng Li

commit 887c290e (sched/numa: Decide whether to favour task or group weights 
based on swap candidate relationships) drop the check against 
sysctl_numa_balancing_settle_count, this patch remove the sysctl.

Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
---
 include/linux/sched/sysctl.h |    1 -
 kernel/sched/fair.c          |    9 ---------
 kernel/sysctl.c              |    7 -------
 3 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
index 41467f8..31e0193 100644
--- a/include/linux/sched/sysctl.h
+++ b/include/linux/sched/sysctl.h
@@ -48,7 +48,6 @@ extern unsigned int sysctl_numa_balancing_scan_delay;
 extern unsigned int sysctl_numa_balancing_scan_period_min;
 extern unsigned int sysctl_numa_balancing_scan_period_max;
 extern unsigned int sysctl_numa_balancing_scan_size;
-extern unsigned int sysctl_numa_balancing_settle_count;
 
 #ifdef CONFIG_SCHED_DEBUG
 extern unsigned int sysctl_sched_migration_cost;
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index ea3fd1e..56bcc0c 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -886,15 +886,6 @@ static unsigned int task_scan_max(struct task_struct *p)
 	return max(smin, smax);
 }
 
-/*
- * Once a preferred node is selected the scheduler balancer will prefer moving
- * a task to that node for sysctl_numa_balancing_settle_count number of PTE
- * scans. This will give the process the chance to accumulate more faults on
- * the preferred node but still allow the scheduler to move the task again if
- * the nodes CPUs are overloaded.
- */
-unsigned int sysctl_numa_balancing_settle_count __read_mostly = 4;
-
 static void account_numa_enqueue(struct rq *rq, struct task_struct *p)
 {
 	rq->nr_numa_running += (p->numa_preferred_nid != -1);
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 34a6047..c8da99f 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -385,13 +385,6 @@ static struct ctl_table kern_table[] = {
 		.proc_handler	= proc_dointvec,
 	},
 	{
-		.procname       = "numa_balancing_settle_count",
-		.data           = &sysctl_numa_balancing_settle_count,
-		.maxlen         = sizeof(unsigned int),
-		.mode           = 0644,
-		.proc_handler   = proc_dointvec,
-	},
-	{
 		.procname       = "numa_balancing_migrate_deferred",
 		.data           = &sysctl_numa_balancing_migrate_deferred,
 		.maxlen         = sizeof(unsigned int),
-- 
1.7.7.6

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [PATCH v2 4/6] sched/numa: use wrapper function task_node to get node which task is on
  2013-12-06  9:12 [PATCH v2 1/6] sched/numa: fix set cpupid on page migration twice Wanpeng Li
  2013-12-06  9:12 ` [PATCH v2 2/6] sched/numa: drop idx field of task_numa_env struct Wanpeng Li
  2013-12-06  9:12 ` [PATCH v2 3/6] sched/numa: drop sysctl_numa_balancing_settle_count sysctl Wanpeng Li
@ 2013-12-06  9:12 ` Wanpeng Li
  2013-12-06 16:57   ` Mel Gorman
                     ` (2 more replies)
  2013-12-06  9:12 ` [PATCH v2 5/6] sched/numa: make numamigrate_isolate_page static Wanpeng Li
                   ` (3 subsequent siblings)
  6 siblings, 3 replies; 19+ messages in thread
From: Wanpeng Li @ 2013-12-06  9:12 UTC (permalink / raw)
  To: Ingo Molnar, Andrew Morton
  Cc: Peter Zijlstra, Mel Gorman, Rik van Riel, Naoya Horiguchi,
	linux-kernel, linux-mm, Wanpeng Li

Use wrapper function task_node to get node which task is on.

Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
---
 kernel/sched/fair.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 56bcc0c..e0b1063 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -1216,7 +1216,7 @@ static int task_numa_migrate(struct task_struct *p)
 	 * elsewhere, so there is no point in (re)trying.
 	 */
 	if (unlikely(!sd)) {
-		p->numa_preferred_nid = cpu_to_node(task_cpu(p));
+		p->numa_preferred_nid = task_node(p);
 		return -EINVAL;
 	}
 
@@ -1283,7 +1283,7 @@ static void numa_migrate_preferred(struct task_struct *p)
 	p->numa_migrate_retry = jiffies + HZ;
 
 	/* Success if task is already running on preferred CPU */
-	if (cpu_to_node(task_cpu(p)) == p->numa_preferred_nid)
+	if (task_node(p) == p->numa_preferred_nid)
 		return;
 
 	/* Otherwise, try migrate to a CPU on the preferred node */
-- 
1.7.7.6

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [PATCH v2 5/6] sched/numa: make numamigrate_isolate_page static
  2013-12-06  9:12 [PATCH v2 1/6] sched/numa: fix set cpupid on page migration twice Wanpeng Li
                   ` (2 preceding siblings ...)
  2013-12-06  9:12 ` [PATCH v2 4/6] sched/numa: use wrapper function task_node to get node which task is on Wanpeng Li
@ 2013-12-06  9:12 ` Wanpeng Li
  2013-12-06 21:19   ` Naoya Horiguchi
  2013-12-06  9:12 ` [PATCH v2 6/6] sched/numa: make numamigrate_update_ratelimit static Wanpeng Li
                   ` (2 subsequent siblings)
  6 siblings, 1 reply; 19+ messages in thread
From: Wanpeng Li @ 2013-12-06  9:12 UTC (permalink / raw)
  To: Ingo Molnar, Andrew Morton
  Cc: Peter Zijlstra, Mel Gorman, Rik van Riel, Naoya Horiguchi,
	linux-kernel, linux-mm, Wanpeng Li

Make numamigrate_update_ratelimit static.

Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
---
 mm/migrate.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/mm/migrate.c b/mm/migrate.c
index fdb70f7..7ad81e0 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1616,7 +1616,7 @@ bool numamigrate_update_ratelimit(pg_data_t *pgdat, unsigned long nr_pages)
 	return rate_limited;
 }
 
-int numamigrate_isolate_page(pg_data_t *pgdat, struct page *page)
+static int numamigrate_isolate_page(pg_data_t *pgdat, struct page *page)
 {
 	int page_lru;
 
-- 
1.7.7.6

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [PATCH v2 6/6] sched/numa: make numamigrate_update_ratelimit static
  2013-12-06  9:12 [PATCH v2 1/6] sched/numa: fix set cpupid on page migration twice Wanpeng Li
                   ` (3 preceding siblings ...)
  2013-12-06  9:12 ` [PATCH v2 5/6] sched/numa: make numamigrate_isolate_page static Wanpeng Li
@ 2013-12-06  9:12 ` Wanpeng Li
  2013-12-08  3:14   ` Rik van Riel
  2013-12-06 16:56 ` [PATCH v2 1/6] sched/numa: fix set cpupid on page migration twice Mel Gorman
  2013-12-08  1:11 ` Rik van Riel
  6 siblings, 1 reply; 19+ messages in thread
From: Wanpeng Li @ 2013-12-06  9:12 UTC (permalink / raw)
  To: Ingo Molnar, Andrew Morton
  Cc: Peter Zijlstra, Mel Gorman, Rik van Riel, Naoya Horiguchi,
	linux-kernel, linux-mm, Wanpeng Li

Make numamigrate_update_ratelimit static.

Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
---
 mm/migrate.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/mm/migrate.c b/mm/migrate.c
index 7ad81e0..1290028 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1592,7 +1592,8 @@ bool migrate_ratelimited(int node)
 }
 
 /* Returns true if the node is migrate rate-limited after the update */
-bool numamigrate_update_ratelimit(pg_data_t *pgdat, unsigned long nr_pages)
+static bool numamigrate_update_ratelimit(pg_data_t *pgdat,
+						unsigned long nr_pages)
 {
 	bool rate_limited = false;
 
-- 
1.7.7.6

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 1/6] sched/numa: fix set cpupid on page migration twice
  2013-12-06  9:12 [PATCH v2 1/6] sched/numa: fix set cpupid on page migration twice Wanpeng Li
                   ` (4 preceding siblings ...)
  2013-12-06  9:12 ` [PATCH v2 6/6] sched/numa: make numamigrate_update_ratelimit static Wanpeng Li
@ 2013-12-06 16:56 ` Mel Gorman
  2013-12-08  0:06   ` Wanpeng Li
  2013-12-08  1:11 ` Rik van Riel
  6 siblings, 1 reply; 19+ messages in thread
From: Mel Gorman @ 2013-12-06 16:56 UTC (permalink / raw)
  To: Wanpeng Li
  Cc: Ingo Molnar, Andrew Morton, Peter Zijlstra, Rik van Riel,
	Naoya Horiguchi, linux-kernel, linux-mm

On Fri, Dec 06, 2013 at 05:12:11PM +0800, Wanpeng Li wrote:
> commit 7851a45cd3 (mm: numa: Copy cpupid on page migration) copy over 
> the cpupid at page migration time, there is unnecessary to set it again 
> in migrate_misplaced_transhuge_page, this patch fix it.
> 
> Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>

Acked-by: Mel Gorman <mgorman@suse.de>

-- 
Mel Gorman
SUSE Labs

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 3/6] sched/numa: drop sysctl_numa_balancing_settle_count sysctl
  2013-12-06  9:12 ` [PATCH v2 3/6] sched/numa: drop sysctl_numa_balancing_settle_count sysctl Wanpeng Li
@ 2013-12-06 16:56   ` Mel Gorman
  2013-12-08  3:02   ` Rik van Riel
  1 sibling, 0 replies; 19+ messages in thread
From: Mel Gorman @ 2013-12-06 16:56 UTC (permalink / raw)
  To: Wanpeng Li
  Cc: Ingo Molnar, Andrew Morton, Peter Zijlstra, Rik van Riel,
	Naoya Horiguchi, linux-kernel, linux-mm

On Fri, Dec 06, 2013 at 05:12:13PM +0800, Wanpeng Li wrote:
> commit 887c290e (sched/numa: Decide whether to favour task or group weights 
> based on swap candidate relationships) drop the check against 
> sysctl_numa_balancing_settle_count, this patch remove the sysctl.
> 
> Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>

Doh

Acked-by: Mel Gorman <mgorman@suse.de>

-- 
Mel Gorman
SUSE Labs

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 4/6] sched/numa: use wrapper function task_node to get node which task is on
  2013-12-06  9:12 ` [PATCH v2 4/6] sched/numa: use wrapper function task_node to get node which task is on Wanpeng Li
@ 2013-12-06 16:57   ` Mel Gorman
  2013-12-06 21:09   ` Naoya Horiguchi
  2013-12-08  3:13   ` Rik van Riel
  2 siblings, 0 replies; 19+ messages in thread
From: Mel Gorman @ 2013-12-06 16:57 UTC (permalink / raw)
  To: Wanpeng Li
  Cc: Ingo Molnar, Andrew Morton, Peter Zijlstra, Rik van Riel,
	Naoya Horiguchi, linux-kernel, linux-mm

On Fri, Dec 06, 2013 at 05:12:14PM +0800, Wanpeng Li wrote:
> Use wrapper function task_node to get node which task is on.
> 
> Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>

Acked-by: Mel Gorman <mgorman@suse.de>

-- 
Mel Gorman
SUSE Labs

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 4/6] sched/numa: use wrapper function task_node to get node which task is on
  2013-12-06  9:12 ` [PATCH v2 4/6] sched/numa: use wrapper function task_node to get node which task is on Wanpeng Li
  2013-12-06 16:57   ` Mel Gorman
@ 2013-12-06 21:09   ` Naoya Horiguchi
  2013-12-08  0:05     ` Wanpeng Li
  2013-12-08  3:13   ` Rik van Riel
  2 siblings, 1 reply; 19+ messages in thread
From: Naoya Horiguchi @ 2013-12-06 21:09 UTC (permalink / raw)
  To: Wanpeng Li
  Cc: Ingo Molnar, Andrew Morton, Peter Zijlstra, Mel Gorman,
	Rik van Riel, linux-kernel, linux-mm

On Fri, Dec 06, 2013 at 05:12:14PM +0800, Wanpeng Li wrote:
> Use wrapper function task_node to get node which task is on.
> 
> Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>

Maybe we have another line to apply the same fix:

./kernel/sched/debug.c:142:     SEQ_printf(m, " %d", cpu_to_node(task_cpu(p)));

But anyway,

Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>

Thanks,
Naoya Horiguchi

> ---
>  kernel/sched/fair.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
> index 56bcc0c..e0b1063 100644
> --- a/kernel/sched/fair.c
> +++ b/kernel/sched/fair.c
> @@ -1216,7 +1216,7 @@ static int task_numa_migrate(struct task_struct *p)
>  	 * elsewhere, so there is no point in (re)trying.
>  	 */
>  	if (unlikely(!sd)) {
> -		p->numa_preferred_nid = cpu_to_node(task_cpu(p));
> +		p->numa_preferred_nid = task_node(p);
>  		return -EINVAL;
>  	}
>  
> @@ -1283,7 +1283,7 @@ static void numa_migrate_preferred(struct task_struct *p)
>  	p->numa_migrate_retry = jiffies + HZ;
>  
>  	/* Success if task is already running on preferred CPU */
> -	if (cpu_to_node(task_cpu(p)) == p->numa_preferred_nid)
> +	if (task_node(p) == p->numa_preferred_nid)
>  		return;
>  
>  	/* Otherwise, try migrate to a CPU on the preferred node */
> -- 
> 1.7.7.6
> 
> --
> To unsubscribe, send a message with 'unsubscribe linux-mm' in
> the body to majordomo@kvack.org.  For more info on Linux MM,
> see: http://www.linux-mm.org/ .
> Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
> 

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 5/6] sched/numa: make numamigrate_isolate_page static
  2013-12-06  9:12 ` [PATCH v2 5/6] sched/numa: make numamigrate_isolate_page static Wanpeng Li
@ 2013-12-06 21:19   ` Naoya Horiguchi
  2013-12-08  3:10     ` Wanpeng Li
  0 siblings, 1 reply; 19+ messages in thread
From: Naoya Horiguchi @ 2013-12-06 21:19 UTC (permalink / raw)
  To: Wanpeng Li
  Cc: Ingo Molnar, Andrew Morton, Peter Zijlstra, Mel Gorman,
	Rik van Riel, linux-kernel, linux-mm

On Fri, Dec 06, 2013 at 05:12:15PM +0800, Wanpeng Li wrote:
> Make numamigrate_update_ratelimit static.

Please change this function name, too :)

Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>

Thanks,
Naoya Horiguchi

> Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
> ---
>  mm/migrate.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/mm/migrate.c b/mm/migrate.c
> index fdb70f7..7ad81e0 100644
> --- a/mm/migrate.c
> +++ b/mm/migrate.c
> @@ -1616,7 +1616,7 @@ bool numamigrate_update_ratelimit(pg_data_t *pgdat, unsigned long nr_pages)
>  	return rate_limited;
>  }
>  
> -int numamigrate_isolate_page(pg_data_t *pgdat, struct page *page)
> +static int numamigrate_isolate_page(pg_data_t *pgdat, struct page *page)
>  {
>  	int page_lru;
>  
> -- 
> 1.7.7.6
> 
> --
> To unsubscribe, send a message with 'unsubscribe linux-mm' in
> the body to majordomo@kvack.org.  For more info on Linux MM,
> see: http://www.linux-mm.org/ .
> Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
> 

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 4/6] sched/numa: use wrapper function task_node to get node which task is on
  2013-12-06 21:09   ` Naoya Horiguchi
@ 2013-12-08  0:05     ` Wanpeng Li
  0 siblings, 0 replies; 19+ messages in thread
From: Wanpeng Li @ 2013-12-08  0:05 UTC (permalink / raw)
  To: Naoya Horiguchi
  Cc: Ingo Molnar, Andrew Morton, Peter Zijlstra, Mel Gorman,
	Rik van Riel, linux-kernel, linux-mm

On Fri, Dec 06, 2013 at 04:09:36PM -0500, Naoya Horiguchi wrote:
>On Fri, Dec 06, 2013 at 05:12:14PM +0800, Wanpeng Li wrote:
>> Use wrapper function task_node to get node which task is on.
>> 
>> Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
>
>Maybe we have another line to apply the same fix:
>
>./kernel/sched/debug.c:142:     SEQ_printf(m, " %d", cpu_to_node(task_cpu(p)));
>

Ok, I will fold it to next version. Thanks for your review. ;-)

Regards,
Wanpeng Li 

>But anyway,
>
>Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
>
>Thanks,
>Naoya Horiguchi
>
>> ---
>>  kernel/sched/fair.c |    4 ++--
>>  1 files changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
>> index 56bcc0c..e0b1063 100644
>> --- a/kernel/sched/fair.c
>> +++ b/kernel/sched/fair.c
>> @@ -1216,7 +1216,7 @@ static int task_numa_migrate(struct task_struct *p)
>>  	 * elsewhere, so there is no point in (re)trying.
>>  	 */
>>  	if (unlikely(!sd)) {
>> -		p->numa_preferred_nid = cpu_to_node(task_cpu(p));
>> +		p->numa_preferred_nid = task_node(p);
>>  		return -EINVAL;
>>  	}
>>  
>> @@ -1283,7 +1283,7 @@ static void numa_migrate_preferred(struct task_struct *p)
>>  	p->numa_migrate_retry = jiffies + HZ;
>>  
>>  	/* Success if task is already running on preferred CPU */
>> -	if (cpu_to_node(task_cpu(p)) == p->numa_preferred_nid)
>> +	if (task_node(p) == p->numa_preferred_nid)
>>  		return;
>>  
>>  	/* Otherwise, try migrate to a CPU on the preferred node */
>> -- 
>> 1.7.7.6
>> 
>> --
>> To unsubscribe, send a message with 'unsubscribe linux-mm' in
>> the body to majordomo@kvack.org.  For more info on Linux MM,
>> see: http://www.linux-mm.org/ .
>> Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
>> 

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 1/6] sched/numa: fix set cpupid on page migration twice
  2013-12-06 16:56 ` [PATCH v2 1/6] sched/numa: fix set cpupid on page migration twice Mel Gorman
@ 2013-12-08  0:06   ` Wanpeng Li
  0 siblings, 0 replies; 19+ messages in thread
From: Wanpeng Li @ 2013-12-08  0:06 UTC (permalink / raw)
  To: Mel Gorman
  Cc: Ingo Molnar, Andrew Morton, Peter Zijlstra, Rik van Riel,
	Naoya Horiguchi, linux-kernel, linux-mm

On Fri, Dec 06, 2013 at 04:56:23PM +0000, Mel Gorman wrote:
>On Fri, Dec 06, 2013 at 05:12:11PM +0800, Wanpeng Li wrote:
>> commit 7851a45cd3 (mm: numa: Copy cpupid on page migration) copy over 
>> the cpupid at page migration time, there is unnecessary to set it again 
>> in migrate_misplaced_transhuge_page, this patch fix it.
>> 
>> Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
>
>Acked-by: Mel Gorman <mgorman@suse.de>
>

Thanks for your review, Mel. ;-)

Regards,
Wanpeng Li 

>-- 
>Mel Gorman
>SUSE Labs
>
>--
>To unsubscribe, send a message with 'unsubscribe linux-mm' in
>the body to majordomo@kvack.org.  For more info on Linux MM,
>see: http://www.linux-mm.org/ .
>Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 1/6] sched/numa: fix set cpupid on page migration twice
  2013-12-06  9:12 [PATCH v2 1/6] sched/numa: fix set cpupid on page migration twice Wanpeng Li
                   ` (5 preceding siblings ...)
  2013-12-06 16:56 ` [PATCH v2 1/6] sched/numa: fix set cpupid on page migration twice Mel Gorman
@ 2013-12-08  1:11 ` Rik van Riel
  2013-12-08  1:19   ` Wanpeng Li
  6 siblings, 1 reply; 19+ messages in thread
From: Rik van Riel @ 2013-12-08  1:11 UTC (permalink / raw)
  To: Wanpeng Li
  Cc: Ingo Molnar, Andrew Morton, Peter Zijlstra, Mel Gorman,
	Naoya Horiguchi, linux-kernel, linux-mm

On 12/06/2013 04:12 AM, Wanpeng Li wrote:
> commit 7851a45cd3 (mm: numa: Copy cpupid on page migration) copy over 
> the cpupid at page migration time, there is unnecessary to set it again 
> in migrate_misplaced_transhuge_page, this patch fix it.
> 
> Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>

Reviewed-by: Rik van Riel <riel@redhat.com>

-- 
All rights reversed

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 1/6] sched/numa: fix set cpupid on page migration twice
  2013-12-08  1:11 ` Rik van Riel
@ 2013-12-08  1:19   ` Wanpeng Li
  0 siblings, 0 replies; 19+ messages in thread
From: Wanpeng Li @ 2013-12-08  1:19 UTC (permalink / raw)
  To: Rik van Riel
  Cc: Ingo Molnar, Andrew Morton, Peter Zijlstra, Mel Gorman,
	Naoya Horiguchi, linux-kernel, linux-mm

On Sat, Dec 07, 2013 at 08:11:54PM -0500, Rik van Riel wrote:
>On 12/06/2013 04:12 AM, Wanpeng Li wrote:
>> commit 7851a45cd3 (mm: numa: Copy cpupid on page migration) copy over 
>> the cpupid at page migration time, there is unnecessary to set it again 
>> in migrate_misplaced_transhuge_page, this patch fix it.
>> 
>> Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
>
>Reviewed-by: Rik van Riel <riel@redhat.com>

Thanks for your review, Rik. ;-)

Regards,
Wanpeng Li 

>
>-- 
>All rights reversed

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 3/6] sched/numa: drop sysctl_numa_balancing_settle_count sysctl
  2013-12-06  9:12 ` [PATCH v2 3/6] sched/numa: drop sysctl_numa_balancing_settle_count sysctl Wanpeng Li
  2013-12-06 16:56   ` Mel Gorman
@ 2013-12-08  3:02   ` Rik van Riel
  1 sibling, 0 replies; 19+ messages in thread
From: Rik van Riel @ 2013-12-08  3:02 UTC (permalink / raw)
  To: Wanpeng Li
  Cc: Ingo Molnar, Andrew Morton, Peter Zijlstra, Mel Gorman,
	Naoya Horiguchi, linux-kernel, linux-mm

On 12/06/2013 04:12 AM, Wanpeng Li wrote:
> commit 887c290e (sched/numa: Decide whether to favour task or group weights 
> based on swap candidate relationships) drop the check against 
> sysctl_numa_balancing_settle_count, this patch remove the sysctl.
> 
> Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>

Reviewed-by: Rik van Riel <riel@redhat.com>


-- 
All rights reversed

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 5/6] sched/numa: make numamigrate_isolate_page static
  2013-12-06 21:19   ` Naoya Horiguchi
@ 2013-12-08  3:10     ` Wanpeng Li
  0 siblings, 0 replies; 19+ messages in thread
From: Wanpeng Li @ 2013-12-08  3:10 UTC (permalink / raw)
  To: Naoya Horiguchi
  Cc: Ingo Molnar, Andrew Morton, Peter Zijlstra, Mel Gorman,
	Rik van Riel, linux-kernel, linux-mm

Hi Naoya,
On Fri, Dec 06, 2013 at 04:19:55PM -0500, Naoya Horiguchi wrote:
>On Fri, Dec 06, 2013 at 05:12:15PM +0800, Wanpeng Li wrote:
>> Make numamigrate_update_ratelimit static.
>
>Please change this function name, too :)

Indeed, the patch description should be "Make numamigrate_isolate_page
static".

Regards,
Wanpeng Li 

>
>Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
>
>Thanks,
>Naoya Horiguchi
>
>> Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
>> ---
>>  mm/migrate.c |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>> 
>> diff --git a/mm/migrate.c b/mm/migrate.c
>> index fdb70f7..7ad81e0 100644
>> --- a/mm/migrate.c
>> +++ b/mm/migrate.c
>> @@ -1616,7 +1616,7 @@ bool numamigrate_update_ratelimit(pg_data_t *pgdat, unsigned long nr_pages)
>>  	return rate_limited;
>>  }
>>  
>> -int numamigrate_isolate_page(pg_data_t *pgdat, struct page *page)
>> +static int numamigrate_isolate_page(pg_data_t *pgdat, struct page *page)
>>  {
>>  	int page_lru;
>>  
>> -- 
>> 1.7.7.6
>> 
>> --
>> To unsubscribe, send a message with 'unsubscribe linux-mm' in
>> the body to majordomo@kvack.org.  For more info on Linux MM,
>> see: http://www.linux-mm.org/ .
>> Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
>> 
>
>--
>To unsubscribe, send a message with 'unsubscribe linux-mm' in
>the body to majordomo@kvack.org.  For more info on Linux MM,
>see: http://www.linux-mm.org/ .
>Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 4/6] sched/numa: use wrapper function task_node to get node which task is on
  2013-12-06  9:12 ` [PATCH v2 4/6] sched/numa: use wrapper function task_node to get node which task is on Wanpeng Li
  2013-12-06 16:57   ` Mel Gorman
  2013-12-06 21:09   ` Naoya Horiguchi
@ 2013-12-08  3:13   ` Rik van Riel
  2 siblings, 0 replies; 19+ messages in thread
From: Rik van Riel @ 2013-12-08  3:13 UTC (permalink / raw)
  To: Wanpeng Li
  Cc: Ingo Molnar, Andrew Morton, Peter Zijlstra, Mel Gorman,
	Naoya Horiguchi, linux-kernel, linux-mm

On 12/06/2013 04:12 AM, Wanpeng Li wrote:
> Use wrapper function task_node to get node which task is on.
> 
> Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>

Reviewed-by: Rik van Riel <riel@redhat.com>

-- 
All rights reversed

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 6/6] sched/numa: make numamigrate_update_ratelimit static
  2013-12-06  9:12 ` [PATCH v2 6/6] sched/numa: make numamigrate_update_ratelimit static Wanpeng Li
@ 2013-12-08  3:14   ` Rik van Riel
  0 siblings, 0 replies; 19+ messages in thread
From: Rik van Riel @ 2013-12-08  3:14 UTC (permalink / raw)
  To: Wanpeng Li
  Cc: Ingo Molnar, Andrew Morton, Peter Zijlstra, Mel Gorman,
	Naoya Horiguchi, linux-kernel, linux-mm

On 12/06/2013 04:12 AM, Wanpeng Li wrote:
> Make numamigrate_update_ratelimit static.
> 
> Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>

Reviewed-by: Rik van Riel <riel@redhat.com>


-- 
All rights reversed

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2013-12-08  3:14 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-06  9:12 [PATCH v2 1/6] sched/numa: fix set cpupid on page migration twice Wanpeng Li
2013-12-06  9:12 ` [PATCH v2 2/6] sched/numa: drop idx field of task_numa_env struct Wanpeng Li
2013-12-06  9:12 ` [PATCH v2 3/6] sched/numa: drop sysctl_numa_balancing_settle_count sysctl Wanpeng Li
2013-12-06 16:56   ` Mel Gorman
2013-12-08  3:02   ` Rik van Riel
2013-12-06  9:12 ` [PATCH v2 4/6] sched/numa: use wrapper function task_node to get node which task is on Wanpeng Li
2013-12-06 16:57   ` Mel Gorman
2013-12-06 21:09   ` Naoya Horiguchi
2013-12-08  0:05     ` Wanpeng Li
2013-12-08  3:13   ` Rik van Riel
2013-12-06  9:12 ` [PATCH v2 5/6] sched/numa: make numamigrate_isolate_page static Wanpeng Li
2013-12-06 21:19   ` Naoya Horiguchi
2013-12-08  3:10     ` Wanpeng Li
2013-12-06  9:12 ` [PATCH v2 6/6] sched/numa: make numamigrate_update_ratelimit static Wanpeng Li
2013-12-08  3:14   ` Rik van Riel
2013-12-06 16:56 ` [PATCH v2 1/6] sched/numa: fix set cpupid on page migration twice Mel Gorman
2013-12-08  0:06   ` Wanpeng Li
2013-12-08  1:11 ` Rik van Riel
2013-12-08  1:19   ` Wanpeng Li

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).