public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: Jiri Pirko <jiri@resnulli.us>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, mlxsw@mellanox.com,
	jakub.kicinski@netronome.com, dsahern@gmail.com
Subject: [patch net-next v4 11/16] netdevsim: generate random switch id instead of using dev id
Date: Thu, 25 Apr 2019 15:59:51 +0200	[thread overview]
Message-ID: <20190425135956.3970-12-jiri@resnulli.us> (raw)
In-Reply-To: <20190425135956.3970-1-jiri@resnulli.us>

From: Jiri Pirko <jiri@mellanox.com>

Current implementation of parent_id/switch_id does not follow the
original idea of being unique. The values are "0", "1", etc. Instead of
that, generate 32 random bytes.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
 drivers/net/netdevsim/dev.c       | 3 +++
 drivers/net/netdevsim/netdev.c    | 3 +--
 drivers/net/netdevsim/netdevsim.h | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
index 93abd0b6c1f9..98a56d8bdcec 100644
--- a/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@ -17,6 +17,7 @@
 
 #include <linux/debugfs.h>
 #include <linux/device.h>
+#include <linux/random.h>
 #include <linux/rtnetlink.h>
 #include <net/devlink.h>
 
@@ -204,6 +205,8 @@ static struct nsim_dev *nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev)
 		return ERR_PTR(-ENOMEM);
 	nsim_dev = devlink_priv(devlink);
 	nsim_dev->nsim_bus_dev = nsim_bus_dev;
+	nsim_dev->switch_id.id_len = sizeof(nsim_dev->switch_id.id);
+	get_random_bytes(nsim_dev->switch_id.id, nsim_dev->switch_id.id_len);
 
 	nsim_dev->fib_data = nsim_fib_create();
 	if (IS_ERR(nsim_dev->fib_data)) {
diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c
index c5f4bbb9716f..9b4310e20129 100644
--- a/drivers/net/netdevsim/netdev.c
+++ b/drivers/net/netdevsim/netdev.c
@@ -32,8 +32,7 @@ static int nsim_get_port_parent_id(struct net_device *dev,
 {
 	struct netdevsim *ns = netdev_priv(dev);
 
-	ppid->id_len = sizeof(ns->nsim_dev->nsim_bus_dev->dev.id);
-	memcpy(&ppid->id, &ns->nsim_dev->nsim_bus_dev->dev.id, ppid->id_len);
+	memcpy(ppid, &ns->nsim_dev->switch_id, sizeof(*ppid));
 	return 0;
 }
 
diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netdevsim.h
index 4ef44a9538db..17639c7c9032 100644
--- a/drivers/net/netdevsim/netdevsim.h
+++ b/drivers/net/netdevsim/netdevsim.h
@@ -141,6 +141,7 @@ struct nsim_dev {
 	u32 prog_id_gen;
 	struct list_head bpf_bound_progs;
 	struct list_head bpf_bound_maps;
+	struct netdev_phys_item_id switch_id;
 };
 
 struct nsim_dev *
-- 
2.17.2


  parent reply	other threads:[~2019-04-25 14:00 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-25 13:59 [patch net-next v4 00/16] netdevsim: implement proper device model Jiri Pirko
2019-04-25 13:59 ` [patch net-next v4 01/16] netdevsim: move device registration on bus to be done earlier in init Jiri Pirko
2019-04-25 13:59 ` [patch net-next v4 02/16] netdevsim: create devlink instance per netdevsim instance Jiri Pirko
2019-04-25 13:59 ` [patch net-next v4 03/16] netdevsim: rename devlink.c to dev.c to contain per-dev(asic) items Jiri Pirko
2019-04-25 13:59 ` [patch net-next v4 04/16] netdevsim: put netdevsim bus code into separate file Jiri Pirko
2019-04-25 13:59 ` [patch net-next v4 05/16] netdevsim: move device registration and related code to bus.c Jiri Pirko
2019-04-25 13:59 ` [patch net-next v4 06/16] netdevsim: add stub netdevsim driver implementation Jiri Pirko
2019-04-25 15:38   ` Sergei Shtylyov
2019-04-25 13:59 ` [patch net-next v4 07/16] netdevsim: use ida for bus device ids Jiri Pirko
2019-04-25 13:59 ` [patch net-next v4 08/16] netdevsim: add bus attributes to add new and delete devices Jiri Pirko
2019-04-25 13:59 ` [patch net-next v4 09/16] netdevsim: rename dev_init/exit() functions and make them independent on ns Jiri Pirko
2019-04-25 13:59 ` [patch net-next v4 10/16] netdevsim: merge sdev into dev Jiri Pirko
2019-04-25 13:59 ` Jiri Pirko [this message]
2019-04-25 13:59 ` [patch net-next v4 12/16] netdevsim: change debugfs tree topology Jiri Pirko
2019-04-25 13:59 ` [patch net-next v4 13/16] netdevsim: implement dev probe/remove skeleton with port initialization Jiri Pirko
2019-04-25 13:59 ` [patch net-next v4 14/16] netdevsim: extend device attrs to support port addition and deletion Jiri Pirko
2019-04-25 13:59 ` [patch net-next v4 15/16] netdevsim: move netdev creation/destruction to dev probe Jiri Pirko
2019-04-25 13:59 ` [patch net-next v4 16/16] netdevsim: implement ndo_get_devlink_port Jiri Pirko
2019-04-25 14:02 ` [patch net-next v4 00/16] netdevsim: implement proper device model Jiri Pirko
2019-04-25 22:11 ` Jakub Kicinski
2019-04-26  5:52   ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190425135956.3970-12-jiri@resnulli.us \
    --to=jiri@resnulli.us \
    --cc=davem@davemloft.net \
    --cc=dsahern@gmail.com \
    --cc=jakub.kicinski@netronome.com \
    --cc=mlxsw@mellanox.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox