Skip to content

Conversation

@smcavoy
Copy link

@smcavoy smcavoy commented Nov 19, 2021

This enable several features used for hosting virtual machines. The LXD platform specifically use these features.

LXD specifically targets Raspberry Pi as a platform

Enabling these features makes it easier for OS packagers to include functional LXD on Raspberry Pi easily.

@pelwell
Copy link
Contributor

pelwell commented Nov 19, 2021

This kind of PR is relatively easy to approve, in that it just requests some modules to be enabled - the core kernel is unchanged. Although there are 6 new modules, they aren't huge:

31592 drivers/vhost/vhost_vsock.ko
11656 drivers/net/vsockmon.ko
8600  net/vmw_vsock/vsock_diag.ko
59136 net/vmw_vsock/vmw_vsock_virtio_transport_common.ko
68280 net/vmw_vsock/vsock.ko
13760 net/vmw_vsock/vsock_loopback.ko

However, I do want you to update the PR to put the new config options into the natural order. You can do this for e.g. bcm2711_defconfig by:

$ make ARCH=arm64 bcm2711_defconfig
$ make ARCH=arm64 savedefconfig
$ cp defconfig arch/arm64/configs/bcm2711_defconfig

Once you've done that for both defconfig files you can either push the changes as a followup commit which I can then squash while merging, or squash/amend it at your end, git push -f to update your PR then I can just merge it.

Either way, add a comment here when you're done.

@pelwell
Copy link
Contributor

pelwell commented Nov 19, 2021

The updated commit looks correct with respect to the file order, but it has lost three modules:

-CONFIG_VSOCKETS_DIAG=m
-CONFIG_VSOCKETS_LOOPBACK=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m

Is that intentional?

@smcavoy
Copy link
Author

smcavoy commented Nov 19, 2021

That was not intentional. I am just looking into that now. will update in just a few.

@smcavoy
Copy link
Author

smcavoy commented Nov 19, 2021

with the unsorted modules enabled in the defconfig the .config is configured with the correct modules enabled (specifically the 3 mentioned). When savedefconfig is run the modules are not enabled in the defconfig file.
Any thoughts?

@pelwell
Copy link
Contributor

pelwell commented Nov 19, 2021

It's fine - those options are implied by the others (if you look in the .config file you'll find they are still present).

@pelwell pelwell merged commit d4077a1 into raspberrypi:rpi-5.10.y Nov 19, 2021
@pelwell
Copy link
Contributor

pelwell commented Nov 19, 2021

(I should have spotted that sooner)

@smcavoy
Copy link
Author

smcavoy commented Nov 19, 2021

I created another PR for 5.15.y

Thanks for the help

popcornmix added a commit to raspberrypi/firmware that referenced this pull request Nov 22, 2021
kernel: enable several virtual devices for hosting virtual machines
See: raspberrypi/linux#4712

kernel: configs: add LEDS_PWM=y
See: raspberrypi/linux#4668

kernel: configs: add CONFIG_HID_PLAYSTATION=m and CONFIG_PLAYSTATION_FF=y
See: raspberrypi/linux#4721

kernel: configs: Add USB gadget support (for Zero 2 W)
See: #1654
popcornmix added a commit to raspberrypi/rpi-firmware that referenced this pull request Nov 22, 2021
kernel: enable several virtual devices for hosting virtual machines
See: raspberrypi/linux#4712

kernel: configs: add LEDS_PWM=y
See: raspberrypi/linux#4668

kernel: configs: add CONFIG_HID_PLAYSTATION=m and CONFIG_PLAYSTATION_FF=y
See: raspberrypi/linux#4721

kernel: configs: Add USB gadget support (for Zero 2 W)
See: raspberrypi/firmware#1654
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants