[kexec-tools PATCH] x86: extend kernel text size up to 1GB

[Simon Horman]

On Thu, Mar 20, 2014 at 12:53:35PM +0800, WANG Chao wrote:
> On 03/20/14 at 12:44pm, Simon Horman wrote:
> > On Fri, Mar 14, 2014 at 03:29:29PM +0800, WANG Chao wrote:
> > > On 03/14/14 at 03:08pm, Dave Young wrote:
> > > > On 03/14/14 at 03:03pm, WANG Chao wrote:
> > > > > On 03/14/14 at 02:47pm, Dave Young wrote:
> > > > > > On 03/14/14 at 02:12pm, Dave Young wrote:
> > > > > > > On 03/12/14 at 11:13am, WANG Chao wrote:
> > > > > > > > Currently kexec hard code X86_64_KERNEL_TEXT_SIZE to 512M. With kASLR
> > > > > > > > enabled (CONFIG_RANDOMIZED_BASE=y), kernel image base offset could be
> > > > > > > > randomized from 0 to 1GB and kexec-tools fails to get kernel virtual
> > > > > > > > address from /proc/kcore when the offset is >512M.
> > > > > > > > 
> > > > > > > > Now extend X86_64_KERNEL_TEXT_SIZE to 1GB to adapt kASLR.
> > > > > > > > 
> > > > > > > > Signed-off-by: WANG Chao <chaowang at redhat.com>
> > > > > > > > ---
> > > > > > > >  kexec/arch/i386/crashdump-x86.h | 2 +-
> > > > > > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > > > > > > 
> > > > > > > > diff --git a/kexec/arch/i386/crashdump-x86.h b/kexec/arch/i386/crashdump-x86.h
> > > > > > > > index e68b626..a5b2dfd 100644
> > > > > > > > --- a/kexec/arch/i386/crashdump-x86.h
> > > > > > > > +++ b/kexec/arch/i386/crashdump-x86.h
> > > > > > > > @@ -18,7 +18,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline,
> > > > > > > >  #define X86_64_MAXMEM        		0x3fffffffffffUL
> > > > > > > >  
> > > > > > > >  /* Kernel text size */
> > > > > > > > -#define X86_64_KERNEL_TEXT_SIZE  (512UL*1024*1024)
> > > > > > > > +#define X86_64_KERNEL_TEXT_SIZE  (1UL*1024*1024*1024)
> > > > > > > 
> > > > > > > Should define a new macro such as: X86_KERNEL_TEXT_START_LIMIT (1UL*1024*1024*1024)
> > > > > > > and then check end addr with X86_64_KERNEL_TEXT_SIZE + X86_64_KERNEL_TEXT_SIZE
> > > > > > 
> > > > > > I means check ktext with range <1G - 1.5G>
> > > > > 
> > > > > You're right.
> > > > > 
> > > > > I think it's fine adding new macro X86_64_RANDOMIZE_BASE_MAX_OFFSET
> > > > > as 0x40000000 (1G) and doing the following check:
> > > > > 
> > > > > (start >= X86_64__START_KERNEL_map) &&
> > > > >  (start <= X86_64__START_KERNEL_map + X86_64_RANDOMIZE_MAX_BASE_OFFSET) &&
> > > > >  (end - start <= X86_64_KERNEL_TEXT_SIZE)
> > > > 
> > > > end - start < X86_64_KERNEL_TEXT_SIZE should be right, other wise I'm fine.
> > > 
> > > Right. size = end - start + 1.
> > > 
> > > I'll post v2.
> > 
> > Hi,
> > 
> > I'd like to enquire about the status of this as I don't see v2 in my inbox.
> 
> Hi, Simon
> 
> I'd like to hold off for such fix. Fixing kaslr issue is not trivial
> as I thought.
> 
> You can find the discussion on kexec mail list or here:
> http://thread.gmane.org/gmane.linux.kernel.kexec/11103
> 
> Sorry. I'll CC you next time.

No problem.

Please repost this patch once a fix is ready.