powerpc/selftests: Use timersub() for gettimeofday()
Subsystems (2)
Sasha Levin
maintainerPATCH 3/7 powerpc/85xx: Fix fall-through warning for Clang
In reply to Sasha LevinFrom: "Gustavo A. R. Silva" <[email protected]>
[ Upstream commit d4d944ff68cb1f896d3f3b1af0bc656949dc626a ]
Fix the following fallthrough warning:
arch/powerpc/platforms/85xx/mpc85xx_cds.c:161:3: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
--- arch/powerpc/platforms/85xx/mpc85xx_cds.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/platforms/85xx/mpc85xx_cds.c +1 -0
@@ -158,6 +158,7 @@ static void __init mpc85xx_cds_pci_irq_fixup(struct pci_dev *dev)else dev->irq =10 ;pci_write_config_byte (dev,PCI_INTERRUPT_LINE , dev->irq); +break ;default :break ; }
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 2/7 powerpc/math-emu: Remove -w build flag and fix warnings
In reply to Sasha LevinFrom: Christophe Leroy <[email protected]>
[ Upstream commit 7245fc5bb7a966852d5bd7779d1f5855530b461a ]
As reported by Nathan, the module_init() macro was not taken into account because the header was missing. That means spe_mathemu_init() was never called.
This should have been detected by gcc at build time, but due to '-w' flag it went undetected.
Removing that flag leads to many warnings hence errors.
Fix those warnings then remove the -w flag.
--- arch/powerpc/math-emu/Makefile | 2 -- arch/powerpc/math-emu/math.c | 18 +++++----- arch/powerpc/math-emu/math_efp.c | 57 +++++++++++++++++--------------- include/math-emu/op-common.h | 3 ++ 4 files changed, 42 insertions(+), 38 deletions(-)
arch/powerpc/math-emu/Makefile +0 -2
@@ -16,5 +16,3 @@ obj-$(CONFIG_SPE) += math_efp.o CFLAGS_fabs.o = -fno-builtin-fabs CFLAGS_math.o = -fno-builtin-fabs - -ccflags-y = -w
arch/powerpc/math-emu/math.c +9 -9
@@ -24,9 +24,9 @@ FLOATFUNC(mtfsf);FLOATFUNC (mtfsfi);#ifdef CONFIG_MATH_EMULATION_HW_UNIMPLEMENTED -#undef FLOATFUNC(x) +#undef FLOATFUNC#define FLOATFUNC (x) static inline int x(void *op1, void *op2, void *op3, \ - void *op4) { } + void *op4) { return 0; }#endif FLOATFUNC (fadd);
@@ -396,28 +396,28 @@ do_mathemu(struct pt_regs *regs)case XCR : op0 = (void *)®s->ccr; - op1 = (void *)((insn >>23 ) &0x7 ); + op1 = (void *)(long )((insn >>23 ) &0x7 ); op2 = (void *)¤t->thread.TS_FPR ((insn >>16 ) &0x1f ); op3 = (void *)¤t->thread.TS_FPR ((insn >>11 ) &0x1f );break ;case XCRL : op0 = (void *)®s->ccr; - op1 = (void *)((insn >>23 ) &0x7 ); - op2 = (void *)((insn >>18 ) &0x7 ); + op1 = (void *)(long )((insn >>23 ) &0x7 ); + op2 = (void *)(long )((insn >>18 ) &0x7 );break ;case XCRB : - op0 = (void *)((insn >>21 ) &0x1f ); + op0 = (void *)(long )((insn >>21 ) &0x1f );break ;case XCRI : - op0 = (void *)((insn >>23 ) &0x7 ); - op1 = (void *)((insn >>12 ) &0xf ); + op0 = (void *)(long )((insn >>23 ) &0x7 ); + op1 = (void *)(long )((insn >>12 ) &0xf );break ;case XFLB : - op0 = (void *)((insn >>17 ) &0xff ); + op0 = (void *)(long )((insn >>17 ) &0xff ); op1 = (void *)¤t->thread.TS_FPR ((insn >>11 ) &0x1f );break ;
arch/powerpc/math-emu/math_efp.c +30 -27
206 lines not on this page · raw message
include/math-emu/op-common.h +3 -0
@@ -662,12 +662,14 @@ do { \ if (X##_e < 0) \ { \FP_SET_EXCEPTION (FP_EX_INEXACT ); \ + fallthrough; \case FP_CLS_ZERO : \ r =0 ; \ } \ else if (X##_e >= rsize - (rsigned > 0 || X##_s) \ || (!rsigned && X##_s)) \ {/* overflow */ \ + fallthrough; \case FP_CLS_NAN : \case FP_CLS_INF : \if (rsigned ==2 ) \
@@ -767,6 +769,7 @@ do { \ if (X##_e >= rsize - (rsigned > 0 || X##_s) \ || (!rsigned && X##_s)) \ {/* overflow */ \ + fallthrough; \case FP_CLS_NAN : \case FP_CLS_INF : \if (!rsigned) \
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 1/7 powerpc/selftests: Use timersub() for gettimeofday()
From: ye xingchen <[email protected]>
[ Upstream commit c814bf958926ff45a9c1e899bd001006ab6cfbae ]
Use timersub() function to simplify the code.
--- tools/testing/selftests/powerpc/benchmarks/gettimeofday.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
tools/testing/selftests/powerpc/benchmarks/gettimeofday.c +4 -2
@@ -12,7 +12,7 @@ static int test_gettimeofday(void) {int i; -struct timeval tv_start, tv_end; +struct timeval tv_start, tv_end, tv_diff;gettimeofday (&tv_start,NULL );
@@ -20,7 +20,9 @@ static int test_gettimeofday(void)gettimeofday (&tv_end,NULL ); } -printf ("time = %.6f\n" , tv_end.tv_sec - tv_start.tv_sec + (tv_end.tv_usec - tv_start.tv_usec) *1e-6 ); +timersub (&tv_start, &tv_end, &tv_diff); + +printf ("time = %.6f\n" , tv_diff.tv_sec + (tv_diff.tv_usec) *1e-6 );return 0 ; }
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 4/7 powerpc: Remove direct call to personality syscall handler
From: Rohan McLure <[email protected]>
[ Upstream commit 4df0221f9ded8c39aecfb1a80cef346026671cb7 ]
Syscall handlers should not be invoked internally by their symbol names, as these symbols defined by the architecture-defined SYSCALL_DEFINE macro. Fortunately, in the case of ppc64_personality, its call to sys_personality can be replaced with an invocation to the equivalent ksys_personality inline helper in <linux/syscalls.h>.
--- arch/powerpc/kernel/syscalls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/syscalls.c +1 -1
@@ -104,7 +104,7 @@ long ppc64_personality(unsigned long personality)if (personality (current->personality) ==PER_LINUX32 &&personality (personality) ==PER_LINUX ) personality = (personality & ~PER_MASK ) |PER_LINUX32 ; - ret =sys_personality (personality); + ret =ksys_personality (personality);if (personality (ret) ==PER_LINUX32 ) ret = (ret & ~PER_MASK ) |PER_LINUX ;return ret;
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 6/7 powerpc/mm: Fix UBSAN warning reported on hugetlb
In reply to Sasha LevinFrom: "Aneesh Kumar K.V" <[email protected]>
[ Upstream commit 7dd3a7b90bca2c12e2146a47d63cf69a2f5d7e89 ]
Powerpc architecture supports 16GB hugetlb pages with hash translation. For 4K page size, this is implemented as a hugepage directory entry at PGD level and for 64K it is implemented as a huge page pte at PUD level
With 16GB hugetlb size, offset within a page is greater than 32 bits. Hence switch to use unsigned long type when using hugepd_shift.
In order to keep things simpler, we make sure we always use unsigned long type when using hugepd_shift() even though all the hugetlb page size won't require that.
The hugetlb_free_p*d_range changes are all related to nohash usage where we can have multiple pgd entries pointing to the same hugepd entries. Hence on book3s64 where we can have > 4GB hugetlb page size we will always find more < next even if we compute the value of more correctly.
Hence there is no functional change in this patch except that it fixes the below warning.
UBSAN: shift-out-of-bounds in arch/powerpc/mm/hugetlbpage.c:499:21
shift exponent 34 is too large for 32-bit type 'int'
CPU: 39 PID: 1673 Comm: a.out Not tainted 6.0.0-rc2-00327-gee88a56e8517-dirty #1
Call Trace:
dump_stack_lvl+0x98/0xe0 (unreliable)
ubsan_epilogue+0x18/0x70
__ubsan_handle_shift_out_of_bounds+0x1bc/0x390
hugetlb_free_pgd_range+0x5d8/0x600
free_pgtables+0x114/0x290
exit_mmap+0x150/0x550
mmput+0xcc/0x210
do_exit+0x420/0xdd0
do_group_exit+0x4c/0xd0
sys_exit_group+0x24/0x30
system_call_exception+0x250/0x600
system_call_common+0xec/0x250--- arch/powerpc/mm/hugetlbpage.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/mm/hugetlbpage.c +3 -3
@@ -387,7 +387,7 @@ static void hugetlb_free_pmd_range(struct mmu_gather *tlb, pud_t *pud,* single hugepage, but all of them point to * the same kmem cache that holds the hugepte. */ - more = addr + (1 <<hugepd_shift (*(hugepd_t *)pmd)); + more = addr + (1UL <<hugepd_shift (*(hugepd_t *)pmd));if (more > next) next = more;
@@ -437,7 +437,7 @@ static void hugetlb_free_pud_range(struct mmu_gather *tlb, p4d_t *p4d,* single hugepage, but all of them point to * the same kmem cache that holds the hugepte. */ - more = addr + (1 <<hugepd_shift (*(hugepd_t *)pud)); + more = addr + (1UL <<hugepd_shift (*(hugepd_t *)pud));if (more > next) next = more;
@@ -507,7 +507,7 @@ void hugetlb_free_pgd_range(struct mmu_gather *tlb,* for a single hugepage, but all of them point to the * same kmem cache that holds the hugepte. */ - more = addr + (1 <<hugepd_shift (*(hugepd_t *)pgd)); + more = addr + (1UL <<hugepd_shift (*(hugepd_t *)pgd));if (more > next) next = more;
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 5/7 powerpc/perf: Fix branch_filter support for multiple filters
In reply to Sasha LevinFrom: Athira Rajeev <[email protected]>
[ Upstream commit b9c001276d4a756f98cc7dc4672eff5343949203 ]
For PERF_SAMPLE_BRANCH_STACK sample type, different branch_sample_type ie branch filters are supported. The branch filters are requested via event attribute "branch_sample_type". Multiple branch filters can be passed in event attribute. eg:
$ perf record -b -o- -B --branch-filter any,ind_call true
None of the Power PMUs support having multiple branch filters at the same time. Branch filters for branch stack sampling is set via MMCRA IFM bits [32:33]. But currently when requesting for multiple filter types, the "perf record" command does not report any error.
eg:
$ perf record -b -o- -B --branch-filter any,save_type true $ perf record -b -o- -B --branch-filter any,ind_call true
The "bhrb_filter_map" function in PMU driver code does the validity check for supported branch filters. But this check is done for single filter. Hence "perf record" will proceed here without reporting any error.
Fix power_pmu_event_init() to return EOPNOTSUPP when multiple branch filters are requested in the event attr.
After the fix:
$ perf record --branch-filter any,ind_call -- ls Error: cycles: PMU Hardware doesn't support sampling/overflow-interrupts. Try 'perf stat'
--- arch/powerpc/perf/core-book3s.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
arch/powerpc/perf/core-book3s.c +17 -0
@@ -2038,6 +2038,23 @@ static int power_pmu_event_init(struct perf_event *event)if (has_branch_stack (event)) {u64 bhrb_filter =-1 ; +/* +* Currently no PMU supports having multiple branch filters +* at the same time. Branch filters are set via MMCRA IFM[32:33] +* bits for Power8 and above. Return EOPNOTSUPP when multiple +* branch filters are requested in the event attr. +* +* When opening event via perf_event_open(), branch_sample_type +* gets adjusted in perf_copy_attr(). Kernel will automatically +* adjust the branch_sample_type based on the event modifier +* settings to include PERF_SAMPLE_BRANCH_PLM_ALL. Hence drop +* the check for PERF_SAMPLE_BRANCH_PLM_ALL. +*/ +if (hweight64 (event->attr.branch_sample_type & ~PERF_SAMPLE_BRANCH_PLM_ALL ) >1 ) { +local_irq_restore (irq_flags); +return -EOPNOTSUPP ; + } +if (ppmu->bhrb_filter_map) bhrb_filter = ppmu->bhrb_filter_map ( event->attr.branch_sample_type);
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 7/7 powerpc/64: Fix msr_check_and_set/clear MSR[EE] race
In reply to Sasha LevinFrom: Nicholas Piggin <[email protected]>
[ Upstream commit 0fa6831811f62cfc10415d731bcf9fde2647ad81 ]
irq soft-masking means that when Linux irqs are disabled, the MSR[EE] value can change from 1 to 0 asynchronously: if a masked interrupt of the PACA_IRQ_MUST_HARD_MASK variety fires while irqs are disabled, the masked handler will return with MSR[EE]=0.
This means a sequence like mtmsr(mfmsr() | MSR_FP) is racy if it can be called with local irqs disabled, unless a hard_irq_disable has been done.
--- arch/powerpc/include/asm/hw_irq.h | 24 ++++++++++++++++++++++++ arch/powerpc/kernel/process.c | 4 ++-- 2 files changed, 26 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/hw_irq.h +24 -0
@@ -413,6 +413,30 @@ static inline void irq_soft_mask_regs_set_state(struct pt_regs *regs, unsigned l }#endif /* CONFIG_PPC64 */ +static inline unsigned long mtmsr_isync_irqsafe (unsigned long msr) +{ +#ifdef CONFIG_PPC64 +if (arch_irqs_disabled ()) { +/* +* With soft-masking, MSR[EE] can change from 1 to 0 +* asynchronously when irqs are disabled, and we don't want to +* set MSR[EE] back to 1 here if that has happened. A race-free +* way to do this is ensure EE is already 0. Another way it +* could be done is with a RESTART_TABLE handler, but that's +* probably overkill here. +*/ + msr &= ~MSR_EE ; +mtmsr_isync (msr); +irq_soft_mask_set (IRQS_ALL_DISABLED ); + local_paca->irq_happened |=PACA_IRQ_HARD_DIS ; + } else +#endif +mtmsr_isync (msr); + +return msr; +} + +#define ARCH_IRQ_INIT_FLAGS IRQ_NOREQUEST#endif /* __ASSEMBLY__ */
arch/powerpc/kernel/process.c +2 -2
@@ -128,7 +128,7 @@ unsigned long notrace msr_check_and_set(unsigned long bits) newmsr |=MSR_VSX ;if (oldmsr != newmsr) -mtmsr_isync (newmsr); + newmsr =mtmsr_isync_irqsafe (newmsr);return newmsr; }
@@ -146,7 +146,7 @@ void notrace __msr_check_and_clear(unsigned long bits) newmsr &= ~MSR_VSX ;if (oldmsr != newmsr) -mtmsr_isync (newmsr); +mtmsr_isync_irqsafe (newmsr); }EXPORT_SYMBOL (__msr_check_and_clear);
Signature · 1 line
2.35.1