Skip to content

Commit 30766f1

Browse files
committed
sh: rework sync_file_range ABI
The unusual function calling conventions on SuperH ended up causing sync_file_range to have the wrong argument order, with the 'flags' argument getting sorted before 'nbytes' by the compiler. In userspace, I found that musl, glibc, uclibc and strace all expect the normal calling conventions with 'nbytes' last, so changing the kernel to match them should make all of those work. In order to be able to also fix libc implementations to work with existing kernels, they need to be able to tell which ABI is used. An easy way to do this is to add yet another system call using the sync_file_range2 ABI that works the same on all architectures. Old user binaries can now work on new kernels, and new binaries can try the new sync_file_range2() to work with new kernels or fall back to the old sync_file_range() version if that doesn't exist. Cc: stable@vger.kernel.org Fixes: 75c92ac ("sh: Wire up new syscalls.") Acked-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent b1e31c1 commit 30766f1

2 files changed

Lines changed: 13 additions & 1 deletion

File tree

arch/sh/kernel/sys_sh32.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,14 @@ asmlinkage int sys_fadvise64_64_wrapper(int fd, u32 offset0, u32 offset1,
5959
(u64)len0 << 32 | len1, advice);
6060
#endif
6161
}
62+
63+
/*
64+
* swap the arguments the way that libc wants them instead of
65+
* moving flags ahead of the 64-bit nbytes argument
66+
*/
67+
SYSCALL_DEFINE6(sh_sync_file_range6, int, fd, SC_ARG64(offset),
68+
SC_ARG64(nbytes), unsigned int, flags)
69+
{
70+
return ksys_sync_file_range(fd, SC_VAL64(loff_t, offset),
71+
SC_VAL64(loff_t, nbytes), flags);
72+
}

arch/sh/kernel/syscalls/syscall.tbl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@
321321
311 common set_robust_list sys_set_robust_list
322322
312 common get_robust_list sys_get_robust_list
323323
313 common splice sys_splice
324-
314 common sync_file_range sys_sync_file_range
324+
314 common sync_file_range sys_sh_sync_file_range6
325325
315 common tee sys_tee
326326
316 common vmsplice sys_vmsplice
327327
317 common move_pages sys_move_pages
@@ -395,6 +395,7 @@
395395
385 common pkey_alloc sys_pkey_alloc
396396
386 common pkey_free sys_pkey_free
397397
387 common rseq sys_rseq
398+
388 common sync_file_range2 sys_sync_file_range2
398399
# room for arch specific syscalls
399400
393 common semget sys_semget
400401
394 common semctl sys_semctl

0 commit comments

Comments
 (0)