From: Andreas Schwab <schwab@suse.de>
To: Yury Norov <ynorov@caviumnetworks.com>
Cc: <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>,
<schwidefsky@de.ibm.com>, <heiko.carstens@de.ibm.com>,
<pinskia@gmail.com>, <broonie@kernel.org>,
<joseph@codesourcery.com>,
<christoph.muellner@theobroma-systems.com>,
<bamvor.zhangjian@huawei.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>
Subject: Re: [PATCH 17/18] arm64:ilp32: add vdso-ilp32 and use for signal return
Date: Wed, 17 Aug 2016 15:18:48 +0200 [thread overview]
Message-ID: <mvmbn0rpm87.fsf@hawking.suse.de> (raw)
In-Reply-To: <1471434403-25291-18-git-send-email-ynorov@caviumnetworks.com> (Yury Norov's message of "Wed, 17 Aug 2016 14:46:42 +0300")
On Aug 17 2016, Yury Norov <ynorov@caviumnetworks.com> wrote:
> diff --git a/arch/arm64/kernel/vdso/gettimeofday.S b/arch/arm64/kernel/vdso/gettimeofday.S
> index e00b467..143b39e 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
> seqcnt .req w7
> w_tmp .req w8
> @@ -136,6 +146,8 @@ x_tmp .req x8
> /* int __kernel_gettimeofday(struct timeval *tv, struct timezone *tz); */
> ENTRY(__kernel_gettimeofday)
> .cfi_startproc
> + DELOUSE(0)
> + DELOUSE(1)
> adr vdso_data, _vdso_data
> /* If tv is NULL, skip to the timezone code. */
> cbz x0, 2f
> @@ -160,7 +172,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
> @@ -182,6 +194,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, #JUMPSLOT_MAX
> b.hi syscall
> adr vdso_data, _vdso_data
> @@ -297,6 +310,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
> ccmp w0, #CLOCK_MONOTONIC_RAW, #0x4, ne
> @@ -311,7 +325,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
I think this is missing:
diff --git a/arch/arm64/kernel/vdso/gettimeofday.S b/arch/arm64/kernel/vdso/gettimeofday.S
index 143b39e..b463c5a 100644
--- a/arch/arm64/kernel/vdso/gettimeofday.S
+++ b/arch/arm64/kernel/vdso/gettimeofday.S
@@ -129,7 +129,7 @@ x_tmp .req x8
.if \shift == 1
lsr x11, x11, x12
.endif
- stp x10, x11, [x1, #TSPEC_TV_SEC]
+ stp PTR_REG(10), PTR_REG(11), [x1, #OFFSET(TSPEC_TV_SEC)]
mov x0, xzr
ret
.endm
--
2.9.3
Andreas.
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
next prev parent reply other threads:[~2016-08-17 13:18 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-17 11:46 [RFC2 nowrap: PATCH v7 00/18] ILP32 for ARM64 Yury Norov
2016-08-17 11:46 ` [PATCH 01/18] 32-bit ABI: introduce ARCH_32BIT_OFF_T config option Yury Norov
2016-08-17 11:46 ` [PATCH 02/18] arm64: ilp32: add documentation on the ILP32 ABI for ARM64 Yury Norov
2016-08-17 11:46 ` [PATCH 03/18] arm64: ensure the kernel is compiled for LP64 Yury Norov
2016-08-17 11:46 ` [PATCH 04/18] arm64: rename COMPAT to AARCH32_EL0 in Kconfig Yury Norov
2016-08-17 11:46 ` [PATCH 05/18] arm64:uapi: set __BITS_PER_LONG correctly for ILP32 and LP64 Yury Norov
2016-08-17 11:46 ` [PATCH 06/18] thread: move thread bits accessors to separated file Yury Norov
2016-08-17 11:46 ` [PATCH 07/18] arm64: introduce is_a32_task and is_a32_thread (for AArch32 compat) Yury Norov
2016-08-17 11:46 ` [PATCH 08/18] arm64: ilp32: add is_ilp32_compat_{task,thread} and TIF_32BIT_AARCH64 Yury Norov
2016-08-17 11:46 ` [PATCH 09/18] arm64: introduce binfmt_elf32.c Yury Norov
2016-08-17 11:46 ` [PATCH 10/18] arm64: ilp32: introduce binfmt_ilp32.c Yury Norov
2016-08-17 11:46 ` [PATCH 11/18] arm64: ilp32: share aarch32 syscall handlers Yury Norov
2016-08-17 11:46 ` [PATCH 12/18] arm64: ilp32: add sys_ilp32.c and a separate table (in entry.S) to use it Yury Norov
2016-09-02 10:46 ` Bamvor Jian Zhang
2016-09-02 12:55 ` Arnd Bergmann
2016-09-02 13:04 ` Yury Norov
2016-08-17 11:46 ` [PATCH 13/18] arm64: signal: share lp64 signal routines to ilp32 Yury Norov
2016-08-17 11:46 ` [PATCH 14/18] arm64: signal32: move ilp32 and aarch32 common code to separated file Yury Norov
2016-08-17 11:46 ` [PATCH 15/18] arm64: ilp32: introduce ilp32-specific handlers for sigframe and ucontext Yury Norov
2016-08-17 11:46 ` [PATCH 16/18] arm64: ptrace: handle ptrace_request differently for aarch32 and ilp32 Yury Norov
2016-08-17 11:46 ` [PATCH 17/18] arm64:ilp32: add vdso-ilp32 and use for signal return Yury Norov
2016-08-17 13:18 ` Andreas Schwab [this message]
2016-08-17 11:46 ` [PATCH 18/18] arm64:ilp32: add ARM64_ILP32 to Kconfig Yury Norov
2016-08-17 12:28 ` [RFC2 nowrap: PATCH v7 00/18] ILP32 for ARM64 Alexander Graf
2016-08-17 12:48 ` Yury Norov
2016-08-17 12:54 ` Dr. Philipp Tomsich
2016-08-17 14:29 ` Catalin Marinas
2016-08-17 14:32 ` Dr. Philipp Tomsich
2016-08-17 15:26 ` Catalin Marinas
2016-08-18 9:45 ` Yury Norov
2016-09-02 10:20 ` Bamvor Jian Zhang
2016-10-21 20:32 [RFC3 " Yury Norov
2016-10-21 20:33 ` [PATCH 17/18] arm64:ilp32: add vdso-ilp32 and use for signal return Yury Norov
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=mvmbn0rpm87.fsf@hawking.suse.de \
--to=schwab@suse.de \
--cc=Nathan_Lynch@mentor.com \
--cc=Prasun.Kapoor@caviumnetworks.com \
--cc=agraf@suse.de \
--cc=arnd@arndb.de \
--cc=bamvor.zhangjian@huawei.com \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=christoph.muellner@theobroma-systems.com \
--cc=cmetcalf@ezchip.com \
--cc=davem@davemloft.net \
--cc=geert@linux-m68k.org \
--cc=heiko.carstens@de.ibm.com \
--cc=joseph@codesourcery.com \
--cc=kilobyte@angband.pl \
--cc=klimov.linux@gmail.com \
--cc=libc-alpha@sourceware.org \
--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=linyongting@huawei.com \
--cc=manuel.montezelo@gmail.com \
--cc=maxim.kuvyrkov@linaro.org \
--cc=philipp.tomsich@theobroma-systems.com \
--cc=pinskia@gmail.com \
--cc=schwidefsky@de.ibm.com \
--cc=szabolcs.nagy@arm.com \
--cc=ynorov@caviumnetworks.com \
--cc=zhouchengming1@huawei.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).