From: "Marek Behún" <marek.behun@nic.cz>
To: netdev@vger.kernel.org
Cc: "Andrew Lunn" <andrew@lunn.ch>,
"Vivien Didelot" <vivien.didelot@gmail.com>,
"Florian Fainelli" <f.fainelli@gmail.com>,
"David Ahern" <dsahern@gmail.com>,
"Stephen Hemminger" <stephen@networkplumber.org>,
"Marek Behún" <marek.behun@nic.cz>
Subject: [PATCH RFC net-next 3/3] net: dsa: implement ndo_set_netlink for chaning port's CPU port
Date: Sat, 24 Aug 2019 04:42:50 +0200 [thread overview]
Message-ID: <20190824024251.4542-4-marek.behun@nic.cz> (raw)
In-Reply-To: <20190824024251.4542-1-marek.behun@nic.cz>
Implement ndo_set_iflink for DSA slave device. In multi-CPU port setup
this should be used to change to which CPU destination port a given port
should be connected.
This adds a new operation into the DSA switch operations structure,
port_change_cpu_port. A driver implementing this function has the
ability to change CPU destination port of a given port.
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
include/net/dsa.h | 6 ++++++
net/dsa/slave.c | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+)
diff --git a/include/net/dsa.h b/include/net/dsa.h
index 64bd70608f2f..4f3f0032b886 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -545,6 +545,12 @@ struct dsa_switch_ops {
*/
netdev_tx_t (*port_deferred_xmit)(struct dsa_switch *ds, int port,
struct sk_buff *skb);
+
+ /*
+ * Multi-CPU port support
+ */
+ int (*port_change_cpu_port)(struct dsa_switch *ds, int port,
+ struct dsa_port *new_cpu_dp);
};
struct dsa_switch_driver {
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 33f41178afcc..bafaadeca912 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -64,6 +64,40 @@ static int dsa_slave_get_iflink(const struct net_device *dev)
return dsa_slave_to_master(dev)->ifindex;
}
+static int dsa_slave_set_iflink(struct net_device *dev, int iflink)
+{
+ struct dsa_port *dp = dsa_slave_to_port(dev);
+ struct dsa_slave_priv *p = netdev_priv(dev);
+ struct net_device *new_cpu_dev;
+ struct dsa_port *new_cpu_dp;
+ int err;
+
+ if (!dp->ds->ops->port_change_cpu_port)
+ return -EOPNOTSUPP;
+
+ new_cpu_dev = dev_get_by_index(dev_net(dev), iflink);
+ if (!new_cpu_dev)
+ return -ENODEV;
+
+ new_cpu_dp = new_cpu_dev->dsa_ptr;
+ if (!new_cpu_dp)
+ return -EINVAL;
+
+ /* new CPU port has to be on the same switch tree */
+ if (new_cpu_dp->dst != dp->dst)
+ return -EINVAL;
+
+ err = dp->ds->ops->port_change_cpu_port(dp->ds, dp->index, new_cpu_dp);
+ if (err)
+ return err;
+
+ /* should this be done atomically? */
+ dp->cpu_dp = new_cpu_dp;
+ p->xmit = new_cpu_dp->tag_ops->xmit;
+
+ return 0;
+}
+
static int dsa_slave_open(struct net_device *dev)
{
struct net_device *master = dsa_slave_to_master(dev);
@@ -1176,6 +1210,7 @@ static const struct net_device_ops dsa_slave_netdev_ops = {
.ndo_fdb_dump = dsa_slave_fdb_dump,
.ndo_do_ioctl = dsa_slave_ioctl,
.ndo_get_iflink = dsa_slave_get_iflink,
+ .ndo_set_iflink = dsa_slave_set_iflink,
#ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_netpoll_setup = dsa_slave_netpoll_setup,
.ndo_netpoll_cleanup = dsa_slave_netpoll_cleanup,
--
2.21.0
next prev parent reply other threads:[~2019-08-24 2:43 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-24 2:42 [PATCH RFC net-next 0/3] Multi-CPU DSA support Marek Behún
2019-08-24 2:42 ` [PATCH RFC net-next 1/3] net: dsa: allow for multiple CPU ports Marek Behún
2019-08-24 15:43 ` Andrew Lunn
2019-08-24 17:41 ` Marek Behun
2019-08-24 2:42 ` [PATCH RFC net-next 2/3] net: add ndo for setting the iflink property Marek Behún
2019-08-24 2:42 ` Marek Behún [this message]
2019-08-24 15:47 ` [PATCH RFC net-next 3/3] net: dsa: implement ndo_set_netlink for chaning port's CPU port Andrew Lunn
2019-08-24 2:42 ` [PATCH RFC iproute2-next] iplink: allow to change iplink value Marek Behún
2019-08-24 15:24 ` [PATCH RFC net-next 0/3] Multi-CPU DSA support Andrew Lunn
2019-08-24 17:45 ` Marek Behun
2019-08-24 17:54 ` Andrew Lunn
2019-08-25 4:19 ` Marek Behun
2019-08-24 15:40 ` Vladimir Oltean
2019-08-24 15:44 ` Vladimir Oltean
2019-08-24 17:55 ` Marek Behun
2019-08-24 15:56 ` Andrew Lunn
2019-08-24 17:58 ` Marek Behun
2019-08-24 20:04 ` Florian Fainelli
2019-08-24 21:01 ` Marek Behun
2019-08-25 4:08 ` Marek Behun
2019-08-25 7:13 ` Marek Behun
2019-08-25 15:00 ` Florian Fainelli
2021-04-10 13:34 Ansuel Smith
2021-04-10 13:34 ` [PATCH RFC net-next 3/3] net: dsa: implement ndo_set_netlink for chaning port's CPU port Ansuel Smith
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=20190824024251.4542-4-marek.behun@nic.cz \
--to=marek.behun@nic.cz \
--cc=andrew@lunn.ch \
--cc=dsahern@gmail.com \
--cc=f.fainelli@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
--cc=vivien.didelot@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).