Commit dba86b7d authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'selftests-virtio_net-introduce-initial-testing-infrastructure' 

Jiri Pirko says:

====================
selftests: virtio_net: introduce initial testing infrastructure

This patchset aims at introducing very basic initial infrastructure
for virtio_net testing, namely it focuses on virtio feature testing.

The first patch adds support for debugfs for virtio devices, allowing
user to filter features to pretend to be driver that is not capable
of the filtered feature.

Example:
$ cat /sys/bus/virtio/devices/virtio0/features
1110010111111111111101010000110010000000100000000000000000000000
$ echo "5" >/sys/kernel/debug/virtio/virtio0/filter_feature_add
$ cat /sys/kernel/debug/virtio/virtio0/filter_features
5
$ echo "virtio0" > /sys/bus/virtio/drivers/virtio_net/unbind
$ echo "virtio0" > /sys/bus/virtio/drivers/virtio_net/bind
$ cat /sys/bus/virtio/devices/virtio0/features
1110000111111111111101010000110010000000100000000000000000000000

Leverage that in the last patch that lays ground for virtio_net
selftests testing, including very basic F_MAC feature test.

To run this, do:
$ make -C tools/testing/selftests/ TARGETS=drivers/net/virtio_net/ run_tests

It is assumed, as with lot of other selftests in the net group,
that there are netdevices connected back-to-back. In this case,
two virtio_net devices connected back to back. If you use "tap" qemu
netdevice type, to configure this loop on a hypervisor, one may use
this script:

DEV1="$1"
DEV2="$2"

sudo tc qdisc add dev $DEV1 clsact
sudo tc qdisc add dev $DEV2 clsact
sudo tc filter add dev $DEV1 ingress protocol all pref 1 matchall action mirred egress redirect dev $DEV2
sudo tc filter add dev $DEV2 ingress protocol all pref 1 matchall action mirred egress redirect dev $DEV1
sudo ip link set $DEV1 up
sudo ip link set $DEV2 up

Another possibility is to use virtme-ng like this:
$ vng --network=loop
or directly:
$ vng --network=loop -- make -C tools/testing/selftests/ TARGETS=drivers/net/virtio_net/ run_tests

"loop" network type will take care of creating two "hubport" qemu netdevs
putting them into a single hub.

To do it manually with qemu, pass following command line options:
-nic hubport,hubid=1,id=nd0,model=virtio-net-pci
-nic hubport,hubid=1,id=nd1,model=virtio-net-pci
====================

Link: https://lore.kernel.org/r/20240424104049.3935572-1-jiri@resnulli.us


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents fc48de77 ccfaed04

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -23466,6 +23466,7 @@ F: include/linux/virtio*.h 
F:	include/linux/vringh.h

F:	include/uapi/linux/virtio_*.h

F:	tools/virtio/

F:	tools/testing/selftests/drivers/net/virtio_net/









VIRTIO CRYPTO DRIVER









M:	Gonglei <arei.gonglei@huawei.com>

























drivers/virtio/Kconfig



+10
−0






























Original line number
Diff line number
Diff line







@@ -178,4 +178,14 @@ config VIRTIO_DMA_SHARED_BUFFER







	 This option adds a flavor of dma buffers that are backed by









	 virtio resources.



















config VIRTIO_DEBUG









	bool "Debug facilities"









	depends on VIRTIO









	help









	  Enable this to expose debug facilities over debugfs.









	  This allows to debug features, to see what features the device









	  advertises and to set filter for features used by driver.



















	  If unsure, say N.



















endif # VIRTIO_MENU
























drivers/virtio/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -13,3 +13,4 @@ obj-$(CONFIG_VIRTIO_INPUT) += virtio_input.o







obj-$(CONFIG_VIRTIO_VDPA) += virtio_vdpa.o









obj-$(CONFIG_VIRTIO_MEM) += virtio_mem.o









obj-$(CONFIG_VIRTIO_DMA_SHARED_BUFFER) += virtio_dma_buf.o









obj-$(CONFIG_VIRTIO_DEBUG) += virtio_debug.o
























drivers/virtio/virtio.c



+8
−0






























Original line number
Diff line number
Diff line







@@ -274,6 +274,9 @@ static int virtio_dev_probe(struct device *_d)







	else









		dev->features = driver_features_legacy & device_features;



















	/* When debugging, user may filter some features by hand. */









	virtio_debug_device_filter_features(dev);



















	/* Transport features always preserved to pass to finalize_features. */









	for (i = VIRTIO_TRANSPORT_F_START; i < VIRTIO_TRANSPORT_F_END; i++)









		if (device_features & (1ULL << i))








@@ -465,6 +468,8 @@ int register_virtio_device(struct virtio_device *dev)







	/* Acknowledge that we've seen the device. */









	virtio_add_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE);



















	virtio_debug_device_init(dev);



















	/*









	 * device_add() causes the bus infrastructure to look for a matching









	 * driver.








@@ -496,6 +501,7 @@ void unregister_virtio_device(struct virtio_device *dev)







	int index = dev->index; /* save for after device release */



















	device_unregister(&dev->dev);









	virtio_debug_device_exit(dev);









	ida_free(&virtio_index_ida, index);









}









EXPORT_SYMBOL_GPL(unregister_virtio_device);








@@ -590,11 +596,13 @@ static int virtio_init(void)







{









	if (bus_register(&virtio_bus) != 0)









		panic("virtio bus registration failed");









	virtio_debug_init();









	return 0;









}



















static void __exit virtio_exit(void)









{









	virtio_debug_exit();









	bus_unregister(&virtio_bus);









	ida_destroy(&virtio_index_ida);









}
































drivers/virtio/virtio_debug.c
0 → 100644



+114
−0






























Original line number
Diff line number
Diff line









// SPDX-License-Identifier: GPL-2.0-or-later



















#include <linux/virtio.h>









#include <linux/virtio_config.h>









#include <linux/debugfs.h>



















static struct dentry *virtio_debugfs_dir;



















static int virtio_debug_device_features_show(struct seq_file *s, void *data)









{









	struct virtio_device *dev = s->private;









	u64 device_features;









	unsigned int i;



















	device_features = dev->config->get_features(dev);









	for (i = 0; i < BITS_PER_LONG_LONG; i++) {









		if (device_features & (1ULL << i))









			seq_printf(s, "%u\n", i);









	}









	return 0;









}









DEFINE_SHOW_ATTRIBUTE(virtio_debug_device_features);



















static int virtio_debug_filter_features_show(struct seq_file *s, void *data)









{









	struct virtio_device *dev = s->private;









	unsigned int i;



















	for (i = 0; i < BITS_PER_LONG_LONG; i++) {









		if (dev->debugfs_filter_features & (1ULL << i))









			seq_printf(s, "%u\n", i);









	}









	return 0;









}









DEFINE_SHOW_ATTRIBUTE(virtio_debug_filter_features);



















static int virtio_debug_filter_features_clear(void *data, u64 val)









{









	struct virtio_device *dev = data;



















	if (val == 1)









		dev->debugfs_filter_features = 0;









	return 0;









}



















DEFINE_DEBUGFS_ATTRIBUTE(virtio_debug_filter_features_clear_fops, NULL,









			 virtio_debug_filter_features_clear, "%llu\n");



















static int virtio_debug_filter_feature_add(void *data, u64 val)









{









	struct virtio_device *dev = data;



















	if (val >= BITS_PER_LONG_LONG)









		return -EINVAL;









	dev->debugfs_filter_features |= BIT_ULL_MASK(val);









	return 0;









}



















DEFINE_DEBUGFS_ATTRIBUTE(virtio_debug_filter_feature_add_fops, NULL,









			 virtio_debug_filter_feature_add, "%llu\n");



















static int virtio_debug_filter_feature_del(void *data, u64 val)









{









	struct virtio_device *dev = data;



















	if (val >= BITS_PER_LONG_LONG)









		return -EINVAL;









	dev->debugfs_filter_features &= ~BIT_ULL_MASK(val);









	return 0;









}



















DEFINE_DEBUGFS_ATTRIBUTE(virtio_debug_filter_feature_del_fops, NULL,









			 virtio_debug_filter_feature_del, "%llu\n");



















void virtio_debug_device_init(struct virtio_device *dev)









{









	dev->debugfs_dir = debugfs_create_dir(dev_name(&dev->dev),









					      virtio_debugfs_dir);









	debugfs_create_file("device_features", 0400, dev->debugfs_dir, dev,









			    &virtio_debug_device_features_fops);









	debugfs_create_file("filter_features", 0400, dev->debugfs_dir, dev,









			    &virtio_debug_filter_features_fops);









	debugfs_create_file("filter_features_clear", 0200, dev->debugfs_dir, dev,









			    &virtio_debug_filter_features_clear_fops);









	debugfs_create_file("filter_feature_add", 0200, dev->debugfs_dir, dev,









			    &virtio_debug_filter_feature_add_fops);









	debugfs_create_file("filter_feature_del", 0200, dev->debugfs_dir, dev,









			    &virtio_debug_filter_feature_del_fops);









}









EXPORT_SYMBOL_GPL(virtio_debug_device_init);



















void virtio_debug_device_filter_features(struct virtio_device *dev)









{









	dev->features &= ~dev->debugfs_filter_features;









}









EXPORT_SYMBOL_GPL(virtio_debug_device_filter_features);



















void virtio_debug_device_exit(struct virtio_device *dev)









{









	debugfs_remove_recursive(dev->debugfs_dir);









}









EXPORT_SYMBOL_GPL(virtio_debug_device_exit);



















void virtio_debug_init(void)









{









	virtio_debugfs_dir = debugfs_create_dir("virtio", NULL);









}









EXPORT_SYMBOL_GPL(virtio_debug_init);



















void virtio_debug_exit(void)









{









	debugfs_remove_recursive(virtio_debugfs_dir);









}









EXPORT_SYMBOL_GPL(virtio_debug_exit);