nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

[PATCH] sparsemem extreme: hotplug preparation

Browse source 
This splits up sparse_index_alloc() into two pieces.  This is needed
because we'll allocate the memory for the second level in a different place
from where we actually consume it to keep the allocation from happening
underneath a lock

Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Bob Picco <bob.picco@hp.com>
Cc: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Dave Hansen 2005-09-03 15:54:29 -07:00 committed by Linus Torvalds
parent 3e347261a8
commit 28ae55c98e
2 changed files with 45 additions and 15 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
include/linux/mmzone.h
View file

@ -588,6 +588,7 @@ static inline int pfn_valid(unsigned long pfn)
void sparse_init(void); void sparse_init(void);
#else #else
#define sparse_init() do {} while (0) #define sparse_init() do {} while (0)
#define sparse_index_init(_sec, _nid) do {} while (0)
#endif /* CONFIG_SPARSEMEM */ #endif /* CONFIG_SPARSEMEM */
#ifdef CONFIG_NODES_SPAN_OTHER_NODES #ifdef CONFIG_NODES_SPAN_OTHER_NODES

59
mm/sparse.c
View file

@ -6,6 +6,7 @@
#include <linux/mmzone.h> #include <linux/mmzone.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/spinlock.h>
#include <asm/dma.h> #include <asm/dma.h>
/* /*
@ -22,27 +23,55 @@ struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT]
#endif #endif
EXPORT_SYMBOL(mem_section); EXPORT_SYMBOL(mem_section);
static void sparse_alloc_root(unsigned long root, int nid)
{
#ifdef CONFIG_SPARSEMEM_EXTREME #ifdef CONFIG_SPARSEMEM_EXTREME
mem_section[root] = alloc_bootmem_node(NODE_DATA(nid), PAGE_SIZE); static struct mem_section *sparse_index_alloc(int nid)
#endif
}
static void sparse_index_init(unsigned long section, int nid)
{ {
unsigned long root = SECTION_NR_TO_ROOT(section); struct mem_section *section = NULL;
unsigned long array_size = SECTIONS_PER_ROOT *
sizeof(struct mem_section);
if (mem_section[root]) section = alloc_bootmem_node(NODE_DATA(nid), array_size);
return;
sparse_alloc_root(root, nid); if (section)
memset(section, 0, array_size);
if (mem_section[root]) return section;
memset(mem_section[root], 0, PAGE_SIZE);
else
panic("memory_present: NO MEMORY\n");
} }
static int sparse_index_init(unsigned long section_nr, int nid)
{
static spinlock_t index_init_lock = SPIN_LOCK_UNLOCKED;
unsigned long root = SECTION_NR_TO_ROOT(section_nr);
struct mem_section *section;
int ret = 0;
if (mem_section[root])
return -EEXIST;
section = sparse_index_alloc(nid);
/*
* This lock keeps two different sections from
* reallocating for the same index
*/
spin_lock(&index_init_lock);
if (mem_section[root]) {
ret = -EEXIST;
goto out;
}
mem_section[root] = section;
out:
spin_unlock(&index_init_lock);
return ret;
}
#else /* !SPARSEMEM_EXTREME */
static inline int sparse_index_init(unsigned long section_nr, int nid)
{
return 0;
}
#endif
/* Record a memory area against a node. */ /* Record a memory area against a node. */
void memory_present(int nid, unsigned long start, unsigned long end) void memory_present(int nid, unsigned long start, unsigned long end)
{ {