lkml.org 
[lkml]   [2010]   [Aug]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 7/9] v4 Update the node sysfs code
    Update the node sysfs code to be aware of the new capability for a memory
    block to contain multiple memory sections. This requires an additional
    parameter to unregister_mem_sect_under_nodes so that we know which memory
    section of the memory block to unregister.

    Signed-off-by: Nathan Fontenot <nfont@austin.ibm.com>
    ---
    drivers/base/memory.c | 2 +-
    drivers/base/node.c | 12 ++++++++----
    include/linux/node.h | 6 ++++--
    3 files changed, 13 insertions(+), 7 deletions(-)

    Index: linux-2.6/drivers/base/node.c
    ===================================================================
    --- linux-2.6.orig/drivers/base/node.c 2010-08-02 13:57:20.000000000 -0500
    +++ linux-2.6/drivers/base/node.c 2010-08-02 14:01:58.000000000 -0500
    @@ -346,8 +346,10 @@ int register_mem_sect_under_node(struct
    return -EFAULT;
    if (!node_online(nid))
    return 0;
    - sect_start_pfn = section_nr_to_pfn(mem_blk->phys_index);
    - sect_end_pfn = sect_start_pfn + PAGES_PER_SECTION - 1;
    +
    + sect_start_pfn = section_nr_to_pfn(mem_blk->start_phys_index);
    + sect_end_pfn = section_nr_to_pfn(mem_blk->end_phys_index);
    + sect_end_pfn += PAGES_PER_SECTION - 1;
    for (pfn = sect_start_pfn; pfn <= sect_end_pfn; pfn++) {
    int page_nid;

    @@ -371,7 +373,8 @@ int register_mem_sect_under_node(struct
    }

    /* unregister memory section under all nodes that it spans */
    -int unregister_mem_sect_under_nodes(struct memory_block *mem_blk)
    +int unregister_mem_sect_under_nodes(struct memory_block *mem_blk,
    + unsigned long phys_index)
    {
    NODEMASK_ALLOC(nodemask_t, unlinked_nodes, GFP_KERNEL);
    unsigned long pfn, sect_start_pfn, sect_end_pfn;
    @@ -383,7 +386,8 @@ int unregister_mem_sect_under_nodes(stru
    if (!unlinked_nodes)
    return -ENOMEM;
    nodes_clear(*unlinked_nodes);
    - sect_start_pfn = section_nr_to_pfn(mem_blk->phys_index);
    +
    + sect_start_pfn = section_nr_to_pfn(phys_index);
    sect_end_pfn = sect_start_pfn + PAGES_PER_SECTION - 1;
    for (pfn = sect_start_pfn; pfn <= sect_end_pfn; pfn++) {
    int nid;
    Index: linux-2.6/drivers/base/memory.c
    ===================================================================
    --- linux-2.6.orig/drivers/base/memory.c 2010-08-02 14:01:04.000000000 -0500
    +++ linux-2.6/drivers/base/memory.c 2010-08-02 14:01:58.000000000 -0500
    @@ -555,9 +555,9 @@ int remove_memory_block(unsigned long no

    mutex_lock(&mem_sysfs_mutex);
    mem = find_memory_block(section);
    + unregister_mem_sect_under_nodes(mem, __section_nr(section));

    if (atomic_dec_and_test(&mem->section_count)) {
    - unregister_mem_sect_under_nodes(mem);
    mem_remove_simple_file(mem, phys_index);
    mem_remove_simple_file(mem, end_phys_index);
    mem_remove_simple_file(mem, state);
    Index: linux-2.6/include/linux/node.h
    ===================================================================
    --- linux-2.6.orig/include/linux/node.h 2010-08-02 13:57:20.000000000 -0500
    +++ linux-2.6/include/linux/node.h 2010-08-02 14:01:58.000000000 -0500
    @@ -44,7 +44,8 @@ extern int register_cpu_under_node(unsig
    extern int unregister_cpu_under_node(unsigned int cpu, unsigned int nid);
    extern int register_mem_sect_under_node(struct memory_block *mem_blk,
    int nid);
    -extern int unregister_mem_sect_under_nodes(struct memory_block *mem_blk);
    +extern int unregister_mem_sect_under_nodes(struct memory_block *mem_blk,
    + unsigned long phys_index);

    #ifdef CONFIG_HUGETLBFS
    extern void register_hugetlbfs_with_node(node_registration_func_t doregister,
    @@ -72,7 +73,8 @@ static inline int register_mem_sect_unde
    {
    return 0;
    }
    -static inline int unregister_mem_sect_under_nodes(struct memory_block *mem_blk)
    +static inline int unregister_mem_sect_under_nodes(struct memory_block *mem_blk,
    + unsigned long phys_index)
    {
    return 0;
    }



    \
     
     \ /
      Last update: 2010-08-03 15:45    [W:0.025 / U:34.760 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site