[xen staging] x86/pvh: pass module command line to dom0

[patchbot@xxxxxxx]

commit 0ecb8eb09f9fa4faefa3bf5bbeec5f94b0eef019
Author:     Roger Pau Monné <roger.pau@xxxxxxxxxx>
AuthorDate: Fri Jan 29 17:10:33 2021 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Jan 29 17:10:33 2021 +0100

    x86/pvh: pass module command line to dom0
    
    Both the multiboot and the HVM start info structures allow passing a
    string together with a module. Implement the missing support in
    pvh_load_kernel so that module strings found in the multiboot
    structure are forwarded to dom0.
    
    Fixes: 62ba982424 ('x86: parse Dom0 kernel for PVHv2')
    Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
    Release-Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 xen/arch/x86/hvm/dom0_build.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c
index 12a82c9d7c..878dc1d808 100644
--- a/xen/arch/x86/hvm/dom0_build.c
+++ b/xen/arch/x86/hvm/dom0_build.c
@@ -617,7 +617,22 @@ static int __init pvh_load_kernel(struct domain *d, const 
module_t *image,
 
         mod.paddr = last_addr;
         mod.size = initrd->mod_end;
-        last_addr += ROUNDUP(initrd->mod_end, PAGE_SIZE);
+        last_addr += ROUNDUP(initrd->mod_end, elf_64bit(&elf) ? 8 : 4);
+        if ( initrd->string )
+        {
+            char *str = __va(initrd->string);
+            size_t len = strlen(str) + 1;
+
+            rc = hvm_copy_to_guest_phys(last_addr, str, len, v);
+            if ( rc )
+            {
+                printk("Unable to copy module command line\n");
+                return rc;
+            }
+            mod.cmdline_paddr = last_addr;
+            last_addr += len;
+        }
+        last_addr = ROUNDUP(last_addr, PAGE_SIZE);
     }
 
     /* Free temporary buffers. */
--
generated by git-patchbot for /home/xen/git/xen.git#staging