From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bamvor Jian Zhang Subject: Re: [PATCH 12/18] arm64: ilp32: add sys_ilp32.c and a separate table (in entry.S) to use it Date: Fri, 2 Sep 2016 18:46:19 +0800 Message-ID: <57C9587B.9080006@huawei.com> References: <1471434403-25291-1-git-send-email-ynorov@caviumnetworks.com> <1471434403-25291-13-git-send-email-ynorov@caviumnetworks.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: Received: from szxga03-in.huawei.com ([119.145.14.66]:44345 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752585AbcIBKtB (ORCPT ); Fri, 2 Sep 2016 06:49:01 -0400 In-Reply-To: <1471434403-25291-13-git-send-email-ynorov@caviumnetworks.com> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Yury Norov , arnd@arndb.de, catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-arch@vger.kernel.org, libc-alpha@sourceware.org Cc: schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, pinskia@gmail.com, broonie@kernel.org, joseph@codesourcery.com, christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, kilobyte@angband.pl, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, maxim.kuvyrkov@linaro.org, davem@davemloft.net, zhouchengming1@huawei.com, cmetcalf@ezchip.com, Andrew Pinski , Andrew Pinski , Hanjun Guo , chenjianguo 00365834 , jijun 00321192 , zhangjian 0029 Hi, Yury On 08/17/2016 07:46 PM, Yury Norov wrote: > From: Andrew Pinski > [...] > diff --git a/arch/arm64/kernel/sys_ilp32.c b/arch/arm64/kernel/sys_ilp32.c > new file mode 100644 > index 0000000..10fc0ca > --- /dev/null > +++ b/arch/arm64/kernel/sys_ilp32.c > @@ -0,0 +1,86 @@ > +/* > + * AArch64- ILP32 specific system calls implementation > + * > + * Copyright (C) 2016 Cavium Inc. > + * Author: Andrew Pinski > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program. If not, see . > + */ > + > +#define __SYSCALL_COMPAT > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +/* > + * Using aarch32 syscall handlerss where off_t is passed. > + */ > +#define compat_sys_fadvise64_64 compat_sys_fadvise64_64_wrapper > +#define compat_sys_fallocate compat_sys_fallocate_wrapper > +#define compat_sys_fcntl64 sys_fcntl > +#define compat_sys_ftruncate64 compat_sys_ftruncate64_wrapper > +#define compat_sys_pread64 compat_sys_pread64_wrapper > +#define compat_sys_pwrite64 compat_sys_pwrite64_wrapper > +#define compat_sys_readahead compat_sys_readahead_wrapper > +#define compat_sys_shmat sys_shmat > +#define compat_sys_sync_file_range compat_sys_sync_file_range2_wrapper > +#define compat_sys_truncate64 compat_sys_truncate64_wrapper When we test sync_file_range with our own testcase, we found that the parameter sequence is not correct for sync_file_range2 because glibc think kernel use the sync_file_range. So, in this patch we force to sync_file_range2. Is it make sense to you? Regards Bamvor >From e730e4db23bca4dd0ff6bcca0bc4c04e5c13b5c7 Mon Sep 17 00:00:00 2001 From: Bamvor Jian Zhang Date: Sat, 27 Aug 2016 12:26:31 +0800 Subject: [PATCH] arm64:ilp32: force sync_file_range2 Define __ARCH_WANT_SYNC_FILE_RANGE2 in order to select correct sync_file_range parameters sequence in glibc and kernel. Tested-by: Jianguo Chen Signed-off-by: Bamvor Jian Zhang --- arch/arm64/include/uapi/asm/unistd.h | 5 +++++ arch/arm64/kernel/sys_ilp32.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/uapi/asm/unistd.h b/arch/arm64/include/uapi/asm/unistd.h index 043d17a..78bea1d 100644 --- a/arch/arm64/include/uapi/asm/unistd.h +++ b/arch/arm64/include/uapi/asm/unistd.h @@ -16,4 +16,9 @@ #define __ARCH_WANT_RENAMEAT +/* We need to make sure it works for both userspace and kernel(sys_ilp32.c) */ +#if defined(__ILP32__) || defined(__SYSCALL_COMPAT) +#define __ARCH_WANT_SYNC_FILE_RANGE2 +#endif + #include diff --git a/arch/arm64/kernel/sys_ilp32.c b/arch/arm64/kernel/sys_ilp32.c index 10fc0ca..13c9c9d 100644 --- a/arch/arm64/kernel/sys_ilp32.c +++ b/arch/arm64/kernel/sys_ilp32.c @@ -42,7 +42,7 @@ #define compat_sys_pwrite64 compat_sys_pwrite64_wrapper #define compat_sys_readahead compat_sys_readahead_wrapper #define compat_sys_shmat sys_shmat -#define compat_sys_sync_file_range compat_sys_sync_file_range2_wrapper +#define compat_sys_sync_file_range2 compat_sys_sync_file_range2_wrapper #define compat_sys_truncate64 compat_sys_truncate64_wrapper #define sys_mmap2 compat_sys_mmap2_wrapper #define sys_ptrace compat_sys_ptrace -- 1.8.4.5 > +#define sys_mmap2 compat_sys_mmap2_wrapper > +#define sys_ptrace compat_sys_ptrace > + > +/* > + * Use non-compat syscall handlers where rlimit, stat and statfs > + * structure pointers are passed, as their layout is identical to LP64. > + */ > +#define compat_sys_fstatfs64 sys_fstatfs > +#define compat_sys_statfs64 sys_statfs > +#define sys_fstat64 sys_newfstat > +#define sys_fstatat64 sys_newfstatat > +#define compat_sys_getrlimit sys_getrlimit > +#define compat_sys_setrlimit sys_setrlimit > + > +asmlinkage long compat_sys_fadvise64_64_wrapper(void); > +asmlinkage long compat_sys_fallocate_wrapper(void); > +asmlinkage long compat_sys_ftruncate64_wrapper(void); > +asmlinkage long compat_sys_mmap2_wrapper(void); > +asmlinkage long compat_sys_pread64_wrapper(void); > +asmlinkage long compat_sys_pwrite64_wrapper(void); > +asmlinkage long compat_sys_readahead_wrapper(void); > +asmlinkage long compat_sys_sync_file_range2_wrapper(void); > +asmlinkage long compat_sys_truncate64_wrapper(void); > + > +asmlinkage long ilp32_sys_rt_sigreturn_wrapper(void); > +#define compat_sys_rt_sigreturn ilp32_sys_rt_sigreturn_wrapper > + > +#include > + > +#undef __SYSCALL > +#define __SYSCALL(nr, sym) [nr] = sym, > + > +/* > + * The sys_call_ilp32_table array must be 4K aligned to be accessible from > + * kernel/entry.S. > + */ > +void *sys_call_ilp32_table[__NR_syscalls] __aligned(4096) = { > + [0 ... __NR_syscalls - 1] = sys_ni_syscall, > +#include > +}; > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from szxga03-in.huawei.com ([119.145.14.66]:44345 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752585AbcIBKtB (ORCPT ); Fri, 2 Sep 2016 06:49:01 -0400 Message-ID: <57C9587B.9080006@huawei.com> Date: Fri, 2 Sep 2016 18:46:19 +0800 From: Bamvor Jian Zhang MIME-Version: 1.0 Subject: Re: [PATCH 12/18] arm64: ilp32: add sys_ilp32.c and a separate table (in entry.S) to use it References: <1471434403-25291-1-git-send-email-ynorov@caviumnetworks.com> <1471434403-25291-13-git-send-email-ynorov@caviumnetworks.com> In-Reply-To: <1471434403-25291-13-git-send-email-ynorov@caviumnetworks.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: Yury Norov , arnd@arndb.de, catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-arch@vger.kernel.org, libc-alpha@sourceware.org Cc: schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, pinskia@gmail.com, broonie@kernel.org, joseph@codesourcery.com, christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, kilobyte@angband.pl, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, maxim.kuvyrkov@linaro.org, davem@davemloft.net, zhouchengming1@huawei.com, cmetcalf@ezchip.com, Andrew Pinski , Andrew Pinski , Hanjun Guo , chenjianguo 00365834 , jijun 00321192 , zhangjian 00293696 Message-ID: <20160902104619.We1-KdDHt5NbcQO0rtb21vTGIM1CTPhKywN6eFW_i-8@z> Hi, Yury On 08/17/2016 07:46 PM, Yury Norov wrote: > From: Andrew Pinski > [...] > diff --git a/arch/arm64/kernel/sys_ilp32.c b/arch/arm64/kernel/sys_ilp32.c > new file mode 100644 > index 0000000..10fc0ca > --- /dev/null > +++ b/arch/arm64/kernel/sys_ilp32.c > @@ -0,0 +1,86 @@ > +/* > + * AArch64- ILP32 specific system calls implementation > + * > + * Copyright (C) 2016 Cavium Inc. > + * Author: Andrew Pinski > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program. If not, see . > + */ > + > +#define __SYSCALL_COMPAT > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +/* > + * Using aarch32 syscall handlerss where off_t is passed. > + */ > +#define compat_sys_fadvise64_64 compat_sys_fadvise64_64_wrapper > +#define compat_sys_fallocate compat_sys_fallocate_wrapper > +#define compat_sys_fcntl64 sys_fcntl > +#define compat_sys_ftruncate64 compat_sys_ftruncate64_wrapper > +#define compat_sys_pread64 compat_sys_pread64_wrapper > +#define compat_sys_pwrite64 compat_sys_pwrite64_wrapper > +#define compat_sys_readahead compat_sys_readahead_wrapper > +#define compat_sys_shmat sys_shmat > +#define compat_sys_sync_file_range compat_sys_sync_file_range2_wrapper > +#define compat_sys_truncate64 compat_sys_truncate64_wrapper When we test sync_file_range with our own testcase, we found that the parameter sequence is not correct for sync_file_range2 because glibc think kernel use the sync_file_range. So, in this patch we force to sync_file_range2. Is it make sense to you? Regards Bamvor From mboxrd@z Thu Jan 1 00:00:00 1970 From: bamvor.zhangjian@huawei.com (Bamvor Jian Zhang) Date: Fri, 2 Sep 2016 18:46:19 +0800 Subject: [PATCH 12/18] arm64: ilp32: add sys_ilp32.c and a separate table (in entry.S) to use it In-Reply-To: <1471434403-25291-13-git-send-email-ynorov@caviumnetworks.com> References: <1471434403-25291-1-git-send-email-ynorov@caviumnetworks.com> <1471434403-25291-13-git-send-email-ynorov@caviumnetworks.com> Message-ID: <57C9587B.9080006@huawei.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi, Yury On 08/17/2016 07:46 PM, Yury Norov wrote: > From: Andrew Pinski > [...] > diff --git a/arch/arm64/kernel/sys_ilp32.c b/arch/arm64/kernel/sys_ilp32.c > new file mode 100644 > index 0000000..10fc0ca > --- /dev/null > +++ b/arch/arm64/kernel/sys_ilp32.c > @@ -0,0 +1,86 @@ > +/* > + * AArch64- ILP32 specific system calls implementation > + * > + * Copyright (C) 2016 Cavium Inc. > + * Author: Andrew Pinski > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program. If not, see . > + */ > + > +#define __SYSCALL_COMPAT > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +/* > + * Using aarch32 syscall handlerss where off_t is passed. > + */ > +#define compat_sys_fadvise64_64 compat_sys_fadvise64_64_wrapper > +#define compat_sys_fallocate compat_sys_fallocate_wrapper > +#define compat_sys_fcntl64 sys_fcntl > +#define compat_sys_ftruncate64 compat_sys_ftruncate64_wrapper > +#define compat_sys_pread64 compat_sys_pread64_wrapper > +#define compat_sys_pwrite64 compat_sys_pwrite64_wrapper > +#define compat_sys_readahead compat_sys_readahead_wrapper > +#define compat_sys_shmat sys_shmat > +#define compat_sys_sync_file_range compat_sys_sync_file_range2_wrapper > +#define compat_sys_truncate64 compat_sys_truncate64_wrapper When we test sync_file_range with our own testcase, we found that the parameter sequence is not correct for sync_file_range2 because glibc think kernel use the sync_file_range. So, in this patch we force to sync_file_range2. Is it make sense to you? Regards Bamvor >>From e730e4db23bca4dd0ff6bcca0bc4c04e5c13b5c7 Mon Sep 17 00:00:00 2001 From: Bamvor Jian Zhang Date: Sat, 27 Aug 2016 12:26:31 +0800 Subject: [PATCH] arm64:ilp32: force sync_file_range2 Define __ARCH_WANT_SYNC_FILE_RANGE2 in order to select correct sync_file_range parameters sequence in glibc and kernel. Tested-by: Jianguo Chen Signed-off-by: Bamvor Jian Zhang --- arch/arm64/include/uapi/asm/unistd.h | 5 +++++ arch/arm64/kernel/sys_ilp32.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/uapi/asm/unistd.h b/arch/arm64/include/uapi/asm/unistd.h index 043d17a..78bea1d 100644 --- a/arch/arm64/include/uapi/asm/unistd.h +++ b/arch/arm64/include/uapi/asm/unistd.h @@ -16,4 +16,9 @@ #define __ARCH_WANT_RENAMEAT +/* We need to make sure it works for both userspace and kernel(sys_ilp32.c) */ +#if defined(__ILP32__) || defined(__SYSCALL_COMPAT) +#define __ARCH_WANT_SYNC_FILE_RANGE2 +#endif + #include diff --git a/arch/arm64/kernel/sys_ilp32.c b/arch/arm64/kernel/sys_ilp32.c index 10fc0ca..13c9c9d 100644 --- a/arch/arm64/kernel/sys_ilp32.c +++ b/arch/arm64/kernel/sys_ilp32.c @@ -42,7 +42,7 @@ #define compat_sys_pwrite64 compat_sys_pwrite64_wrapper #define compat_sys_readahead compat_sys_readahead_wrapper #define compat_sys_shmat sys_shmat -#define compat_sys_sync_file_range compat_sys_sync_file_range2_wrapper +#define compat_sys_sync_file_range2 compat_sys_sync_file_range2_wrapper #define compat_sys_truncate64 compat_sys_truncate64_wrapper #define sys_mmap2 compat_sys_mmap2_wrapper #define sys_ptrace compat_sys_ptrace -- 1.8.4.5 > +#define sys_mmap2 compat_sys_mmap2_wrapper > +#define sys_ptrace compat_sys_ptrace > + > +/* > + * Use non-compat syscall handlers where rlimit, stat and statfs > + * structure pointers are passed, as their layout is identical to LP64. > + */ > +#define compat_sys_fstatfs64 sys_fstatfs > +#define compat_sys_statfs64 sys_statfs > +#define sys_fstat64 sys_newfstat > +#define sys_fstatat64 sys_newfstatat > +#define compat_sys_getrlimit sys_getrlimit > +#define compat_sys_setrlimit sys_setrlimit > + > +asmlinkage long compat_sys_fadvise64_64_wrapper(void); > +asmlinkage long compat_sys_fallocate_wrapper(void); > +asmlinkage long compat_sys_ftruncate64_wrapper(void); > +asmlinkage long compat_sys_mmap2_wrapper(void); > +asmlinkage long compat_sys_pread64_wrapper(void); > +asmlinkage long compat_sys_pwrite64_wrapper(void); > +asmlinkage long compat_sys_readahead_wrapper(void); > +asmlinkage long compat_sys_sync_file_range2_wrapper(void); > +asmlinkage long compat_sys_truncate64_wrapper(void); > + > +asmlinkage long ilp32_sys_rt_sigreturn_wrapper(void); > +#define compat_sys_rt_sigreturn ilp32_sys_rt_sigreturn_wrapper > + > +#include > + > +#undef __SYSCALL > +#define __SYSCALL(nr, sym) [nr] = sym, > + > +/* > + * The sys_call_ilp32_table array must be 4K aligned to be accessible from > + * kernel/entry.S. > + */ > +void *sys_call_ilp32_table[__NR_syscalls] __aligned(4096) = { > + [0 ... __NR_syscalls - 1] = sys_ni_syscall, > +#include > +}; > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752839AbcIBKwf (ORCPT ); Fri, 2 Sep 2016 06:52:35 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:47938 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752414AbcIBKwc (ORCPT ); Fri, 2 Sep 2016 06:52:32 -0400 Message-ID: <57C9587B.9080006@huawei.com> Date: Fri, 2 Sep 2016 18:46:19 +0800 From: Bamvor Jian Zhang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: Yury Norov , , , , , , , CC: , , , , , , , , , , , , , , , , , , , , Andrew Pinski , Andrew Pinski , Hanjun Guo , chenjianguo 00365834 , jijun 00321192 , "zhangjian 00293696" Subject: Re: [PATCH 12/18] arm64: ilp32: add sys_ilp32.c and a separate table (in entry.S) to use it References: <1471434403-25291-1-git-send-email-ynorov@caviumnetworks.com> <1471434403-25291-13-git-send-email-ynorov@caviumnetworks.com> In-Reply-To: <1471434403-25291-13-git-send-email-ynorov@caviumnetworks.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.110.52.23] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A0B0201.57C95827.0049,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: c4225b133c684cc23854906aa6d582dd Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Yury On 08/17/2016 07:46 PM, Yury Norov wrote: > From: Andrew Pinski > [...] > diff --git a/arch/arm64/kernel/sys_ilp32.c b/arch/arm64/kernel/sys_ilp32.c > new file mode 100644 > index 0000000..10fc0ca > --- /dev/null > +++ b/arch/arm64/kernel/sys_ilp32.c > @@ -0,0 +1,86 @@ > +/* > + * AArch64- ILP32 specific system calls implementation > + * > + * Copyright (C) 2016 Cavium Inc. > + * Author: Andrew Pinski > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program. If not, see . > + */ > + > +#define __SYSCALL_COMPAT > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +/* > + * Using aarch32 syscall handlerss where off_t is passed. > + */ > +#define compat_sys_fadvise64_64 compat_sys_fadvise64_64_wrapper > +#define compat_sys_fallocate compat_sys_fallocate_wrapper > +#define compat_sys_fcntl64 sys_fcntl > +#define compat_sys_ftruncate64 compat_sys_ftruncate64_wrapper > +#define compat_sys_pread64 compat_sys_pread64_wrapper > +#define compat_sys_pwrite64 compat_sys_pwrite64_wrapper > +#define compat_sys_readahead compat_sys_readahead_wrapper > +#define compat_sys_shmat sys_shmat > +#define compat_sys_sync_file_range compat_sys_sync_file_range2_wrapper > +#define compat_sys_truncate64 compat_sys_truncate64_wrapper When we test sync_file_range with our own testcase, we found that the parameter sequence is not correct for sync_file_range2 because glibc think kernel use the sync_file_range. So, in this patch we force to sync_file_range2. Is it make sense to you? Regards Bamvor >>From e730e4db23bca4dd0ff6bcca0bc4c04e5c13b5c7 Mon Sep 17 00:00:00 2001 From: Bamvor Jian Zhang Date: Sat, 27 Aug 2016 12:26:31 +0800 Subject: [PATCH] arm64:ilp32: force sync_file_range2 Define __ARCH_WANT_SYNC_FILE_RANGE2 in order to select correct sync_file_range parameters sequence in glibc and kernel. Tested-by: Jianguo Chen Signed-off-by: Bamvor Jian Zhang --- arch/arm64/include/uapi/asm/unistd.h | 5 +++++ arch/arm64/kernel/sys_ilp32.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/uapi/asm/unistd.h b/arch/arm64/include/uapi/asm/unistd.h index 043d17a..78bea1d 100644 --- a/arch/arm64/include/uapi/asm/unistd.h +++ b/arch/arm64/include/uapi/asm/unistd.h @@ -16,4 +16,9 @@ #define __ARCH_WANT_RENAMEAT +/* We need to make sure it works for both userspace and kernel(sys_ilp32.c) */ +#if defined(__ILP32__) || defined(__SYSCALL_COMPAT) +#define __ARCH_WANT_SYNC_FILE_RANGE2 +#endif + #include diff --git a/arch/arm64/kernel/sys_ilp32.c b/arch/arm64/kernel/sys_ilp32.c index 10fc0ca..13c9c9d 100644 --- a/arch/arm64/kernel/sys_ilp32.c +++ b/arch/arm64/kernel/sys_ilp32.c @@ -42,7 +42,7 @@ #define compat_sys_pwrite64 compat_sys_pwrite64_wrapper #define compat_sys_readahead compat_sys_readahead_wrapper #define compat_sys_shmat sys_shmat -#define compat_sys_sync_file_range compat_sys_sync_file_range2_wrapper +#define compat_sys_sync_file_range2 compat_sys_sync_file_range2_wrapper #define compat_sys_truncate64 compat_sys_truncate64_wrapper #define sys_mmap2 compat_sys_mmap2_wrapper #define sys_ptrace compat_sys_ptrace -- 1.8.4.5 > +#define sys_mmap2 compat_sys_mmap2_wrapper > +#define sys_ptrace compat_sys_ptrace > + > +/* > + * Use non-compat syscall handlers where rlimit, stat and statfs > + * structure pointers are passed, as their layout is identical to LP64. > + */ > +#define compat_sys_fstatfs64 sys_fstatfs > +#define compat_sys_statfs64 sys_statfs > +#define sys_fstat64 sys_newfstat > +#define sys_fstatat64 sys_newfstatat > +#define compat_sys_getrlimit sys_getrlimit > +#define compat_sys_setrlimit sys_setrlimit > + > +asmlinkage long compat_sys_fadvise64_64_wrapper(void); > +asmlinkage long compat_sys_fallocate_wrapper(void); > +asmlinkage long compat_sys_ftruncate64_wrapper(void); > +asmlinkage long compat_sys_mmap2_wrapper(void); > +asmlinkage long compat_sys_pread64_wrapper(void); > +asmlinkage long compat_sys_pwrite64_wrapper(void); > +asmlinkage long compat_sys_readahead_wrapper(void); > +asmlinkage long compat_sys_sync_file_range2_wrapper(void); > +asmlinkage long compat_sys_truncate64_wrapper(void); > + > +asmlinkage long ilp32_sys_rt_sigreturn_wrapper(void); > +#define compat_sys_rt_sigreturn ilp32_sys_rt_sigreturn_wrapper > + > +#include > + > +#undef __SYSCALL > +#define __SYSCALL(nr, sym) [nr] = sym, > + > +/* > + * The sys_call_ilp32_table array must be 4K aligned to be accessible from > + * kernel/entry.S. > + */ > +void *sys_call_ilp32_table[__NR_syscalls] __aligned(4096) = { > + [0 ... __NR_syscalls - 1] = sys_ni_syscall, > +#include > +}; >