From: "Zhangjian (Bamvor)" <bamvor.zhangjian@huawei.com>
To: Yury Norov <ynorov@caviumnetworks.com>,
Andrew Pinski <pinskia@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
Catalin Marinas <catalin.marinas@arm.com>,
Linux-Arch <linux-arch@vger.kernel.org>,
linux-s390 <linux-s390@vger.kernel.org>,
"Kapoor, Prasun" <Prasun.Kapoor@caviumnetworks.com>,
Andreas Schwab <schwab@suse.de>, Mark Brown <broonie@kernel.org>,
linux-doc@vger.kernel.org,
Heiko Carstens <heiko.carstens@de.ibm.com>,
LKML <linux-kernel@vger.kernel.org>,
Alexander Graf <agraf@suse.de>,
Alexey Klimov <klimov.linux@gmail.com>,
"Joseph S. Myers" <joseph@codesourcery.com>,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Nathan Lynch <Nathan_Lynch@mentor.com>,
Philipp Tomsich <philipp.tomsich@theobroma-systems.com>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
christoph.muellner@theobroma-systems.com,
Hanjun Guo <guohanjun@huawei.com>,
"Zhangjian (Bamvor)" <bamvor.zhangjian@huawei.com>
Subject: Re: [PATCH 24/25] arm64:ilp32: add vdso-ilp32 and use for signal return
Date: Mon, 9 May 2016 18:07:06 +0800 [thread overview]
Message-ID: <5730614A.2000601@huawei.com> (raw)
In-Reply-To: <20160506140022.GA18587@yury-N73SV>
Hi, yury
I tested successful in both little endian and big endian.
Just two comments below:
On 2016/5/6 22:00, Yury Norov wrote:
> Hello colleagues,
>
> After all comments, VDSO fix looks like this for me.
>
> Note I renamed Andrew's ZERO macro to DELOUSE, as
> there already is __SC_DELOUSE which does the same,
> but in C, not asm.
>
> Like Bamvor, I'm not sure how we'd apply this patch -
> standalone or meld to VDSO. I think, VDSO patch is too
> big and bad-structurized, and if I find how to refactor
> it, I'll incorporate this fix.
>
> Signed-off-by: Yury Norov <ynorov@caviumnetworks.com>
> ---
> arch/arm64/kernel/asm-offsets.c | 7 +++++++
> arch/arm64/kernel/vdso-ilp32/vdso-ilp32.lds.S | 2 +-
> arch/arm64/kernel/vdso/gettimeofday.S | 20 +++++++++++++++++---
> 3 files changed, 25 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
> index e229525..fcfd087 100644
> --- a/arch/arm64/kernel/asm-offsets.c
> +++ b/arch/arm64/kernel/asm-offsets.c
> @@ -101,6 +101,13 @@ int main(void)
> DEFINE(TSPEC_TV_SEC, offsetof(struct timespec, tv_sec));
> DEFINE(TSPEC_TV_NSEC, offsetof(struct timespec, tv_nsec));
> BLANK();
> +#ifdef CONFIG_ARM64_ILP32
The following structs exist in both aarch32 el0 and ilp32. How about change it to
"#ifdef CONFIG_COMPAT"?
> + DEFINE(COMPAT_TVAL_TV_SEC, offsetof(struct compat_timeval, tv_sec));
> + DEFINE(COMPAT_TVAL_TV_USEC, offsetof(struct compat_timeval, tv_usec));
> + DEFINE(COMPAT_TSPEC_TV_SEC, offsetof(struct compat_timespec, tv_sec));
> + DEFINE(COMPAT_TSPEC_TV_NSEC, offsetof(struct compat_timespec, tv_nsec));
> + BLANK();
> +#endif
> DEFINE(TZ_MINWEST, offsetof(struct timezone, tz_minuteswest));
> DEFINE(TZ_DSTTIME, offsetof(struct timezone, tz_dsttime));
> BLANK();
> diff --git a/arch/arm64/kernel/vdso-ilp32/vdso-ilp32.lds.S b/arch/arm64/kernel/vdso-ilp32/vdso-ilp32.lds.S
> index ddc63fd..d182a8d 100644
> --- a/arch/arm64/kernel/vdso-ilp32/vdso-ilp32.lds.S
> +++ b/arch/arm64/kernel/vdso-ilp32/vdso-ilp32.lds.S
> @@ -79,7 +79,7 @@ PHDRS
> */
> VERSION
> {
> - LINUX_2.6 {
> + LINUX_2.6.39 {
Do we really want to this version? Maybe 4.x is better?
Regards
Bamvor
> global:
> __kernel_rt_sigreturn;
> __kernel_gettimeofday;
> diff --git a/arch/arm64/kernel/vdso/gettimeofday.S b/arch/arm64/kernel/vdso/gettimeofday.S
> index efa79e8..a2d8a70 100644
> --- a/arch/arm64/kernel/vdso/gettimeofday.S
> +++ b/arch/arm64/kernel/vdso/gettimeofday.S
> @@ -25,6 +25,16 @@
> #define NSEC_PER_SEC_LO16 0xca00
> #define NSEC_PER_SEC_HI16 0x3b9a
>
> +#ifdef __LP64__
> +#define PTR_REG(n) x##n
> +#define OFFSET(n) n
> +#define DELOUSE(n)
> +#else
> +#define PTR_REG(n) w##n
> +#define OFFSET(n) COMPAT_##n
> +#define DELOUSE(n) mov w##n, w##n
> +#endif
> +
> vdso_data .req x6
> use_syscall .req w7
> seqcnt .req w8
> @@ -51,6 +61,8 @@ seqcnt .req w8
> /* int __kernel_gettimeofday(struct timeval *tv, struct timezone *tz); */
> ENTRY(__kernel_gettimeofday)
> .cfi_startproc
> + DELOUSE(0)
> + DELOUSE(1)
> mov x2, x30
> .cfi_register x30, x2
>
> @@ -68,7 +80,7 @@ ENTRY(__kernel_gettimeofday)
> mov x13, #1000
> lsl x13, x13, x12
> udiv x11, x11, x13
> - stp x10, x11, [x0, #TVAL_TV_SEC]
> + stp PTR_REG(10), PTR_REG(11), [x0, #OFFSET(TVAL_TV_SEC)]
> 2:
> /* If tz is NULL, return 0. */
> cbz x1, 3f
> @@ -88,6 +100,7 @@ ENDPROC(__kernel_gettimeofday)
> /* int __kernel_clock_gettime(clockid_t clock_id, struct timespec *tp); */
> ENTRY(__kernel_clock_gettime)
> .cfi_startproc
> + DELOUSE(1)
> cmp w0, #CLOCK_REALTIME
> ccmp w0, #CLOCK_MONOTONIC, #0x4, ne
> b.ne 2f
> @@ -159,7 +172,7 @@ ENTRY(__kernel_clock_gettime)
>
> 6: /* Store to the user timespec. */
> lsr x11, x11, x12
> - stp x10, x11, [x1, #TSPEC_TV_SEC]
> + stp PTR_REG(10), PTR_REG(11), [x1, #OFFSET(TSPEC_TV_SEC)]
> mov x0, xzr
> ret
> 7:
> @@ -174,6 +187,7 @@ ENDPROC(__kernel_clock_gettime)
> /* int __kernel_clock_getres(clockid_t clock_id, struct timespec *res); */
> ENTRY(__kernel_clock_getres)
> .cfi_startproc
> + DELOUSE(1)
> cmp w0, #CLOCK_REALTIME
> ccmp w0, #CLOCK_MONOTONIC, #0x4, ne
> b.ne 1f
> @@ -187,7 +201,7 @@ ENTRY(__kernel_clock_getres)
> ldr x2, 6f
> 2:
> cbz w1, 3f
> - stp xzr, x2, [x1]
> + stp PTR_REG(zr), PTR_REG(2), [x1]
>
> 3: /* res == NULL. */
> mov w0, wzr
>
next prev parent reply other threads:[~2016-05-09 10:11 UTC|newest]
Thread overview: 222+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-05 22:08 [RFC6 PATCH v6 00/21] ILP32 for ARM64 Yury Norov
2016-04-05 22:08 ` [PATCH 01/25] all: syscall wrappers: add documentation Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-05 22:08 ` [PATCH 02/25] all: introduce COMPAT_WRAPPER option and enable it for s390 Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-05 22:08 ` [PATCH 03/25] all: s390: move wrapper infrastructure to generic headers Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-05 22:08 ` [PATCH 04/25] all: s390: move compat_wrappers.c from arch/s390/kernel to kernel/ Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-05 22:08 ` [PATCH 05/25] all: wrap needed syscalls in generic unistd Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-05 22:08 ` [PATCH 06/25] compat ABI: use non-compat openat and open_by_handle_at variants Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-05 22:08 ` [PATCH 07/25] 32-bit ABI: introduce ARCH_32BIT_OFF_T config option Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-05 22:08 ` [PATCH 08/25] arm64: ilp32: add documentation on the ILP32 ABI for ARM64 Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-05 22:08 ` [PATCH 09/25] arm64: ensure the kernel is compiled for LP64 Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-05 22:08 ` [PATCH 10/25] arm64: rename COMPAT to AARCH32_EL0 in Kconfig Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-14 3:20 ` Zhangjian (Bamvor)
2016-04-14 3:20 ` Zhangjian (Bamvor)
2016-04-22 15:28 ` Catalin Marinas
2016-04-22 15:28 ` Catalin Marinas
2016-04-05 22:08 ` [PATCH 11/25] arm64: change some CONFIG_COMPAT over to use CONFIG_AARCH32_EL0 instead Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-05 22:08 ` [PATCH 12/25] arm64: compat: change config dependences to aarch32 Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-22 15:58 ` Catalin Marinas
2016-04-22 15:58 ` Catalin Marinas
2016-04-22 21:59 ` Yury Norov
2016-04-22 21:59 ` Yury Norov
2016-04-23 2:33 ` Zhangjian (Bamvor)
2016-04-23 2:33 ` Zhangjian (Bamvor)
2016-04-05 22:08 ` [PATCH 13/25] arm64:uapi: set __BITS_PER_LONG correctly for ILP32 and LP64 Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-05 22:08 ` [PATCH 14/25] thread: move thread bits accessors to separated file Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-05 22:08 ` [PATCH 15/25] arm64: introduce is_a32_task and is_a32_thread (for AArch32 compat) Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-05-06 12:02 ` Zhangjian (Bamvor)
2016-04-05 22:08 ` [PATCH 16/25] arm64: ilp32: add is_ilp32_compat_{task,thread} and TIF_32BIT_AARCH64 Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-05 22:08 ` [PATCH 17/25] arm64: introduce binfmt_elf32.c Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-05 22:08 ` [PATCH 18/25] arm64: ilp32: introduce binfmt_ilp32.c Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-22 16:51 ` Catalin Marinas
2016-04-22 17:41 ` Arnd Bergmann
2016-04-05 22:08 ` [PATCH 19/25] arm64: ptrace: handle ptrace_request differently for aarch32 and ilp32 Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-22 17:10 ` Catalin Marinas
2016-04-22 17:10 ` Catalin Marinas
2016-04-22 21:40 ` Yury Norov
2016-04-25 16:57 ` Catalin Marinas
2016-04-25 16:57 ` Catalin Marinas
2016-04-05 22:08 ` [PATCH 20/25] arm64:ilp32: add sys_ilp32.c and a separate table (in entry.S) to use it Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-25 17:26 ` Catalin Marinas
2016-04-25 18:19 ` Yury Norov
2016-04-25 18:47 ` Yury Norov
2016-04-26 10:08 ` Catalin Marinas
2016-04-26 10:08 ` Catalin Marinas
2016-04-26 16:57 ` Catalin Marinas
2016-04-26 16:57 ` Catalin Marinas
2016-04-28 19:19 ` Yury Norov
2016-04-28 19:19 ` Yury Norov
2016-04-28 20:43 ` Arnd Bergmann
2016-04-28 20:43 ` Arnd Bergmann
2016-04-28 22:21 ` Yury Norov
2016-04-28 22:43 ` Arnd Bergmann
2016-04-28 22:43 ` Arnd Bergmann
2016-04-29 13:13 ` Yury Norov
2016-04-29 15:45 ` Arnd Bergmann
2016-05-06 12:16 ` Zhangjian (Bamvor)
2016-05-06 12:37 ` Yury Norov
2016-05-10 7:42 ` Zhangjian (Bamvor)
2016-05-10 7:42 ` Zhangjian (Bamvor)
2016-05-10 7:55 ` Zhangjian (Bamvor)
2016-05-10 8:36 ` Arnd Bergmann
2016-05-10 8:36 ` Arnd Bergmann
2016-05-10 9:47 ` Zhangjian (Bamvor)
2016-05-10 11:48 ` Arnd Bergmann
2016-05-10 11:48 ` Arnd Bergmann
2016-05-10 12:39 ` Zhangjian (Bamvor)
2016-05-10 12:39 ` Zhangjian (Bamvor)
2016-05-10 12:50 ` Arnd Bergmann
2016-05-10 12:50 ` Arnd Bergmann
2016-05-11 2:04 ` Zhangjian (Bamvor)
2016-05-11 2:04 ` Zhangjian (Bamvor)
2016-05-11 8:04 ` Yury Norov
2016-05-11 10:55 ` Arnd Bergmann
2016-05-11 16:59 ` Catalin Marinas
2016-05-11 19:30 ` Arnd Bergmann
2016-05-11 19:30 ` Arnd Bergmann
2016-05-12 9:17 ` Catalin Marinas
2016-05-12 9:17 ` Catalin Marinas
2016-05-12 9:21 ` Arnd Bergmann
2016-05-12 12:49 ` Zhangjian (Bamvor)
2016-05-12 12:49 ` Zhangjian (Bamvor)
2016-05-12 13:06 ` Arnd Bergmann
2016-05-12 13:19 ` Yury Norov
2016-05-12 13:19 ` Yury Norov
2016-05-14 12:49 ` Yury Norov
2016-05-14 12:49 ` Yury Norov
2016-05-11 8:09 ` Arnd Bergmann
2016-05-11 10:12 ` Zhangjian (Bamvor)
2016-05-11 10:12 ` Zhangjian (Bamvor)
2016-05-11 11:16 ` Zhangjian (Bamvor)
2016-05-11 14:50 ` Arnd Bergmann
2016-05-11 14:50 ` Arnd Bergmann
2016-05-12 3:45 ` Zhangjian (Bamvor)
2016-05-12 3:45 ` Zhangjian (Bamvor)
2016-05-12 8:24 ` Yury Norov
2016-05-12 8:24 ` Yury Norov
2016-05-12 12:52 ` Zhangjian (Bamvor)
2016-05-12 12:52 ` Zhangjian (Bamvor)
2016-05-12 12:59 ` Yury Norov
2016-05-12 12:59 ` Yury Norov
2016-05-14 15:03 ` Yury Norov
2016-05-14 15:03 ` Yury Norov
2016-05-16 17:06 ` Catalin Marinas
2016-05-16 17:06 ` Catalin Marinas
2016-05-17 19:05 ` Yury Norov
2016-05-18 11:21 ` Catalin Marinas
2016-05-18 11:21 ` Catalin Marinas
2016-05-18 17:58 ` Yury Norov
2016-05-18 17:58 ` Yury Norov
2016-04-05 22:08 ` [PATCH 21/25] arm64: signal: share lp64 signal routines to ilp32 Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-05 22:08 ` [PATCH 22/25] arm64: signal32: move ilp32 and aarch32 common code to separated file Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-05 22:08 ` [PATCH 23/25] arm64: ilp32: introduce ilp32-specific handlers for sigframe and ucontext Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-05 22:08 ` [PATCH 24/25] arm64:ilp32: add vdso-ilp32 and use for signal return Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-13 9:19 ` Zhangjian (Bamvor)
2016-04-13 15:55 ` Yury Norov
2016-04-13 15:55 ` Yury Norov
2016-05-03 12:49 ` Zhangjian (Bamvor)
2016-04-29 16:01 ` Catalin Marinas
2016-04-29 17:30 ` Arnd Bergmann
2016-04-29 17:30 ` Arnd Bergmann
2016-05-03 9:00 ` Catalin Marinas
2016-05-03 9:00 ` Catalin Marinas
2016-05-03 9:05 ` Arnd Bergmann
2016-05-03 9:05 ` Arnd Bergmann
2016-05-03 11:07 ` Zhangjian (Bamvor)
2016-05-03 11:07 ` Zhangjian (Bamvor)
2016-05-03 12:41 ` Zhangjian (Bamvor)
2016-05-03 12:41 ` Zhangjian (Bamvor)
2016-05-04 21:49 ` Yury Norov
2016-05-04 21:49 ` Yury Norov
2016-05-04 23:23 ` Andrew Pinski
2016-05-05 2:24 ` Zhangjian (Bamvor)
2016-05-05 2:24 ` Zhangjian (Bamvor)
2016-05-05 6:40 ` Andrew Pinski
2016-05-06 14:00 ` Yury Norov
2016-05-06 14:00 ` Yury Norov
2016-05-09 10:07 ` Zhangjian (Bamvor) [this message]
2016-05-05 8:22 ` Yury Norov
2016-05-05 8:22 ` Yury Norov
2016-04-05 22:08 ` [PATCH 25/25] arm64:ilp32: add ARM64_ILP32 to Kconfig Yury Norov
2016-04-05 22:08 ` Yury Norov
2016-04-29 16:03 ` Catalin Marinas
2016-04-29 16:08 ` Yury Norov
2016-04-29 16:08 ` Yury Norov
2016-04-29 16:14 ` Catalin Marinas
2016-04-29 16:14 ` Catalin Marinas
2016-04-29 16:26 ` Yury Norov
2016-04-29 16:26 ` Yury Norov
2016-04-05 22:44 ` [RFC6 PATCH v6 00/21] ILP32 for ARM64 - LTP results Yury Norov
2016-04-05 22:44 ` Yury Norov
2016-04-23 3:37 ` Zhangjian (Bamvor)
2016-04-27 7:30 ` Andrew Pinski
2016-04-27 7:30 ` Andrew Pinski
2016-04-27 21:15 ` Andrew Pinski
2016-04-27 21:15 ` Andrew Pinski
2016-04-28 12:16 ` Zhangjian (Bamvor)
2016-04-28 12:16 ` Zhangjian (Bamvor)
2016-04-06 6:51 ` [RFC6 PATCH v6 00/21] ILP32 for ARM64 Geert Uytterhoeven
2016-04-06 12:29 ` Yury Norov
2016-04-07 12:28 ` Geert Uytterhoeven
2016-04-07 12:28 ` Geert Uytterhoeven
2016-05-12 0:20 ` Yury Norov
2016-05-12 9:19 ` Arnd Bergmann
2016-05-12 10:30 ` Yury Norov
2016-05-12 10:30 ` Yury Norov
2016-05-12 13:35 ` Catalin Marinas
2016-05-12 13:35 ` Catalin Marinas
2016-05-12 13:44 ` Yury Norov
2016-05-12 13:44 ` Yury Norov
2016-05-12 14:07 ` Catalin Marinas
2016-05-12 14:07 ` Catalin Marinas
2016-05-12 14:20 ` Catalin Marinas
2016-05-12 14:20 ` Catalin Marinas
2016-05-12 14:34 ` Yury Norov
2016-05-12 14:34 ` Yury Norov
2016-05-12 14:54 ` Catalin Marinas
2016-05-12 15:27 ` Yury Norov
2016-05-12 15:27 ` Yury Norov
2016-05-12 14:24 ` Yury Norov
2016-05-12 14:24 ` Yury Norov
2016-05-12 15:28 ` Catalin Marinas
2016-05-13 8:11 ` Zhangjian (Bamvor)
2016-05-13 8:11 ` Zhangjian (Bamvor)
2016-05-13 9:28 ` Catalin Marinas
2016-05-13 9:28 ` Catalin Marinas
2016-05-13 10:51 ` Yury Norov
2016-05-13 11:03 ` Catalin Marinas
2016-05-13 13:32 ` Catalin Marinas
2016-05-13 13:32 ` Catalin Marinas
2016-05-17 12:10 ` Szabolcs Nagy
2016-05-17 15:37 ` Arnd Bergmann
2016-05-17 15:45 ` Joseph Myers
2016-05-17 16:02 ` Andreas Schwab
2016-05-17 16:02 ` Andreas Schwab
2016-05-17 22:45 ` Arnd Bergmann
2016-05-17 22:45 ` Arnd Bergmann
2016-05-17 15:40 ` Joseph Myers
2016-05-17 15:40 ` Joseph Myers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5730614A.2000601@huawei.com \
--to=bamvor.zhangjian@huawei.com \
--cc=Nathan_Lynch@mentor.com \
--cc=Prasun.Kapoor@caviumnetworks.com \
--cc=agraf@suse.de \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=christoph.muellner@theobroma-systems.com \
--cc=guohanjun@huawei.com \
--cc=heiko.carstens@de.ibm.com \
--cc=joseph@codesourcery.com \
--cc=klimov.linux@gmail.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=philipp.tomsich@theobroma-systems.com \
--cc=pinskia@gmail.com \
--cc=schwab@suse.de \
--cc=schwidefsky@de.ibm.com \
--cc=ynorov@caviumnetworks.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).