diff options
| author | Christoph Lameter <clameter@sgi.com> | 2006-09-26 02:31:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 11:48:50 -0400 |
| commit | fbd98167e653535c5816be154f2149c0efa7757d (patch) | |
| tree | 4cc984a81571c19cffa091d0bb467798396413e0 | |
| parent | 1192d526412b1b8ccb1493064cea06efc12c772b (diff) | |
[PATCH] Profiling: require buffer allocation on the correct node
Profiling really suffers with off node buffers. Fail if no memory is
available on the nodes. The profiling code can deal with these failures
should they occur.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | kernel/profile.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/kernel/profile.c b/kernel/profile.c index d5bd75e7501c..fb660c7d35ba 100644 --- a/kernel/profile.c +++ b/kernel/profile.c | |||
| @@ -309,13 +309,17 @@ static int __devinit profile_cpu_callback(struct notifier_block *info, | |||
| 309 | node = cpu_to_node(cpu); | 309 | node = cpu_to_node(cpu); |
| 310 | per_cpu(cpu_profile_flip, cpu) = 0; | 310 | per_cpu(cpu_profile_flip, cpu) = 0; |
| 311 | if (!per_cpu(cpu_profile_hits, cpu)[1]) { | 311 | if (!per_cpu(cpu_profile_hits, cpu)[1]) { |
| 312 | page = alloc_pages_node(node, GFP_KERNEL | __GFP_ZERO, 0); | 312 | page = alloc_pages_node(node, |
| 313 | GFP_KERNEL | __GFP_ZERO | GFP_THISNODE, | ||
| 314 | 0); | ||
| 313 | if (!page) | 315 | if (!page) |
| 314 | return NOTIFY_BAD; | 316 | return NOTIFY_BAD; |
| 315 | per_cpu(cpu_profile_hits, cpu)[1] = page_address(page); | 317 | per_cpu(cpu_profile_hits, cpu)[1] = page_address(page); |
| 316 | } | 318 | } |
| 317 | if (!per_cpu(cpu_profile_hits, cpu)[0]) { | 319 | if (!per_cpu(cpu_profile_hits, cpu)[0]) { |
| 318 | page = alloc_pages_node(node, GFP_KERNEL | __GFP_ZERO, 0); | 320 | page = alloc_pages_node(node, |
| 321 | GFP_KERNEL | __GFP_ZERO | GFP_THISNODE, | ||
| 322 | 0); | ||
| 319 | if (!page) | 323 | if (!page) |
| 320 | goto out_free; | 324 | goto out_free; |
| 321 | per_cpu(cpu_profile_hits, cpu)[0] = page_address(page); | 325 | per_cpu(cpu_profile_hits, cpu)[0] = page_address(page); |
| @@ -491,12 +495,16 @@ static int __init create_hash_tables(void) | |||
| 491 | int node = cpu_to_node(cpu); | 495 | int node = cpu_to_node(cpu); |
| 492 | struct page *page; | 496 | struct page *page; |
| 493 | 497 | ||
| 494 | page = alloc_pages_node(node, GFP_KERNEL | __GFP_ZERO, 0); | 498 | page = alloc_pages_node(node, |
| 499 | GFP_KERNEL | __GFP_ZERO | GFP_THISNODE, | ||
| 500 | 0); | ||
| 495 | if (!page) | 501 | if (!page) |
| 496 | goto out_cleanup; | 502 | goto out_cleanup; |
| 497 | per_cpu(cpu_profile_hits, cpu)[1] | 503 | per_cpu(cpu_profile_hits, cpu)[1] |
| 498 | = (struct profile_hit *)page_address(page); | 504 | = (struct profile_hit *)page_address(page); |
| 499 | page = alloc_pages_node(node, GFP_KERNEL | __GFP_ZERO, 0); | 505 | page = alloc_pages_node(node, |
| 506 | GFP_KERNEL | __GFP_ZERO | GFP_THISNODE, | ||
| 507 | 0); | ||
| 500 | if (!page) | 508 | if (!page) |
| 501 | goto out_cleanup; | 509 | goto out_cleanup; |
| 502 | per_cpu(cpu_profile_hits, cpu)[0] | 510 | per_cpu(cpu_profile_hits, cpu)[0] |