lkml.org 
[lkml]   [2013]   [Jul]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 015/103] powerpc/numa: Do not update sysfs cpu registration from invalid context
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Nathan Fontenot <nfont@linux.vnet.ibm.com>

    commit dd023217e17e72b46fb4d49c7734c426938c3dba upstream.

    The topology update code that updates the cpu node registration in sysfs
    should not be called while in stop_machine(). The register/unregister
    calls take a lock and may sleep.

    This patch moves these calls outside of the call to stop_machine().

    Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/powerpc/mm/numa.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/arch/powerpc/mm/numa.c
    +++ b/arch/powerpc/mm/numa.c
    @@ -1433,11 +1433,9 @@ static int update_cpu_topology(void *dat
    if (cpu != update->cpu)
    continue;

    - unregister_cpu_under_node(update->cpu, update->old_nid);
    unmap_cpu_from_node(update->cpu);
    map_cpu_to_node(update->cpu, update->new_nid);
    vdso_getcpu_init();
    - register_cpu_under_node(update->cpu, update->new_nid);
    }

    return 0;
    @@ -1485,6 +1483,9 @@ int arch_update_cpu_topology(void)
    stop_machine(update_cpu_topology, &updates[0], &updated_cpus);

    for (ud = &updates[0]; ud; ud = ud->next) {
    + unregister_cpu_under_node(ud->cpu, ud->old_nid);
    + register_cpu_under_node(ud->cpu, ud->new_nid);
    +
    dev = get_cpu_device(ud->cpu);
    if (dev)
    kobject_uevent(&dev->kobj, KOBJ_CHANGE);



    \
     
     \ /
      Last update: 2013-07-24 01:41    [W:4.252 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site