• Thomas Gleixner's avatar
    perf/x86/intel/rapl: Make package handling more robust · 3df3b2ef
    Thomas Gleixner authored
    commit dd86e373 upstream.
    
    The package management code in RAPL relies on package mapping being
    available before a CPU is started. This changed with:
    
      9d85eb91 ("x86/smpboot: Make logical package management more robust")
    
    because the ACPI/BIOS information turned out to be unreliable, but that
    left RAPL in broken state. This was not noticed because on a regular boot
    all CPUs are online before RAPL is initialized.
    
    A possible fix would be to reintroduce the mess which allocates a package
    data structure in CPU prepare and when it turns out to already exist in
    starting throw it away later in the CPU online callback. But that's a
    horrible hack and not required at all because RAPL becomes functional for
    perf only in the CPU online callback. That's correct because user space is
    not yet informed about the CPU being onlined, so nothing caan rely on RAPL
    being available on that particular CPU.
    
    Move the allocation to the CPU online callback and simplify the hotplug
    handling. At this point the package mapping is established and correct.
    
    This also adds a missing check for available package data in the
    event_init() function.
    Reported-by: default avatarYasuaki Ishimatsu <yasu.isimatu@gmail.com>
    Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Sebastian Siewior <bigeasy@linutronix.de>
    Cc: Stephane Eranian <eranian@google.com>
    Cc: Vince Weaver <vincent.weaver@maine.edu>
    Fixes: 9d85eb91 ("x86/smpboot: Make logical package management more robust")
    Link: http://lkml.kernel.org/r/20170131230141.212593966@linutronix.deSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
    [ jwang: backport to 4.9 fix Null pointer deref during hotplug cpu.]
    Signed-off-by: default avatarJack Wang <jinpu.wang@profitbricks.com>
    Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
    3df3b2ef
rapl.c 21.5 KB