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

Merge branch 'netdevsim-fix-tests-and-netdevsim' 



Jakub Kicinski says:

====================
netdevsim: fix tests and netdevsim

The first patch fixes a merge which brought back some dead
code. Next a tiny re-write of the main test using netdevsim
aims to ease debugging.
====================

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

drivers/net/netdevsim/dev.c

+8 −39
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ err_fib_destroy: 
	return err;

}



static struct nsim_dev *nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev)

int nsim_dev_probe(struct nsim_bus_dev *nsim_bus_dev)

{

	struct nsim_dev *nsim_dev;

	struct devlink *devlink;
@@ -761,7 +761,7 @@ static struct nsim_dev *nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev) 


	devlink = devlink_alloc(&nsim_dev_devlink_ops, sizeof(*nsim_dev));

	if (!devlink)

		return ERR_PTR(-ENOMEM);

		return -ENOMEM;

	devlink_net_set(devlink, nsim_bus_dev->initial_net);

	nsim_dev = devlink_priv(devlink);

	nsim_dev->nsim_bus_dev = nsim_bus_dev;
@@ -773,6 +773,8 @@ static struct nsim_dev *nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev) 
	nsim_dev->max_macs = NSIM_DEV_MAX_MACS_DEFAULT;

	nsim_dev->test1 = NSIM_DEV_TEST1_DEFAULT;



	dev_set_drvdata(&nsim_bus_dev->dev, nsim_dev);



	err = nsim_dev_resources_register(devlink);

	if (err)

		goto err_devlink_free;
@@ -818,7 +820,7 @@ static struct nsim_dev *nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev) 
		goto err_bpf_dev_exit;



	devlink_params_publish(devlink);

	return nsim_dev;

	return 0;



err_bpf_dev_exit:

	nsim_bpf_dev_exit(nsim_dev);
@@ -841,7 +843,7 @@ err_resources_unregister: 
	devlink_resources_unregister(devlink, NULL);

err_devlink_free:

	devlink_free(devlink);

	return ERR_PTR(err);

	return err;

}



static void nsim_dev_reload_destroy(struct nsim_dev *nsim_dev)
@@ -858,8 +860,9 @@ static void nsim_dev_reload_destroy(struct nsim_dev *nsim_dev) 
	nsim_fib_destroy(devlink, nsim_dev->fib_data);

}



static void nsim_dev_destroy(struct nsim_dev *nsim_dev)

void nsim_dev_remove(struct nsim_bus_dev *nsim_bus_dev)

{

	struct nsim_dev *nsim_dev = dev_get_drvdata(&nsim_bus_dev->dev);

	struct devlink *devlink = priv_to_devlink(nsim_dev);



	nsim_dev_reload_destroy(nsim_dev);
@@ -873,40 +876,6 @@ static void nsim_dev_destroy(struct nsim_dev *nsim_dev) 
	devlink_free(devlink);

}



int nsim_dev_probe(struct nsim_bus_dev *nsim_bus_dev)

{

	struct nsim_dev *nsim_dev;

	int i;

	int err;



	nsim_dev = nsim_dev_create(nsim_bus_dev);

	if (IS_ERR(nsim_dev))

		return PTR_ERR(nsim_dev);

	dev_set_drvdata(&nsim_bus_dev->dev, nsim_dev);



	mutex_lock(&nsim_dev->port_list_lock);

	for (i = 0; i < nsim_bus_dev->port_count; i++) {

		err = __nsim_dev_port_add(nsim_dev, i);

		if (err)

			goto err_port_del_all;

	}

	mutex_unlock(&nsim_dev->port_list_lock);

	return 0;



err_port_del_all:

	mutex_unlock(&nsim_dev->port_list_lock);

	nsim_dev_port_del_all(nsim_dev);

	nsim_dev_destroy(nsim_dev);

	return err;

}



void nsim_dev_remove(struct nsim_bus_dev *nsim_bus_dev)

{

	struct nsim_dev *nsim_dev = dev_get_drvdata(&nsim_bus_dev->dev);



	nsim_dev_destroy(nsim_dev);

}



static struct nsim_dev_port *

__nsim_dev_port_lookup(struct nsim_dev *nsim_dev, unsigned int port_index)

{

tools/testing/selftests/bpf/test_offload.py

+14 −6
Original line number Diff line number Diff line
@@ -335,13 +335,22 @@ class NetdevSimDev: 
    """

    Class for netdevsim bus device and its attributes.

    """

    @staticmethod

    def ctrl_write(path, val):

        fullpath = os.path.join("/sys/bus/netdevsim/", path)

        try:

            with open(fullpath, "w") as f:

                f.write(val)

        except OSError as e:

            log("WRITE %s: %r" % (fullpath, val), -e.errno)

            raise e

        log("WRITE %s: %r" % (fullpath, val), 0)



    def __init__(self, port_count=1):

        addr = 0

        while True:

            try:

                with open("/sys/bus/netdevsim/new_device", "w") as f:

                    f.write("%u %u" % (addr, port_count))

                self.ctrl_write("new_device", "%u %u" % (addr, port_count))

            except OSError as e:

                if e.errno == errno.ENOSPC:

                    addr += 1
@@ -403,14 +412,13 @@ class NetdevSimDev: 
        return progs



    def remove(self):

        with open("/sys/bus/netdevsim/del_device", "w") as f:

            f.write("%u" % self.addr)

        self.ctrl_write("del_device", "%u" % (self.addr, ))

        devs.remove(self)



    def remove_nsim(self, nsim):

        self.nsims.remove(nsim)

        with open("/sys/bus/netdevsim/devices/netdevsim%u/del_port" % self.addr ,"w") as f:

            f.write("%u" % nsim.port_index)

        self.ctrl_write("devices/netdevsim%u/del_port" % (self.addr, ),

                        "%u" % (nsim.port_index, ))



class NetdevSim:

    """

CRA Git | Maintained and supported by SUSTech CRA and CCSE