From: Christophe Leroy <christophe.leroy@c-s.fr> To: Arnd Bergmann <arnd@arndb.de> Cc: Allison Randal <allison@lohutok.net>, linuxppc-dev <linuxppc-dev@lists.ozlabs.org>, Thomas Gleixner <tglx@linutronix.de>, Nicholas Piggin <npiggin@gmail.com>, linux-kernel@vger.kernel.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Michael Ellerman <mpe@ellerman.id.au>, Paul Mackerras <paulus@samba.org>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, y2038 Mailman List <y2038@lists.linaro.org>, Ben Hutchings <ben.hutchings@codethink.co.uk> Subject: Re: [Y2038] [PATCH 07/23] y2038: vdso: powerpc: avoid timespec references Date: Thu, 21 Nov 2019 17:25:29 +0100 [thread overview] Message-ID: <20191121172529.Horde.0uDMS4xQ-xexjp4a2mIoXQ5@messagerie.si.c-s.fr> (raw) In-Reply-To: <CAK8P3a1nRq98ngfKnR2Du+7_vOxSRFD9AyjHyUCsAtk_gLR_Uw@mail.gmail.com> Arnd Bergmann <arnd@arndb.de> a écrit : > On Wed, Nov 20, 2019 at 11:43 PM Ben Hutchings > <ben.hutchings@codethink.co.uk> wrote: >> >> On Fri, 2019-11-08 at 22:07 +0100, Arnd Bergmann wrote: >> [...] >> > --- a/arch/powerpc/kernel/vdso32/gettimeofday.S >> > +++ b/arch/powerpc/kernel/vdso32/gettimeofday.S >> > @@ -15,10 +15,8 @@ >> > /* Offset for the low 32-bit part of a field of long type */ >> > #if defined(CONFIG_PPC64) && defined(CONFIG_CPU_BIG_ENDIAN) >> > #define LOPART 4 >> > -#define TSPEC_TV_SEC TSPC64_TV_SEC+LOPART >> > #else >> > #define LOPART 0 >> > -#define TSPEC_TV_SEC TSPC32_TV_SEC >> > #endif >> > >> > .text >> > @@ -192,7 +190,7 @@ V_FUNCTION_BEGIN(__kernel_time) >> > bl __get_datapage@local >> > mr r9, r3 /* datapage ptr in r9 */ >> > >> > - lwz r3,STAMP_XTIME+TSPEC_TV_SEC(r9) >> > + lwz r3,STAMP_XTIME_SEC+LOWPART(r9) >> >> "LOWPART" should be "LOPART". >> > > Thanks, fixed both instances in a patch on top now. I considered folding > it into the original patch, but as it's close to the merge window I'd > rather not rebase it, and this way I also give you credit for > finding the bug. Take care, might conflict with https://github.com/linuxppc/linux/commit/5e381d727fe8834ca5a126f510194a7a4ac6dd3a Christophe > > I'm surprised that the 0-day bot did not report this already. > > Thanks fro the careful review! > > Arnd > > commit 1c11ca7a0584ddede5b8c93057b40d31e8a96d3d (HEAD) > Author: Arnd Bergmann <arnd@arndb.de> > Date: Thu Nov 21 15:19:49 2019 +0100 > > y2038: fix typo in powerpc vdso "LOPART" > > The earlier patch introduced a typo, change LOWPART back to > LOPART. > > Fixes: 176ed98c8a76 ("y2038: vdso: powerpc: avoid timespec references") > Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > diff --git a/arch/powerpc/kernel/vdso32/gettimeofday.S > b/arch/powerpc/kernel/vdso32/gettimeofday.S > index a7180b0f4aa1..c8e6902cb01b 100644 > --- a/arch/powerpc/kernel/vdso32/gettimeofday.S > +++ b/arch/powerpc/kernel/vdso32/gettimeofday.S > @@ -190,7 +190,7 @@ V_FUNCTION_BEGIN(__kernel_time) > bl __get_datapage@local > mr r9, r3 /* datapage ptr in r9 */ > > - lwz r3,STAMP_XTIME_SEC+LOWPART(r9) > + lwz r3,STAMP_XTIME_SEC+LOPART(r9) > > cmplwi r11,0 /* check if t is NULL */ > beq 2f > @@ -266,7 +266,7 @@ __do_get_tspec: > * as a 32.32 fixed-point number in r3 and r4. > * Load & add the xtime stamp. > */ > - lwz r5,STAMP_XTIME_SEC+LOWPART(r9) > + lwz r5,STAMP_XTIME_SEC+LOPART(r9) > > lwz r6,STAMP_SEC_FRAC(r9) > addc r4,r4,r6 > adde r3,r3,r5
WARNING: multiple messages have this Message-ID (diff)
From: Christophe Leroy <christophe.leroy@c-s.fr> To: Arnd Bergmann <arnd@arndb.de> Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>, y2038 Mailman List <y2038@lists.linaro.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-kernel@vger.kernel.org, Nicholas Piggin <npiggin@gmail.com>, Paul Mackerras <paulus@samba.org>, Thomas Gleixner <tglx@linutronix.de>, linuxppc-dev <linuxppc-dev@lists.ozlabs.org>, Allison Randal <allison@lohutok.net> Subject: Re: [Y2038] [PATCH 07/23] y2038: vdso: powerpc: avoid timespec references Date: Thu, 21 Nov 2019 17:25:29 +0100 [thread overview] Message-ID: <20191121172529.Horde.0uDMS4xQ-xexjp4a2mIoXQ5@messagerie.si.c-s.fr> (raw) In-Reply-To: <CAK8P3a1nRq98ngfKnR2Du+7_vOxSRFD9AyjHyUCsAtk_gLR_Uw@mail.gmail.com> Arnd Bergmann <arnd@arndb.de> a écrit : > On Wed, Nov 20, 2019 at 11:43 PM Ben Hutchings > <ben.hutchings@codethink.co.uk> wrote: >> >> On Fri, 2019-11-08 at 22:07 +0100, Arnd Bergmann wrote: >> [...] >> > --- a/arch/powerpc/kernel/vdso32/gettimeofday.S >> > +++ b/arch/powerpc/kernel/vdso32/gettimeofday.S >> > @@ -15,10 +15,8 @@ >> > /* Offset for the low 32-bit part of a field of long type */ >> > #if defined(CONFIG_PPC64) && defined(CONFIG_CPU_BIG_ENDIAN) >> > #define LOPART 4 >> > -#define TSPEC_TV_SEC TSPC64_TV_SEC+LOPART >> > #else >> > #define LOPART 0 >> > -#define TSPEC_TV_SEC TSPC32_TV_SEC >> > #endif >> > >> > .text >> > @@ -192,7 +190,7 @@ V_FUNCTION_BEGIN(__kernel_time) >> > bl __get_datapage@local >> > mr r9, r3 /* datapage ptr in r9 */ >> > >> > - lwz r3,STAMP_XTIME+TSPEC_TV_SEC(r9) >> > + lwz r3,STAMP_XTIME_SEC+LOWPART(r9) >> >> "LOWPART" should be "LOPART". >> > > Thanks, fixed both instances in a patch on top now. I considered folding > it into the original patch, but as it's close to the merge window I'd > rather not rebase it, and this way I also give you credit for > finding the bug. Take care, might conflict with https://github.com/linuxppc/linux/commit/5e381d727fe8834ca5a126f510194a7a4ac6dd3a Christophe > > I'm surprised that the 0-day bot did not report this already. > > Thanks fro the careful review! > > Arnd > > commit 1c11ca7a0584ddede5b8c93057b40d31e8a96d3d (HEAD) > Author: Arnd Bergmann <arnd@arndb.de> > Date: Thu Nov 21 15:19:49 2019 +0100 > > y2038: fix typo in powerpc vdso "LOPART" > > The earlier patch introduced a typo, change LOWPART back to > LOPART. > > Fixes: 176ed98c8a76 ("y2038: vdso: powerpc: avoid timespec references") > Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > diff --git a/arch/powerpc/kernel/vdso32/gettimeofday.S > b/arch/powerpc/kernel/vdso32/gettimeofday.S > index a7180b0f4aa1..c8e6902cb01b 100644 > --- a/arch/powerpc/kernel/vdso32/gettimeofday.S > +++ b/arch/powerpc/kernel/vdso32/gettimeofday.S > @@ -190,7 +190,7 @@ V_FUNCTION_BEGIN(__kernel_time) > bl __get_datapage@local > mr r9, r3 /* datapage ptr in r9 */ > > - lwz r3,STAMP_XTIME_SEC+LOWPART(r9) > + lwz r3,STAMP_XTIME_SEC+LOPART(r9) > > cmplwi r11,0 /* check if t is NULL */ > beq 2f > @@ -266,7 +266,7 @@ __do_get_tspec: > * as a 32.32 fixed-point number in r3 and r4. > * Load & add the xtime stamp. > */ > - lwz r5,STAMP_XTIME_SEC+LOWPART(r9) > + lwz r5,STAMP_XTIME_SEC+LOPART(r9) > > lwz r6,STAMP_SEC_FRAC(r9) > addc r4,r4,r6 > adde r3,r3,r5
next prev parent reply other threads:[~2019-11-21 16:25 UTC|newest] Thread overview: 124+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-08 21:02 [PATCH 00/23] y2038 cleanups Arnd Bergmann 2019-11-08 21:02 ` Arnd Bergmann 2019-11-08 21:02 ` Arnd Bergmann 2019-11-08 21:02 ` Arnd Bergmann 2019-11-08 21:02 ` Arnd Bergmann 2019-11-08 21:02 ` Arnd Bergmann 2019-11-08 21:02 ` Arnd Bergmann 2019-11-08 21:07 ` [PATCH 01/23] y2038: remove CONFIG_64BIT_TIME Arnd Bergmann 2019-11-20 22:28 ` [Y2038] " Ben Hutchings 2019-11-20 22:58 ` Dmitry Safonov 2019-11-08 21:07 ` [PATCH 02/23] y2038: add __kernel_old_timespec and __kernel_old_time_t Arnd Bergmann 2019-11-09 19:02 ` Deepa Dinamani 2019-11-20 22:30 ` [Y2038] " Ben Hutchings 2019-11-21 14:17 ` Arnd Bergmann 2019-11-08 21:07 ` [PATCH 03/23] y2038: vdso: change timeval to __kernel_old_timeval Arnd Bergmann 2019-11-08 21:07 ` Arnd Bergmann 2019-11-08 21:07 ` Arnd Bergmann 2019-11-08 21:07 ` Arnd Bergmann 2019-11-13 21:56 ` Thomas Gleixner 2019-11-13 21:56 ` Thomas Gleixner 2019-11-13 21:56 ` Thomas Gleixner 2019-11-13 21:56 ` Thomas Gleixner 2019-11-08 21:07 ` [PATCH 04/23] y2038: vdso: change timespec to __kernel_old_timespec Arnd Bergmann 2019-11-08 21:07 ` Arnd Bergmann 2019-11-08 21:07 ` Arnd Bergmann 2019-11-08 21:07 ` [PATCH 05/23] y2038: vdso: change time_t to __kernel_old_time_t Arnd Bergmann 2019-11-08 21:07 ` Arnd Bergmann 2019-11-13 21:57 ` Thomas Gleixner 2019-11-13 21:57 ` Thomas Gleixner 2019-11-08 21:07 ` [PATCH 06/23] y2038: vdso: nds32: open-code timespec_add_ns() Arnd Bergmann 2019-11-08 21:07 ` [PATCH 07/23] y2038: vdso: powerpc: avoid timespec references Arnd Bergmann 2019-11-08 21:07 ` Arnd Bergmann 2019-11-20 22:43 ` [Y2038] " Ben Hutchings 2019-11-20 22:43 ` Ben Hutchings 2019-11-21 14:23 ` Arnd Bergmann 2019-11-21 14:23 ` Arnd Bergmann 2019-11-21 16:25 ` Christophe Leroy [this message] 2019-11-21 16:25 ` Christophe Leroy 2019-11-27 11:03 ` Arnd Bergmann 2019-11-27 11:03 ` Arnd Bergmann 2019-12-02 12:55 ` Christophe Leroy 2019-12-02 12:55 ` Christophe Leroy 2019-12-02 14:03 ` Arnd Bergmann 2019-12-02 14:03 ` Arnd Bergmann 2019-11-08 21:07 ` [PATCH 08/23] y2038: ipc: remove __kernel_time_t reference from headers Arnd Bergmann 2019-11-08 21:07 ` Arnd Bergmann 2019-11-08 21:07 ` Arnd Bergmann 2019-11-20 22:49 ` [Y2038] " Ben Hutchings 2019-11-20 22:49 ` Ben Hutchings 2019-11-20 22:49 ` Ben Hutchings 2019-11-21 14:28 ` [Y2038] " Arnd Bergmann 2019-11-21 14:28 ` Arnd Bergmann 2019-11-21 14:28 ` Arnd Bergmann 2019-11-21 14:28 ` Arnd Bergmann 2019-11-08 21:07 ` [PATCH 09/23] y2038: stat: avoid 'time_t' in 'struct stat' Arnd Bergmann 2019-11-08 21:07 ` Arnd Bergmann 2019-11-08 21:07 ` Arnd Bergmann 2019-11-08 21:12 ` [PATCH 10/23] y2038: uapi: change __kernel_time_t to __kernel_old_time_t Arnd Bergmann 2019-11-09 19:03 ` Deepa Dinamani 2019-11-11 12:38 ` Christian Brauner 2019-11-08 21:12 ` [PATCH 11/23] y2038: rusage: use __kernel_old_timeval Arnd Bergmann 2019-11-12 21:09 ` Cyrill Gorcunov 2019-11-13 10:02 ` Arnd Bergmann 2019-11-13 17:22 ` Cyrill Gorcunov 2019-11-14 0:38 ` Christian Brauner 2019-11-14 0:38 ` Christian Brauner 2019-11-14 10:18 ` Arnd Bergmann 2019-11-14 10:23 ` Christian Brauner 2019-11-08 21:12 ` [PATCH 12/23] y2038: syscalls: change remaining timeval to __kernel_old_timeval Arnd Bergmann 2019-11-08 21:12 ` Arnd Bergmann 2019-11-11 12:44 ` Christian Brauner 2019-11-11 12:44 ` Christian Brauner 2019-11-11 12:44 ` Christian Brauner 2019-11-13 22:39 ` Rafael J. Wysocki 2019-11-13 22:39 ` Rafael J. Wysocki 2019-11-08 21:12 ` [PATCH 13/23] y2038: socket: remove timespec reference in timestamping Arnd Bergmann 2019-11-09 19:03 ` Deepa Dinamani 2019-11-11 20:24 ` Arnd Bergmann 2019-11-08 21:12 ` [PATCH 14/23] y2038: make ns_to_compat_timeval use __kernel_old_timeval Arnd Bergmann 2019-11-08 21:12 ` [PATCH 15/23] y2038: elfcore: Use __kernel_old_timeval for process times Arnd Bergmann 2019-11-08 21:12 ` [PATCH 16/23] y2038: timerfd: Use timespec64 internally Arnd Bergmann 2019-11-13 21:49 ` Thomas Gleixner 2019-11-08 21:12 ` [PATCH 17/23] y2038: time: avoid timespec usage in settimeofday() Arnd Bergmann 2019-11-13 21:53 ` Thomas Gleixner 2019-11-14 11:06 ` Arnd Bergmann 2019-11-14 11:06 ` Arnd Bergmann 2019-11-14 14:04 ` Thomas Gleixner 2019-11-14 14:04 ` Thomas Gleixner 2019-11-14 14:35 ` Arnd Bergmann 2019-11-14 23:01 ` Abel Vesa 2019-11-15 7:58 ` Arnd Bergmann 2019-11-15 10:27 ` Rasmus Villemoes 2019-11-15 13:50 ` Arnd Bergmann 2019-11-08 21:12 ` [PATCH 18/23] y2038: itimer: compat handling to itimer.c Arnd Bergmann 2019-11-13 21:54 ` Thomas Gleixner 2019-11-08 21:12 ` [PATCH 19/23] y2038: use compat_{get,set}_itimer on alpha Arnd Bergmann 2019-12-02 13:13 ` Guenter Roeck 2019-11-08 21:12 ` [PATCH 20/23] y2038: move itimer reset into itimer.c Arnd Bergmann 2019-11-09 13:43 ` Ondrej Mosnacek 2019-11-09 21:02 ` Arnd Bergmann 2019-11-09 23:07 ` Ondrej Mosnacek 2019-11-11 10:57 ` Arnd Bergmann 2019-11-14 8:51 ` Ondrej Mosnacek 2019-11-14 10:51 ` Thomas Gleixner 2019-11-13 22:03 ` Thomas Gleixner 2019-11-08 21:12 ` [PATCH 21/23] y2038: itimer: change implementation to timespec64 Arnd Bergmann 2019-11-13 22:28 ` Thomas Gleixner 2019-11-14 2:06 ` Steven Rostedt 2019-11-14 10:48 ` Thomas Gleixner 2019-11-14 10:52 ` Arnd Bergmann 2019-11-14 10:51 ` Arnd Bergmann 2019-11-14 10:57 ` Thomas Gleixner 2019-11-21 16:52 ` [Y2038] " Ben Hutchings 2019-11-25 20:26 ` Arnd Bergmann 2019-11-08 21:12 ` [PATCH 22/23] [RFC] y2038: itimer: use ktime_t internally Arnd Bergmann 2019-11-13 22:30 ` Thomas Gleixner 2019-11-08 21:12 ` [PATCH 23/23] y2038: allow disabling time32 system calls Arnd Bergmann 2019-11-11 12:31 ` Christian Brauner 2019-11-13 21:40 ` [PATCH 00/23] y2038 cleanups Arnd Bergmann 2019-11-13 21:40 ` Arnd Bergmann 2019-11-13 21:40 ` Arnd Bergmann 2019-11-13 21:40 ` Arnd Bergmann 2019-11-13 21:40 ` Arnd Bergmann 2019-11-13 21:40 ` Arnd Bergmann
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=20191121172529.Horde.0uDMS4xQ-xexjp4a2mIoXQ5@messagerie.si.c-s.fr \ --to=christophe.leroy@c-s.fr \ --cc=allison@lohutok.net \ --cc=arnd@arndb.de \ --cc=ben.hutchings@codethink.co.uk \ --cc=benh@kernel.crashing.org \ --cc=gregkh@linuxfoundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mpe@ellerman.id.au \ --cc=npiggin@gmail.com \ --cc=paulus@samba.org \ --cc=tglx@linutronix.de \ --cc=y2038@lists.linaro.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.