[meta-virtualization][PATCH 1/3] xen-tools: Load xen related kernel modules during system boot

[meta-virtualization][PATCH 1/3] xen-tools: Load xen related kernel modules during system boot

[Kamil Dziezyk]

This patch changes the location of xen.conf file, that contains list of kernel
modules to be loaded during system boot, to "${nonarch_libdir}". This is done
by removing '--with-systemd-modules-load=' flag from EXTRA_OECONF variable.

Previous path based on "${systemd_unitdir}" was not considered by default by
systemd-modules-load.service.

Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
---
 recipes-extended/xen/xen-tools.inc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc
index d831941..6b99040 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -653,10 +653,10 @@ FILES:${PN}-xm = "\
     "
 
 FILES:${PN}-xencommons += "\
+    ${nonarch_libdir}/modules-load.d/xen.conf \
     ${sysconfdir}/default/xencommons \
     ${sysconfdir}/init.d/xencommons \
     ${sysconfdir}/xen/scripts/launch-xenstore \
-    ${systemd_unitdir}/modules-load.d/xen.conf \
     ${systemd_unitdir}/system/proc-xen.mount \
     ${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service \
     ${systemd_unitdir}/system/xenconsoled.service \
@@ -744,7 +744,6 @@ SYSTEMD_SERVICE:${PN}-xendomains = "xendomains.service"
 
 EXTRA_OECONF += " \
     --with-systemd=${systemd_unitdir}/system \
-    --with-systemd-modules-load=${systemd_unitdir}/modules-load.d \
     --with-initddir=${INIT_D_DIR} \
     --with-sysconfig-leaf-dir=default \
     --with-system-qemu=${bindir}/qemu-system-i386 \
-- 
2.17.1

[meta-virtualization][PATCH 2/3] xen: Clear TUNE_CCARGS for Xen build for aarch64 machines

[Kamil Dziezyk]

Xen build may fail for arm machines that have enabled extra flags,
that can be enabled only for specific architecture version, e.g. armv8-2a.

Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
---
 recipes-extended/xen/xen.inc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
index d3c7a7d..9ac82ef 100644
--- a/recipes-extended/xen/xen.inc
+++ b/recipes-extended/xen/xen.inc
@@ -102,6 +102,11 @@ EXTRA_CFLAGS_XEN_CORE="${DEBUG_PREFIX_MAP}"
 #   EXTRA_CFLAGS_XEN_TOOLS: so clear TUNE_CCARGS on x86 to prevent that.
 TUNE_CCARGS:x86-64=""
 
+# - The Xen build for aarch64 systems with HVM-mode enabled may include
+#   architecture specific flags '-march=*' which causes build failure, so clear
+#   TUNE_CCARGS on aarch64 to prevent that.
+TUNE_CCARGS:aarch64=""
+
 # - Yocto supplies the _FORTIFY_SOURCE flag via CC/CPP/CXX but then passes the
 #   optimization -O via C*FLAGS which is problematic when the CFLAGS are cleared
 #   within the build because compilation fails with the compiler stating
-- 
2.17.1

Re: [meta-virtualization][PATCH 2/3] xen: Clear TUNE_CCARGS for Xen build for aarch64 machines

[Bertrand Marquis]

Hi Kamil,

> On 8 Dec 2021, at 10:44, Kamil Dziezyk via lists.yoctoproject.org <kamil.dziezyk=arm.com@lists.yoctoproject.org> wrote:
> 
> Xen build may fail for arm machines that have enabled extra flags,
> that can be enabled only for specific architecture version, e.g. armv8-2a.
> 
> Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>

Cheers
Bertrand

> ---
> recipes-extended/xen/xen.inc | 5 +++++
> 1 file changed, 5 insertions(+)
> 
> diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
> index d3c7a7d..9ac82ef 100644
> --- a/recipes-extended/xen/xen.inc
> +++ b/recipes-extended/xen/xen.inc
> @@ -102,6 +102,11 @@ EXTRA_CFLAGS_XEN_CORE="${DEBUG_PREFIX_MAP}"
> #   EXTRA_CFLAGS_XEN_TOOLS: so clear TUNE_CCARGS on x86 to prevent that.
> TUNE_CCARGS:x86-64=""
> 
> +# - The Xen build for aarch64 systems with HVM-mode enabled may include
> +#   architecture specific flags '-march=*' which causes build failure, so clear
> +#   TUNE_CCARGS on aarch64 to prevent that.
> +TUNE_CCARGS:aarch64=""
> +
> # - Yocto supplies the _FORTIFY_SOURCE flag via CC/CPP/CXX but then passes the
> #   optimization -O via C*FLAGS which is problematic when the CFLAGS are cleared
> #   within the build because compilation fails with the compiler stating
> -- 
> 2.17.1
> 
> 
> 
> 

[meta-virtualization][PATCH 3/3] grub-efi: Add xen_boot support when 'xen' is in DISTRO_FEATURES for aarch64

[Kamil Dziezyk]

Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
---
 recipes-bsp/grub/grub-efi_%.bbappend | 1 +
 recipes-bsp/grub/grub-efi_xen.inc    | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 recipes-bsp/grub/grub-efi_%.bbappend
 create mode 100644 recipes-bsp/grub/grub-efi_xen.inc

diff --git a/recipes-bsp/grub/grub-efi_%.bbappend b/recipes-bsp/grub/grub-efi_%.bbappend
new file mode 100644
index 0000000..df2b688
--- /dev/null
+++ b/recipes-bsp/grub/grub-efi_%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('DISTRO_FEATURES', 'xen', '${BPN}_xen.inc', '', d)}
diff --git a/recipes-bsp/grub/grub-efi_xen.inc b/recipes-bsp/grub/grub-efi_xen.inc
new file mode 100644
index 0000000..5aa0958
--- /dev/null
+++ b/recipes-bsp/grub/grub-efi_xen.inc
@@ -0,0 +1 @@
+GRUB_BUILDIN:append:aarch64 = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' xen_boot', '', d)}"
-- 
2.17.1

Re: [meta-virtualization][PATCH 3/3] grub-efi: Add xen_boot support when 'xen' is in DISTRO_FEATURES for aarch64

[Bertrand Marquis]

Hi Kamil,

> On 8 Dec 2021, at 10:44, Kamil Dziezyk via lists.yoctoproject.org <kamil.dziezyk=arm.com@lists.yoctoproject.org> wrote:
> 
> Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>

But an empty commit message is not something that I like (more for next time, no need to change this patch).

Cheers
Bertrand
> ---
> recipes-bsp/grub/grub-efi_%.bbappend | 1 +
> recipes-bsp/grub/grub-efi_xen.inc    | 1 +
> 2 files changed, 2 insertions(+)
> create mode 100644 recipes-bsp/grub/grub-efi_%.bbappend
> create mode 100644 recipes-bsp/grub/grub-efi_xen.inc
> 
> diff --git a/recipes-bsp/grub/grub-efi_%.bbappend b/recipes-bsp/grub/grub-efi_%.bbappend
> new file mode 100644
> index 0000000..df2b688
> --- /dev/null
> +++ b/recipes-bsp/grub/grub-efi_%.bbappend
> @@ -0,0 +1 @@
> +require ${@bb.utils.contains('DISTRO_FEATURES', 'xen', '${BPN}_xen.inc', '', d)}
> diff --git a/recipes-bsp/grub/grub-efi_xen.inc b/recipes-bsp/grub/grub-efi_xen.inc
> new file mode 100644
> index 0000000..5aa0958
> --- /dev/null
> +++ b/recipes-bsp/grub/grub-efi_xen.inc
> @@ -0,0 +1 @@
> +GRUB_BUILDIN:append:aarch64 = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' xen_boot', '', d)}"
> -- 
> 2.17.1
> 
> 
> 
> 

Re: [meta-virtualization][PATCH 1/3] xen-tools: Load xen related kernel modules during system boot

[Bertrand Marquis]

Hi Kamil,

> On 8 Dec 2021, at 10:44, Kamil Dziezyk via lists.yoctoproject.org <kamil.dziezyk=arm.com@lists.yoctoproject.org> wrote:
> 
> This patch changes the location of xen.conf file, that contains list of kernel
> modules to be loaded during system boot, to "${nonarch_libdir}". This is done
> by removing '--with-systemd-modules-load=' flag from EXTRA_OECONF variable.
> 
> Previous path based on "${systemd_unitdir}" was not considered by default by
> systemd-modules-load.service.
> 
> Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>

Cheers
Bertrand

> ---
> recipes-extended/xen/xen-tools.inc | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc
> index d831941..6b99040 100644
> --- a/recipes-extended/xen/xen-tools.inc
> +++ b/recipes-extended/xen/xen-tools.inc
> @@ -653,10 +653,10 @@ FILES:${PN}-xm = "\
>     "
> 
> FILES:${PN}-xencommons += "\
> +    ${nonarch_libdir}/modules-load.d/xen.conf \
>     ${sysconfdir}/default/xencommons \
>     ${sysconfdir}/init.d/xencommons \
>     ${sysconfdir}/xen/scripts/launch-xenstore \
> -    ${systemd_unitdir}/modules-load.d/xen.conf \
>     ${systemd_unitdir}/system/proc-xen.mount \
>     ${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service \
>     ${systemd_unitdir}/system/xenconsoled.service \
> @@ -744,7 +744,6 @@ SYSTEMD_SERVICE:${PN}-xendomains = "xendomains.service"
> 
> EXTRA_OECONF += " \
>     --with-systemd=${systemd_unitdir}/system \
> -    --with-systemd-modules-load=${systemd_unitdir}/modules-load.d \
>     --with-initddir=${INIT_D_DIR} \
>     --with-sysconfig-leaf-dir=default \
>     --with-system-qemu=${bindir}/qemu-system-i386 \
> -- 
> 2.17.1
> 
> 
> 
> 

Re: [meta-virtualization][PATCH 1/3] xen-tools: Load xen related kernel modules during system boot

[Christopher Clark]

[-- Attachment #1: Type: text/plain, Size: 2822 bytes --]

On Wed, Dec 8, 2021 at 5:10 AM Bertrand Marquis <bertrand.marquis@arm.com>
wrote:

> Hi Kamil,
>
> > On 8 Dec 2021, at 10:44, Kamil Dziezyk via lists.yoctoproject.org
> <kamil.dziezyk=arm.com@lists.yoctoproject.org> wrote:
> >
> > This patch changes the location of xen.conf file, that contains list of
> kernel
> > modules to be loaded during system boot, to "${nonarch_libdir}". This is
> done
> > by removing '--with-systemd-modules-load=' flag from EXTRA_OECONF
> variable.
> >
> > Previous path based on "${systemd_unitdir}" was not considered by
> default by
> > systemd-modules-load.service.
>

ok, it does look like there's a fix that should be made here, thanks. It
took a bit of following to see what's involved, so:

There are two recipes in meta-openembedded that do use ${nonarch_libdir}
for this, but the systemd package itself doesn't: the recipe
has ${exec_prefix}/lib/modules-load.d instead, and there's a systemd patch
that applies ${exec_prefix}/lib/modules-load.d too; but then in oe-core,
bitbake.conf defines: nonarch_libdir = "${exec_prefix}/lib"
so the end result should work in the default configuration.

Khem: should the OE Core systemd recipe and patch be using
${nonarch_libdir} too? Or should the recipes that package modules.d config
files place them via ${exec_prefix}/lib ?

thanks

Christopher



> >
> > Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
> Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
>
> Cheers
> Bertrand
>
> > ---
> > recipes-extended/xen/xen-tools.inc | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/recipes-extended/xen/xen-tools.inc
> b/recipes-extended/xen/xen-tools.inc
> > index d831941..6b99040 100644
> > --- a/recipes-extended/xen/xen-tools.inc
> > +++ b/recipes-extended/xen/xen-tools.inc
> > @@ -653,10 +653,10 @@ FILES:${PN}-xm = "\
> >     "
> >
> > FILES:${PN}-xencommons += "\
> > +    ${nonarch_libdir}/modules-load.d/xen.conf \
> >     ${sysconfdir}/default/xencommons \
> >     ${sysconfdir}/init.d/xencommons \
> >     ${sysconfdir}/xen/scripts/launch-xenstore \
> > -    ${systemd_unitdir}/modules-load.d/xen.conf \
> >     ${systemd_unitdir}/system/proc-xen.mount \
> >     ${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service \
> >     ${systemd_unitdir}/system/xenconsoled.service \
> > @@ -744,7 +744,6 @@ SYSTEMD_SERVICE:${PN}-xendomains =
> "xendomains.service"
> >
> > EXTRA_OECONF += " \
> >     --with-systemd=${systemd_unitdir}/system \
> > -    --with-systemd-modules-load=${systemd_unitdir}/modules-load.d \
> >     --with-initddir=${INIT_D_DIR} \
> >     --with-sysconfig-leaf-dir=default \
> >     --with-system-qemu=${bindir}/qemu-system-i386 \
> > --
> > 2.17.1
> >
> >
> >
> >
>
>
> 
>
>

[-- Attachment #2: Type: text/html, Size: 3991 bytes --]

Re: [meta-virtualization][PATCH 1/3] xen-tools: Load xen related kernel modules during system boot

[Christopher Clark]

[-- Attachment #1: Type: text/plain, Size: 3719 bytes --]

On Wed, Dec 8, 2021 at 6:35 PM Khem Raj <raj.khem@gmail.com> wrote:

>
> On Wed, Dec 8, 2021 at 6:24 PM Christopher Clark <
> christopher.w.clark@gmail.com> wrote:
>
>> On Wed, Dec 8, 2021 at 5:10 AM Bertrand Marquis <bertrand.marquis@arm.com>
>> wrote:
>>
>>> Hi Kamil,
>>>
>>> > On 8 Dec 2021, at 10:44, Kamil Dziezyk via lists.yoctoproject.org
>>> <kamil.dziezyk=arm.com@lists.yoctoproject.org> wrote:
>>> >
>>> > This patch changes the location of xen.conf file, that contains list
>>> of kernel
>>> > modules to be loaded during system boot, to "${nonarch_libdir}". This
>>> is done
>>> > by removing '--with-systemd-modules-load=' flag from EXTRA_OECONF
>>> variable.
>>> >
>>> > Previous path based on "${systemd_unitdir}" was not considered by
>>> default by
>>> > systemd-modules-load.service.
>>>
>>
>> ok, it does look like there's a fix that should be made here, thanks. It
>> took a bit of following to see what's involved, so:
>>
>> There are two recipes in meta-openembedded that do use ${nonarch_libdir}
>> for this, but the systemd package itself doesn't: the recipe
>> has ${exec_prefix}/lib/modules-load.d instead, and there's a systemd patch
>> that applies ${exec_prefix}/lib/modules-load.d too; but then in oe-core,
>> bitbake.conf defines: nonarch_libdir = "${exec_prefix}/lib"
>> so the end result should work in the default configuration.
>>
>> Khem: should the OE Core systemd recipe and patch be using
>> ${nonarch_libdir} too? Or should the recipes that package modules.d config
>> files place them via ${exec_prefix}/lib ?
>>
>
> I think nonarch_libdir is right option here
>

Thanks, Khem.

Kamil: Is there any reason that you chose to drop specifying the install
directory via the flags passed to EXTRA_OECONF?
ie. An alternative would be: rather than remove the
"--with-systemd-modules-load" flag, you could update it to use the correct
location:
    ${nonarch_libdir}/modules-load.d
so that if exec_prefix or nonarch_libdir are ever overridden to a
non-default value, the config file will still be placed correctly.

Christopher




>
>> thanks
>>
>> Christopher
>>
>>
>>
>>> >
>>> > Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
>>> Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
>>>
>>> Cheers
>>> Bertrand
>>>
>>> > ---
>>> > recipes-extended/xen/xen-tools.inc | 3 +--
>>> > 1 file changed, 1 insertion(+), 2 deletions(-)
>>> >
>>> > diff --git a/recipes-extended/xen/xen-tools.inc
>>> b/recipes-extended/xen/xen-tools.inc
>>> > index d831941..6b99040 100644
>>> > --- a/recipes-extended/xen/xen-tools.inc
>>> > +++ b/recipes-extended/xen/xen-tools.inc
>>> > @@ -653,10 +653,10 @@ FILES:${PN}-xm = "\
>>> >     "
>>> >
>>> > FILES:${PN}-xencommons += "\
>>> > +    ${nonarch_libdir}/modules-load.d/xen.conf \
>>> >     ${sysconfdir}/default/xencommons \
>>> >     ${sysconfdir}/init.d/xencommons \
>>> >     ${sysconfdir}/xen/scripts/launch-xenstore \
>>> > -    ${systemd_unitdir}/modules-load.d/xen.conf \
>>> >     ${systemd_unitdir}/system/proc-xen.mount \
>>> >     ${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service \
>>> >     ${systemd_unitdir}/system/xenconsoled.service \
>>> > @@ -744,7 +744,6 @@ SYSTEMD_SERVICE:${PN}-xendomains =
>>> "xendomains.service"
>>> >
>>> > EXTRA_OECONF += " \
>>> >     --with-systemd=${systemd_unitdir}/system \
>>> > -    --with-systemd-modules-load=${systemd_unitdir}/modules-load.d \
>>> >     --with-initddir=${INIT_D_DIR} \
>>> >     --with-sysconfig-leaf-dir=default \
>>> >     --with-system-qemu=${bindir}/qemu-system-i386 \
>>> > --
>>> > 2.17.1
>>> >
>>> >
>>> >
>>> >
>>>
>>>
>>> 
>>>
>>>

[-- Attachment #2: Type: text/html, Size: 5826 bytes --]

Re: [PATCH 1/3] xen-tools: Load xen related kernel modules during system boot

[Kamil Dziezyk]

[-- Attachment #1: Type: text/plain, Size: 374 bytes --]

Hi Christopher,

> 
> 
> 
> Is there any reason that you chose to drop specifying the install
> directory via the flags passed to EXTRA_OECONF?
> 
> 

I have dropped setting install directory, because it seemed for me to be redundant,

but I missed the case, when user customize exec_prefix or nonarch_libdir, so I will apply your suggestion.

Thanks, Kamil

[-- Attachment #2: Type: text/html, Size: 412 bytes --]