[dpdk-dev,v2] kni: don't reassign ethernet address every time an interface goes up

Message ID 1461256050-46372-1-git-send-email-iryzhov@nfware.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers

Commit Message

Igor Ryzhov April 21, 2016, 4:27 p.m. UTC
  Currently every time a KNI interface goes up, its ethernet address is reassigned.
After this patch ethernet address is assigned only once, at initialization time.

Suggested-by: Sergey Balabanov <balabanovsv@ecotelecom.ru>
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
---
v2:
- change variable name from dev to net_dev
- slightly rewrite commit message header and body

 lib/librte_eal/linuxapp/kni/kni_misc.c | 10 ++++++++++
 lib/librte_eal/linuxapp/kni/kni_net.c  |  9 ---------
 2 files changed, 10 insertions(+), 9 deletions(-)
  

Comments

Zhang, Helin April 22, 2016, 6:27 a.m. UTC | #1
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Igor Ryzhov
> Sent: Friday, April 22, 2016 12:28 AM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH v2] kni: don't reassign ethernet address every
> time an interface goes up
> 
> Currently every time a KNI interface goes up, its ethernet address is
> reassigned.
> After this patch ethernet address is assigned only once, at initialization time.
> 
> Suggested-by: Sergey Balabanov <balabanovsv@ecotelecom.ru>
> Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
Acked-by: Helin Zhang <helin.zhang@intel.com>
  
Thomas Monjalon April 29, 2016, 1:50 p.m. UTC | #2
> > Currently every time a KNI interface goes up, its ethernet address is
> > reassigned.
> > After this patch ethernet address is assigned only once, at initialization time.
> > 
> > Suggested-by: Sergey Balabanov <balabanovsv@ecotelecom.ru>
> > Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
> Acked-by: Helin Zhang <helin.zhang@intel.com>

Applied, thanks
  

Patch

diff --git a/lib/librte_eal/linuxapp/kni/kni_misc.c b/lib/librte_eal/linuxapp/kni/kni_misc.c
index ae8133f..871437f 100644
--- a/lib/librte_eal/linuxapp/kni/kni_misc.c
+++ b/lib/librte_eal/linuxapp/kni/kni_misc.c
@@ -26,6 +26,7 @@ 
 #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>
@@ -542,6 +543,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",
diff --git a/lib/librte_eal/linuxapp/kni/kni_net.c b/lib/librte_eal/linuxapp/kni/kni_net.c
index cfa8339..3d2d246 100644
--- a/lib/librte_eal/linuxapp/kni/kni_net.c
+++ b/lib/librte_eal/linuxapp/kni/kni_net.c
@@ -69,15 +69,6 @@  kni_net_open(struct net_device *dev)
 	struct rte_kni_request req;
 	struct kni_dev *kni = netdev_priv(dev);
 
-	if (kni->lad_dev)
-		memcpy(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(dev->dev_addr);
-
 	netif_start_queue(dev);
 
 	memset(&req, 0, sizeof(req));