From: Horatiu Vultur <horatiu.vultur@microchip.com>
To: <linux-kernel@vger.kernel.org>, <netdev@vger.kernel.org>,
<bridge@lists.linux-foundation.org>, <jiri@resnulli.us>,
<ivecera@redhat.com>, <davem@davemloft.net>,
<roopa@cumulusnetworks.com>, <nikolay@cumulusnetworks.com>,
<anirudh.venkataramanan@intel.com>, <olteanv@gmail.com>,
<andrew@lunn.ch>, <jeffrey.t.kirsher@intel.com>,
<UNGLinuxDriver@microchip.com>
Cc: Horatiu Vultur <horatiu.vultur@microchip.com>
Subject: [RFC net-next v3 08/10] net: bridge: mrp: Connect MRP api with the switchev API
Date: Fri, 24 Jan 2020 17:18:26 +0100 [thread overview]
Message-ID: <20200124161828.12206-9-horatiu.vultur@microchip.com> (raw)
In-Reply-To: <20200124161828.12206-1-horatiu.vultur@microchip.com>
Implement the MRP api.
The functions are just a wrapper over the switchdev API with extra checks
regarding the MRP instances and ports.
Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
---
net/bridge/br_mrp.c | 193 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 193 insertions(+)
create mode 100644 net/bridge/br_mrp.c
diff --git a/net/bridge/br_mrp.c b/net/bridge/br_mrp.c
new file mode 100644
index 000000000000..69e1a3e526d5
--- /dev/null
+++ b/net/bridge/br_mrp.c
@@ -0,0 +1,193 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "br_private_mrp.h"
+
+static struct br_mrp *br_mrp_find_id(struct net_bridge *br, u32 ring_nr)
+{
+ struct br_mrp *mrp;
+
+ list_for_each_entry(mrp, &br->mrp_list, list) {
+ if (mrp->ring_nr == ring_nr)
+ return mrp;
+ }
+
+ return NULL;
+}
+
+static struct br_mrp *br_mrp_find_port(struct net_bridge *br,
+ struct net_bridge_port *p)
+{
+ struct br_mrp *mrp;
+
+ list_for_each_entry(mrp, &br->mrp_list, list) {
+ if (mrp->p_port == p || mrp->s_port == p)
+ return mrp;
+ }
+
+ return NULL;
+}
+
+int br_mrp_add(struct net_bridge *br, u32 ring_nr)
+{
+ struct br_mrp *mrp;
+
+ /* If the ring exists, it is not possible to create another one with the
+ * same ring_nr
+ */
+ mrp = br_mrp_find_id(br, ring_nr);
+ if (mrp)
+ return -EINVAL;
+
+ mrp = devm_kzalloc(&br->dev->dev, sizeof(struct br_mrp), GFP_KERNEL);
+ if (!mrp)
+ return -ENOMEM;
+
+ mrp->br = br;
+ mrp->p_port = NULL;
+ mrp->s_port = NULL;
+ mrp->ring_nr = ring_nr;
+
+ list_add_tail(&mrp->list, &br->mrp_list);
+
+ return 0;
+}
+
+int br_mrp_add_port(struct net_bridge *br, u32 ring_nr,
+ struct net_bridge_port *p)
+{
+ struct br_mrp *mrp = br_mrp_find_id(br, ring_nr);
+
+ if (!mrp)
+ return -EINVAL;
+
+ p->state = BR_STATE_FORWARDING;
+ p->mrp_aware = true;
+
+ br_mrp_port_switchdev_add(p, mrp->ring_nr);
+
+ return 0;
+}
+
+int br_mrp_del(struct net_bridge *br, u32 ring_nr)
+{
+ struct br_mrp *mrp = br_mrp_find_id(br, ring_nr);
+
+ if (!mrp)
+ return -EINVAL;
+
+ /* Stop sending MRP_Test frames */
+ br_mrp_switchdev_send_ring_test(mrp, 0, 0);
+
+ /* Destroy the ring */
+ mrp->br = NULL;
+ mrp->p_port = NULL;
+ mrp->s_port = NULL;
+
+ list_del(&mrp->list);
+ devm_kfree(&br->dev->dev, mrp);
+
+ return 0;
+}
+
+int br_mrp_del_port(struct net_bridge_port *p)
+{
+ struct net_bridge *br;
+ struct br_mrp *mrp;
+
+ br = p->br;
+ mrp = br_mrp_find_port(br, p);
+ if (!mrp)
+ return 0;
+
+ /* Stop sending MRP_Test frames */
+ br_mrp_switchdev_send_ring_test(mrp, 0, 0);
+
+ p->state = BR_STATE_FORWARDING;
+ p->mrp_aware = false;
+ if (p == mrp->p_port)
+ mrp->p_port = NULL;
+ if (p == mrp->s_port)
+ mrp->s_port = NULL;
+
+ br_mrp_port_switchdev_del(p, mrp->ring_nr);
+
+ return 0;
+}
+
+int br_mrp_set_port_state(struct net_bridge_port *p,
+ enum br_mrp_port_state_type state)
+{
+ struct net_bridge *br;
+
+ br = p->br;
+ if (state == BR_MRP_PORT_STATE_FORWARDING)
+ p->state = BR_STATE_FORWARDING;
+ else
+ p->state = BR_STATE_BLOCKING;
+
+ br_mrp_port_switchdev_set_state(p, state);
+
+ return 0;
+}
+
+int br_mrp_set_port_role(struct net_bridge_port *p, u32 ring_nr,
+ enum br_mrp_port_role_type role)
+{
+ struct br_mrp *mrp = br_mrp_find_id(p->br, ring_nr);
+
+ if (!mrp)
+ return -EINVAL;
+
+ if (role == BR_MRP_PORT_ROLE_PRIMARY)
+ mrp->p_port = p;
+ if (role == BR_MRP_PORT_ROLE_SECONDARY)
+ mrp->s_port = p;
+
+ br_mrp_port_switchdev_set_role(p, role);
+
+ return 0;
+}
+
+int br_mrp_set_ring_state(struct net_bridge *br, u32 ring_nr,
+ enum br_mrp_ring_state_type state)
+{
+ struct br_mrp *mrp = br_mrp_find_id(br, ring_nr);
+
+ if (!mrp)
+ return -EINVAL;
+
+ br_mrp_switchdev_set_ring_state(mrp, state);
+
+ return 0;
+}
+
+int br_mrp_set_ring_role(struct net_bridge *br, u32 ring_nr,
+ enum br_mrp_ring_role_type role)
+{
+ struct br_mrp *mrp = br_mrp_find_id(br, ring_nr);
+
+ if (!mrp)
+ return -EINVAL;
+
+ br_mrp_switchdev_set_ring_role(mrp, role);
+
+ return 0;
+}
+
+int br_mrp_start_test(struct net_bridge *br, u32 ring_nr, u32 interval,
+ u8 max_miss)
+{
+ struct br_mrp *mrp = br_mrp_find_id(br, ring_nr);
+
+ if (!mrp)
+ return -EINVAL;
+
+ return br_mrp_switchdev_send_ring_test(mrp, interval, max_miss);
+}
+
+int br_mrp_flush(struct net_bridge *br, u32 ring_nr)
+{
+ br_fdb_flush(br);
+ return 0;
+}
+
--
2.17.1
next prev parent reply other threads:[~2020-01-24 16:20 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 16:18 [RFC net-next v3 00/10] net: bridge: mrp: Add support for Media Redundancy Protocol (MRP) Horatiu Vultur
2020-01-24 16:18 ` [RFC net-next v3 01/10] net: bridge: mrp: Expose mrp attributes Horatiu Vultur
2020-01-24 16:18 ` [RFC net-next v3 02/10] net: bridge: mrp: Expose function br_mrp_port_open Horatiu Vultur
2020-01-24 17:37 ` Andrew Lunn
2020-01-25 11:29 ` Horatiu Vultur
2020-01-24 16:18 ` [RFC net-next v3 03/10] net: bridge: mrp: Add MRP interface used by netlink Horatiu Vultur
2020-01-24 17:43 ` Andrew Lunn
2020-01-25 11:37 ` Horatiu Vultur
2020-01-25 15:20 ` Andrew Lunn
2020-01-25 19:16 ` Allan W. Nielsen
2020-01-26 13:28 ` Horatiu Vultur
2020-01-26 15:39 ` Andrew Lunn
2020-02-20 9:08 ` Nikolay Aleksandrov
2020-02-20 13:00 ` Allan W. Nielsen
2020-01-24 16:18 ` [RFC net-next v3 04/10] net: bridge: mrp: Add generic netlink interface to configure MRP Horatiu Vultur
2020-01-25 15:34 ` Andrew Lunn
2020-01-25 19:28 ` Allan W. Nielsen
2020-01-26 13:39 ` Horatiu Vultur
2020-01-24 16:18 ` [RFC net-next v3 05/10] net: bridge: mrp: Update MRP interface to add switchdev support Horatiu Vultur
2020-01-24 16:18 ` [RFC net-next v3 06/10] net: bridge: mrp: switchdev: Extend switchdev API to offload MRP Horatiu Vultur
2020-01-25 16:35 ` Andrew Lunn
2020-01-26 13:22 ` Horatiu Vultur
2020-01-26 15:59 ` Andrew Lunn
2020-01-27 11:04 ` Allan W. Nielsen
2020-01-27 14:41 ` Jürgen Lambrecht
[not found] ` <c5733ddb-a837-b866-54bf-c631baf36c54@televic.com>
2020-01-27 15:06 ` Andrew Lunn
2020-01-28 9:50 ` Jürgen Lambrecht
2020-01-27 11:29 ` Jürgen Lambrecht
2020-01-27 12:27 ` Allan W. Nielsen
2020-01-27 14:39 ` Jürgen Lambrecht
2020-01-28 9:58 ` Allan W. Nielsen
2020-01-24 16:18 ` [RFC net-next v3 07/10] net: bridge: mrp: switchdev: Implement MRP API for switchdev Horatiu Vultur
2020-01-24 16:18 ` Horatiu Vultur [this message]
2020-01-24 16:18 ` [RFC net-next v3 09/10] net: bridge: mrp: Integrate MRP into the bridge Horatiu Vultur
2020-01-25 15:42 ` Andrew Lunn
2020-01-26 12:49 ` Horatiu Vultur
2020-01-25 16:16 ` Andrew Lunn
2020-01-26 13:01 ` Horatiu Vultur
2020-01-26 17:12 ` Andrew Lunn
2020-01-27 10:57 ` Allan W. Nielsen
2020-01-27 13:02 ` Horatiu Vultur
2020-01-27 13:40 ` Andrew Lunn
2020-01-28 9:56 ` Jürgen Lambrecht
2020-01-28 10:17 ` Allan W. Nielsen
2020-01-24 16:18 ` [RFC net-next v3 10/10] net: bridge: mrp: Update Kconfig and Makefile Horatiu Vultur
2020-01-24 20:34 ` [RFC net-next v3 00/10] net: bridge: mrp: Add support for Media Redundancy Protocol (MRP) Allan W. Nielsen
2020-01-24 21:05 ` Vinicius Costa Gomes
2020-01-25 9:44 ` Allan W. Nielsen
2020-01-25 16:23 ` Andrew Lunn
2020-01-25 19:12 ` Allan W. Nielsen
2020-01-25 21:18 ` Vinicius Costa Gomes
2020-01-28 10:35 ` Jürgen Lambrecht
2020-02-18 12:18 ` Allan W. Nielsen
2020-02-18 16:55 ` Jakub Kicinski
2020-02-20 10:48 ` Nikolay Aleksandrov
2020-02-20 12:58 ` Allan W. Nielsen
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=20200124161828.12206-9-horatiu.vultur@microchip.com \
--to=horatiu.vultur@microchip.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew@lunn.ch \
--cc=anirudh.venkataramanan@intel.com \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=ivecera@redhat.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=jiri@resnulli.us \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nikolay@cumulusnetworks.com \
--cc=olteanv@gmail.com \
--cc=roopa@cumulusnetworks.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).