Commit e77824d8 authored by Henrik Bjoernlund's avatar Henrik Bjoernlund Committed by Jakub Kicinski
Browse files

bridge: cfm: Netlink GET status Interface. 



This is the implementation of CFM netlink status
get information interface.

Add new nested netlink attributes. These attributes are used by the
user space to get status information.

GETLINK:
    Request filter RTEXT_FILTER_CFM_STATUS:
    Indicating that CFM status information must be delivered.

    IFLA_BRIDGE_CFM:
        Points to the CFM information.

    IFLA_BRIDGE_CFM_MEP_STATUS_INFO:
        This indicate that the MEP instance status are following.
    IFLA_BRIDGE_CFM_CC_PEER_STATUS_INFO:
        This indicate that the peer MEP status are following.

CFM nested attribute has the following attributes in next level.

GETLINK RTEXT_FILTER_CFM_STATUS:
    IFLA_BRIDGE_CFM_MEP_STATUS_INSTANCE:
        The MEP instance number of the delivered status.
        The type is u32.
    IFLA_BRIDGE_CFM_MEP_STATUS_OPCODE_UNEXP_SEEN:
        The MEP instance received CFM PDU with unexpected Opcode.
        The type is u32 (bool).
    IFLA_BRIDGE_CFM_MEP_STATUS_VERSION_UNEXP_SEEN:
        The MEP instance received CFM PDU with unexpected version.
        The type is u32 (bool).
    IFLA_BRIDGE_CFM_MEP_STATUS_RX_LEVEL_LOW_SEEN:
        The MEP instance received CCM PDU with MD level lower than
        configured level. This frame is discarded.
        The type is u32 (bool).

    IFLA_BRIDGE_CFM_CC_PEER_STATUS_INSTANCE:
        The MEP instance number of the delivered status.
        The type is u32.
    IFLA_BRIDGE_CFM_CC_PEER_STATUS_PEER_MEPID:
        The added Peer MEP ID of the delivered status.
        The type is u32.
    IFLA_BRIDGE_CFM_CC_PEER_STATUS_CCM_DEFECT:
        The CCM defect status.
        The type is u32 (bool).
        True means no CCM frame is received for 3.25 intervals.
        IFLA_BRIDGE_CFM_CC_CONFIG_EXP_INTERVAL.
    IFLA_BRIDGE_CFM_CC_PEER_STATUS_RDI:
        The last received CCM PDU RDI.
        The type is u32 (bool).
    IFLA_BRIDGE_CFM_CC_PEER_STATUS_PORT_TLV_VALUE:
        The last received CCM PDU Port Status TLV value field.
        The type is u8.
    IFLA_BRIDGE_CFM_CC_PEER_STATUS_IF_TLV_VALUE:
        The last received CCM PDU Interface Status TLV value field.
        The type is u8.
    IFLA_BRIDGE_CFM_CC_PEER_STATUS_SEEN:
        A CCM frame has been received from Peer MEP.
        The type is u32 (bool).
        This is cleared after GETLINK IFLA_BRIDGE_CFM_CC_PEER_STATUS_INFO.
    IFLA_BRIDGE_CFM_CC_PEER_STATUS_TLV_SEEN:
        A CCM frame with TLV has been received from Peer MEP.
        The type is u32 (bool).
        This is cleared after GETLINK IFLA_BRIDGE_CFM_CC_PEER_STATUS_INFO.
    IFLA_BRIDGE_CFM_CC_PEER_STATUS_SEQ_UNEXP_SEEN:
        A CCM frame with unexpected sequence number has been received
        from Peer MEP.
        The type is u32 (bool).
        When a sequence number is not one higher than previously received
        then it is unexpected.
        This is cleared after GETLINK IFLA_BRIDGE_CFM_CC_PEER_STATUS_INFO.

Signed-off-by: default avatarHenrik Bjoernlund <henrik.bjoernlund@microchip.com>
Reviewed-by: default avatarHoratiu Vultur <horatiu.vultur@microchip.com>
Acked-by: default avatarNikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5e312fc0

include/uapi/linux/if_bridge.h

+29 −0
Original line number Diff line number Diff line
@@ -345,6 +345,8 @@ enum { 
	IFLA_BRIDGE_CFM_CC_RDI_INFO,

	IFLA_BRIDGE_CFM_CC_CCM_TX_INFO,

	IFLA_BRIDGE_CFM_CC_PEER_MEP_INFO,

	IFLA_BRIDGE_CFM_MEP_STATUS_INFO,

	IFLA_BRIDGE_CFM_CC_PEER_STATUS_INFO,

	__IFLA_BRIDGE_CFM_MAX,

};
@@ -424,6 +426,33 @@ enum { 


#define IFLA_BRIDGE_CFM_CC_CCM_TX_MAX (__IFLA_BRIDGE_CFM_CC_CCM_TX_MAX - 1)



enum {

	IFLA_BRIDGE_CFM_MEP_STATUS_UNSPEC,

	IFLA_BRIDGE_CFM_MEP_STATUS_INSTANCE,

	IFLA_BRIDGE_CFM_MEP_STATUS_OPCODE_UNEXP_SEEN,

	IFLA_BRIDGE_CFM_MEP_STATUS_VERSION_UNEXP_SEEN,

	IFLA_BRIDGE_CFM_MEP_STATUS_RX_LEVEL_LOW_SEEN,

	__IFLA_BRIDGE_CFM_MEP_STATUS_MAX,

};



#define IFLA_BRIDGE_CFM_MEP_STATUS_MAX (__IFLA_BRIDGE_CFM_MEP_STATUS_MAX - 1)



enum {

	IFLA_BRIDGE_CFM_CC_PEER_STATUS_UNSPEC,

	IFLA_BRIDGE_CFM_CC_PEER_STATUS_INSTANCE,

	IFLA_BRIDGE_CFM_CC_PEER_STATUS_PEER_MEPID,

	IFLA_BRIDGE_CFM_CC_PEER_STATUS_CCM_DEFECT,

	IFLA_BRIDGE_CFM_CC_PEER_STATUS_RDI,

	IFLA_BRIDGE_CFM_CC_PEER_STATUS_PORT_TLV_VALUE,

	IFLA_BRIDGE_CFM_CC_PEER_STATUS_IF_TLV_VALUE,

	IFLA_BRIDGE_CFM_CC_PEER_STATUS_SEEN,

	IFLA_BRIDGE_CFM_CC_PEER_STATUS_TLV_SEEN,

	IFLA_BRIDGE_CFM_CC_PEER_STATUS_SEQ_UNEXP_SEEN,

	__IFLA_BRIDGE_CFM_CC_PEER_STATUS_MAX,

};



#define IFLA_BRIDGE_CFM_CC_PEER_STATUS_MAX (__IFLA_BRIDGE_CFM_CC_PEER_STATUS_MAX - 1)



struct bridge_stp_xstats {

	__u64 transition_blk;

	__u64 transition_fwd;

include/uapi/linux/rtnetlink.h

+1 −0
Original line number Diff line number Diff line
@@ -780,6 +780,7 @@ enum { 
#define	RTEXT_FILTER_SKIP_STATS	(1 << 3)

#define RTEXT_FILTER_MRP	(1 << 4)

#define RTEXT_FILTER_CFM_CONFIG	(1 << 5)

#define RTEXT_FILTER_CFM_STATUS	(1 << 6)



/* End of information exported to user level */

net/bridge/br_cfm_netlink.c

+105 −0
Original line number Diff line number Diff line
@@ -612,3 +612,108 @@ nla_put_failure: 
nla_info_failure:

	return -EMSGSIZE;

}



int br_cfm_status_fill_info(struct sk_buff *skb, struct net_bridge *br)

{

	struct br_cfm_peer_mep *peer_mep;

	struct br_cfm_mep *mep;

	struct nlattr *tb;



	hlist_for_each_entry_rcu(mep, &br->mep_list, head) {

		tb = nla_nest_start(skb, IFLA_BRIDGE_CFM_MEP_STATUS_INFO);

		if (!tb)

			goto nla_info_failure;



		if (nla_put_u32(skb, IFLA_BRIDGE_CFM_MEP_STATUS_INSTANCE,

				mep->instance))

			goto nla_put_failure;



		if (nla_put_u32(skb,

				IFLA_BRIDGE_CFM_MEP_STATUS_OPCODE_UNEXP_SEEN,

				mep->status.opcode_unexp_seen))

			goto nla_put_failure;



		if (nla_put_u32(skb,

				IFLA_BRIDGE_CFM_MEP_STATUS_VERSION_UNEXP_SEEN,

				mep->status.version_unexp_seen))

			goto nla_put_failure;



		if (nla_put_u32(skb,

				IFLA_BRIDGE_CFM_MEP_STATUS_RX_LEVEL_LOW_SEEN,

				mep->status.rx_level_low_seen))

			goto nla_put_failure;



		/* Clear all 'seen' indications */

		mep->status.opcode_unexp_seen = false;

		mep->status.version_unexp_seen = false;

		mep->status.rx_level_low_seen = false;



		nla_nest_end(skb, tb);



		hlist_for_each_entry_rcu(peer_mep, &mep->peer_mep_list, head) {

			tb = nla_nest_start(skb,

					    IFLA_BRIDGE_CFM_CC_PEER_STATUS_INFO);

			if (!tb)

				goto nla_info_failure;



			if (nla_put_u32(skb,

					IFLA_BRIDGE_CFM_CC_PEER_STATUS_INSTANCE,

					mep->instance))

				goto nla_put_failure;



			if (nla_put_u32(skb,

					IFLA_BRIDGE_CFM_CC_PEER_STATUS_PEER_MEPID,

					peer_mep->mepid))

				goto nla_put_failure;



			if (nla_put_u32(skb,

					IFLA_BRIDGE_CFM_CC_PEER_STATUS_CCM_DEFECT,

					peer_mep->cc_status.ccm_defect))

				goto nla_put_failure;



			if (nla_put_u32(skb, IFLA_BRIDGE_CFM_CC_PEER_STATUS_RDI,

					peer_mep->cc_status.rdi))

				goto nla_put_failure;



			if (nla_put_u8(skb,

				       IFLA_BRIDGE_CFM_CC_PEER_STATUS_PORT_TLV_VALUE,

				       peer_mep->cc_status.port_tlv_value))

				goto nla_put_failure;



			if (nla_put_u8(skb,

				       IFLA_BRIDGE_CFM_CC_PEER_STATUS_IF_TLV_VALUE,

				       peer_mep->cc_status.if_tlv_value))

				goto nla_put_failure;



			if (nla_put_u32(skb,

					IFLA_BRIDGE_CFM_CC_PEER_STATUS_SEEN,

					peer_mep->cc_status.seen))

				goto nla_put_failure;



			if (nla_put_u32(skb,

					IFLA_BRIDGE_CFM_CC_PEER_STATUS_TLV_SEEN,

					peer_mep->cc_status.tlv_seen))

				goto nla_put_failure;



			if (nla_put_u32(skb,

					IFLA_BRIDGE_CFM_CC_PEER_STATUS_SEQ_UNEXP_SEEN,

					peer_mep->cc_status.seq_unexp_seen))

				goto nla_put_failure;



			/* Clear all 'seen' indications */

			peer_mep->cc_status.seen = false;

			peer_mep->cc_status.tlv_seen = false;

			peer_mep->cc_status.seq_unexp_seen = false;



			nla_nest_end(skb, tb);

		}

	}



	return 0;



nla_put_failure:

	nla_nest_cancel(skb, tb);



nla_info_failure:

	return -EMSGSIZE;

}

net/bridge/br_netlink.c

+13 −3
Original line number Diff line number Diff line
@@ -428,7 +428,8 @@ static int br_fill_ifinfo(struct sk_buff *skb, 
	if (filter_mask & (RTEXT_FILTER_BRVLAN |

			   RTEXT_FILTER_BRVLAN_COMPRESSED |

			   RTEXT_FILTER_MRP |

			   RTEXT_FILTER_CFM_CONFIG)) {

			   RTEXT_FILTER_CFM_CONFIG |

			   RTEXT_FILTER_CFM_STATUS)) {

		af = nla_nest_start_noflag(skb, IFLA_AF_SPEC);

		if (!af)

			goto nla_put_failure;
@@ -477,7 +478,7 @@ static int br_fill_ifinfo(struct sk_buff *skb, 
			goto nla_put_failure;

	}



	if (filter_mask & RTEXT_FILTER_CFM_CONFIG) {

	if (filter_mask & (RTEXT_FILTER_CFM_CONFIG | RTEXT_FILTER_CFM_STATUS)) {

		struct nlattr *cfm_nest = NULL;

		int err;
@@ -496,6 +497,14 @@ static int br_fill_ifinfo(struct sk_buff *skb, 
				goto nla_put_failure;

		}



		if (filter_mask & RTEXT_FILTER_CFM_STATUS) {

			rcu_read_lock();

			err = br_cfm_status_fill_info(skb, br);

			rcu_read_unlock();

			if (err)

				goto nla_put_failure;

		}



		nla_nest_end(skb, cfm_nest);

	}
@@ -563,7 +572,8 @@ int br_getlink(struct sk_buff *skb, u32 pid, u32 seq, 
	if (!port && !(filter_mask & RTEXT_FILTER_BRVLAN) &&

	    !(filter_mask & RTEXT_FILTER_BRVLAN_COMPRESSED) &&

	    !(filter_mask & RTEXT_FILTER_MRP) &&

	    !(filter_mask & RTEXT_FILTER_CFM_CONFIG))

	    !(filter_mask & RTEXT_FILTER_CFM_CONFIG) &&

	    !(filter_mask & RTEXT_FILTER_CFM_STATUS))

		return 0;



	return br_fill_ifinfo(skb, port, pid, seq, RTM_NEWLINK, nlflags,

net/bridge/br_private.h

+6 −0
Original line number Diff line number Diff line
@@ -1466,6 +1466,7 @@ int br_cfm_parse(struct net_bridge *br, struct net_bridge_port *p, 
bool br_cfm_created(struct net_bridge *br);

void br_cfm_port_del(struct net_bridge *br, struct net_bridge_port *p);

int br_cfm_config_fill_info(struct sk_buff *skb, struct net_bridge *br);

int br_cfm_status_fill_info(struct sk_buff *skb, struct net_bridge *br);

#else

static inline int br_cfm_parse(struct net_bridge *br, struct net_bridge_port *p,

			       struct nlattr *attr, int cmd,
@@ -1488,6 +1489,11 @@ static inline int br_cfm_config_fill_info(struct sk_buff *skb, struct net_bridge 
{

	return -EOPNOTSUPP;

}



static inline int br_cfm_status_fill_info(struct sk_buff *skb, struct net_bridge *br)

{

	return -EOPNOTSUPP;

}

#endif



/* br_netlink.c */

CRA Git | Maintained and supported by SUSTech CRA and CCSE