hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bridge: mrp: Set the priority of MRP instance 

Each MRP instance has a priority, a lower value means a higher priority.
The priority of MRP instance is stored in MRP_Test frame in this way
all the MRP nodes in the ring can see other nodes priority.

Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Horatiu Vultur 2020-05-30 18:09:47 +00:00 committed by David S. Miller
parent 7e89ed8ab3
commit 4b3a61b030
6 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/switchdev.h
View File

@ -116,6 +116,7 @@ struct switchdev_obj_mrp {
struct net_device *p_port; struct net_device *p_port;
struct net_device *s_port; struct net_device *s_port;
u32 ring_id; u32 ring_id;
u16 prio;
}; };
#define SWITCHDEV_OBJ_MRP(OBJ) \ #define SWITCHDEV_OBJ_MRP(OBJ) \

2
include/uapi/linux/if_bridge.h
View File

@ -176,6 +176,7 @@ enum {
IFLA_BRIDGE_MRP_INSTANCE_RING_ID, IFLA_BRIDGE_MRP_INSTANCE_RING_ID,
IFLA_BRIDGE_MRP_INSTANCE_P_IFINDEX, IFLA_BRIDGE_MRP_INSTANCE_P_IFINDEX,
IFLA_BRIDGE_MRP_INSTANCE_S_IFINDEX, IFLA_BRIDGE_MRP_INSTANCE_S_IFINDEX,
IFLA_BRIDGE_MRP_INSTANCE_PRIO,
__IFLA_BRIDGE_MRP_INSTANCE_MAX, __IFLA_BRIDGE_MRP_INSTANCE_MAX,
}; };
@ -230,6 +231,7 @@ struct br_mrp_instance {
__u32 ring_id; __u32 ring_id;
__u32 p_ifindex; __u32 p_ifindex;
__u32 s_ifindex; __u32 s_ifindex;
__u16 prio;
}; };
struct br_mrp_ring_state { struct br_mrp_ring_state {

3
net/bridge/br_mrp.c
View File

@ -147,7 +147,7 @@ static struct sk_buff *br_mrp_alloc_test_skb(struct br_mrp *mrp,
br_mrp_skb_tlv(skb, BR_MRP_TLV_HEADER_RING_TEST, sizeof(*hdr)); br_mrp_skb_tlv(skb, BR_MRP_TLV_HEADER_RING_TEST, sizeof(*hdr));
hdr = skb_put(skb, sizeof(*hdr)); hdr = skb_put(skb, sizeof(*hdr));
hdr->prio = cpu_to_be16(MRP_DEFAULT_PRIO); hdr->prio = cpu_to_be16(mrp->prio);
ether_addr_copy(hdr->sa, p->br->dev->dev_addr); ether_addr_copy(hdr->sa, p->br->dev->dev_addr);
hdr->port_role = cpu_to_be16(port_role); hdr->port_role = cpu_to_be16(port_role);
hdr->state = cpu_to_be16(mrp->ring_state); hdr->state = cpu_to_be16(mrp->ring_state);
@ -290,6 +290,7 @@ int br_mrp_add(struct net_bridge *br, struct br_mrp_instance *instance)
return -ENOMEM; return -ENOMEM;
mrp->ring_id = instance->ring_id; mrp->ring_id = instance->ring_id;
mrp->prio = instance->prio;
p = br_mrp_get_port(br, instance->p_ifindex); p = br_mrp_get_port(br, instance->p_ifindex);
spin_lock_bh(&br->lock); spin_lock_bh(&br->lock);

5
net/bridge/br_mrp_netlink.c
View File

@ -22,6 +22,7 @@ br_mrp_instance_policy[IFLA_BRIDGE_MRP_INSTANCE_MAX + 1] = {
[IFLA_BRIDGE_MRP_INSTANCE_RING_ID] = { .type = NLA_U32 }, [IFLA_BRIDGE_MRP_INSTANCE_RING_ID] = { .type = NLA_U32 },
[IFLA_BRIDGE_MRP_INSTANCE_P_IFINDEX] = { .type = NLA_U32 }, [IFLA_BRIDGE_MRP_INSTANCE_P_IFINDEX] = { .type = NLA_U32 },
[IFLA_BRIDGE_MRP_INSTANCE_S_IFINDEX] = { .type = NLA_U32 }, [IFLA_BRIDGE_MRP_INSTANCE_S_IFINDEX] = { .type = NLA_U32 },
[IFLA_BRIDGE_MRP_INSTANCE_PRIO] = { .type = NLA_U16 },
}; };
static int br_mrp_instance_parse(struct net_bridge *br, struct nlattr *attr, static int br_mrp_instance_parse(struct net_bridge *br, struct nlattr *attr,
@ -49,6 +50,10 @@ static int br_mrp_instance_parse(struct net_bridge *br, struct nlattr *attr,
inst.ring_id = nla_get_u32(tb[IFLA_BRIDGE_MRP_INSTANCE_RING_ID]); inst.ring_id = nla_get_u32(tb[IFLA_BRIDGE_MRP_INSTANCE_RING_ID]);
inst.p_ifindex = nla_get_u32(tb[IFLA_BRIDGE_MRP_INSTANCE_P_IFINDEX]); inst.p_ifindex = nla_get_u32(tb[IFLA_BRIDGE_MRP_INSTANCE_P_IFINDEX]);
inst.s_ifindex = nla_get_u32(tb[IFLA_BRIDGE_MRP_INSTANCE_S_IFINDEX]); inst.s_ifindex = nla_get_u32(tb[IFLA_BRIDGE_MRP_INSTANCE_S_IFINDEX]);
inst.prio = MRP_DEFAULT_PRIO;
if (tb[IFLA_BRIDGE_MRP_INSTANCE_PRIO])
inst.prio = nla_get_u16(tb[IFLA_BRIDGE_MRP_INSTANCE_PRIO]);
if (cmd == RTM_SETLINK) if (cmd == RTM_SETLINK)
return br_mrp_add(br, &inst); return br_mrp_add(br, &inst);

1
net/bridge/br_mrp_switchdev.c
View File

@ -12,6 +12,7 @@ int br_mrp_switchdev_add(struct net_bridge *br, struct br_mrp *mrp)
.p_port = rtnl_dereference(mrp->p_port)->dev, .p_port = rtnl_dereference(mrp->p_port)->dev,
.s_port = rtnl_dereference(mrp->s_port)->dev, .s_port = rtnl_dereference(mrp->s_port)->dev,
.ring_id = mrp->ring_id, .ring_id = mrp->ring_id,
.prio = mrp->prio,
}; };
int err; int err;

1
net/bridge/br_private_mrp.h
View File

@ -14,6 +14,7 @@ struct br_mrp {
struct net_bridge_port __rcu *s_port; struct net_bridge_port __rcu *s_port;
u32 ring_id; u32 ring_id;
u16 prio;
enum br_mrp_ring_role_type ring_role; enum br_mrp_ring_role_type ring_role;
u8 ring_role_offloaded; u8 ring_role_offloaded;