From 8d81296cfcce89013a714feb8d25004a156f8181 Mon Sep 17 00:00:00 2001

From: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>

Date: Thu, 30 Nov 2017 14:35:54 +0530

Subject: [PATCH] powerpc/radix: Remove trace_tlbie call from

 radix__flush_tlb_all

References: bsc#1055117, fate#323286, git-fixes

Patch-mainline: v4.16-rc1

Git-commit: 8d81296cfcce89013a714feb8d25004a156f8181

radix__flush_tlb_all() is called only in kexec path in real mode and any

tracepoints at this stage will make kexec to fail if enabled.

To verify enable tlbie trace before kexec.

$ echo 1 > /sys/kernel/debug/tracing/events/powerpc/tlbie/enable

== kexec into new kernel and kexec fails.

Fix this by not calling trace_tlbie from radix__flush_tlb_all().

Fixes: 0428491cba92 ("powerpc/mm: Trace tlbie(l) instructions")

Cc: stable@vger.kernel.org # v4.13+

Signed-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>

Acked-by: Balbir Singh <bsingharora@gmail.com>

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

Acked-by: Michal Suchanek <msuchanek@suse.de>

---

 arch/powerpc/mm/tlb-radix.c | 2 --

 1 file changed, 2 deletions(-)

diff --git a/arch/powerpc/mm/tlb-radix.c b/arch/powerpc/mm/tlb-radix.c

index fbaa429471a1..71d1b19ad1c0 100644

--- a/arch/powerpc/mm/tlb-radix.c

+++ b/arch/powerpc/mm/tlb-radix.c

@@ -666,14 +666,12 @@ void radix__flush_tlb_all(void)

 	 */

 	asm volatile(PPC_TLBIE_5(%0, %4, %3, %2, %1)

 		     : : "r"(rb), "i"(r), "i"(1), "i"(ric), "r"(rs) : "memory");

-	trace_tlbie(0, 0, rb, rs, ric, prs, r);

 	/*

 	 * now flush host entires by passing PRS = 0 and LPID == 0

 	 */

 	asm volatile(PPC_TLBIE_5(%0, %4, %3, %2, %1)

 		     : : "r"(rb), "i"(r), "i"(prs), "i"(ric), "r"(0) : "memory");

 	asm volatile("eieio; tlbsync; ptesync": : :"memory");

-	trace_tlbie(0, 0, rb, 0, ric, prs, r);

 }

 void radix__flush_tlb_pte_p9_dd1(unsigned long old_pte, struct mm_struct *mm,

-- 

2.13.6