linux-kernel - Re: [PATCH 12/17] csky: convert to generic syscall table

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <9b269c2a-c6b5-4fa0-801b-e5e1c3ccb671@app.fastmail.com>
Date: Wed, 10 Jul 2024 12:27:13 +0200
From: "Arnd Bergmann" <arnd@...db.de>
To: "Arnd Bergmann" <arnd@...nel.org>, Linux-Arch <linux-arch@...r.kernel.org>
Cc: "Masahiro Yamada" <masahiroy@...nel.org>,
 "Nathan Chancellor" <nathan@...nel.org>,
 "Nicolas Schier" <nicolas@...sle.eu>, "Vineet Gupta" <vgupta@...nel.org>,
 "Russell King" <linux@...linux.org.uk>,
 "Catalin Marinas" <catalin.marinas@....com>,
 "Will Deacon" <will@...nel.org>, guoren <guoren@...nel.org>,
 "Brian Cain" <bcain@...cinc.com>, "Huacai Chen" <chenhuacai@...nel.org>,
 "WANG Xuerui" <kernel@...0n.name>, "Dinh Nguyen" <dinguyen@...nel.org>,
 "Jonas Bonn" <jonas@...thpole.se>,
 "Stefan Kristiansson" <stefan.kristiansson@...nalahti.fi>,
 "Stafford Horne" <shorne@...il.com>,
 "Paul Walmsley" <paul.walmsley@...ive.com>,
 "Palmer Dabbelt" <palmer@...belt.com>,
 "Albert Ou" <aou@...s.berkeley.edu>, "Rich Felker" <dalias@...c.org>,
 "John Paul Adrian Glaubitz" <glaubitz@...sik.fu-berlin.de>,
 "David S . Miller" <davem@...emloft.net>,
 "Andreas Larsson" <andreas@...sler.com>,
 "Christian Brauner" <brauner@...nel.org>,
 "Mark Rutland" <mark.rutland@....com>, linux-kbuild@...r.kernel.org,
 linux-kernel@...r.kernel.org, linux-snps-arc@...ts.infradead.org,
 linux-arm-kernel@...ts.infradead.org,
 "linux-csky@...r.kernel.org" <linux-csky@...r.kernel.org>,
 linux-hexagon@...r.kernel.org, loongarch@...ts.linux.dev,
 "linux-openrisc@...r.kernel.org" <linux-openrisc@...r.kernel.org>,
 linux-riscv@...ts.infradead.org
Subject: Re: [PATCH 12/17] csky: convert to generic syscall table

On Thu, Jul 4, 2024, at 16:36, Arnd Bergmann wrote:
> -
> -#define __NR_set_thread_area	(__NR_arch_specific_syscall + 0)
> -__SYSCALL(__NR_set_thread_area, sys_set_thread_area)
> -#define __NR_cacheflush		(__NR_arch_specific_syscall + 1)
> -__SYSCALL(__NR_cacheflush, sys_cacheflush)
> +#include <asm/unistd_32.h>
> +#define __NR_sync_file_range2 __NR_sync_file_range

A small update: I have folded this fixup into this patch
and the hexagon one, to ensure we don't define both
__NR_sync_file_range2 and __NR_sync_file_range. I already
have patches to clean this up further to avoid both the
#undef and #define, but that is part of a larger rework
that is not ready before the merge window.

     Arnd

diff --git a/arch/csky/include/uapi/asm/unistd.h b/arch/csky/include/uapi/asm/unistd.h
index 794adbc04e48..44882179a6e1 100644
--- a/arch/csky/include/uapi/asm/unistd.h
+++ b/arch/csky/include/uapi/asm/unistd.h
@@ -1,4 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

 #include <asm/unistd_32.h>
-#define __NR_sync_file_range2 __NR_sync_file_range
+
+#define __NR_sync_file_range2 84
+#undef __NR_sync_file_range
diff --git a/arch/hexagon/include/uapi/asm/unistd.h b/arch/hexagon/include/uapi/asm/unistd.h
index 6f670347dd61..a3b0cac25580 100644
--- a/arch/hexagon/include/uapi/asm/unistd.h
+++ b/arch/hexagon/include/uapi/asm/unistd.h
@@ -29,4 +29,5 @@

 #include <asm/unistd_32.h>

-#define __NR_sync_file_range2 __NR_sync_file_range
+#define __NR_sync_file_range2 84
+#undef __NR_sync_file_range