| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 24 Jan 2020 17:18:26 +0100
From: Horatiu Vultur <horatiu.vultur@...rochip.com>
To: <linux-kernel@...r.kernel.org>, <netdev@...r.kernel.org>,
<bridge@...ts.linux-foundation.org>, <jiri@...nulli.us>,
<ivecera@...hat.com>, <davem@...emloft.net>,
<roopa@...ulusnetworks.com>, <nikolay@...ulusnetworks.com>,
<anirudh.venkataramanan@...el.com>, <olteanv@...il.com>,
<andrew@...n.ch>, <jeffrey.t.kirsher@...el.com>,
<UNGLinuxDriver@...rochip.com>
CC: Horatiu Vultur <horatiu.vultur@...rochip.com>
Subject: [RFC net-next v3 08/10] net: bridge: mrp: Connect MRP api with the switchev API
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@...rochip.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
Powered by blists - more mailing lists