Re: [PATCH RFT] net: dsa: Allow configuring CPU port VLANs

From: Petr Machata
Date: Tue Aug 14 2018 - 14:18:15 EST


Florian Fainelli <f.fainelli@xxxxxxxxx> writes:

> On 06/25/2018 02:17 AM, Ilias Apalodimas wrote:
>> On Mon, Jun 25, 2018 at 12:13:10PM +0300, Petr Machata wrote:
>>> Florian Fainelli <f.fainelli@xxxxxxxxx> writes:
>>>
>>>> if (netif_is_bridge_master(vlan->obj.orig_dev))
>>>> - return -EOPNOTSUPP;
>>>> + info.port = dp->cpu_dp->index;
>>>
>>> The condition above will trigger also when a VLAN is added on a member
>>> port, and there's no other port with that VLAN. In that case the VLAN
>>> comes without the BRIDGE_VLAN_INFO_BRENTRY flag. In mlxsw we have this
>>> to get the bridge VLANs:
>>>
>>> if (netif_is_bridge_master(orig_dev)) {
>>> [...]
>>> if ((vlan->flags & BRIDGE_VLAN_INFO_BRENTRY) &&
>>> [...]
>>>
>>> This doesn't appear to be done in DSA unless I'm missing something.
>> Petr's right. This will trigger for VLANs added on 'not cpu ports' if the VLAN
>> is not already a member.
>>
>> This command has BRIDGE_VLAN_INFO_BRENTRY set:
>> bridge vlan add dev br0 vid 100 pvid untagged self
>> I had the same issue on my CPSW RFC and solved it
>> exactly the same was as Petr suggested.
>
> Humm, there must be something obvious I am missing, but the following
> don't exactly result in what I would expect after adding a check for
> vlan->flags & BRIDGE_VLAN_INFO_BRENTRY:
>
> brctl addbr br0
> echo 1 > /sys/class/net/br0/bridge/vlan_filtering
> brctl addif br0 lan1

>From what I see, the CPU port is configured with VLAN 1 as soon as the
bridge is created:

# brctl addbr br
# bridge v sh dev br
port vlan ids
br 1 PVID Egress Untagged

I expect there are events for this (but I didn't check), but the driver
won't see them, because it doesn't have any ports attached to the bridge
yet.

> #1 results in lan1 being programmed with VID 1, PVID, untagged, but not
> the CPU port. I would have sort of expected that the bridge layer would
> also push the configuration to br0/CPU port since this is the default VLAN:
>
> bridge vlan show dev br0
> port vlan ids
> br0 1 PVID Egress Untagged

OK, apparently we are talking past each other. When you say "CPU port",
is "br0" not what you have in mind? Because I see 1 configured at br0 in
your listings.

> bridge vlan add vid 2 dev lan1
>
> #2 same thing, results in only lan1 being programmed with VID 2, tagged
> but that is expected because we are creating the VLAN only for the
> user-facing port.
>
> bridge vlan add vid 3 dev br0 self
>
> #3 results in the CPU port being programmed with VID 3, tagged, again,
> this is expected because we are only programming the bridge master/CPU
> port here.
>
> Does #1 also happen for cpsw and mlxsw or do you actually get events
> about the bridge's default VLAN configuration? Or does the switch driver
> actually need to obtain that at the time the port is enslaved somehow?

I don't think we care about the CPU port in mlxsw. If the packet matches
one of the local MACs, it gets trapped anyway, so all this stuff is then
handled in slow path.

Petr