1. 31 3月, 2018 10 次提交
    • N
      powerpc/64s: Remove POWER4 support · 471d7ff8
      Nicholas Piggin 提交于
      POWER4 has been broken since at least the change 49d09bf2
      ("powerpc/64s: Optimise MSR handling in exception handling"), which
      requires mtmsrd L=1 support. This was introduced in ISA v2.01, and
      POWER4 supports ISA v2.00.
      Signed-off-by: NNicholas Piggin <npiggin@gmail.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      471d7ff8
    • N
      powerpc/64s: Fix POWER9 DD2.2 and above in DT CPU features · 9e9626ed
      Nicholas Piggin 提交于
      The CPU_FTR_POWER9_DD2_1 flag is intended to be set for DD2.1 and
      above (which is what the cputable setup does). Fix DT CPU features
      quirk setup to match.
      Signed-off-by: NNicholas Piggin <npiggin@gmail.com>
      [mpe: Merge with upstream changes]
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      9e9626ed
    • N
      powerpc/64s: Set assembler machine type to POWER4 · 15a3204d
      Nicholas Piggin 提交于
      Rather than override the machine type in .S code (which can hide wrong
      or ambiguous code generation for the target), set the type to power4
      for all assembly.
      
      This also means we need to be careful not to build power4-only code
      when we're not building for Book3S, such as the "power7" versions of
      copyuser/page/memcpy.
      Signed-off-by: NNicholas Piggin <npiggin@gmail.com>
      [mpe: Fix Book3E build, don't build the "power7" variants for non-Book3S]
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      15a3204d
    • N
      powerpc/64s/idle: avoid sync for KVM state when waking from idle · 8c1c7fb0
      Nicholas Piggin 提交于
      When waking from a CPU idle instruction (e.g., nap or stop), the sync
      for ordering the KVM secondary thread state can be avoided if there
      wakeup is coming from a kernel context rather than KVM context.
      
      This improves performance for ping-pong benchmark with the stop0 idle
      state by 0.46% for 2 threads in the same core, and 1.02% for different
      cores.
      Signed-off-by: NNicholas Piggin <npiggin@gmail.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      8c1c7fb0
    • N
      powerpc/64s/idle: POWER9 implement a separate idle stop function for hotplug · 3d4fbffd
      Nicholas Piggin 提交于
      Implement a new function to invoke stop, power9_offline_stop, which is
      like power9_idle_stop but used by the cpu hotplug code.
      
      Move KVM secondary state manipulation code to the offline case.
      Signed-off-by: NNicholas Piggin <npiggin@gmail.com>
      Reviewed-by: NVaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      3d4fbffd
    • N
      powerpc/64s: sreset panic if there is no debugger or crash dump handlers · d40b6768
      Nicholas Piggin 提交于
      system_reset_exception does most of its own crash handling now,
      invoking the debugger or crash dumps if they are registered. If not,
      then it goes through to die() to print stack traces, and then is
      supposed to panic (according to comments).
      
      However after die() prints oopses, it does its own handling which
      doesn't allow system_reset_exception to panic (e.g., it may just
      kill the current process). This patch causes sreset exceptions to
      return from die after it prints messages but before acting.
      
      This also stops die from invoking the debugger on 0x100 crashes.
      system_reset_exception similarly calls the debugger. It had been
      thought this was harmless (because if the debugger was disabled,
      neither call would fire, and if it was enabled the first call
      would return). However in some cases like xmon 'X' command, the
      debugger returns 0, which currently causes it to be entered
      again (first in system_reset_exception, then in die), which is
      confusing.
      Signed-off-by: NNicholas Piggin <npiggin@gmail.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      d40b6768
    • N
      powerpc/64s: return more carefully from sreset NMI · 15b4dd79
      Nicholas Piggin 提交于
      System Reset, being an NMI, must return more carefully than other
      interrupts. It has traditionally returned via the nromal return
      from exception path, but that has a number of problems.
      
      - r13 does not get restored if returning to kernel. This is for
        interrupts which may cause a context switch, which sreset will
        never do. Interrupting OPAL (which uses a different r13) is one
        place where this causes breakage.
      
      - It may cause several other problems returning to kernel with
        preempt or TIF_EMULATE_STACK_STORE if it hits at the wrong time.
      
      It's safer just to have a simple restore and return, like machine
      check which is the other NMI.
      Signed-off-by: NNicholas Piggin <npiggin@gmail.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      15b4dd79
    • M
      powerpc/eeh: Fix race with driver un/bind · f0295e04
      Michael Neuling 提交于
      The current EEH callbacks can race with a driver unbind. This can
      result in a backtraces like this:
      
        EEH: Frozen PHB#0-PE#1fc detected
        EEH: PE location: S000009, PHB location: N/A
        CPU: 2 PID: 2312 Comm: kworker/u258:3 Not tainted 4.15.6-openpower1 #2
        Workqueue: nvme-wq nvme_reset_work [nvme]
        Call Trace:
          dump_stack+0x9c/0xd0 (unreliable)
          eeh_dev_check_failure+0x420/0x470
          eeh_check_failure+0xa0/0xa4
          nvme_reset_work+0x138/0x1414 [nvme]
          process_one_work+0x1ec/0x328
          worker_thread+0x2e4/0x3a8
          kthread+0x14c/0x154
          ret_from_kernel_thread+0x5c/0xc8
        nvme nvme1: Removing after probe failure status: -19
        <snip>
        cpu 0x23: Vector: 300 (Data Access) at [c000000ff50f3800]
            pc: c0080000089a0eb0: nvme_error_detected+0x4c/0x90 [nvme]
            lr: c000000000026564: eeh_report_error+0xe0/0x110
            sp: c000000ff50f3a80
           msr: 9000000000009033
           dar: 400
         dsisr: 40000000
          current = 0xc000000ff507c000
          paca    = 0xc00000000fdc9d80   softe: 0        irq_happened: 0x01
            pid   = 782, comm = eehd
        Linux version 4.15.6-openpower1 (smc@smc-desktop) (gcc version 6.4.0 (Buildroot 2017.11.2-00008-g4b6188e)) #2 SM                                             P Tue Feb 27 12:33:27 PST 2018
        enter ? for help
          eeh_report_error+0xe0/0x110
          eeh_pe_dev_traverse+0xc0/0xdc
          eeh_handle_normal_event+0x184/0x4c4
          eeh_handle_event+0x30/0x288
          eeh_event_handler+0x124/0x170
          kthread+0x14c/0x154
          ret_from_kernel_thread+0x5c/0xc8
      
      The first part is an EEH (on boot), the second half is the resulting
      crash. nvme probe starts the nvme_reset_work() worker thread. This
      worker thread starts touching the device which see a device error
      (EEH) and hence queues up an event in the powerpc EEH worker
      thread. nvme_reset_work() then continues and runs
      nvme_remove_dead_ctrl_work() which results in unbinding the driver
      from the device and hence releases all resources. At the same time,
      the EEH worker thread starts doing the EEH .error_detected() driver
      callback, which no longer works since the resources have been freed.
      
      This fixes the problem in the same way the generic PCIe AER code (in
      drivers/pci/pcie/aer/aerdrv_core.c) does. It makes the EEH code hold
      the device_lock() while performing the driver EEH callbacks and
      associated code. This ensures either the callbacks are no longer
      register, or if they are registered the driver will not be removed
      from underneath us.
      
      This has been broken forever. The EEH call backs were first introduced
      in 2005 (in 77bd7415) but it's not clear if a lock was needed back
      then.
      
      Fixes: 77bd7415 ("[PATCH] powerpc: PCI Error Recovery: PPC64 core recovery routines")
      Cc: stable@vger.kernel.org # v2.6.16+
      Signed-off-by: NMichael Neuling <mikey@neuling.org>
      Reviewed-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      f0295e04
    • T
      powerpc/kexec_file: Fix error code when trying to load kdump kernel · bf8a1abc
      Thiago Jung Bauermann 提交于
      kexec_file_load() on powerpc doesn't support kdump kernels yet, so it
      returns -ENOTSUPP in that case.
      
      I've recently learned that this errno is internal to the kernel and
      isn't supposed to be exposed to userspace. Therefore, change to
      -EOPNOTSUPP which is defined in an uapi header.
      
      This does indeed make kexec-tools happier. Before the patch, on
      ppc64le:
      
        # ~bauermann/src/kexec-tools/build/sbin/kexec -s -p /boot/vmlinuz
        kexec_file_load failed: Unknown error 524
      
      After the patch:
      
        # ~bauermann/src/kexec-tools/build/sbin/kexec -s -p /boot/vmlinuz
        kexec_file_load failed: Operation not supported
      
      Fixes: a0458284 ("powerpc: Add support code for kexec_file_load()")
      Cc: stable@vger.kernel.org # v4.10+
      Reported-by: NDave Young <dyoung@redhat.com>
      Signed-off-by: NThiago Jung Bauermann <bauerman@linux.vnet.ibm.com>
      Reviewed-by: NSimon Horman <horms@verge.net.au>
      Reviewed-by: NDave Young <dyoung@redhat.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      bf8a1abc
    • M
      powerpc/64e: Fix oops due to deferral of paca allocation · 1d0afc0d
      Michael Ellerman 提交于
      On 64-bit Book3E systems, in setup_tlb_core_data() we reference other
      CPUs pacas. But in commit 59f57774 ("powerpc/64: Defer paca
      allocation until memory topology is discovered") the allocation of
      non-boot-CPU pacas was deferred until later in boot.
      
      This leads to an oops:
      
        CPU maps initialized for 1 thread per core
        Unable to handle kernel paging request for data at address 0x8888888888888918
        Faulting instruction address: 0xc000000000e2f0d0
        Oops: Kernel access of bad area, sig: 11 [#1]
        NIP .setup_tlb_core_data+0xdc/0x160
        Call Trace:
          .setup_tlb_core_data+0x5c/0x160 (unreliable)
          .setup_arch+0x80/0x348
          .start_kernel+0x7c/0x598
          start_here_common+0x1c/0x40
      
      Luckily setup_tlb_core_data() is called immediately prior to
      smp_setup_pacas(). So simply switching their order is sufficient to
      fix the oops and seems unlikely to have any other unwanted side
      effects.
      
      Fixes: 59f57774 ("powerpc/64: Defer paca allocation until memory topology is discovered")
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      1d0afc0d
  2. 30 3月, 2018 12 次提交
  3. 27 3月, 2018 18 次提交