powerpc/selftests: Use timersub() for gettimeofday()
Subsystems (2)
Sasha Levin
maintainerPATCH 2/4 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
@@ -162,6 +162,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 4/4 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
@@ -363,7 +363,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;
@@ -413,7 +413,7 @@ static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,* 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;
@@ -480,7 +480,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 1/4 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 3/4 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
@@ -109,7 +109,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