1. Patchew
  2. Xen
  3. [PATCH v5 00/44] Boot modules for Hyperlaunch
  4. View patch

[PATCH v5 28/44] x86/boot: add cmdline to struct boot_module

Daniel P. Smith posted 44 patches 1 year ago
There is a newer version of this series
[PATCH v5 28/44] x86/boot: add cmdline to struct boot_module
Posted by Daniel P. Smith 1 year ago 
Add a char pointer field, cmdline, to struct boot_module to hold the address
pointed to by the string field of struct mod. This removes the need to use the
early_mod field to get to the dom0 kernel command line.

Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com>
---
 xen/arch/x86/include/asm/bootinfo.h | 2 ++
 xen/arch/x86/setup.c                | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/xen/arch/x86/include/asm/bootinfo.h b/xen/arch/x86/include/asm/bootinfo.h
index 9ed260629012..3b6bfbe88770 100644
--- a/xen/arch/x86/include/asm/bootinfo.h
+++ b/xen/arch/x86/include/asm/bootinfo.h
@@ -38,6 +38,8 @@ struct boot_module {
 #define BOOTMOD_FLAG_X86_RELOCATED     (1U << 0)
 #define BOOTMOD_FLAG_X86_CONSUMED      (1U << 1)
 
+    const char *cmdline;
+
     paddr_t start;
     size_t size;
 };
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index aed0837902c4..d5916e85f68e 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -312,6 +312,8 @@ static struct boot_info __init *multiboot_fill_boot_info(unsigned long mbi_p)
     {
         bi->mods[i].mod = &mods[i];
 
+        bi->mods[i].cmdline = (char *)(paddr_t)mods[i].string;
+
         bi->mods[i].start = (paddr_t)mods[i].mod_start;
         bi->mods[i].size = mods[i].mod_end - mods[i].mod_start;
     }
@@ -1000,10 +1002,11 @@ static struct domain *__init create_dom0(struct boot_info *bi)
         panic("Error creating d%uv0\n", domid);
 
     /* Grab the DOM0 command line. */
-    if ( image->mod->string || bi->kextra )
+    if ( image->cmdline || bi->kextra )
     {
-        if ( image->mod->string )
-            safe_strcpy(cmdline, cmdline_cook(__va(image->mod->string),
+        if ( image->cmdline )
+            safe_strcpy(cmdline,
+                        cmdline_cook(__va((unsigned long)image->cmdline),
                         bi->loader));
 
         if ( bi->kextra )
-- 
2.30.2
Re: [PATCH v5 28/44] x86/boot: add cmdline to struct boot_module
Posted by Jason Andryuk 1 year ago 
On 2024-10-06 17:49, Daniel P. Smith wrote:
> Add a char pointer field, cmdline, to struct boot_module to hold the address
> pointed to by the string field of struct mod. This removes the need to use the
> early_mod field to get to the dom0 kernel command line.
> 
> Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com>
> ---
>   xen/arch/x86/include/asm/bootinfo.h | 2 ++
>   xen/arch/x86/setup.c                | 9 ++++++---
>   2 files changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/xen/arch/x86/include/asm/bootinfo.h b/xen/arch/x86/include/asm/bootinfo.h
> index 9ed260629012..3b6bfbe88770 100644
> --- a/xen/arch/x86/include/asm/bootinfo.h
> +++ b/xen/arch/x86/include/asm/bootinfo.h
> @@ -38,6 +38,8 @@ struct boot_module {
>   #define BOOTMOD_FLAG_X86_RELOCATED     (1U << 0)
>   #define BOOTMOD_FLAG_X86_CONSUMED      (1U << 1)
>   
> +    const char *cmdline;
> +
>       paddr_t start;
>       size_t size;
>   };
> diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
> index aed0837902c4..d5916e85f68e 100644
> --- a/xen/arch/x86/setup.c
> +++ b/xen/arch/x86/setup.c
> @@ -312,6 +312,8 @@ static struct boot_info __init *multiboot_fill_boot_info(unsigned long mbi_p)
>       {
>           bi->mods[i].mod = &mods[i];
>   
> +        bi->mods[i].cmdline = (char *)(paddr_t)mods[i].string;
> +
>           bi->mods[i].start = (paddr_t)mods[i].mod_start;
>           bi->mods[i].size = mods[i].mod_end - mods[i].mod_start;
>       }
> @@ -1000,10 +1002,11 @@ static struct domain *__init create_dom0(struct boot_info *bi)
>           panic("Error creating d%uv0\n", domid);
>   
>       /* Grab the DOM0 command line. */
> -    if ( image->mod->string || bi->kextra )
> +    if ( image->cmdline || bi->kextra )
>       {
> -        if ( image->mod->string )
> -            safe_strcpy(cmdline, cmdline_cook(__va(image->mod->string),
> +        if ( image->cmdline )
> +            safe_strcpy(cmdline,
> +                        cmdline_cook(__va((unsigned long)image->cmdline),

char * seems inappropriate if cmdline isn't usable as a string.  Maybe 
have cmdline as a paddr_t, or can __va() be used at assignment time?

Regards,
Jason

>                           bi->loader));
>   
>           if ( bi->kextra )
Re: [PATCH v5 28/44] x86/boot: add cmdline to struct boot_module
Posted by Daniel P. Smith 1 year ago 
On 10/8/24 13:08, Jason Andryuk wrote:
> On 2024-10-06 17:49, Daniel P. Smith wrote:
>> Add a char pointer field, cmdline, to struct boot_module to hold the 
>> address
>> pointed to by the string field of struct mod. This removes the need to 
>> use the
>> early_mod field to get to the dom0 kernel command line.
>>
>> Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com>
>> ---
>>   xen/arch/x86/include/asm/bootinfo.h | 2 ++
>>   xen/arch/x86/setup.c                | 9 ++++++---
>>   2 files changed, 8 insertions(+), 3 deletions(-)
>>
>> diff --git a/xen/arch/x86/include/asm/bootinfo.h 
>> b/xen/arch/x86/include/asm/bootinfo.h
>> index 9ed260629012..3b6bfbe88770 100644
>> --- a/xen/arch/x86/include/asm/bootinfo.h
>> +++ b/xen/arch/x86/include/asm/bootinfo.h
>> @@ -38,6 +38,8 @@ struct boot_module {
>>   #define BOOTMOD_FLAG_X86_RELOCATED     (1U << 0)
>>   #define BOOTMOD_FLAG_X86_CONSUMED      (1U << 1)
>> +    const char *cmdline;
>> +
>>       paddr_t start;
>>       size_t size;
>>   };
>> diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
>> index aed0837902c4..d5916e85f68e 100644
>> --- a/xen/arch/x86/setup.c
>> +++ b/xen/arch/x86/setup.c
>> @@ -312,6 +312,8 @@ static struct boot_info __init 
>> *multiboot_fill_boot_info(unsigned long mbi_p)
>>       {
>>           bi->mods[i].mod = &mods[i];
>> +        bi->mods[i].cmdline = (char *)(paddr_t)mods[i].string;
>> +
>>           bi->mods[i].start = (paddr_t)mods[i].mod_start;
>>           bi->mods[i].size = mods[i].mod_end - mods[i].mod_start;
>>       }
>> @@ -1000,10 +1002,11 @@ static struct domain *__init 
>> create_dom0(struct boot_info *bi)
>>           panic("Error creating d%uv0\n", domid);
>>       /* Grab the DOM0 command line. */
>> -    if ( image->mod->string || bi->kextra )
>> +    if ( image->cmdline || bi->kextra )
>>       {
>> -        if ( image->mod->string )
>> -            safe_strcpy(cmdline, cmdline_cook(__va(image->mod->string),
>> +        if ( image->cmdline )
>> +            safe_strcpy(cmdline,
>> +                        cmdline_cook(__va((unsigned 
>> long)image->cmdline),
> 
> char * seems inappropriate if cmdline isn't usable as a string.  Maybe 
> have cmdline as a paddr_t, or can __va() be used at assignment time?
> 

Yah, char * was not the correct choice, paddr_t is more appropriate.

v/r,
dps

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.