[9.4-stable] Add Support for Persistent OVMF Settings in Pillar #4269

shjala · 2024-09-18T17:04:33Z

Backport of #4261.

pkg/pillar/Dockerfile

shjala · 2024-09-19T13:06:58Z

May God be with us, and may the semicolons fall exactly where they should!

OhmSpectator · 2024-09-19T15:05:06Z

pkg/pillar/hypervisor/kvm.go

+func getFmlCustomResolution(status *types.DomainStatus, globalConfig *types.ConfigItemValueMap) (string, error) {
+	fmlResolutions := status.FmlCustomResolution
+	// if not set in the domain status, try to get it from the global config
+	if fmlResolutions == types.FmlResolutionUnset {


@shjala, are you sure about this line? I the master branch I had to add a comparison with "" here. For some reason, it was a case...

the status.FmlCustomResolution is always set from the domainmanager, either to a custom resolution that was read from the "cloud-config" or if nothing present in the "cloud-config" is set to Unset.

But now that you mentioned I think I should add a single line in case there is no "cloud-config" at all, but that shouldn't prevent us from testing, still can use the global config or "cloud-config".

Yesterday, without this extra check for "", I got a situation when file resolution was set to "", and it resulted in the wrong filename and crash on app start.

I HOPE IT WILL NOT BE THE CASE NOW, AFTER HOURS OF WAITING FOR THE HECKING WIN APP TO BE DOWNLOADED. Sorry =D

I tested it on 9.4 multiple times, both cloud-config and global config where working fine.

you can check for yourself logread -f | grep FmlResolution.

My deployment process has yet to reach the point where this code is called...

OhmSpectator · 2024-09-19T19:50:26Z

Manual test failed =( Will have to retest with a smaller app (

OhmSpectator

Approving to see the Eden tests results.

shjala · 2024-09-20T08:12:00Z

Didn't we updated the UEFI hash? build is failing on Eden.

OhmSpectator · 2024-09-20T09:06:15Z

Didn't we updated the UEFI hash? build is failing on Eden.

We should revert the changes in the UEFI package and hence - not update the hash. I remove the 2 corresponding commits from the master PR (updating UEFI, updating hsashes)

OhmSpectator · 2024-09-20T09:35:19Z

These commits should be dropped:

OhmSpectator · 2024-09-20T12:27:04Z

I'm taking care of the PR to sync it with the master version.

shjala · 2024-09-20T13:14:08Z

I'm taking care of the PR to sync it with the master version.

awesome, thanks!

This commit copies OVMF_VARS.fd into the pillar container by adding it to /usr/lib/xen/boot/ovmf_vars.bin. It is important that the file is available in the pillar container because Pillar will create per-domain copies of it stored in /persist, which are then accessible to the xen-tools container. This sets the groundwork for enabling virtual machines to save and retain UEFI settings across reboots by using per-domain NVRAM files. Signed-off-by: Nikolay Martyanov <nikolay@zededa.com>

Introduce support for managing per-domain OVMF_VARS.fd files, which are essential for maintaining persistent UEFI settings for FML guests. It adds functionality to prepare and clean up individual OVMF settings files stored in the persist directory, ensuring that each virtual machine has its own dedicated NVRAM file. The VM configuration structures are updated to reference the bootloader settings file, enabling the creation of unique UEFI variable stores for each domain. Signed-off-by: Nikolay Martyanov <nikolay@zededa.com>

Switch to using separate OVMF_CODE.fd and OVMF_VARS.fd files for FML x86 modes instead of a combined .bin file. This ensures that settings are stored correctly and maintains consistent naming conventions. These changes do not affect containers, ARM or Xen. To support ARM the OVMF build should produce separate files. Currently it produces QEMU_EFI that incorporates both code and variable sections. Signed-off-by: Nikolay Martyanov <nikolay@zededa.com>

Add a new global config value app.fml.resolution to set custom resolution for FML apps. This is a string value in the format of "widthxheight". This value can be set device-wide as a global config value or set in a per-app/vm setting by defining it as top-level variable in the cloud-config. Signed-off-by: Shahriyar Jalayeri <shahriyar@zededa.com>

Implemented logic to select predefined OVMF_VARS.fd files for specific screen resolutions. Added pre-saved OVMF settings for 800x600, 1024x768, 1280x800, and 1920x1080 resolutions, ensuring clean boot entries. Signed-off-by: Nikolay Martyanov <nikolay@zededa.com>

Adapt the existing tests to account for the addition of the OVMF settings file for FML guests, ensuring the expected output includes the BootLoader. It also fixes the ARM tests by ensuring the firmware line is present in the expected configuration, aligning the tests with the updated behavior for UEFI boot on both AMD64 and ARM architectures. Signed-off-by: Nikolay Martyanov <nikolay@zededa.com>

OhmSpectator

Approving to run Eden

In the FIRMWARE doc, add a new section explaining what OVMF is, when it's used in EVE, the key OVMF files, how settings are managed, and future automation plans. Signed-off-by: Nikolay Martyanov <nikolay@zededa.com>

eriknordmark · 2024-09-20T20:39:08Z

Backport of #4261 and #4264 .

Seems like all of the commits are in #4261 so it makes sense to update the description.

OhmSpectator · 2024-09-22T08:07:37Z

Eden fails to start QEMU with EVE (not Application!) with this error:

qemu-system-x86_64:/home/runner/.eden/default-qemu.conf:8: Could not open '/home/runner/work/eve/eve/dist/default-images/eve/OVMF_CODE.fd': No such file or directory

That's strange... I remember we had this problem previously and I hope it does not related to the changes.

I see the following fix by @milan-zededa in the Eden repo that fixes similar issue:
lf-edge/eden@33ed9a7

So I would either ignore the Eden tests failure or ask @milan-zededa and @uncleDecart to help with the Eden tests fix.

OhmSpectator

Rerun workflows

OhmSpectator · 2024-09-23T08:22:39Z

I'll close this PR and create a new one (into the "-stable" branch) to trigger the necessary workflows.

shjala requested review from eriknordmark and rvs as code owners September 18, 2024 17:04

shjala marked this pull request as draft September 18, 2024 18:56

shjala changed the title ~~[WIP] [9.4-backport] Add config for FML mode custom resolution~~ [WIP] [9.4-backport] Add Support for Persistent OVMF Settings in Pillar Sep 19, 2024

shjala force-pushed the 9.4_backport_fml.config branch from cd33c2b to 1dcff8b Compare September 19, 2024 11:14

OhmSpectator force-pushed the 9.4_backport_fml.config branch from 1dcff8b to 8a9d13f Compare September 19, 2024 12:09

OhmSpectator reviewed Sep 19, 2024

View reviewed changes

pkg/pillar/Dockerfile Show resolved Hide resolved

OhmSpectator force-pushed the 9.4_backport_fml.config branch 2 times, most recently from ddead4c to cf803d2 Compare September 19, 2024 12:35

shjala changed the title ~~[WIP] [9.4-backport] Add Support for Persistent OVMF Settings in Pillar~~ [9.4-backport] Add Support for Persistent OVMF Settings in Pillar Sep 19, 2024

OhmSpectator force-pushed the 9.4_backport_fml.config branch from cf803d2 to ec1945c Compare September 19, 2024 12:41

OhmSpectator reviewed Sep 19, 2024

View reviewed changes

OhmSpectator approved these changes Sep 19, 2024

View reviewed changes

shjala force-pushed the 9.4_backport_fml.config branch from 1cbfdbf to 4b43aa3 Compare September 20, 2024 08:58

shjala force-pushed the 9.4_backport_fml.config branch from 4b43aa3 to d0478ce Compare September 20, 2024 09:08

OhmSpectator mentioned this pull request Sep 20, 2024

Add Support for Persistent OVMF Settings in Pillar #4261

Merged

5 tasks

shjala force-pushed the 9.4_backport_fml.config branch from d0478ce to ce346d5 Compare September 20, 2024 12:10

OhmSpectator and others added 6 commits September 20, 2024 16:16

OhmSpectator force-pushed the 9.4_backport_fml.config branch from ce346d5 to ba0e367 Compare September 20, 2024 16:29

OhmSpectator changed the title ~~[9.4-backport] Add Support for Persistent OVMF Settings in Pillar~~ [9.4-stable] Add Support for Persistent OVMF Settings in Pillar Sep 20, 2024

OhmSpectator marked this pull request as ready for review September 20, 2024 16:31

OhmSpectator approved these changes Sep 20, 2024

View reviewed changes

docs: Describe OVMF usage.

a81a9cc

In the FIRMWARE doc, add a new section explaining what OVMF is, when it's used in EVE, the key OVMF files, how settings are managed, and future automation plans. Signed-off-by: Nikolay Martyanov <nikolay@zededa.com>

OhmSpectator approved these changes Sep 20, 2024

View reviewed changes

OhmSpectator changed the base branch from 9.4-stable-EOS to 9.4-stable September 23, 2024 08:16

OhmSpectator approved these changes Sep 23, 2024

View reviewed changes

OhmSpectator closed this Sep 23, 2024

OhmSpectator mentioned this pull request Sep 23, 2024

[9.4-stable] Add Support for Persistent OVMF Settings in Pillar #4276

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[9.4-stable] Add Support for Persistent OVMF Settings in Pillar #4269

[9.4-stable] Add Support for Persistent OVMF Settings in Pillar #4269

shjala commented Sep 18, 2024 •

edited by OhmSpectator

Loading

shjala commented Sep 19, 2024

OhmSpectator Sep 19, 2024

shjala Sep 19, 2024 •

edited

Loading

OhmSpectator Sep 19, 2024 •

edited

Loading

shjala Sep 19, 2024

shjala Sep 19, 2024

OhmSpectator Sep 19, 2024

OhmSpectator commented Sep 19, 2024

OhmSpectator left a comment

shjala commented Sep 20, 2024

OhmSpectator commented Sep 20, 2024

OhmSpectator commented Sep 20, 2024

OhmSpectator commented Sep 20, 2024

shjala commented Sep 20, 2024

OhmSpectator left a comment

eriknordmark commented Sep 20, 2024

OhmSpectator commented Sep 22, 2024 •

edited

Loading

OhmSpectator left a comment

OhmSpectator commented Sep 23, 2024

[9.4-stable] Add Support for Persistent OVMF Settings in Pillar #4269

[9.4-stable] Add Support for Persistent OVMF Settings in Pillar #4269

Conversation

shjala commented Sep 18, 2024 • edited by OhmSpectator Loading

shjala commented Sep 19, 2024

OhmSpectator Sep 19, 2024

Choose a reason for hiding this comment

shjala Sep 19, 2024 • edited Loading

Choose a reason for hiding this comment

OhmSpectator Sep 19, 2024 • edited Loading

Choose a reason for hiding this comment

shjala Sep 19, 2024

Choose a reason for hiding this comment

shjala Sep 19, 2024

Choose a reason for hiding this comment

OhmSpectator Sep 19, 2024

Choose a reason for hiding this comment

OhmSpectator commented Sep 19, 2024

OhmSpectator left a comment

Choose a reason for hiding this comment

shjala commented Sep 20, 2024

OhmSpectator commented Sep 20, 2024

OhmSpectator commented Sep 20, 2024

OhmSpectator commented Sep 20, 2024

shjala commented Sep 20, 2024

OhmSpectator left a comment

Choose a reason for hiding this comment

eriknordmark commented Sep 20, 2024

OhmSpectator commented Sep 22, 2024 • edited Loading

OhmSpectator left a comment

Choose a reason for hiding this comment

OhmSpectator commented Sep 23, 2024

shjala commented Sep 18, 2024 •

edited by OhmSpectator

Loading

shjala Sep 19, 2024 •

edited

Loading

OhmSpectator Sep 19, 2024 •

edited

Loading

OhmSpectator commented Sep 22, 2024 •

edited

Loading