[PATCH net-next 0/2] net: dsa: Implement ndo_get_phys_port_name()

[PATCH net-next 0/2] net: dsa: Implement ndo_get_phys_port_name()

[Florian Fainelli]

Hi all,

This patch series implements ndo_get_phys_port_name() so we can revert
ndo_get_phys_id() which was (ab)used in the DSA layer.

Thanks

Florian Fainelli (2):
  net: dsa: Implement ndo_get_phys_port_name()
  Revert "net: dsa: Implement ndo_get_phys_port_id"

 net/dsa/slave.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

-- 
2.9.3

[PATCH net-next 1/2] net: dsa: Implement ndo_get_phys_port_name()

[Florian Fainelli]

Return the physical port number of a DSA created network device using
ndo_get_phys_port_name().

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 net/dsa/slave.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 5cd5b8137c08..fed3fbd403cb 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -990,6 +990,15 @@ static int dsa_slave_get_phys_port_id(struct net_device *dev,
 
 	ppid->id_len = sizeof(p->port);
 	memcpy(ppid->id, &p->port, ppid->id_len);
+}
+
+static int dsa_slave_get_phys_port_name(struct net_device *dev,
+					char *name, size_t len)
+{
+	struct dsa_slave_priv *p = netdev_priv(dev);
+
+	if (snprintf(name, len, "p%d", p->port) >= len)
+		return -EINVAL;
 
 	return 0;
 }
@@ -1042,6 +1051,7 @@ static const struct net_device_ops dsa_slave_netdev_ops = {
 	.ndo_bridge_setlink	= switchdev_port_bridge_setlink,
 	.ndo_bridge_dellink	= switchdev_port_bridge_dellink,
 	.ndo_get_phys_port_id	= dsa_slave_get_phys_port_id,
+	.ndo_get_phys_port_name	= dsa_slave_get_phys_port_name,
 };
 
 static const struct switchdev_ops dsa_slave_switchdev_ops = {
-- 
2.9.3

[PATCH net-next 2/2] Revert "net: dsa: Implement ndo_get_phys_port_id"

[Florian Fainelli]

This reverts commit 3a543ef479868e36c95935de320608a7e41466ca ("net: dsa:
Implement ndo_get_phys_port_id") since it misuses the purpose of
ndo_get_phys_port_id(). We have ndo_get_phys_port_name() to do the
correct thing for us now.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 net/dsa/slave.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index fed3fbd403cb..0cdcaf526987 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -983,15 +983,6 @@ static void dsa_slave_poll_controller(struct net_device *dev)
 }
 #endif
 
-static int dsa_slave_get_phys_port_id(struct net_device *dev,
-				      struct netdev_phys_item_id *ppid)
-{
-	struct dsa_slave_priv *p = netdev_priv(dev);
-
-	ppid->id_len = sizeof(p->port);
-	memcpy(ppid->id, &p->port, ppid->id_len);
-}
-
 static int dsa_slave_get_phys_port_name(struct net_device *dev,
 					char *name, size_t len)
 {
@@ -1050,7 +1041,6 @@ static const struct net_device_ops dsa_slave_netdev_ops = {
 	.ndo_bridge_getlink	= switchdev_port_bridge_getlink,
 	.ndo_bridge_setlink	= switchdev_port_bridge_setlink,
 	.ndo_bridge_dellink	= switchdev_port_bridge_dellink,
-	.ndo_get_phys_port_id	= dsa_slave_get_phys_port_id,
 	.ndo_get_phys_port_name	= dsa_slave_get_phys_port_name,
 };
 
-- 
2.9.3

Re: [PATCH net-next 1/2] net: dsa: Implement ndo_get_phys_port_name()

[Vivien Didelot]

Hi Florian,

Florian Fainelli <f.fainelli@gmail.com> writes:

> Return the physical port number of a DSA created network device using
> ndo_get_phys_port_name().
>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Tested-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>

Thanks,

        Vivien

Re: [PATCH net-next 2/2] Revert "net: dsa: Implement ndo_get_phys_port_id"

[Vivien Didelot]

Hi Florian,

Florian Fainelli <f.fainelli@gmail.com> writes:

> This reverts commit 3a543ef479868e36c95935de320608a7e41466ca ("net: dsa:
> Implement ndo_get_phys_port_id") since it misuses the purpose of
> ndo_get_phys_port_id(). We have ndo_get_phys_port_name() to do the
> correct thing for us now.
>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>

Thanks,

        Vivien

Re: [PATCH net-next 1/2] net: dsa: Implement ndo_get_phys_port_name()

[Andrew Lunn]

On Tue, Jan 10, 2017 at 12:32:36PM -0800, Florian Fainelli wrote:
> Return the physical port number of a DSA created network device using
> ndo_get_phys_port_name().

At what level does this need to be unique?

We can have multiple switches within one switch cluster. p->port will
be unique within one switch, but can be repeated in a cluster.

We can also have multiple clusters, and again p->port will be re-used.

   Andrew

Re: [PATCH net-next 1/2] net: dsa: Implement ndo_get_phys_port_name()

[Vivien Didelot]

Hi Andrew,

Andrew Lunn <andrew@lunn.ch> writes:

> On Tue, Jan 10, 2017 at 12:32:36PM -0800, Florian Fainelli wrote:
>> Return the physical port number of a DSA created network device using
>> ndo_get_phys_port_name().
>
> At what level does this need to be unique?

The port name must be unique at the switch Linux device level.

Thanks,

        Vivien

Re: [PATCH net-next 1/2] net: dsa: Implement ndo_get_phys_port_name()

[Florian Fainelli]

On 01/10/2017 12:50 PM, Andrew Lunn wrote:
> On Tue, Jan 10, 2017 at 12:32:36PM -0800, Florian Fainelli wrote:
>> Return the physical port number of a DSA created network device using
>> ndo_get_phys_port_name().
> 
> At what level does this need to be unique?

This needs to be unique to the switch I would say,
ndo_get_phys_switch_id would return the physical number of the switch
device in the tree/cluster, so that number plus the port name should be
an unique differentiator that is good enough for e.g: a persistent
naming rule?

> 
> We can have multiple switches within one switch cluster. p->port will
> be unique within one switch, but can be repeated in a cluster.
> 
> We can also have multiple clusters, and again p->port will be re-used.


-- 
Florian

Re: [PATCH net-next 1/2] net: dsa: Implement ndo_get_phys_port_name()

[Jiri Pirko]

Tue, Jan 10, 2017 at 09:58:53PM CET, f.fainelli@gmail.com wrote:
>On 01/10/2017 12:50 PM, Andrew Lunn wrote:
>> On Tue, Jan 10, 2017 at 12:32:36PM -0800, Florian Fainelli wrote:
>>> Return the physical port number of a DSA created network device using
>>> ndo_get_phys_port_name().
>> 
>> At what level does this need to be unique?
>
>This needs to be unique to the switch I would say,

Yes.

>ndo_get_phys_switch_id would return the physical number of the switch
>device in the tree/cluster, so that number plus the port name should be
>an unique differentiator that is good enough for e.g: a persistent
>naming rule?

Yes.

>
>> 
>> We can have multiple switches within one switch cluster. p->port will
>> be unique within one switch, but can be repeated in a cluster.
>> 
>> We can also have multiple clusters, and again p->port will be re-used.
>
>
>-- 
>Florian

Re: [PATCH net-next 1/2] net: dsa: Implement ndo_get_phys_port_name()

[Jiri Pirko]

Tue, Jan 10, 2017 at 09:32:36PM CET, f.fainelli@gmail.com wrote:
>Return the physical port number of a DSA created network device using
>ndo_get_phys_port_name().
>
>Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Reviewed-by: Jiri Pirko <jiri@mellanox.com>


>---
> net/dsa/slave.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
>diff --git a/net/dsa/slave.c b/net/dsa/slave.c
>index 5cd5b8137c08..fed3fbd403cb 100644
>--- a/net/dsa/slave.c
>+++ b/net/dsa/slave.c
>@@ -990,6 +990,15 @@ static int dsa_slave_get_phys_port_id(struct net_device *dev,
> 
> 	ppid->id_len = sizeof(p->port);
> 	memcpy(ppid->id, &p->port, ppid->id_len);
>+}
>+
>+static int dsa_slave_get_phys_port_name(struct net_device *dev,
>+					char *name, size_t len)
>+{
>+	struct dsa_slave_priv *p = netdev_priv(dev);
>+
>+	if (snprintf(name, len, "p%d", p->port) >= len)
>+		return -EINVAL;
> 
> 	return 0;
> }
>@@ -1042,6 +1051,7 @@ static const struct net_device_ops dsa_slave_netdev_ops = {
> 	.ndo_bridge_setlink	= switchdev_port_bridge_setlink,
> 	.ndo_bridge_dellink	= switchdev_port_bridge_dellink,
> 	.ndo_get_phys_port_id	= dsa_slave_get_phys_port_id,
>+	.ndo_get_phys_port_name	= dsa_slave_get_phys_port_name,
> };
> 
> static const struct switchdev_ops dsa_slave_switchdev_ops = {
>-- 
>2.9.3
>

Re: [PATCH net-next 2/2] Revert "net: dsa: Implement ndo_get_phys_port_id"

[Jiri Pirko]

Tue, Jan 10, 2017 at 09:32:37PM CET, f.fainelli@gmail.com wrote:
>This reverts commit 3a543ef479868e36c95935de320608a7e41466ca ("net: dsa:
>Implement ndo_get_phys_port_id") since it misuses the purpose of
>ndo_get_phys_port_id(). We have ndo_get_phys_port_name() to do the
>correct thing for us now.
>
>Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Reviewed-by: Jiri Pirko <jiri@mellanox.com>


>---
> net/dsa/slave.c | 10 ----------
> 1 file changed, 10 deletions(-)
>
>diff --git a/net/dsa/slave.c b/net/dsa/slave.c
>index fed3fbd403cb..0cdcaf526987 100644
>--- a/net/dsa/slave.c
>+++ b/net/dsa/slave.c
>@@ -983,15 +983,6 @@ static void dsa_slave_poll_controller(struct net_device *dev)
> }
> #endif
> 
>-static int dsa_slave_get_phys_port_id(struct net_device *dev,
>-				      struct netdev_phys_item_id *ppid)
>-{
>-	struct dsa_slave_priv *p = netdev_priv(dev);
>-
>-	ppid->id_len = sizeof(p->port);
>-	memcpy(ppid->id, &p->port, ppid->id_len);
>-}
>-
> static int dsa_slave_get_phys_port_name(struct net_device *dev,
> 					char *name, size_t len)
> {
>@@ -1050,7 +1041,6 @@ static const struct net_device_ops dsa_slave_netdev_ops = {
> 	.ndo_bridge_getlink	= switchdev_port_bridge_getlink,
> 	.ndo_bridge_setlink	= switchdev_port_bridge_setlink,
> 	.ndo_bridge_dellink	= switchdev_port_bridge_dellink,
>-	.ndo_get_phys_port_id	= dsa_slave_get_phys_port_id,
> 	.ndo_get_phys_port_name	= dsa_slave_get_phys_port_name,
> };
> 
>-- 
>2.9.3
>

Re: [PATCH net-next 0/2] net: dsa: Implement ndo_get_phys_port_name()

[David Miller]

From: Florian Fainelli <f.fainelli@gmail.com>
Date: Tue, 10 Jan 2017 12:32:35 -0800

> This patch series implements ndo_get_phys_port_name() so we can revert
> ndo_get_phys_id() which was (ab)used in the DSA layer.

Series applied, thanks Florian.