kni: fix crash when removing interface

[dpdk.git] / lib / librte_eal / linuxapp / kni / kni_misc.c

diff --git a/lib/librte_eal/linuxapp/kni/kni_misc.c b/lib/librte_eal/linuxapp/kni/kni_misc.c
index 635e18f..4f07507 100644 (file)
--- a/lib/librte_eal/linuxapp/kni/kni_misc.c
+++ b/lib/librte_eal/linuxapp/kni/kni_misc.c
@@ -22,9 +22,11 @@
  *   Intel Corporation
  */
 
+#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/miscdevice.h>
 #include <linux/netdevice.h>
+#include <linux/etherdevice.h>
 #include <linux/pci.h>
 #include <linux/kthread.h>
 #include <linux/rwsem.h>
@@ -33,8 +35,9 @@
 #include <net/netns/generic.h>
 
 #include <exec-env/rte_kni_common.h>
+
+#include "compat.h"
 #include "kni_dev.h"
-#include <rte_config.h>
 
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Intel Corporation");
@@ -52,8 +55,10 @@ extern void kni_set_ethtool_ops(struct net_device *netdev);
 
 extern int ixgbe_kni_probe(struct pci_dev *pdev, struct net_device **lad_dev);
 extern void ixgbe_kni_remove(struct pci_dev *pdev);
+extern struct pci_device_id ixgbe_pci_tbl[];
 extern int igb_kni_probe(struct pci_dev *pdev, struct net_device **lad_dev);
 extern void igb_kni_remove(struct pci_dev *pdev);
+extern struct pci_device_id igb_pci_tbl[];
 
 static int kni_open(struct inode *inode, struct file *file);
 static int kni_release(struct inode *inode, struct file *file);
@@ -102,9 +107,20 @@ struct kni_net {
        struct list_head kni_list_head;
 };
 
-static __net_init int kni_init_net(struct net *net)
+static int __net_init kni_init_net(struct net *net)
 {
+#ifdef HAVE_SIMPLIFIED_PERNET_OPERATIONS
        struct kni_net *knet = net_generic(net, kni_net_id);
+#else
+       struct kni_net *knet;
+       int ret;
+
+       knet = kmalloc(sizeof(struct kni_net), GFP_KERNEL);
+       if (!knet) {
+               ret = -ENOMEM;
+               return ret;
+       }
+#endif
 
        /* Clear the bit of device in use */
        clear_bit(KNI_DEV_IN_USE_BIT_NUM, &knet->device_in_use);
@@ -112,14 +128,33 @@ static __net_init int kni_init_net(struct net *net)
        init_rwsem(&knet->kni_list_lock);
        INIT_LIST_HEAD(&knet->kni_list_head);
 
+#ifdef HAVE_SIMPLIFIED_PERNET_OPERATIONS
        return 0;
+#else
+       ret = net_assign_generic(net, kni_net_id, knet);
+       if (ret < 0)
+               kfree(knet);
+
+       return ret;
+#endif
+}
+
+static void __net_exit kni_exit_net(struct net *net)
+{
+#ifndef HAVE_SIMPLIFIED_PERNET_OPERATIONS
+       struct kni_net *knet = net_generic(net, kni_net_id);
+
+       kfree(knet);
+#endif
 }
 
 static struct pernet_operations kni_net_ops = {
        .init = kni_init_net,
-       .exit = NULL,
+       .exit = kni_exit_net,
+#ifdef HAVE_SIMPLIFIED_PERNET_OPERATIONS
        .id   = &kni_net_id,
        .size = sizeof(struct kni_net),
+#endif
 };
 
 static int __init
@@ -134,7 +169,11 @@ kni_init(void)
                return -EINVAL;
        }
 
+#ifdef HAVE_SIMPLIFIED_PERNET_OPERATIONS
        rc = register_pernet_subsys(&kni_net_ops);
+#else
+       rc = register_pernet_gen_subsys(&kni_net_id, &kni_net_ops);
+#endif
        if (rc)
                return -EPERM;
 
@@ -152,7 +191,11 @@ kni_init(void)
        return 0;
 
 out:
+#ifdef HAVE_SIMPLIFIED_PERNET_OPERATIONS
        unregister_pernet_subsys(&kni_net_ops);
+#else
+       register_pernet_gen_subsys(&kni_net_id, &kni_net_ops);
+#endif
        return rc;
 }
 
@@ -160,7 +203,11 @@ static void __exit
 kni_exit(void)
 {
        misc_deregister(&kni_misc);
+#ifdef HAVE_SIMPLIFIED_PERNET_OPERATIONS
        unregister_pernet_subsys(&kni_net_ops);
+#else
+       register_pernet_gen_subsys(&kni_net_id, &kni_net_ops);
+#endif
        KNI_PRINT("####### DPDK kni module unloaded  #######\n");
 }
 
@@ -308,17 +355,11 @@ kni_dev_remove(struct kni_dev *dev)
        if (!dev)
                return -ENODEV;
 
-       switch (dev->device_id) {
-       #define RTE_PCI_DEV_ID_DECL_IGB(vend, dev) case (dev):
-       #include <rte_pci_dev_ids.h>
-               igb_kni_remove(dev->pci_dev);
-               break;
-       #define RTE_PCI_DEV_ID_DECL_IXGBE(vend, dev) case (dev):
-       #include <rte_pci_dev_ids.h>
-               ixgbe_kni_remove(dev->pci_dev);
-               break;
-       default:
-               break;
+       if (dev->pci_dev) {
+               if (pci_match_id(ixgbe_pci_tbl, dev->pci_dev))
+                       ixgbe_kni_remove(dev->pci_dev);
+               else if (pci_match_id(igb_pci_tbl, dev->pci_dev))
+                       igb_kni_remove(dev->pci_dev);
        }
 
        if (dev->net_dev) {
@@ -465,20 +506,13 @@ kni_ioctl_create(struct net *net,
                        (PCI_SLOT(pci->devfn) == dev_info.devid) &&
                        (PCI_FUNC(pci->devfn) == dev_info.function)) {
                        found_pci = pci;
-                       switch (dev_info.device_id) {
-                       #define RTE_PCI_DEV_ID_DECL_IGB(vend, dev) case (dev):
-                       #include <rte_pci_dev_ids.h>
-                               ret = igb_kni_probe(found_pci, &lad_dev);
-                               break;
-                       #define RTE_PCI_DEV_ID_DECL_IXGBE(vend, dev) \
-                                                       case (dev):
-                       #include <rte_pci_dev_ids.h>
+
+                       if (pci_match_id(ixgbe_pci_tbl, found_pci))
                                ret = ixgbe_kni_probe(found_pci, &lad_dev);
-                               break;
-                       default:
+                       else if (pci_match_id(igb_pci_tbl, found_pci))
+                               ret = igb_kni_probe(found_pci, &lad_dev);
+                       else
                                ret = -1;
-                               break;
-                       }
 
                        KNI_DBG("PCI found: pci=0x%p, lad_dev=0x%p\n",
                                                        pci, lad_dev);
@@ -500,6 +534,15 @@ kni_ioctl_create(struct net *net,
        if (pci)
                pci_dev_put(pci);
 
+       if (kni->lad_dev)
+               memcpy(net_dev->dev_addr, kni->lad_dev->dev_addr, ETH_ALEN);
+       else
+               /*
+                * Generate random mac address. eth_random_addr() is the newer
+                * version of generating mac address in linux kernel.
+                */
+               random_ether_addr(net_dev->dev_addr);
+
        ret = register_netdev(net_dev);
        if (ret) {
                KNI_ERR("error %i registering device \"%s\"\n",