From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
To: Horatiu Vultur <horatiu.vultur@microchip.com>
Cc: jiri@resnulli.us, ivecera@redhat.com, davem@davemloft.net,
kuba@kernel.org, roopa@cumulusnetworks.com, andrew@lunn.ch,
UNGLinuxDriver@microchip.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, bridge@lists.linux-foundation.org
Subject: Re: [PATCH 1/3] bridge: mrp: Add br_mrp_unique_ifindex function
Date: Thu, 21 May 2020 19:58:04 +0300 [thread overview]
Message-ID: <39ba5110-2c2a-6fd9-a3e3-000b52a366dc@cumulusnetworks.com> (raw)
In-Reply-To: <20200521181337.ory6lxyswatqhoej@soft-dev3.localdomain>
On 21/05/2020 21:49, Horatiu Vultur wrote:
> The 05/21/2020 11:16, Nikolay Aleksandrov wrote:
>> On 20/05/2020 16:09, Horatiu Vultur wrote:
>>> It is not allow to have the same net bridge port part of multiple MRP
>>> rings. Therefore add a check if the port is used already in a different
>>> MRP. In that case return failure.
>>>
>>> Fixes: 9a9f26e8f7ea ("bridge: mrp: Connect MRP API with the switchdev API")
>>> Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
>>> ---
>>> net/bridge/br_mrp.c | 31 +++++++++++++++++++++++++++++++
>>> 1 file changed, 31 insertions(+)
>>>
>>> diff --git a/net/bridge/br_mrp.c b/net/bridge/br_mrp.c
>>> index d7bc09de4c139..a5a3fa59c078a 100644
>>> --- a/net/bridge/br_mrp.c
>>> +++ b/net/bridge/br_mrp.c
>>> @@ -37,6 +37,32 @@ static struct br_mrp *br_mrp_find_id(struct net_bridge *br, u32 ring_id)
>>> return res;
>>> }
>>>
>>> +static bool br_mrp_unique_ifindex(struct net_bridge *br, u32 ifindex)
>>> +{
>>> + struct br_mrp *mrp;
>>> + bool res = true;
>>> +
>>> + rcu_read_lock();
>>
>> Why do you need the rcu_read_lock() here when lockdep_rtnl_is_held() is used?
>> You should be able to just do rtnl_dereference() below as this is used only
>> under rtnl.
>
> Hi Nik,
>
> Also initially I thought that is not needed, but when I enabled all the
> RCU debug configs to see if I use correctly the RCU, I got a warning
> regarding suspicious RCU usage.
> And that is the reason why I have put it.
>
Did you try using rtnl_dereference() instead of rcu_dereference() ?
>>
>>> + list_for_each_entry_rcu(mrp, &br->mrp_list, list,
>>> + lockdep_rtnl_is_held()) {
>>> + struct net_bridge_port *p;
>>> +
>>> + p = rcu_dereference(mrp->p_port);
>>> + if (p && p->dev->ifindex == ifindex) {
>>> + res = false;
>>> + break;
>>> + }
>>> +
>>> + p = rcu_dereference(mrp->s_port);
>>> + if (p && p->dev->ifindex == ifindex) {
>>> + res = false;
>>> + break;
>>> + }
>>> + }
>>> + rcu_read_unlock();
>>> + return res;
>>> +}
>>> +
>>> static struct br_mrp *br_mrp_find_port(struct net_bridge *br,
>>> struct net_bridge_port *p)
>>> {
>>> @@ -255,6 +281,11 @@ int br_mrp_add(struct net_bridge *br, struct br_mrp_instance *instance)
>>> !br_mrp_get_port(br, instance->s_ifindex))
>>> return -EINVAL;
>>>
>>> + /* It is not possible to have the same port part of multiple rings */
>>> + if (!br_mrp_unique_ifindex(br, instance->p_ifindex) ||
>>> + !br_mrp_unique_ifindex(br, instance->s_ifindex))
>>> + return -EINVAL;
>>> +
>>> mrp = kzalloc(sizeof(*mrp), GFP_KERNEL);
>>> if (!mrp)
>>> return -ENOMEM;
>>>
>>
>
next prev parent reply other threads:[~2020-05-21 16:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 13:09 [PATCH 0/3] net: bridge: mrp: Add small fixes to MRP Horatiu Vultur
2020-05-20 13:09 ` [PATCH 1/3] bridge: mrp: Add br_mrp_unique_ifindex function Horatiu Vultur
2020-05-21 8:16 ` Nikolay Aleksandrov
2020-05-21 18:49 ` Horatiu Vultur
2020-05-21 16:58 ` Nikolay Aleksandrov [this message]
2020-05-21 19:30 ` Horatiu Vultur
2020-05-20 13:09 ` [PATCH 2/3] switchdev: mrp: Remove the variable mrp_ring_state Horatiu Vultur
2020-05-20 15:56 ` Ivan Vecera
2020-05-20 13:09 ` [PATCH 3/3] bridge: mrp: Restore port state when deleting MRP instance Horatiu Vultur
2020-05-21 8:18 ` Nikolay Aleksandrov
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=39ba5110-2c2a-6fd9-a3e3-000b52a366dc@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).