| Message ID | 20241006214956.24339-11-dpsmith@apertussolutions.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Boot modules for Hyperlaunch | expand |
On 2024-10-06 17:49, Daniel P. Smith wrote: > The existing startup code employs various ad-hoc state tracking about certain > boot module types by each area of the code. A boot module flags is added to > enable tracking these different states. The first state to be transition by > this commit is module relocation. > > Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com> > --- > xen/arch/x86/include/asm/bootinfo.h | 4 ++++ > xen/arch/x86/setup.c | 8 ++++---- > 2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/xen/arch/x86/include/asm/bootinfo.h b/xen/arch/x86/include/asm/bootinfo.h > index 6941a8975ea6..021ff0d93643 100644 > --- a/xen/arch/x86/include/asm/bootinfo.h > +++ b/xen/arch/x86/include/asm/bootinfo.h > @@ -31,6 +31,10 @@ struct boot_module { > */ > unsigned long headroom; > enum bootmod_type type; > + > + uint32_t flags; > +#define BOOTMOD_FLAG_X86_RELOCATED (1U << 0) > + Stray newline. Otherwise: Reviewed-by: Jason Andryuk <jason.andryuk@amd.com> > }; > > /*
On 10/7/24 16:02, Jason Andryuk wrote: > On 2024-10-06 17:49, Daniel P. Smith wrote: >> The existing startup code employs various ad-hoc state tracking about >> certain >> boot module types by each area of the code. A boot module flags is >> added to >> enable tracking these different states. The first state to be >> transition by >> this commit is module relocation. >> >> Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com> >> --- >> xen/arch/x86/include/asm/bootinfo.h | 4 ++++ >> xen/arch/x86/setup.c | 8 ++++---- >> 2 files changed, 8 insertions(+), 4 deletions(-) >> >> diff --git a/xen/arch/x86/include/asm/bootinfo.h >> b/xen/arch/x86/include/asm/bootinfo.h >> index 6941a8975ea6..021ff0d93643 100644 >> --- a/xen/arch/x86/include/asm/bootinfo.h >> +++ b/xen/arch/x86/include/asm/bootinfo.h >> @@ -31,6 +31,10 @@ struct boot_module { >> */ >> unsigned long headroom; >> enum bootmod_type type; >> + >> + uint32_t flags; >> +#define BOOTMOD_FLAG_X86_RELOCATED (1U << 0) >> + > > Stray newline. Otherwise: > Reviewed-by: Jason Andryuk <jason.andryuk@amd.com> Ack and thank you. v/r, dps
On 07.10.2024 22:02, Jason Andryuk wrote: > On 2024-10-06 17:49, Daniel P. Smith wrote: >> The existing startup code employs various ad-hoc state tracking about certain >> boot module types by each area of the code. A boot module flags is added to >> enable tracking these different states. The first state to be transition by >> this commit is module relocation. >> >> Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com> >> --- >> xen/arch/x86/include/asm/bootinfo.h | 4 ++++ >> xen/arch/x86/setup.c | 8 ++++---- >> 2 files changed, 8 insertions(+), 4 deletions(-) >> >> diff --git a/xen/arch/x86/include/asm/bootinfo.h b/xen/arch/x86/include/asm/bootinfo.h >> index 6941a8975ea6..021ff0d93643 100644 >> --- a/xen/arch/x86/include/asm/bootinfo.h >> +++ b/xen/arch/x86/include/asm/bootinfo.h >> @@ -31,6 +31,10 @@ struct boot_module { >> */ >> unsigned long headroom; >> enum bootmod_type type; >> + >> + uint32_t flags; >> +#define BOOTMOD_FLAG_X86_RELOCATED (1U << 0) >> + > > Stray newline. Otherwise: > Reviewed-by: Jason Andryuk <jason.andryuk@amd.com> Acked-by: Jan Beulich <jbeulich@suse.com>
diff --git a/xen/arch/x86/include/asm/bootinfo.h b/xen/arch/x86/include/asm/bootinfo.h index 6941a8975ea6..021ff0d93643 100644 --- a/xen/arch/x86/include/asm/bootinfo.h +++ b/xen/arch/x86/include/asm/bootinfo.h @@ -31,6 +31,10 @@ struct boot_module { */ unsigned long headroom; enum bootmod_type type; + + uint32_t flags; +#define BOOTMOD_FLAG_X86_RELOCATED (1U << 0) + }; /* diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 69c45f115523..161415a8e667 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1354,7 +1354,6 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) panic("Bootloader didn't honor module alignment request\n"); bi->mods[i].mod->mod_end -= bi->mods[i].mod->mod_start; bi->mods[i].mod->mod_start >>= PAGE_SHIFT; - bi->mods[i].mod->reserved = 0; } /* @@ -1470,7 +1469,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) size = PAGE_ALIGN(bm->headroom + bm->mod->mod_end); - if ( bi->mods[j].mod->reserved ) + if ( bi->mods[j].flags & BOOTMOD_FLAG_X86_RELOCATED ) continue; /* Don't overlap with other modules (or Xen itself). */ @@ -1489,7 +1488,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) bm->mod->mod_end); bm->mod->mod_start = (end - size) >> PAGE_SHIFT; bm->mod->mod_end += bm->headroom; - bm->mod->reserved = 1; + bm->flags |= BOOTMOD_FLAG_X86_RELOCATED; } } @@ -1515,7 +1514,8 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) #endif } - if ( bi->mods[0].headroom && !bi->mods[0].mod->reserved ) + if ( bi->mods[0].headroom && + !(bi->mods[0].flags & BOOTMOD_FLAG_X86_RELOCATED) ) panic("Not enough memory to relocate the dom0 kernel image\n"); for ( i = 0; i < bi->nr_modules; ++i ) {
The existing startup code employs various ad-hoc state tracking about certain boot module types by each area of the code. A boot module flags is added to enable tracking these different states. The first state to be transition by this commit is module relocation. Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com> --- xen/arch/x86/include/asm/bootinfo.h | 4 ++++ xen/arch/x86/setup.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-)