Commit e1636836 authored by Phil Sutter's avatar Phil Sutter Committed by David S. Miller

net: dummy: Introduce dummy virtual functions

The idea for this was born when testing VF support in iproute2 which was
impeded by hardware requirements. In fact, not every VF-capable hardware
driver implements all netdev ops, so testing the interface is still hard
to do even with a well-sorted hardware shelf.

To overcome this and allow for testing the user-kernel interface, this
patch allows to turn dummy into a PF with a configurable amount of VFs.

Since my patch series 'bus-agnostic-num-vf' has been accepted,
implementing the required interfaces is pretty straightforward: Iff
'num_vfs' module parameter was given a value >0, a dummy bus type is
being registered which implements the 'num_vf()' callback. Additionally,
a dummy parent device common to all dummy devices is registered which
sits on the above dummy bus.

Joint work with Sabrina Dubroca.
Signed-off-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Signed-off-by: default avatarPhil Sutter <phil@nwl.cc>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8b86b2c1
...@@ -41,7 +41,48 @@ ...@@ -41,7 +41,48 @@
#define DRV_NAME "dummy" #define DRV_NAME "dummy"
#define DRV_VERSION "1.0" #define DRV_VERSION "1.0"
#undef pr_fmt
#define pr_fmt(fmt) DRV_NAME ": " fmt
static int numdummies = 1; static int numdummies = 1;
static int num_vfs;
struct vf_data_storage {
u8 vf_mac[ETH_ALEN];
u16 pf_vlan; /* When set, guest VLAN config not allowed. */
u16 pf_qos;
__be16 vlan_proto;
u16 min_tx_rate;
u16 max_tx_rate;
u8 spoofchk_enabled;
bool rss_query_enabled;
u8 trusted;
int link_state;
};
struct dummy_priv {
struct vf_data_storage *vfinfo;
};
static int dummy_num_vf(struct device *dev)
{
return num_vfs;
}
static struct bus_type dummy_bus = {
.name = "dummy",
.num_vf = dummy_num_vf,
};
static void release_dummy_parent(struct device *dev)
{
}
static struct device dummy_parent = {
.init_name = "dummy",
.bus = &dummy_bus,
.release = release_dummy_parent,
};
/* fake multicast ability */ /* fake multicast ability */
static void set_multicast_list(struct net_device *dev) static void set_multicast_list(struct net_device *dev)
...@@ -90,10 +131,25 @@ static netdev_tx_t dummy_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -90,10 +131,25 @@ static netdev_tx_t dummy_xmit(struct sk_buff *skb, struct net_device *dev)
static int dummy_dev_init(struct net_device *dev) static int dummy_dev_init(struct net_device *dev)
{ {
struct dummy_priv *priv = netdev_priv(dev);
dev->dstats = netdev_alloc_pcpu_stats(struct pcpu_dstats); dev->dstats = netdev_alloc_pcpu_stats(struct pcpu_dstats);
if (!dev->dstats) if (!dev->dstats)
return -ENOMEM; return -ENOMEM;
priv->vfinfo = NULL;
if (!num_vfs)
return 0;
dev->dev.parent = &dummy_parent;
priv->vfinfo = kcalloc(num_vfs, sizeof(struct vf_data_storage),
GFP_KERNEL);
if (!priv->vfinfo) {
free_percpu(dev->dstats);
return -ENOMEM;
}
return 0; return 0;
} }
...@@ -111,6 +167,117 @@ static int dummy_change_carrier(struct net_device *dev, bool new_carrier) ...@@ -111,6 +167,117 @@ static int dummy_change_carrier(struct net_device *dev, bool new_carrier)
return 0; return 0;
} }
static int dummy_set_vf_mac(struct net_device *dev, int vf, u8 *mac)
{
struct dummy_priv *priv = netdev_priv(dev);
if (!is_valid_ether_addr(mac) || (vf >= num_vfs))
return -EINVAL;
memcpy(priv->vfinfo[vf].vf_mac, mac, ETH_ALEN);
return 0;
}
static int dummy_set_vf_vlan(struct net_device *dev, int vf,
u16 vlan, u8 qos, __be16 vlan_proto)
{
struct dummy_priv *priv = netdev_priv(dev);
if ((vf >= num_vfs) || (vlan > 4095) || (qos > 7))
return -EINVAL;
priv->vfinfo[vf].pf_vlan = vlan;
priv->vfinfo[vf].pf_qos = qos;
priv->vfinfo[vf].vlan_proto = vlan_proto;
return 0;
}
static int dummy_set_vf_rate(struct net_device *dev, int vf, int min, int max)
{
struct dummy_priv *priv = netdev_priv(dev);
if (vf >= num_vfs)
return -EINVAL;
priv->vfinfo[vf].min_tx_rate = min;
priv->vfinfo[vf].max_tx_rate = max;
return 0;
}
static int dummy_set_vf_spoofchk(struct net_device *dev, int vf, bool val)
{
struct dummy_priv *priv = netdev_priv(dev);
if (vf >= num_vfs)
return -EINVAL;
priv->vfinfo[vf].spoofchk_enabled = val;
return 0;
}
static int dummy_set_vf_rss_query_en(struct net_device *dev, int vf, bool val)
{
struct dummy_priv *priv = netdev_priv(dev);
if (vf >= num_vfs)
return -EINVAL;
priv->vfinfo[vf].rss_query_enabled = val;
return 0;
}
static int dummy_set_vf_trust(struct net_device *dev, int vf, bool val)
{
struct dummy_priv *priv = netdev_priv(dev);
if (vf >= num_vfs)
return -EINVAL;
priv->vfinfo[vf].trusted = val;
return 0;
}
static int dummy_get_vf_config(struct net_device *dev,
int vf, struct ifla_vf_info *ivi)
{
struct dummy_priv *priv = netdev_priv(dev);
if (vf >= num_vfs)
return -EINVAL;
ivi->vf = vf;
memcpy(&ivi->mac, priv->vfinfo[vf].vf_mac, ETH_ALEN);
ivi->vlan = priv->vfinfo[vf].pf_vlan;
ivi->qos = priv->vfinfo[vf].pf_qos;
ivi->spoofchk = priv->vfinfo[vf].spoofchk_enabled;
ivi->linkstate = priv->vfinfo[vf].link_state;
ivi->min_tx_rate = priv->vfinfo[vf].min_tx_rate;
ivi->max_tx_rate = priv->vfinfo[vf].max_tx_rate;
ivi->rss_query_en = priv->vfinfo[vf].rss_query_enabled;
ivi->trusted = priv->vfinfo[vf].trusted;
ivi->vlan_proto = priv->vfinfo[vf].vlan_proto;
return 0;
}
static int dummy_set_vf_link_state(struct net_device *dev, int vf, int state)
{
struct dummy_priv *priv = netdev_priv(dev);
if (vf >= num_vfs)
return -EINVAL;
priv->vfinfo[vf].link_state = state;
return 0;
}
static const struct net_device_ops dummy_netdev_ops = { static const struct net_device_ops dummy_netdev_ops = {
.ndo_init = dummy_dev_init, .ndo_init = dummy_dev_init,
.ndo_uninit = dummy_dev_uninit, .ndo_uninit = dummy_dev_uninit,
...@@ -120,6 +287,14 @@ static const struct net_device_ops dummy_netdev_ops = { ...@@ -120,6 +287,14 @@ static const struct net_device_ops dummy_netdev_ops = {
.ndo_set_mac_address = eth_mac_addr, .ndo_set_mac_address = eth_mac_addr,
.ndo_get_stats64 = dummy_get_stats64, .ndo_get_stats64 = dummy_get_stats64,
.ndo_change_carrier = dummy_change_carrier, .ndo_change_carrier = dummy_change_carrier,
.ndo_set_vf_mac = dummy_set_vf_mac,
.ndo_set_vf_vlan = dummy_set_vf_vlan,
.ndo_set_vf_rate = dummy_set_vf_rate,
.ndo_set_vf_spoofchk = dummy_set_vf_spoofchk,
.ndo_set_vf_trust = dummy_set_vf_trust,
.ndo_get_vf_config = dummy_get_vf_config,
.ndo_set_vf_link_state = dummy_set_vf_link_state,
.ndo_set_vf_rss_query_en = dummy_set_vf_rss_query_en,
}; };
static void dummy_get_drvinfo(struct net_device *dev, static void dummy_get_drvinfo(struct net_device *dev,
...@@ -133,6 +308,14 @@ static const struct ethtool_ops dummy_ethtool_ops = { ...@@ -133,6 +308,14 @@ static const struct ethtool_ops dummy_ethtool_ops = {
.get_drvinfo = dummy_get_drvinfo, .get_drvinfo = dummy_get_drvinfo,
}; };
static void dummy_free_netdev(struct net_device *dev)
{
struct dummy_priv *priv = netdev_priv(dev);
kfree(priv->vfinfo);
free_netdev(dev);
}
static void dummy_setup(struct net_device *dev) static void dummy_setup(struct net_device *dev)
{ {
ether_setup(dev); ether_setup(dev);
...@@ -140,7 +323,7 @@ static void dummy_setup(struct net_device *dev) ...@@ -140,7 +323,7 @@ static void dummy_setup(struct net_device *dev)
/* Initialize the device structure. */ /* Initialize the device structure. */
dev->netdev_ops = &dummy_netdev_ops; dev->netdev_ops = &dummy_netdev_ops;
dev->ethtool_ops = &dummy_ethtool_ops; dev->ethtool_ops = &dummy_ethtool_ops;
dev->destructor = free_netdev; dev->destructor = dummy_free_netdev;
/* Fill in device structure with ethernet-generic values. */ /* Fill in device structure with ethernet-generic values. */
dev->flags |= IFF_NOARP; dev->flags |= IFF_NOARP;
...@@ -171,6 +354,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[]) ...@@ -171,6 +354,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
static struct rtnl_link_ops dummy_link_ops __read_mostly = { static struct rtnl_link_ops dummy_link_ops __read_mostly = {
.kind = DRV_NAME, .kind = DRV_NAME,
.priv_size = sizeof(struct dummy_priv),
.setup = dummy_setup, .setup = dummy_setup,
.validate = dummy_validate, .validate = dummy_validate,
}; };
...@@ -179,12 +363,16 @@ static struct rtnl_link_ops dummy_link_ops __read_mostly = { ...@@ -179,12 +363,16 @@ static struct rtnl_link_ops dummy_link_ops __read_mostly = {
module_param(numdummies, int, 0); module_param(numdummies, int, 0);
MODULE_PARM_DESC(numdummies, "Number of dummy pseudo devices"); MODULE_PARM_DESC(numdummies, "Number of dummy pseudo devices");
module_param(num_vfs, int, 0);
MODULE_PARM_DESC(num_vfs, "Number of dummy VFs per dummy device");
static int __init dummy_init_one(void) static int __init dummy_init_one(void)
{ {
struct net_device *dev_dummy; struct net_device *dev_dummy;
int err; int err;
dev_dummy = alloc_netdev(0, "dummy%d", NET_NAME_UNKNOWN, dummy_setup); dev_dummy = alloc_netdev(sizeof(struct dummy_priv),
"dummy%d", NET_NAME_UNKNOWN, dummy_setup);
if (!dev_dummy) if (!dev_dummy)
return -ENOMEM; return -ENOMEM;
...@@ -203,6 +391,21 @@ static int __init dummy_init_module(void) ...@@ -203,6 +391,21 @@ static int __init dummy_init_module(void)
{ {
int i, err = 0; int i, err = 0;
if (num_vfs) {
err = bus_register(&dummy_bus);
if (err < 0) {
pr_err("registering dummy bus failed\n");
return err;
}
err = device_register(&dummy_parent);
if (err < 0) {
pr_err("registering dummy parent device failed\n");
bus_unregister(&dummy_bus);
return err;
}
}
rtnl_lock(); rtnl_lock();
err = __rtnl_link_register(&dummy_link_ops); err = __rtnl_link_register(&dummy_link_ops);
if (err < 0) if (err < 0)
...@@ -218,12 +421,22 @@ static int __init dummy_init_module(void) ...@@ -218,12 +421,22 @@ static int __init dummy_init_module(void)
out: out:
rtnl_unlock(); rtnl_unlock();
if (err && num_vfs) {
device_unregister(&dummy_parent);
bus_unregister(&dummy_bus);
}
return err; return err;
} }
static void __exit dummy_cleanup_module(void) static void __exit dummy_cleanup_module(void)
{ {
rtnl_link_unregister(&dummy_link_ops); rtnl_link_unregister(&dummy_link_ops);
if (num_vfs) {
device_unregister(&dummy_parent);
bus_unregister(&dummy_bus);
}
} }
module_init(dummy_init_module); module_init(dummy_init_module);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment