On Wed, Jan 18, 2023 at 12:27:40PM -0800, Bobby Eshleman wrote:
Add the ability to use vsock in the vmtest.sh script and
the test kernel config.
Signed-off-by: Bobby Eshleman <bobby.eshleman@xxxxxxxxxxxxx>
---
tools/testing/selftests/bpf/config.x86_64 | 4 ++++
tools/testing/selftests/bpf/vmtest.sh | 1 +
2 files changed, 5 insertions(+)
diff --git a/tools/testing/selftests/bpf/config.x86_64 b/tools/testing/selftests/bpf/config.x86_64
index dd97d61d325ca..db5e6b9a91711 100644
--- a/tools/testing/selftests/bpf/config.x86_64
+++ b/tools/testing/selftests/bpf/config.x86_64
@@ -234,7 +234,11 @@ CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CONSOLE=y
CONFIG_VIRTIO_NET=y
CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_VSOCKETS=y
+CONFIG_VIRTIO_VSOCKETS_COMMON=y
CONFIG_VLAN_8021Q=y
+CONFIG_VSOCKETS=y
+CONFIG_VSOCKETS_LOOPBACK=y
CONFIG_X86_ACPI_CPUFREQ=y
CONFIG_X86_CPUID=y
CONFIG_X86_MSR=y
diff --git a/tools/testing/selftests/bpf/vmtest.sh b/tools/testing/selftests/bpf/vmtest.sh
index 316a56d680f25..aad27ffd4ec68 100755
--- a/tools/testing/selftests/bpf/vmtest.sh
+++ b/tools/testing/selftests/bpf/vmtest.sh
@@ -250,6 +250,7 @@ EOF
-enable-kvm \
-m 4G \
-drive file="${rootfs_img}",format=raw,index=1,media=disk,if=virtio,cache=none \
+ -device vhost-vsock-pci,guest-cid=1234 \
I'm not sure if this will work with qemu-system-s390x and
qemu-system-aarch64.
Maybe the "virt" machine of qemu-system-aarch64 supports PCI, but IIRC
s390x doesn't support it and we should use the vhost-vsock-ccw device.
In addition, we are changing only config.x86_64, so maybe we should add
the vhost-vsock-pci device only for x86_64 (maybe in the QEMU_FLAGS or a
new VSOCK_DEV variable), and run the tests only for that architecture.
Thanks,
Stefano
-kernel "${kernel_bzimage}" \
-append "root=/dev/vda rw console=${QEMU_CONSOLE}"
}
--
2.30.2
