net: Add extack argument to rtnl_create_link

Add extack arg to rtnl_create_link and add messages for invalid
number of Tx or Rx queues.

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/can/vxcan.c b/drivers/net/can/vxcan.c
index ed68288..80af658 100644 (file)
--- a/drivers/net/can/vxcan.c
+++ b/drivers/net/can/vxcan.c
@@ -207,7 +207,7 @@ static int vxcan_newlink(struct net *net, struct net_device *dev,
                return PTR_ERR(peer_net);
 
        peer = rtnl_create_link(peer_net, ifname, name_assign_type,
-                               &vxcan_link_ops, tbp);
+                               &vxcan_link_ops, tbp, extack);
        if (IS_ERR(peer)) {
                put_net(peer_net);
                return PTR_ERR(peer);

diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index a0cd1c4..fbfc13d 100644 (file)
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -1666,7 +1666,7 @@ struct net_device *geneve_dev_create_fb(struct net *net, const char *name,
 
        memset(tb, 0, sizeof(tb));
        dev = rtnl_create_link(net, name, name_assign_type,
-                              &geneve_link_ops, tb);
+                              &geneve_link_ops, tb, NULL);
        if (IS_ERR(dev))
                return dev;
 

diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 890fa5b..f412ea1 100644 (file)
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -1253,7 +1253,7 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
                return PTR_ERR(net);
 
        peer = rtnl_create_link(net, ifname, name_assign_type,
-                               &veth_link_ops, tbp);
+                               &veth_link_ops, tbp, extack);
        if (IS_ERR(peer)) {
                put_net(net);
                return PTR_ERR(peer);

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 297cdea..ae969f8 100644 (file)
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -3749,7 +3749,7 @@ struct net_device *vxlan_dev_create(struct net *net, const char *name,
        memset(&tb, 0, sizeof(tb));
 
        dev = rtnl_create_link(net, name, name_assign_type,
-                              &vxlan_link_ops, tb);
+                              &vxlan_link_ops, tb, NULL);
        if (IS_ERR(dev))
                return dev;
 

diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
index cf26e5a..e2091bb 100644 (file)
--- a/include/net/rtnetlink.h
+++ b/include/net/rtnetlink.h
@@ -159,7 +159,8 @@ struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[]);
 struct net_device *rtnl_create_link(struct net *net, const char *ifname,
                                    unsigned char name_assign_type,
                                    const struct rtnl_link_ops *ops,
-                                   struct nlattr *tb[]);
+                                   struct nlattr *tb[],
+                                   struct netlink_ext_ack *extack);
 int rtnl_delete_link(struct net_device *dev);
 int rtnl_configure_link(struct net_device *dev, const struct ifinfomsg *ifm);
 

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 33d9227..f787b76 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2885,9 +2885,11 @@ int rtnl_configure_link(struct net_device *dev, const struct ifinfomsg *ifm)
 }
 EXPORT_SYMBOL(rtnl_configure_link);
 
-struct net_device *rtnl_create_link(struct net *net,
-       const char *ifname, unsigned char name_assign_type,
-       const struct rtnl_link_ops *ops, struct nlattr *tb[])
+struct net_device *rtnl_create_link(struct net *net, const char *ifname,
+                                   unsigned char name_assign_type,
+                                   const struct rtnl_link_ops *ops,
+                                   struct nlattr *tb[],
+                                   struct netlink_ext_ack *extack)
 {
        struct net_device *dev;
        unsigned int num_tx_queues = 1;
@@ -2903,11 +2905,15 @@ struct net_device *rtnl_create_link(struct net *net,
        else if (ops->get_num_rx_queues)
                num_rx_queues = ops->get_num_rx_queues();
 
-       if (num_tx_queues < 1 || num_tx_queues > 4096)
+       if (num_tx_queues < 1 || num_tx_queues > 4096) {
+               NL_SET_ERR_MSG(extack, "Invalid number of transmit queues");
                return ERR_PTR(-EINVAL);
+       }
 
-       if (num_rx_queues < 1 || num_rx_queues > 4096)
+       if (num_rx_queues < 1 || num_rx_queues > 4096) {
+               NL_SET_ERR_MSG(extack, "Invalid number of receive queues");
                return ERR_PTR(-EINVAL);
+       }
 
        dev = alloc_netdev_mqs(ops->priv_size, ifname, name_assign_type,
                               ops->setup, num_tx_queues, num_rx_queues);
@@ -3163,7 +3169,7 @@ replay:
                }
 
                dev = rtnl_create_link(link_net ? : dest_net, ifname,
-                                      name_assign_type, ops, tb);
+                                      name_assign_type, ops, tb, extack);
                if (IS_ERR(dev)) {
                        err = PTR_ERR(dev);
                        goto out;

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 38befe8..2c67af6 100644 (file)
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -1601,7 +1601,7 @@ struct net_device *gretap_fb_dev_create(struct net *net, const char *name,
        memset(&tb, 0, sizeof(tb));
 
        dev = rtnl_create_link(net, name, name_assign_type,
-                              &ipgre_tap_ops, tb);
+                              &ipgre_tap_ops, tb, NULL);
        if (IS_ERR(dev))
                return dev;