From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
To: Horatiu Vultur <horatiu.vultur@microchip.com>,
roopa@cumulusnetworks.com, davem@davemloft.net, kuba@kernel.org,
jiri@resnulli.us, ivecera@redhat.com, andrew@lunn.ch,
UNGLinuxDriver@microchip.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, bridge@lists.linux-foundation.org
Subject: Re: [PATCH net-next v4 02/12] bridge: uapi: mrp: Extend MRP attributes for MRP interconnect
Date: Tue, 14 Jul 2020 16:14:12 +0300 [thread overview]
Message-ID: <86fe5d1d-1cda-e832-3ebb-504876ed548a@cumulusnetworks.com> (raw)
In-Reply-To: <20200714073458.1939574-3-horatiu.vultur@microchip.com>
On 14/07/2020 10:34, Horatiu Vultur wrote:
> Extend the existing MRP netlink attributes to allow to configure MRP
> Interconnect:
>
> IFLA_BRIDGE_MRP_IN_ROLE - the parameter type is br_mrp_in_role which
> contains the interconnect id, the ring id, the interconnect role(MIM
> or MIC) and the port ifindex that represents the interconnect port.
>
> IFLA_BRIDGE_MRP_IN_STATE - the parameter type is br_mrp_in_state which
> contains the interconnect id and the interconnect state.
>
> IFLA_BRIDGE_MRP_IN_TEST - the parameter type is br_mrp_start_in_test
> which contains the interconnect id, the interval at which to send
> MRP_InTest frames, how many test frames can be missed before declaring
> the interconnect ring open and the period which represents for how long
> to send MRP_InTest frames.
>
> Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
> ---
> include/uapi/linux/if_bridge.h | 53 +++++++++++++++++++++++++++++++++
> include/uapi/linux/mrp_bridge.h | 38 +++++++++++++++++++++++
> 2 files changed, 91 insertions(+)
>
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
> diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
> index c114c1c2bd533..d840a3e37a37c 100644
> --- a/include/uapi/linux/if_bridge.h
> +++ b/include/uapi/linux/if_bridge.h
> @@ -167,6 +167,9 @@ enum {
> IFLA_BRIDGE_MRP_RING_ROLE,
> IFLA_BRIDGE_MRP_START_TEST,
> IFLA_BRIDGE_MRP_INFO,
> + IFLA_BRIDGE_MRP_IN_ROLE,
> + IFLA_BRIDGE_MRP_IN_STATE,
> + IFLA_BRIDGE_MRP_START_IN_TEST,
> __IFLA_BRIDGE_MRP_MAX,
> };
>
> @@ -245,6 +248,37 @@ enum {
>
> #define IFLA_BRIDGE_MRP_INFO_MAX (__IFLA_BRIDGE_MRP_INFO_MAX - 1)
>
> +enum {
> + IFLA_BRIDGE_MRP_IN_STATE_UNSPEC,
> + IFLA_BRIDGE_MRP_IN_STATE_IN_ID,
> + IFLA_BRIDGE_MRP_IN_STATE_STATE,
> + __IFLA_BRIDGE_MRP_IN_STATE_MAX,
> +};
> +
> +#define IFLA_BRIDGE_MRP_IN_STATE_MAX (__IFLA_BRIDGE_MRP_IN_STATE_MAX - 1)
> +
> +enum {
> + IFLA_BRIDGE_MRP_IN_ROLE_UNSPEC,
> + IFLA_BRIDGE_MRP_IN_ROLE_RING_ID,
> + IFLA_BRIDGE_MRP_IN_ROLE_IN_ID,
> + IFLA_BRIDGE_MRP_IN_ROLE_ROLE,
> + IFLA_BRIDGE_MRP_IN_ROLE_I_IFINDEX,
> + __IFLA_BRIDGE_MRP_IN_ROLE_MAX,
> +};
> +
> +#define IFLA_BRIDGE_MRP_IN_ROLE_MAX (__IFLA_BRIDGE_MRP_IN_ROLE_MAX - 1)
> +
> +enum {
> + IFLA_BRIDGE_MRP_START_IN_TEST_UNSPEC,
> + IFLA_BRIDGE_MRP_START_IN_TEST_IN_ID,
> + IFLA_BRIDGE_MRP_START_IN_TEST_INTERVAL,
> + IFLA_BRIDGE_MRP_START_IN_TEST_MAX_MISS,
> + IFLA_BRIDGE_MRP_START_IN_TEST_PERIOD,
> + __IFLA_BRIDGE_MRP_START_IN_TEST_MAX,
> +};
> +
> +#define IFLA_BRIDGE_MRP_START_IN_TEST_MAX (__IFLA_BRIDGE_MRP_START_IN_TEST_MAX - 1)
> +
> struct br_mrp_instance {
> __u32 ring_id;
> __u32 p_ifindex;
> @@ -270,6 +304,25 @@ struct br_mrp_start_test {
> __u32 monitor;
> };
>
> +struct br_mrp_in_state {
> + __u32 in_state;
> + __u16 in_id;
> +};
> +
> +struct br_mrp_in_role {
> + __u32 ring_id;
> + __u32 in_role;
> + __u32 i_ifindex;
> + __u16 in_id;
> +};
> +
> +struct br_mrp_start_in_test {
> + __u32 interval;
> + __u32 max_miss;
> + __u32 period;
> + __u16 in_id;
> +};
> +
> struct bridge_stp_xstats {
> __u64 transition_blk;
> __u64 transition_fwd;
> diff --git a/include/uapi/linux/mrp_bridge.h b/include/uapi/linux/mrp_bridge.h
> index bee3665402129..6aeb13ef0b1ec 100644
> --- a/include/uapi/linux/mrp_bridge.h
> +++ b/include/uapi/linux/mrp_bridge.h
> @@ -21,11 +21,22 @@ enum br_mrp_ring_role_type {
> BR_MRP_RING_ROLE_MRA,
> };
>
> +enum br_mrp_in_role_type {
> + BR_MRP_IN_ROLE_DISABLED,
> + BR_MRP_IN_ROLE_MIC,
> + BR_MRP_IN_ROLE_MIM,
> +};
> +
> enum br_mrp_ring_state_type {
> BR_MRP_RING_STATE_OPEN,
> BR_MRP_RING_STATE_CLOSED,
> };
>
> +enum br_mrp_in_state_type {
> + BR_MRP_IN_STATE_OPEN,
> + BR_MRP_IN_STATE_CLOSED,
> +};
> +
> enum br_mrp_port_state_type {
> BR_MRP_PORT_STATE_DISABLED,
> BR_MRP_PORT_STATE_BLOCKED,
> @@ -36,6 +47,7 @@ enum br_mrp_port_state_type {
> enum br_mrp_port_role_type {
> BR_MRP_PORT_ROLE_PRIMARY,
> BR_MRP_PORT_ROLE_SECONDARY,
> + BR_MRP_PORT_ROLE_INTER,
> };
>
> enum br_mrp_tlv_header_type {
> @@ -45,6 +57,10 @@ enum br_mrp_tlv_header_type {
> BR_MRP_TLV_HEADER_RING_TOPO = 0x3,
> BR_MRP_TLV_HEADER_RING_LINK_DOWN = 0x4,
> BR_MRP_TLV_HEADER_RING_LINK_UP = 0x5,
> + BR_MRP_TLV_HEADER_IN_TEST = 0x6,
> + BR_MRP_TLV_HEADER_IN_TOPO = 0x7,
> + BR_MRP_TLV_HEADER_IN_LINK_DOWN = 0x8,
> + BR_MRP_TLV_HEADER_IN_LINK_UP = 0x9,
> BR_MRP_TLV_HEADER_OPTION = 0x7f,
> };
>
> @@ -118,4 +134,26 @@ struct br_mrp_oui_hdr {
> __u8 oui[MRP_OUI_LENGTH];
> };
>
> +struct br_mrp_in_test_hdr {
> + __be16 id;
> + __u8 sa[ETH_ALEN];
> + __be16 port_role;
> + __be16 state;
> + __be16 transitions;
> + __be32 timestamp;
> +};
> +
> +struct br_mrp_in_topo_hdr {
> + __u8 sa[ETH_ALEN];
> + __be16 id;
> + __be16 interval;
> +};
> +
> +struct br_mrp_in_link_hdr {
> + __u8 sa[ETH_ALEN];
> + __be16 port_role;
> + __be16 id;
> + __be16 interval;
> +};
> +
> #endif
>
next prev parent reply other threads:[~2020-07-14 13:14 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-14 7:34 [PATCH net-next v4 00/12] bridge: mrp: Add support for interconnect ring Horatiu Vultur
2020-07-14 7:34 ` [PATCH net-next v4 01/12] switchdev: mrp: Extend switchdev API for MRP Interconnect Horatiu Vultur
2020-07-14 13:30 ` Nikolay Aleksandrov
2020-07-14 7:34 ` [PATCH net-next v4 02/12] bridge: uapi: mrp: Extend MRP attributes for MRP interconnect Horatiu Vultur
2020-07-14 13:14 ` Nikolay Aleksandrov [this message]
2020-07-14 7:34 ` [PATCH net-next v4 03/12] bridge: mrp: Extend bridge interface Horatiu Vultur
2020-07-14 13:14 ` Nikolay Aleksandrov
2020-07-14 7:34 ` [PATCH net-next v4 04/12] bridge: mrp: Extend br_mrp for MRP interconnect Horatiu Vultur
2020-07-14 13:15 ` Nikolay Aleksandrov
2020-07-14 7:34 ` [PATCH net-next v4 05/12] bridge: mrp: Rename br_mrp_port_open to br_mrp_ring_port_open Horatiu Vultur
2020-07-14 13:15 ` Nikolay Aleksandrov
2020-07-14 7:34 ` [PATCH net-next v4 06/12] bridge: mrp: Add br_mrp_in_port_open function Horatiu Vultur
2020-07-14 13:16 ` Nikolay Aleksandrov
2020-07-14 7:34 ` [PATCH net-next v4 07/12] bridge: switchdev: mrp: Extend MRP API for switchdev for MRP Interconnect Horatiu Vultur
2020-07-14 13:16 ` Nikolay Aleksandrov
2020-07-14 7:34 ` [PATCH net-next v4 08/12] bridge: mrp: Implement the MRP Interconnect API Horatiu Vultur
2020-07-14 13:23 ` Nikolay Aleksandrov
2020-07-14 7:34 ` [PATCH net-next v4 09/12] bridge: mrp: Extend MRP netlink interface for configuring MRP interconnect Horatiu Vultur
2020-07-14 13:24 ` Nikolay Aleksandrov
2020-07-14 7:34 ` [PATCH net-next v4 10/12] bridge: uapi: mrp: Extend MRP_INFO attributes for interconnect status Horatiu Vultur
2020-07-14 13:24 ` Nikolay Aleksandrov
2020-07-14 7:34 ` [PATCH net-next v4 11/12] bridge: mrp: Extend br_mrp_fill_info Horatiu Vultur
2020-07-14 13:24 ` Nikolay Aleksandrov
2020-07-14 7:34 ` [PATCH net-next v4 12/12] net: bridge: Add port attribute IFLA_BRPORT_MRP_IN_OPEN Horatiu Vultur
2020-07-14 13:29 ` Nikolay Aleksandrov
2020-07-14 15:07 ` Horatiu Vultur
2020-07-14 15:33 ` Nikolay Aleksandrov
2020-07-14 15:53 ` Horatiu Vultur
2020-07-14 20:47 ` [PATCH net-next v4 00/12] bridge: mrp: Add support for interconnect ring David Miller
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=86fe5d1d-1cda-e832-3ebb-504876ed548a@cumulusnetworks.com \
--to=nikolay@cumulusnetworks.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew@lunn.ch \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=horatiu.vultur@microchip.com \
--cc=ivecera@redhat.com \
--cc=jiri@resnulli.us \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--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).