| Message ID | 1481417456-28826-2-git-send-email-alex.popov@linux.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Dec 11, 2016 at 03:50:55AM +0300, Alexander Popov wrote: > Introduce kaslr_offset() similarly to x86_64 for fixing kcov. > > Signed-off-by: Alexander Popov <alex.popov@linux.com> > --- > arch/arm64/include/asm/setup.h | 19 +++++++++++++++++++ > arch/arm64/include/uapi/asm/setup.h | 4 ++-- > arch/arm64/kernel/setup.c | 8 ++++---- > 3 files changed, 25 insertions(+), 6 deletions(-) > create mode 100644 arch/arm64/include/asm/setup.h > > diff --git a/arch/arm64/include/asm/setup.h b/arch/arm64/include/asm/setup.h > new file mode 100644 > index 0000000..e7b59b9 > --- /dev/null > +++ b/arch/arm64/include/asm/setup.h > @@ -0,0 +1,19 @@ > +/* > + * arch/arm64/include/asm/setup.h > + * > + * 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. > + */ > + > +#ifndef __ASM_SETUP_H > +#define __ASM_SETUP_H > + > +#include <uapi/asm/setup.h> > + > +static inline unsigned long kaslr_offset(void) > +{ > + return kimage_vaddr - KIMAGE_VADDR; > +} > + > +#endif You could probably just stick this in asm/memory.h, since that's where kimage_vaddr is declared and it would save adding a new header file. > diff --git a/arch/arm64/include/uapi/asm/setup.h b/arch/arm64/include/uapi/asm/setup.h > index 9cf2e46..26631c8 100644 > --- a/arch/arm64/include/uapi/asm/setup.h > +++ b/arch/arm64/include/uapi/asm/setup.h > @@ -16,8 +16,8 @@ > * You should have received a copy of the GNU General Public License > * along with this program. If not, see <http://www.gnu.org/licenses/>. > */ > -#ifndef __ASM_SETUP_H > -#define __ASM_SETUP_H > +#ifndef _UAPI__ASM_SETUP_H > +#define _UAPI__ASM_SETUP_H > > #include <linux/types.h> You can drop this hunk. With those changes: Acked-by: Will Deacon <will.deacon@arm.com> Will
On 12.12.2016 14:29, Will Deacon wrote: > On Sun, Dec 11, 2016 at 03:50:55AM +0300, Alexander Popov wrote: >> Introduce kaslr_offset() similarly to x86_64 for fixing kcov. >> >> Signed-off-by: Alexander Popov <alex.popov@linux.com> >> --- >> arch/arm64/include/asm/setup.h | 19 +++++++++++++++++++ >> arch/arm64/include/uapi/asm/setup.h | 4 ++-- >> arch/arm64/kernel/setup.c | 8 ++++---- >> 3 files changed, 25 insertions(+), 6 deletions(-) >> create mode 100644 arch/arm64/include/asm/setup.h > > You could probably just stick this in asm/memory.h, since that's where > kimage_vaddr is declared and it would save adding a new header file. Thanks, Will. I'll do that. -- Alexander
On Sun, Dec 11, 2016 at 03:50:55AM +0300, Alexander Popov wrote: > Introduce kaslr_offset() similarly to x86_64 for fixing kcov. > > Signed-off-by: Alexander Popov <alex.popov@linux.com> > --- > arch/arm64/include/asm/setup.h | 19 +++++++++++++++++++ > arch/arm64/include/uapi/asm/setup.h | 4 ++-- > arch/arm64/kernel/setup.c | 8 ++++---- > 3 files changed, 25 insertions(+), 6 deletions(-) > create mode 100644 arch/arm64/include/asm/setup.h > > diff --git a/arch/arm64/include/asm/setup.h b/arch/arm64/include/asm/setup.h > new file mode 100644 > index 0000000..e7b59b9 > --- /dev/null > +++ b/arch/arm64/include/asm/setup.h > @@ -0,0 +1,19 @@ > +/* > + * arch/arm64/include/asm/setup.h > + * > + * 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. > + */ > + > +#ifndef __ASM_SETUP_H > +#define __ASM_SETUP_H > + > +#include <uapi/asm/setup.h> > + > +static inline unsigned long kaslr_offset(void) > +{ > + return kimage_vaddr - KIMAGE_VADDR; > +} > + > +#endif Hi Alexander, I found today's linux-next master broken: In file included from init/main.c:88:0: ./arch/arm64/include/asm/setup.h:14:100: error: redefinition of ‘kaslr_offset’ In file included from ./arch/arm64/include/asm/page.h:54:0, from ./include/linux/mm_types.h:16, from ./include/linux/sched.h:27, from ./arch/arm64/include/asm/compat.h:25, from ./arch/arm64/include/asm/stat.h:23, from ./include/linux/stat.h:5, from ./include/linux/module.h:10, from init/main.c:15: /arch/arm64/include/asm/memory.h:168:100: note: previous definition of ‘kaslr_offset’ was here scripts/Makefile.build:293: recipe for target 'init/main.o' failed make[1]: *** [init/main.o] Error 1 It looks like you declare kaslr_offset() twice - in this patch, and in 7ede8665f (arm64: setup: introduce kaslr_offset()). Yury
On 22.12.2016 09:18, Yury Norov wrote: > On Sun, Dec 11, 2016 at 03:50:55AM +0300, Alexander Popov wrote: >> Introduce kaslr_offset() similarly to x86_64 for fixing kcov. [...] > Hi Alexander, > > I found today's linux-next master broken: [...] > It looks like you declare kaslr_offset() twice - in this patch, and in 7ede8665f > (arm64: setup: introduce kaslr_offset()). Hello Yury, There was a race during applying this patch. So currently linux-next has 2 versions of it. The first one is 1a339a14b1f2c7a0dfdd6db79eee1e55d3cec357, which is original. The second one is 7ede8665f27cde7da69e8b2fbeaa1ed0664879c5, updated by Will Deacon and applied to the mainline. I'm sorry for that. The first one should be definitely dropped. Best regards, Alexander
Hi Will, Catalin, On 22/12/16 12:51, Alexander Popov wrote: > On 22.12.2016 09:18, Yury Norov wrote: >> On Sun, Dec 11, 2016 at 03:50:55AM +0300, Alexander Popov wrote: >>> Introduce kaslr_offset() similarly to x86_64 for fixing kcov. > > [...] > >> Hi Alexander, >> >> I found today's linux-next master broken: > > [...] > >> It looks like you declare kaslr_offset() twice - in this patch, and in 7ede8665f >> (arm64: setup: introduce kaslr_offset()). > > Hello Yury, > > There was a race during applying this patch. So currently linux-next has 2 versions of it. > > The first one is 1a339a14b1f2c7a0dfdd6db79eee1e55d3cec357, which is original. > The second one is 7ede8665f27cde7da69e8b2fbeaa1ed0664879c5, updated by Will Deacon and > applied to the mainline. > > I'm sorry for that. The first one should be definitely dropped. Looks like this is still broken in today's -next. Cheers Jon
On Tue, Jan 03, 2017 at 11:18:15AM +0000, Jon Hunter wrote: > On 22/12/16 12:51, Alexander Popov wrote: > > On 22.12.2016 09:18, Yury Norov wrote: > >> On Sun, Dec 11, 2016 at 03:50:55AM +0300, Alexander Popov wrote: > >>> Introduce kaslr_offset() similarly to x86_64 for fixing kcov. > > > > [...] > > > >> Hi Alexander, > >> > >> I found today's linux-next master broken: > > > > [...] > > > >> It looks like you declare kaslr_offset() twice - in this patch, and in 7ede8665f > >> (arm64: setup: introduce kaslr_offset()). > > > > Hello Yury, > > > > There was a race during applying this patch. So currently linux-next has 2 versions of it. > > > > The first one is 1a339a14b1f2c7a0dfdd6db79eee1e55d3cec357, which is original. > > The second one is 7ede8665f27cde7da69e8b2fbeaa1ed0664879c5, updated by Will Deacon and > > applied to the mainline. > > > > I'm sorry for that. The first one should be definitely dropped. > > Looks like this is still broken in today's -next. I think this is coming in via akpm's tree, so there's nothing we can do about it from the arm64 side :/ Andrew -- please can you drop 1a339a14b1f2 ("arm64: setup: introduce kaslr_offset()") from your -next branch? It's superceded by 7ede8665f27c ("arm64: setup: introduce kaslr_offset()"), which landed in mainline for -rc1, so you'll need to pick that up if you want your branch to build on its own. Thanks, Will
diff --git a/arch/arm64/include/asm/setup.h b/arch/arm64/include/asm/setup.h new file mode 100644 index 0000000..e7b59b9 --- /dev/null +++ b/arch/arm64/include/asm/setup.h @@ -0,0 +1,19 @@ +/* + * arch/arm64/include/asm/setup.h + * + * 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. + */ + +#ifndef __ASM_SETUP_H +#define __ASM_SETUP_H + +#include <uapi/asm/setup.h> + +static inline unsigned long kaslr_offset(void) +{ + return kimage_vaddr - KIMAGE_VADDR; +} + +#endif diff --git a/arch/arm64/include/uapi/asm/setup.h b/arch/arm64/include/uapi/asm/setup.h index 9cf2e46..26631c8 100644 --- a/arch/arm64/include/uapi/asm/setup.h +++ b/arch/arm64/include/uapi/asm/setup.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __ASM_SETUP_H -#define __ASM_SETUP_H +#ifndef _UAPI__ASM_SETUP_H +#define _UAPI__ASM_SETUP_H #include <linux/types.h> diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index f534f49..11eefda5 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -329,11 +329,11 @@ subsys_initcall(topology_init); static int dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p) { - u64 const kaslr_offset = kimage_vaddr - KIMAGE_VADDR; + const unsigned long offset = kaslr_offset(); - if (IS_ENABLED(CONFIG_RANDOMIZE_BASE) && kaslr_offset > 0) { - pr_emerg("Kernel Offset: 0x%llx from 0x%lx\n", - kaslr_offset, KIMAGE_VADDR); + if (IS_ENABLED(CONFIG_RANDOMIZE_BASE) && offset > 0) { + pr_emerg("Kernel Offset: 0x%lx from 0x%lx\n", + offset, KIMAGE_VADDR); } else { pr_emerg("Kernel Offset: disabled\n"); }
Introduce kaslr_offset() similarly to x86_64 for fixing kcov. Signed-off-by: Alexander Popov <alex.popov@linux.com> --- arch/arm64/include/asm/setup.h | 19 +++++++++++++++++++ arch/arm64/include/uapi/asm/setup.h | 4 ++-- arch/arm64/kernel/setup.c | 8 ++++---- 3 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 arch/arm64/include/asm/setup.h