From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06AD6C55186 for ; Wed, 22 Apr 2020 08:32:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C1F90206B9 for ; Wed, 22 Apr 2020 08:32:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="DTp0DAuK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726451AbgDVIcd (ORCPT ); Wed, 22 Apr 2020 04:32:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1725968AbgDVIcd (ORCPT ); Wed, 22 Apr 2020 04:32:33 -0400 Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2CDFC03C1A7 for ; Wed, 22 Apr 2020 01:32:32 -0700 (PDT) Received: by mail-lj1-x244.google.com with SMTP id u15so1361116ljd.3 for ; Wed, 22 Apr 2020 01:32:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=CQRBQtf1ALJUwvfe4je1xJlNccBLQC4SmGhql6g2vcQ=; b=DTp0DAuKX2GJt5mL//M58OYEoVt0dKzDx9heIjunMnsYaTfx/+2oFJJAtGGBYL0iVC UJ03ETbMDHAcG1VASEXHBGwgeRKlUFVxgbUfBWzqHO+LOvPAnr+WzdGdQX9cwnnFbiAL Yrb2JObZlpWYU5V/5ih/Av3QWOlyHEaW7dHDo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=CQRBQtf1ALJUwvfe4je1xJlNccBLQC4SmGhql6g2vcQ=; b=dinqZpe26dQO8wSQPDnj9tO7XXOrrQiGOnJM4gd+5WuPvJCKx/y8O8jdqC2ibG2pv3 yfjCKT0zlCVTl4C9kuJ46dx5GHChn5lrOukLKi2FVYTyXGEryRymFTxVEJZ/kuhgoDp8 /5Nuam7oKaFwZtrBF0S+4EfCMMJxzTLBsDlt+tNarKuAw1zMSoT9UzHm1Hlyyrkckt+b 7UJqWIuMNyaf7GNyexxQG9MIoE++lDZ49/wuI8k2WbX07HFNqL+qhI0gD2dtvdS5JmlM FNHatJroV6rxeuN04VJjRZOvUblcsB2wv7uIKWePNrgkfnYD9e2pGP8DWAdSN3Qa5DLJ zL5g== X-Gm-Message-State: AGi0Pubyz99AYQmGCXagHkoFic9J1h0avZRXkqi9ELWIhIKgMY3IzqPt zP6iMDtGZA4jyZoVpWrgs44OvA== X-Google-Smtp-Source: APiQypINW1cbtVAAakRJBDELIkBNC278SNgvTlUoJ02MIqQri2uGkFITmNetGhQZLdq3b00+vjO9/w== X-Received: by 2002:a2e:888e:: with SMTP id k14mr15773929lji.4.1587544350988; Wed, 22 Apr 2020 01:32:30 -0700 (PDT) Received: from [192.168.0.109] (84-238-136-197.ip.btc-net.bg. [84.238.136.197]) by smtp.gmail.com with ESMTPSA id p2sm3678487ljn.56.2020.04.22.01.32.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 22 Apr 2020 01:32:30 -0700 (PDT) Subject: Re: [PATCH net-next v2 08/11] bridge: mrp: Connect MRP API with the switchdev API To: Horatiu Vultur , davem@davemloft.net, jiri@resnulli.us, ivecera@redhat.com, kuba@kernel.org, roopa@cumulusnetworks.com, olteanv@gmail.com, andrew@lunn.ch, UNGLinuxDriver@microchip.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bridge@lists.linux-foundation.org References: <20200421143752.2248-1-horatiu.vultur@microchip.com> <20200421143752.2248-9-horatiu.vultur@microchip.com> From: Nikolay Aleksandrov Message-ID: <7a87d381-fb6c-5d0f-acc6-af5882274a9a@cumulusnetworks.com> Date: Wed, 22 Apr 2020 11:32:28 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <20200421143752.2248-9-horatiu.vultur@microchip.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 21/04/2020 17:37, Horatiu Vultur wrote: > Implement the MRP API. > > In case the HW can't generate MRP Test frames then the SW will try to generate > the frames. In case that also the SW will fail in generating the frames then a > error is return to the userspace. The userspace is responsible to generate all > the other MRP frames regardless if the test frames are generated by HW or SW. > > The forwarding/termination of MRP frames is happening in the kernel and is done > by the MRP instance. The userspace application doesn't do the forwarding. > > Signed-off-by: Horatiu Vultur > --- > net/bridge/Makefile | 2 +- > net/bridge/br_mrp.c | 559 ++++++++++++++++++++++++++++++++++++ > net/bridge/br_mrp_netlink.c | 29 ++ > 3 files changed, 589 insertions(+), 1 deletion(-) > create mode 100644 net/bridge/br_mrp.c > create mode 100644 net/bridge/br_mrp_netlink.c > > diff --git a/net/bridge/Makefile b/net/bridge/Makefile > index 3cacf9dd78d5..ccb394236fbd 100644 > --- a/net/bridge/Makefile > +++ b/net/bridge/Makefile > @@ -26,4 +26,4 @@ bridge-$(CONFIG_NET_SWITCHDEV) += br_switchdev.o > > obj-$(CONFIG_NETFILTER) += netfilter/ > > -bridge-$(CONFIG_BRIDGE_MRP) += br_mrp_switchdev.o > +bridge-$(CONFIG_BRIDGE_MRP) += br_mrp_switchdev.o br_mrp.o br_mrp_netlink.o > diff --git a/net/bridge/br_mrp.c b/net/bridge/br_mrp.c > new file mode 100644 > index 000000000000..533f621fa56a > --- /dev/null > +++ b/net/bridge/br_mrp.c > @@ -0,0 +1,559 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > + > +#include > +#include "br_private_mrp.h" > + > +static const u8 mrp_test_dmac[ETH_ALEN] = { 0x1, 0x15, 0x4e, 0x0, 0x0, 0x1 }; > + > +static struct net_bridge_port *br_mrp_get_port(struct net_bridge *br, > + u32 ifindex) > +{ > + struct net_bridge_port *res = NULL; > + struct net_bridge_port *port; > + > + list_for_each_entry(port, &br->port_list, list) { > + if (port->dev->ifindex == ifindex) { > + res = port; > + break; > + } > + } > + > + return res; > +} > + > +static struct br_mrp *br_mrp_find_id(struct net_bridge *br, u32 ring_id) > +{ > + struct br_mrp *res = NULL; > + struct br_mrp *mrp; > + > + list_for_each_entry_rcu(mrp, &br->mrp_list, list, > + lockdep_rtnl_is_held()) { > + if (mrp->ring_id == ring_id) { > + res = mrp; > + break; > + } > + } > + > + return res; > +} > + > +static struct br_mrp *br_mrp_find_port(struct net_bridge *br, > + struct net_bridge_port *p) > +{ > + struct br_mrp *res = NULL; > + struct br_mrp *mrp; > + > + list_for_each_entry_rcu(mrp, &br->mrp_list, list, > + lockdep_rtnl_is_held()) { > + if (rcu_access_pointer(mrp->p_port) == p || > + rcu_access_pointer(mrp->s_port) == p) { > + res = mrp; > + break; > + } > + } > + > + return res; > +} > + > +static int br_mrp_next_seq(struct br_mrp *mrp) > +{ > + mrp->seq_id++; > + return mrp->seq_id; > +} > + > +static struct sk_buff *br_mrp_skb_alloc(struct net_bridge_port *p, > + const u8 *src, const u8 *dst) > +{ > + struct ethhdr *eth_hdr; > + struct sk_buff *skb; > + u16 *version; > + > + skb = dev_alloc_skb(MRP_MAX_FRAME_LENGTH); > + if (!skb) > + return NULL; > + > + skb->dev = p->dev; > + skb->protocol = htons(ETH_P_MRP); > + skb->priority = MRP_FRAME_PRIO; > + skb_reserve(skb, sizeof(*eth_hdr)); > + > + eth_hdr = skb_push(skb, sizeof(*eth_hdr)); > + ether_addr_copy(eth_hdr->h_dest, dst); > + ether_addr_copy(eth_hdr->h_source, src); > + eth_hdr->h_proto = htons(ETH_P_MRP); > + > + version = skb_put(skb, sizeof(*version)); > + *version = cpu_to_be16(MRP_VERSION); > + > + return skb; > +} > + > +static void br_mrp_skb_tlv(struct sk_buff *skb, > + enum br_mrp_tlv_header_type type, > + u8 length) > +{ > + struct br_mrp_tlv_hdr *hdr; > + > + hdr = skb_put(skb, sizeof(*hdr)); > + hdr->type = type; > + hdr->length = length; > +} > + > +static void br_mrp_skb_common(struct sk_buff *skb, struct br_mrp *mrp) > +{ > + struct br_mrp_common_hdr *hdr; > + > + br_mrp_skb_tlv(skb, BR_MRP_TLV_HEADER_COMMON, sizeof(*hdr)); > + > + hdr = skb_put(skb, sizeof(*hdr)); > + hdr->seq_id = cpu_to_be16(br_mrp_next_seq(mrp)); > + memset(hdr->domain, 0xff, MRP_DOMAIN_UUID_LENGTH); > +} > + > +static struct sk_buff *br_mrp_alloc_test_skb(struct br_mrp *mrp, > + struct net_bridge_port *p, > + enum br_mrp_port_role_type port_role) > +{ net/bridge/br_mrp.c: In function ‘br_mrp_alloc_test_skb’: net/bridge/br_mrp.c:118:21: warning: variable ‘br’ set but not used [-Wunused-but-set-variable] 118 | struct net_bridge *br = p->br; > + struct br_mrp_ring_test_hdr *hdr = NULL; > + struct net_bridge *br = p->br; > + struct sk_buff *skb = NULL; > + > + if (!p) > + return NULL; > + > + br = p->br; > + > + skb = br_mrp_skb_alloc(p, p->dev->dev_addr, mrp_test_dmac); > + if (!skb) > + return NULL; > + > + br_mrp_skb_tlv(skb, BR_MRP_TLV_HEADER_RING_TEST, sizeof(*hdr)); > + hdr = skb_put(skb, sizeof(*hdr)); > + > + hdr->prio = cpu_to_be16(MRP_DEFAULT_PRIO); > + ether_addr_copy(hdr->sa, p->br->dev->dev_addr); > + hdr->port_role = cpu_to_be16(port_role); > + hdr->state = cpu_to_be16(mrp->ring_state); > + hdr->transitions = cpu_to_be16(mrp->ring_transitions); > + hdr->timestamp = cpu_to_be32(jiffies_to_msecs(jiffies)); > + > + br_mrp_skb_common(skb, mrp); > + br_mrp_skb_tlv(skb, BR_MRP_TLV_HEADER_END, 0x0); > + > + return skb; > +} > + > +static void br_mrp_test_work_expired(struct work_struct *work) > +{ > + struct delayed_work *del_work = to_delayed_work(work); > + struct br_mrp *mrp = container_of(del_work, struct br_mrp, test_work); > + struct net_bridge_port *p; > + bool notify_open = false; > + struct sk_buff *skb; > + > + if (time_before_eq(mrp->test_end, jiffies)) > + return; > + > + if (mrp->test_count_miss < mrp->test_max_miss) { > + mrp->test_count_miss++; > + } else { > + /* Notify that the ring is open only if the ring state is > + * closed, otherwise it would continue to notify at every > + * interval. > + */ > + if (mrp->ring_state == BR_MRP_RING_STATE_CLOSED) > + notify_open = true; > + } > + > + rcu_read_lock(); > + > + p = rcu_dereference(mrp->p_port); > + if (p) { > + skb = br_mrp_alloc_test_skb(mrp, p, BR_MRP_PORT_ROLE_PRIMARY); > + if (!skb) > + goto out; > + > + skb_reset_network_header(skb); > + dev_queue_xmit(skb); > + > + if (notify_open && !mrp->ring_role_offloaded) > + br_mrp_port_open(p->dev, true); > + } > + > + p = rcu_dereference(mrp->s_port); > + if (p) { > + skb = br_mrp_alloc_test_skb(mrp, p, BR_MRP_PORT_ROLE_SECONDARY); > + if (!skb) > + goto out; > + > + skb_reset_network_header(skb); > + dev_queue_xmit(skb); > + > + if (notify_open && !mrp->ring_role_offloaded) > + br_mrp_port_open(p->dev, true); > + } > + > +out: > + rcu_read_unlock(); > + > + queue_delayed_work(system_wq, &mrp->test_work, > + usecs_to_jiffies(mrp->test_interval)); > +} > + > +/* Deletes the MRP instance. > + * note: called under rtnl_lock > + */ > +static void br_mrp_del_impl(struct net_bridge *br, struct br_mrp *mrp) > +{ > + struct net_bridge_port *p; > + > + /* Stop sending MRP_Test frames */ > + cancel_delayed_work_sync(&mrp->test_work); > + br_mrp_switchdev_send_ring_test(br, mrp, 0, 0, 0); > + > + br_mrp_switchdev_del(br, mrp); > + > + /* Reset the ports */ > + p = rtnl_dereference(mrp->p_port); > + if (p) { > + spin_lock_bh(&br->lock); > + p->state = BR_STATE_FORWARDING; > + p->flags &= ~BR_MRP_AWARE; > + spin_unlock_bh(&br->lock); > + br_mrp_port_switchdev_set_state(p, BR_STATE_FORWARDING); > + rcu_assign_pointer(mrp->p_port, NULL); > + } > + > + p = rtnl_dereference(mrp->s_port); > + if (p) { > + spin_lock_bh(&br->lock); > + p->state = BR_STATE_FORWARDING; > + p->flags &= ~BR_MRP_AWARE; > + spin_unlock_bh(&br->lock); > + br_mrp_port_switchdev_set_state(p, BR_STATE_FORWARDING); > + rcu_assign_pointer(mrp->s_port, NULL); > + } > + > + list_del_rcu(&mrp->list); > + kfree_rcu(mrp, rcu); > +} > + > +/* Adds a new MRP instance. > + * note: called under rtnl_lock > + */ > +int br_mrp_add(struct net_bridge *br, struct br_mrp_instance *instance) > +{ > + struct net_bridge_port *p; > + struct br_mrp *mrp; > + int err; > + > + /* If the ring exists, it is not possible to create another one with the > + * same ring_id > + */ > + mrp = br_mrp_find_id(br, instance->ring_id); > + if (mrp) > + return -EINVAL; > + > + if (!br_mrp_get_port(br, instance->p_ifindex) || > + !br_mrp_get_port(br, instance->s_ifindex)) > + return -EINVAL; > + > + mrp = kzalloc(sizeof(*mrp), GFP_KERNEL); > + if (!mrp) > + return -ENOMEM; > + > + mrp->ring_id = instance->ring_id; > + > + p = br_mrp_get_port(br, instance->p_ifindex); > + spin_lock_bh(&br->lock); > + p->state = BR_STATE_FORWARDING; > + p->flags |= BR_MRP_AWARE; > + spin_unlock_bh(&br->lock); > + rcu_assign_pointer(mrp->p_port, p); > + > + p = br_mrp_get_port(br, instance->s_ifindex); > + spin_lock_bh(&br->lock); > + p->state = BR_STATE_FORWARDING; > + p->flags |= BR_MRP_AWARE; > + spin_unlock_bh(&br->lock); > + rcu_assign_pointer(mrp->s_port, p); > + > + INIT_DELAYED_WORK(&mrp->test_work, br_mrp_test_work_expired); > + list_add_tail_rcu(&mrp->list, &br->mrp_list); > + > + err = br_mrp_switchdev_add(br, mrp); > + if (err) > + goto delete_mrp; > + > + return 0; > + > +delete_mrp: > + br_mrp_del_impl(br, mrp); > + > + return err; > +} > + > +/* Deletes the MRP instance from which the port is part of > + * note: called under rtnl_lock > + */ > +void br_mrp_port_del(struct net_bridge *br, struct net_bridge_port *p) > +{ > + struct br_mrp *mrp = br_mrp_find_port(br, p); > + > + /* If the port is not part of a MRP instance just bail out */ > + if (!mrp) > + return; > + > + br_mrp_del_impl(br, mrp); > +} > + > +/* Deletes existing MRP instance based on ring_id > + * note: called under rtnl_lock > + */ > +int br_mrp_del(struct net_bridge *br, struct br_mrp_instance *instance) > +{ > + struct br_mrp *mrp = br_mrp_find_id(br, instance->ring_id); > + > + if (!mrp) > + return -EINVAL; > + > + br_mrp_del_impl(br, mrp); > + > + return 0; > +} > + > +/* Set port state, port state can be forwarding, blocked or disabled > + * note: already called with rcu_read_lock > + */ > +int br_mrp_set_port_state(struct net_bridge_port *p, > + enum br_mrp_port_state_type state) > +{ > + if (!p || !(p->flags & BR_MRP_AWARE)) > + return -EINVAL; > + > + spin_lock_bh(&p->br->lock); > + > + if (state == BR_MRP_PORT_STATE_FORWARDING) > + p->state = BR_STATE_FORWARDING; > + else > + p->state = BR_STATE_BLOCKING; > + > + spin_unlock_bh(&p->br->lock); > + > + br_mrp_port_switchdev_set_state(p, state); > + > + return 0; > +} > + > +/* Set port role, port role can be primary or secondary > + * note: already called with rcu_read_lock > + */ > +int br_mrp_set_port_role(struct net_bridge_port *p, > + struct br_mrp_port_role *role) > +{ > + struct br_mrp *mrp; > + > + if (!p || !(p->flags & BR_MRP_AWARE)) > + return -EINVAL; > + > + mrp = br_mrp_find_id(p->br, role->ring_id); > + > + if (!mrp) > + return -EINVAL; > + > + if (role->role == BR_MRP_PORT_ROLE_PRIMARY) > + rcu_assign_pointer(mrp->p_port, p); > + else > + rcu_assign_pointer(mrp->s_port, p); > + > + br_mrp_port_switchdev_set_role(p, role->role); > + > + return 0; > +} > + > +/* Set ring state, ring state can be only Open or Closed > + * note: already called with rcu_read_lock > + */ > +int br_mrp_set_ring_state(struct net_bridge *br, > + struct br_mrp_ring_state *state) > +{ > + struct br_mrp *mrp = br_mrp_find_id(br, state->ring_id); > + > + if (!mrp) > + return -EINVAL; > + > + if (mrp->ring_state == BR_MRP_RING_STATE_CLOSED && > + state->ring_state != BR_MRP_RING_STATE_CLOSED) > + mrp->ring_transitions++; > + > + mrp->ring_state = state->ring_state; > + > + br_mrp_switchdev_set_ring_state(br, mrp, state->ring_state); > + > + return 0; > +} > + > +/* Set ring role, ring role can be only MRM(Media Redundancy Manager) or > + * MRC(Media Redundancy Client). > + * note: already called with rcu_read_lock > + */ > +int br_mrp_set_ring_role(struct net_bridge *br, > + struct br_mrp_ring_role *role) > +{ > + struct br_mrp *mrp = br_mrp_find_id(br, role->ring_id); > + int err; > + > + if (!mrp) > + return -EINVAL; > + > + mrp->ring_role = role->ring_role; > + > + /* If there is an error just bailed out */ > + err = br_mrp_switchdev_set_ring_role(br, mrp, role->ring_role); > + if (err && err != -EOPNOTSUPP) > + return err; > + > + /* Now detect if the HW actually applied the role or not. If the HW > + * applied the role it means that the SW will not to do those operations > + * anymore. For example if the role ir MRM then the HW will notify the > + * SW when ring is open, but if the is not pushed to the HW the SW will > + * need to detect when the ring is open > + */ > + mrp->ring_role_offloaded = err == -EOPNOTSUPP ? 0 : 1; > + > + return 0; > +} > + > +/* Start to generate MRP test frames, the frames are generated by HW and if it > + * fails, they are generated by the SW. > + * note: already called with rcu_read_lock > + */ > +int br_mrp_start_test(struct net_bridge *br, > + struct br_mrp_start_test *test) > +{ > + struct br_mrp *mrp = br_mrp_find_id(br, test->ring_id); > + > + if (!mrp) > + return -EINVAL; > + > + /* Try to push is to the HW and if it fails then continue to generate in > + * SW and if that also fails then return error > + */ > + if (!br_mrp_switchdev_send_ring_test(br, mrp, test->interval, > + test->max_miss, test->period)) > + return 0; > + > + mrp->test_interval = test->interval; > + mrp->test_end = jiffies + usecs_to_jiffies(test->period); > + mrp->test_max_miss = test->max_miss; > + mrp->test_count_miss = 0; > + queue_delayed_work(system_wq, &mrp->test_work, > + usecs_to_jiffies(test->interval)); > + > + return 0; > +} > + > +/* Process only MRP Test frame. All the other MRP frames are processed by > + * userspace application > + * note: already called with rcu_read_lock > + */ > +static void br_mrp_mrm_process(struct br_mrp *mrp, struct net_bridge_port *port, > + struct sk_buff *skb) > +{ > + struct br_mrp_tlv_hdr *hdr; > + > + hdr = (struct br_mrp_tlv_hdr *)(skb->data + sizeof(uint16_t)); > + > + if (!hdr) > + return; > + > + if (hdr->type != BR_MRP_TLV_HEADER_RING_TEST) > + return; > + > + mrp->test_count_miss = 0; > + > + /* Notify the userspace that the ring is closed only when the ring is > + * not closed > + */ > + if (mrp->ring_state != BR_MRP_RING_STATE_CLOSED) > + br_mrp_port_open(port->dev, false); > +} > + > +/* This will just forward the frame to the other mrp ring port(MRC role) or will > + * not do anything. > + * note: already called with rcu_read_lock > + */ > +static int br_mrp_rcv(struct net_bridge_port *p, > + struct sk_buff *skb, struct net_device *dev) > +{ > + struct net_device *s_dev, *p_dev, *d_dev; > + struct net_bridge_port *p_port, *s_port; > + struct net_bridge *br; > + struct sk_buff *nskb; > + struct br_mrp *mrp; > + > + /* If port is disabled don't accept any frames */ > + if (p->state == BR_STATE_DISABLED) > + return 0; > + > + br = p->br; > + mrp = br_mrp_find_port(br, p); > + if (unlikely(!mrp)) > + return 0; > + > + p_port = rcu_dereference(mrp->p_port); > + if (!p_port) > + return 0; > + > + s_port = rcu_dereference(mrp->s_port); > + if (!s_port) > + return 0; > + > + /* If the role is MRM then don't forward the frames */ > + if (mrp->ring_role == BR_MRP_RING_ROLE_MRM) { > + br_mrp_mrm_process(mrp, p, skb); > + return 1; > + } > + > + /* Clone the frame and forward it on the other MRP port */ > + nskb = skb_clone(skb, GFP_ATOMIC); > + if (!nskb) > + return 0; > + > + p_dev = p_port->dev; > + s_dev = s_port->dev; > + > + if (p_dev == dev) > + d_dev = s_dev; > + else > + d_dev = p_dev; > + > + nskb->dev = d_dev; > + skb_push(nskb, ETH_HLEN); > + dev_queue_xmit(nskb); > + > + return 1; > +} > + > +/* Check if the frame was received on a port that is part of MRP ring > + * and if the frame has MRP eth. In that case process the frame otherwise do > + * normal forwarding. > + * note: already called with rcu_read_lock > + */ > +int br_mrp_process(struct net_bridge_port *p, struct sk_buff *skb) > +{ > + /* If there is no MRP instance do normal forwarding */ > + if (likely(!(p->flags & BR_MRP_AWARE))) > + goto out; > + > + if (unlikely(skb->protocol == htons(ETH_P_MRP))) > + return br_mrp_rcv(p, skb, p->dev); > + > +out: > + return 0; > +} > + > +bool br_mrp_enabled(struct net_bridge *br) > +{ > + return !list_empty(&br->mrp_list); > +} > diff --git a/net/bridge/br_mrp_netlink.c b/net/bridge/br_mrp_netlink.c > new file mode 100644 > index 000000000000..b982db14bbf4 > --- /dev/null > +++ b/net/bridge/br_mrp_netlink.c > @@ -0,0 +1,29 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > + > +#include > + > +#include > +#include "br_private.h" > +#include "br_private_mrp.h" > + > +int br_mrp_port_open(struct net_device *dev, u8 loc) > +{ > + struct net_bridge_port *p; > + int err = 0; > + > + p = br_port_get_rcu(dev); > + if (!p) { > + err = -EINVAL; > + goto out; > + } > + > + if (loc) > + p->flags |= BR_MRP_LOST_CONT; > + else > + p->flags &= ~BR_MRP_LOST_CONT; > + > + br_ifinfo_notify(RTM_NEWLINK, NULL, p); > + > +out: > + return err; > +} >