Commit a15d80a1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ynl-tests' 

Jakub Kicinski says:

====================
selftests: net: groundwork for YNL-based tests

Currently the options for writing networking tests are C, bash or
some mix of the two. YAML/Netlink gives us the ability to easily
interface with Netlink in higher level laguages. In particular,
there is a Python library already available in tree, under tools/net.
Add the scaffolding which allows writing tests using this library.

The "scaffolding" is needed because the library lives under
tools/net and uses YAML files from under Documentation/.
So we need a small amount of glue code to find those things
and add them to TEST_FILES.

This series adds both a basic SW sanity test and driver
test which can be run against netdevsim or a real device.
When I develop core code I usually test with netdevsim,
then a real device, and then a backport to Meta's kernel.
Because of the lack of integration, until now I had
to throw away the (YNL-based) test script and netdevsim code.

Running tests in tree directly:

 $ ./tools/testing/selftests/net/nl_netdev.py
 KTAP version 1
 1..2
 ok 1 nl_netdev.empty_check
 ok 2 nl_netdev.lo_check
 # Totals: pass:2 fail:0 xfail:0 xpass:0 skip:0 error:0

in tree via make:

 $ make -C tools/testing/selftests/ TARGETS=net \
	TEST_PROGS=nl_netdev.py TEST_GEN_PROGS="" run_tests
  [ ... ]

and installed externally, all seem to work:

 $ make -C tools/testing/selftests/ TARGETS=net \
	install INSTALL_PATH=/tmp/ksft-net
 $ /tmp/ksft-net/run_kselftest.sh -t net:nl_netdev.py
  [ ... ]

For driver tests I followed the lead of net/forwarding and
get the device name from env and/or a config file.

v3:
 - fix up netdevsim C
 - various small nits in other patches (see changelog in patches)
v2: https://lore.kernel.org/all/20240403023426.1762996-1-kuba@kernel.org/
 - don't add to TARGETS, create a deperate variable with deps
 - support and use with
 - support and use passing arguments to tests
v1: https://lore.kernel.org/all/20240402010520.1209517-1-kuba@kernel.org/


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d7d6e470 f0e6c86e

drivers/net/netdevsim/ethtool.c

+11 −0
Original line number Diff line number Diff line
@@ -140,6 +140,13 @@ nsim_set_fecparam(struct net_device *dev, struct ethtool_fecparam *fecparam) 
	return 0;

}



static void

nsim_get_fec_stats(struct net_device *dev, struct ethtool_fec_stats *fec_stats)

{

	fec_stats->corrected_blocks.total = 123;

	fec_stats->uncorrectable_blocks.total = 4;

}



static int nsim_get_ts_info(struct net_device *dev,

			    struct ethtool_ts_info *info)

{
@@ -163,6 +170,7 @@ static const struct ethtool_ops nsim_ethtool_ops = { 
	.set_channels			= nsim_set_channels,

	.get_fecparam			= nsim_get_fecparam,

	.set_fecparam			= nsim_set_fecparam,

	.get_fec_stats			= nsim_get_fec_stats,

	.get_ts_info			= nsim_get_ts_info,

};
@@ -182,6 +190,9 @@ void nsim_ethtool_init(struct netdevsim *ns) 


	nsim_ethtool_ring_init(ns);



	ns->ethtool.pauseparam.report_stats_rx = true;

	ns->ethtool.pauseparam.report_stats_tx = true;



	ns->ethtool.fec.fec = ETHTOOL_FEC_NONE;

	ns->ethtool.fec.active_fec = ETHTOOL_FEC_NONE;

drivers/net/netdevsim/netdev.c

+49 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/module.h>

#include <linux/netdevice.h>

#include <linux/slab.h>

#include <net/netdev_queues.h>

#include <net/netlink.h>

#include <net/pkt_cls.h>

#include <net/rtnetlink.h>
@@ -330,6 +331,53 @@ static const struct net_device_ops nsim_vf_netdev_ops = { 
	.ndo_set_features	= nsim_set_features,

};



/* We don't have true per-queue stats, yet, so do some random fakery here.

 * Only report stuff for queue 0.

 */

static void nsim_get_queue_stats_rx(struct net_device *dev, int idx,

				    struct netdev_queue_stats_rx *stats)

{

	struct rtnl_link_stats64 rtstats = {};



	if (!idx)

		nsim_get_stats64(dev, &rtstats);



	stats->packets = rtstats.rx_packets - !!rtstats.rx_packets;

	stats->bytes = rtstats.rx_bytes;

}



static void nsim_get_queue_stats_tx(struct net_device *dev, int idx,

				    struct netdev_queue_stats_tx *stats)

{

	struct rtnl_link_stats64 rtstats = {};



	if (!idx)

		nsim_get_stats64(dev, &rtstats);



	stats->packets = rtstats.tx_packets - !!rtstats.tx_packets;

	stats->bytes = rtstats.tx_bytes;

}



static void nsim_get_base_stats(struct net_device *dev,

				struct netdev_queue_stats_rx *rx,

				struct netdev_queue_stats_tx *tx)

{

	struct rtnl_link_stats64 rtstats = {};



	nsim_get_stats64(dev, &rtstats);



	rx->packets = !!rtstats.rx_packets;

	rx->bytes = 0;

	tx->packets = !!rtstats.tx_packets;

	tx->bytes = 0;

}



static const struct netdev_stat_ops nsim_stat_ops = {

	.get_queue_stats_tx	= nsim_get_queue_stats_tx,

	.get_queue_stats_rx	= nsim_get_queue_stats_rx,

	.get_base_stats		= nsim_get_base_stats,

};



static void nsim_setup(struct net_device *dev)

{

	ether_setup(dev);
@@ -360,6 +408,7 @@ static int nsim_init_netdevsim(struct netdevsim *ns) 


	ns->phc = phc;

	ns->netdev->netdev_ops = &nsim_netdev_ops;

	ns->netdev->stat_ops = &nsim_stat_ops;



	err = nsim_udp_tunnels_info_create(ns->nsim_dev, ns->netdev);

	if (err)

tools/testing/selftests/Makefile

+9 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ TARGETS += devices 
TARGETS += dmabuf-heaps

TARGETS += drivers/dma-buf

TARGETS += drivers/s390x/uvdevice

TARGETS += drivers/net

TARGETS += drivers/net/bonding

TARGETS += drivers/net/team

TARGETS += dt
@@ -116,6 +117,13 @@ TARGETS += zram 
TARGETS_HOTPLUG = cpu-hotplug

TARGETS_HOTPLUG += memory-hotplug



# Networking tests want the net/lib target, include it automatically

ifneq ($(filter net drivers/net,$(TARGETS)),)

ifeq ($(filter net/lib,$(TARGETS)),)

	INSTALL_DEP_TARGETS := net/lib

endif

endif



# User can optionally provide a TARGETS skiplist.  By default we skip

# BPF since it has cutting edge build time dependencies which require

# more effort to install.
@@ -245,7 +253,7 @@ ifdef INSTALL_PATH 
	install -m 744 run_kselftest.sh $(INSTALL_PATH)/

	rm -f $(TEST_LIST)

	@ret=1;	\

	for TARGET in $(TARGETS); do \

	for TARGET in $(TARGETS) $(INSTALL_DEP_TARGETS); do \

		BUILD_TARGET=$$BUILD/$$TARGET;	\

		$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET install \

				INSTALL_PATH=$(INSTALL_PATH)/$$TARGET \

tools/testing/selftests/drivers/net/Makefile

0 → 100644
+7 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



TEST_INCLUDES := $(wildcard lib/py/*.py)



TEST_PROGS := stats.py



include ../../lib.mk

tools/testing/selftests/drivers/net/README.rst

0 → 100644
+30 −0
Original line number Diff line number Diff line 
Running tests

=============



Tests are executed within kselftest framework like any other tests.

By default tests execute against software drivers such as netdevsim.

All tests must support running against a real device (SW-only tests

should instead be placed in net/ or drivers/net/netdevsim, HW-only

tests in drivers/net/hw).



Set appropriate variables to point the tests at a real device.



Variables

=========



Variables can be set in the environment or by creating a net.config

file in the same directory as this README file. Example::



  $ NETIF=eth0 ./some_test.sh



or::



  $ cat tools/testing/selftests/drivers/net/net.config

  # Variable set in a file

  NETIF=eth0



NETIF

~~~~~



Name of the netdevice against which the test should be executed.

When empty or not set software devices will be used.