From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: from second.openwall.net (second.openwall.net [193.110.157.125]) by inbox.vuxu.org (Postfix) with SMTP id 94DB6242CD for ; Fri, 21 Jun 2024 14:50:42 +0200 (CEST) Received: (qmail 5318 invoked by uid 550); 21 Jun 2024 12:50:30 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 16347 invoked from network); 21 Jun 2024 08:45:11 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=fu-berlin.de; s=fub01; h=MIME-Version:Content-Transfer-Encoding: Content-Type:References:In-Reply-To:Date:Cc:To:From:Subject:Message-ID:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=vnRm0j85otx50gSN5LqFcKunoR/H3ua98B1Wub0g2Lg=; t=1718959513; x=1719564313; b=MMpMrVLvvATneweeSDFQe2w18AUsUL+ZGWVIx4XoCCTc9kgbAkFjnkqSdNcn1ovZ2Qmb5RPI0Xy pSirfHFuzpjJSzUM4ewncJ5mAaBQQcN4eOmxL1r4cc0cbtgGfPu2NBv2KKLD9gW0HJ5YIofUBc0nl ebap78EVUGtsLkwYkGVNO78VhLY4YTJEqMNuI38wVo4Cw9uyds8NoHuqlqyfXzJa10G/nWJEw8IDD CqIZW44o53/hm2vDeuqtj+VwL4hbPVb43YryZtlCGnH4+RdYArgWwHKK7zOILcYq3slYrbZmrBXo7 fsw2cqRTZyfsPshw84L2jj/aj6Co7QXrG8GA==; Message-ID: <366548c1a0d9749e42c0d0c993414a353c9b0b02.camel@physik.fu-berlin.de> From: John Paul Adrian Glaubitz To: Arnd Bergmann , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann , Thomas Bogendoerfer , linux-mips@vger.kernel.org, Helge Deller , linux-parisc@vger.kernel.org, "David S. Miller" , Andreas Larsson , sparclinux@vger.kernel.org, Michael Ellerman , Nicholas Piggin , Christophe Leroy , "Naveen N . Rao" , linuxppc-dev@lists.ozlabs.org, Brian Cain , linux-hexagon@vger.kernel.org, Guo Ren , linux-csky@vger.kernel.org, Heiko Carstens , linux-s390@vger.kernel.org, Rich Felker , linux-sh@vger.kernel.org, "H. Peter Anvin" , Alexander Viro , Christian Brauner , linux-fsdevel@vger.kernel.org, libc-alpha@sourceware.org, musl@lists.openwall.com, ltp@lists.linux.it, stable@vger.kernel.org Date: Fri, 21 Jun 2024 10:44:39 +0200 In-Reply-To: <20240620162316.3674955-10-arnd@kernel.org> References: <20240620162316.3674955-1-arnd@kernel.org> <20240620162316.3674955-10-arnd@kernel.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.52.2 MIME-Version: 1.0 X-Original-Sender: glaubitz@physik.fu-berlin.de X-Originating-IP: 91.19.164.117 X-ZEDAT-Hint: PO Subject: [musl] Re: [PATCH 09/15] sh: rework sync_file_range ABI Hi Arnd, thanks for your patch! On Thu, 2024-06-20 at 18:23 +0200, Arnd Bergmann wrote: > From: Arnd Bergmann >=20 > The unusual function calling conventions on superh ended up causing ^^^^^^ It's spelled SuperH > sync_file_range to have the wrong argument order, with the 'flags' > argument getting sorted before 'nbytes' by the compiler. >=20 > 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. >=20 > In order to be able to also fix libc implementations to work with existin= g > 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. >=20 > 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. >=20 > Cc: stable@vger.kernel.org > Fixes: 75c92acdd5b1 ("sh: Wire up new syscalls.") > Signed-off-by: Arnd Bergmann > --- > arch/sh/kernel/sys_sh32.c | 11 +++++++++++ > arch/sh/kernel/syscalls/syscall.tbl | 3 ++- > 2 files changed, 13 insertions(+), 1 deletion(-) >=20 > diff --git a/arch/sh/kernel/sys_sh32.c b/arch/sh/kernel/sys_sh32.c > index 9dca568509a5..d5a4f7c697d8 100644 > --- a/arch/sh/kernel/sys_sh32.c > +++ b/arch/sh/kernel/sys_sh32.c > @@ -59,3 +59,14 @@ asmlinkage int sys_fadvise64_64_wrapper(int fd, u32 of= fset0, u32 offset1, > (u64)len0 << 32 | len1, advice); > #endif > } > + > +/* > + * swap the arguments the way that libc wants it instead of I think "swap the arguments to the order that libc wants them" would be easier to understand here. > + * moving flags ahead of the 64-bit nbytes argument > + */ > +SYSCALL_DEFINE6(sh_sync_file_range6, int, fd, SC_ARG64(offset), > + SC_ARG64(nbytes), unsigned int, flags) > +{ > + return ksys_sync_file_range(fd, SC_VAL64(loff_t, offset), > + SC_VAL64(loff_t, nbytes), flags); > +} > diff --git a/arch/sh/kernel/syscalls/syscall.tbl b/arch/sh/kernel/syscall= s/syscall.tbl > index bbf83a2db986..c55fd7696d40 100644 > --- a/arch/sh/kernel/syscalls/syscall.tbl > +++ b/arch/sh/kernel/syscalls/syscall.tbl > @@ -321,7 +321,7 @@ > 311 common set_robust_list sys_set_robust_list > 312 common get_robust_list sys_get_robust_list > 313 common splice sys_splice > -314 common sync_file_range sys_sync_file_range > +314 common sync_file_range sys_sh_sync_file_range6 ^^^^^^ Why= the suffix 6 here? > 315 common tee sys_tee > 316 common vmsplice sys_vmsplice > 317 common move_pages sys_move_pages > @@ -395,6 +395,7 @@ > 385 common pkey_alloc sys_pkey_alloc > 386 common pkey_free sys_pkey_free > 387 common rseq sys_rseq > +388 common sync_file_range2 sys_sync_file_range2 > # room for arch specific syscalls > 393 common semget sys_semget > 394 common semctl sys_semctl I wonder how you discovered this bug. Did you look up the calling conventio= n on SuperH and compare the argument order for the sys_sync_file_range system call docu= mented there with the order in the kernel? Did you also check what order libc uses? I would expect libc on SuperH miso= rdering the arguments as well unless I am missing something. Or do we know that the cod= e is actually currently broken? Thanks, Adrian --=20 .''`. John Paul Adrian Glaubitz : :' : Debian Developer `. `' Physicist `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913