Commit f0ead99e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Replay-and-offload-host-VLAN-entries-in-DSA' 

Vladimir Oltean says:

====================
Replay and offload host VLAN entries in DSA

v2->v3:
- make the bridge stop notifying switchdev for !BRENTRY VLANs
- create precommit and commit wrappers around __vlan_add_flags().
- special-case the BRENTRY transition from false to true, instead of
  treating it as a change of flags and letting drivers figure out that
  it really isn't.
- avoid setting *changed unless we know that functions will not error
  out later.
- drop "old_flags" from struct switchdev_obj_port_vlan, nobody needs it
  now, in v2 only DSA needed it to filter out BRENTRY transitions, that
  is now solved cleaner.
- no BRIDGE_VLAN_INFO_BRENTRY flag checks and manipulations in DSA
  whatsoever, use the "bool changed" bit as-is after changing what it
  means.
- merge dsa_slave_host_vlan_{add,del}() with
  dsa_slave_foreign_vlan_{add,del}(), since now they do the same thing,
  because the host_vlan functions no longer need to mangle the vlan
  BRENTRY flags and bool changed.

v1->v2:
- prune switchdev VLAN additions with no actual change differently
- no longer need to revert struct net_bridge_vlan changes on error from
  switchdev
- no longer need to first delete a changed VLAN before readding it
- pass 'bool changed' and 'u16 old_flags' through switchdev_obj_port_vlan
  so that DSA can do some additional post-processing with the
  BRIDGE_VLAN_INFO_BRENTRY flag
- support VLANs on foreign interfaces
- fix the same -EOPNOTSUPP error in mv88e6xxx, this time on removal, due
  to VLAN deletion getting replayed earlier than FDB deletion

The motivation behind these patches is that Rafael reported the
following error with mv88e6xxx when the first switch port joins a
bridge:

mv88e6085 0x0000000008b96000:00: port 0 failed to add a6:ef:77:c8:5f:3d vid 1 to fdb: -95 (-EOPNOTSUPP)

The FDB entry that's added is the MAC address of the bridge, in VID 1
(the default_pvid), being replayed as part of br_add_if() -> ... ->
nbp_switchdev_sync_objs().

-EOPNOTSUPP is the mv88e6xxx driver's way of saying that VID 1 doesn't
exist in the VTU, so it can't program the ATU with a FID, something
which it needs.

It appears to be a race, but it isn't, since we only end up installing
VID 1 in the VTU by coincidence. DSA's approximation of programming
VLANs on the CPU port together with the user ports breaks down with
host FDB entries on mv88e6xxx, since that strictly requires the VTU to
contain the VID. But the user may freely add VLANs pointing just towards
the bridge, and FDB entries in those VLANs, and DSA will not be aware of
them, because it only listens for VLANs on user ports.

To create a solution that scales properly to cross-chip setups and
doesn't leak entries behind, some changes in the bridge driver are
required. I believe that these are for the better overall, but I may be
wrong. Namely, the same refcounting procedure that DSA has in place for
host FDB and MDB entries can be replicated for VLANs, except that it's
garbage in, garbage out: the VLAN addition and removal notifications
from switchdev aren't balanced. So the first 2 patches attempt to deal
with that.

This patch set has been superficially tested on a board with 3 mv88e6xxx
switches in a daisy chain and appears to produce the primary desired
effect - the driver no longer returns -EOPNOTSUPP when the first port
joins a bridge, and is successful in performing local termination under
a VLAN-aware bridge.
As an additional side effect, it silences the annoying "p%d: already a
member of VLAN %d\n" warning messages that the mv88e6xxx driver produces
when coupled with systemd-networkd, and a few VLANs are configured.
Furthermore, it advances Florian's idea from a few years back, which
never got merged:
https://lore.kernel.org/lkml/20180624153339.13572-1-f.fainelli@gmail.com/


v2 has also been tested on the NXP LS1028A felix switch.

Some testing:

root@debian:~# bridge vlan add dev br0 vid 101 pvid self
[  100.709220] mv88e6085 d0032004.mdio-mii:10: mv88e6xxx_port_vlan_add: port 9 vlan 101
[  100.873426] mv88e6085 d0032004.mdio-mii:10: mv88e6xxx_port_vlan_add: port 10 vlan 101
[  100.892314] mv88e6085 d0032004.mdio-mii:11: mv88e6xxx_port_vlan_add: port 9 vlan 101
[  101.053392] mv88e6085 d0032004.mdio-mii:11: mv88e6xxx_port_vlan_add: port 10 vlan 101
[  101.076994] mv88e6085 d0032004.mdio-mii:12: mv88e6xxx_port_vlan_add: port 9 vlan 101
root@debian:~# bridge vlan add dev br0 vid 101 pvid self
root@debian:~# bridge vlan add dev br0 vid 101 pvid self
root@debian:~# bridge vlan
port              vlan-id
eth0              1 PVID Egress Untagged
lan9              1 PVID Egress Untagged
lan10             1 PVID Egress Untagged
lan11             1 PVID Egress Untagged
lan12             1 PVID Egress Untagged
lan13             1 PVID Egress Untagged
lan14             1 PVID Egress Untagged
lan15             1 PVID Egress Untagged
lan16             1 PVID Egress Untagged
lan17             1 PVID Egress Untagged
lan18             1 PVID Egress Untagged
lan19             1 PVID Egress Untagged
lan20             1 PVID Egress Untagged
lan21             1 PVID Egress Untagged
lan22             1 PVID Egress Untagged
lan23             1 PVID Egress Untagged
lan24             1 PVID Egress Untagged
sfp               1 PVID Egress Untagged
lan1              1 PVID Egress Untagged
lan2              1 PVID Egress Untagged
lan3              1 PVID Egress Untagged
lan4              1 PVID Egress Untagged
lan5              1 PVID Egress Untagged
lan6              1 PVID Egress Untagged
lan7              1 PVID Egress Untagged
lan8              1 PVID Egress Untagged
br0               1 Egress Untagged
                  101 PVID
root@debian:~# bridge vlan del dev br0 vid 101 pvid self
[  108.340487] mv88e6085 d0032004.mdio-mii:11: mv88e6xxx_port_vlan_del: port 9 vlan 101
[  108.379167] mv88e6085 d0032004.mdio-mii:11: mv88e6xxx_port_vlan_del: port 10 vlan 101
[  108.402319] mv88e6085 d0032004.mdio-mii:12: mv88e6xxx_port_vlan_del: port 9 vlan 101
[  108.425866] mv88e6085 d0032004.mdio-mii:10: mv88e6xxx_port_vlan_del: port 9 vlan 101
[  108.452280] mv88e6085 d0032004.mdio-mii:10: mv88e6xxx_port_vlan_del: port 10 vlan 101
root@debian:~# bridge vlan del dev br0 vid 101 pvid self
root@debian:~# bridge vlan del dev br0 vid 101 pvid self
root@debian:~# bridge vlan
port              vlan-id
eth0              1 PVID Egress Untagged
lan9              1 PVID Egress Untagged
lan10             1 PVID Egress Untagged
lan11             1 PVID Egress Untagged
lan12             1 PVID Egress Untagged
lan13             1 PVID Egress Untagged
lan14             1 PVID Egress Untagged
lan15             1 PVID Egress Untagged
lan16             1 PVID Egress Untagged
lan17             1 PVID Egress Untagged
lan18             1 PVID Egress Untagged
lan19             1 PVID Egress Untagged
lan20             1 PVID Egress Untagged
lan21             1 PVID Egress Untagged
lan22             1 PVID Egress Untagged
lan23             1 PVID Egress Untagged
lan24             1 PVID Egress Untagged
sfp               1 PVID Egress Untagged
lan1              1 PVID Egress Untagged
lan2              1 PVID Egress Untagged
lan3              1 PVID Egress Untagged
lan4              1 PVID Egress Untagged
lan5              1 PVID Egress Untagged
lan6              1 PVID Egress Untagged
lan7              1 PVID Egress Untagged
lan8              1 PVID Egress Untagged
br0               1 Egress Untagged
root@debian:~# bridge vlan del dev br0 vid 101 pvid self
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b0471c26 164f861b

include/net/dsa.h

+10 −0
Original line number Diff line number Diff line
@@ -312,6 +312,10 @@ struct dsa_port { 
	struct mutex		addr_lists_lock;

	struct list_head	fdbs;

	struct list_head	mdbs;



	/* List of VLANs that CPU and DSA ports are members of. */

	struct mutex		vlans_lock;

	struct list_head	vlans;

};



/* TODO: ideally DSA ports would have a single dp->link_dp member,
@@ -332,6 +336,12 @@ struct dsa_mac_addr { 
	struct list_head list;

};



struct dsa_vlan {

	u16 vid;

	refcount_t refcount;

	struct list_head list;

};



struct dsa_switch {

	struct device *dev;

include/net/switchdev.h

+46 −0
Original line number Diff line number Diff line
@@ -81,6 +81,13 @@ struct switchdev_obj_port_vlan { 
	struct switchdev_obj obj;

	u16 flags;

	u16 vid;

	/* If set, the notifier signifies a change of one of the following

	 * flags for a VLAN that already exists:

	 * - BRIDGE_VLAN_INFO_PVID

	 * - BRIDGE_VLAN_INFO_UNTAGGED

	 * Entries with BRIDGE_VLAN_INFO_BRENTRY unset are not notified at all.

	 */

	bool changed;

};



#define SWITCHDEV_OBJ_PORT_VLAN(OBJ) \
@@ -317,11 +324,26 @@ int switchdev_handle_port_obj_add(struct net_device *dev, 
			int (*add_cb)(struct net_device *dev, const void *ctx,

				      const struct switchdev_obj *obj,

				      struct netlink_ext_ack *extack));

int switchdev_handle_port_obj_add_foreign(struct net_device *dev,

			struct switchdev_notifier_port_obj_info *port_obj_info,

			bool (*check_cb)(const struct net_device *dev),

			bool (*foreign_dev_check_cb)(const struct net_device *dev,

						     const struct net_device *foreign_dev),

			int (*add_cb)(struct net_device *dev, const void *ctx,

				      const struct switchdev_obj *obj,

				      struct netlink_ext_ack *extack));

int switchdev_handle_port_obj_del(struct net_device *dev,

			struct switchdev_notifier_port_obj_info *port_obj_info,

			bool (*check_cb)(const struct net_device *dev),

			int (*del_cb)(struct net_device *dev, const void *ctx,

				      const struct switchdev_obj *obj));

int switchdev_handle_port_obj_del_foreign(struct net_device *dev,

			struct switchdev_notifier_port_obj_info *port_obj_info,

			bool (*check_cb)(const struct net_device *dev),

			bool (*foreign_dev_check_cb)(const struct net_device *dev,

						     const struct net_device *foreign_dev),

			int (*del_cb)(struct net_device *dev, const void *ctx,

				      const struct switchdev_obj *obj));



int switchdev_handle_port_attr_set(struct net_device *dev,

			struct switchdev_notifier_port_attr_info *port_attr_info,
@@ -440,6 +462,18 @@ switchdev_handle_port_obj_add(struct net_device *dev, 
	return 0;

}



static inline int switchdev_handle_port_obj_add_foreign(struct net_device *dev,

			struct switchdev_notifier_port_obj_info *port_obj_info,

			bool (*check_cb)(const struct net_device *dev),

			bool (*foreign_dev_check_cb)(const struct net_device *dev,

						     const struct net_device *foreign_dev),

			int (*add_cb)(struct net_device *dev, const void *ctx,

				      const struct switchdev_obj *obj,

				      struct netlink_ext_ack *extack))

{

	return 0;

}



static inline int

switchdev_handle_port_obj_del(struct net_device *dev,

			struct switchdev_notifier_port_obj_info *port_obj_info,
@@ -450,6 +484,18 @@ switchdev_handle_port_obj_del(struct net_device *dev, 
	return 0;

}



static inline int

switchdev_handle_port_obj_del_foreign(struct net_device *dev,

			struct switchdev_notifier_port_obj_info *port_obj_info,

			bool (*check_cb)(const struct net_device *dev),

			bool (*foreign_dev_check_cb)(const struct net_device *dev,

						     const struct net_device *foreign_dev),

			int (*del_cb)(struct net_device *dev, const void *ctx,

				      const struct switchdev_obj *obj))

{

	return 0;

}



static inline int

switchdev_handle_port_attr_set(struct net_device *dev,

			struct switchdev_notifier_port_attr_info *port_attr_info,

net/bridge/br_private.h

+3 −3
Original line number Diff line number Diff line
@@ -1985,7 +1985,7 @@ void br_switchdev_mdb_notify(struct net_device *dev, 
			     struct net_bridge_port_group *pg,

			     int type);

int br_switchdev_port_vlan_add(struct net_device *dev, u16 vid, u16 flags,

			       struct netlink_ext_ack *extack);

			       bool changed, struct netlink_ext_ack *extack);

int br_switchdev_port_vlan_del(struct net_device *dev, u16 vid);

void br_switchdev_init(struct net_bridge *br);
@@ -2052,8 +2052,8 @@ static inline int br_switchdev_set_port_flag(struct net_bridge_port *p, 
	return 0;

}



static inline int br_switchdev_port_vlan_add(struct net_device *dev,

					     u16 vid, u16 flags,

static inline int br_switchdev_port_vlan_add(struct net_device *dev, u16 vid,

					     u16 flags, bool changed,

					     struct netlink_ext_ack *extack)

{

	return -EOPNOTSUPP;

net/bridge/br_switchdev.c

+52 −43
Original line number Diff line number Diff line
@@ -160,13 +160,14 @@ br_switchdev_fdb_notify(struct net_bridge *br, 
}



int br_switchdev_port_vlan_add(struct net_device *dev, u16 vid, u16 flags,

			       struct netlink_ext_ack *extack)

			       bool changed, struct netlink_ext_ack *extack)

{

	struct switchdev_obj_port_vlan v = {

		.obj.orig_dev = dev,

		.obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,

		.flags = flags,

		.vid = vid,

		.changed = changed,

	};



	return switchdev_port_obj_add(dev, &v.obj, extack);
@@ -351,51 +352,19 @@ br_switchdev_vlan_replay_one(struct notifier_block *nb, 
	return notifier_to_errno(err);

}



static int br_switchdev_vlan_replay(struct net_device *br_dev,

static int br_switchdev_vlan_replay_group(struct notifier_block *nb,

					  struct net_device *dev,

				    const void *ctx, bool adding,

				    struct notifier_block *nb,

					  struct net_bridge_vlan_group *vg,

					  const void *ctx, unsigned long action,

					  struct netlink_ext_ack *extack)

{

	struct net_bridge_vlan_group *vg;

	struct net_bridge_vlan *v;

	struct net_bridge_port *p;

	struct net_bridge *br;

	unsigned long action;

	int err = 0;

	u16 pvid;



	ASSERT_RTNL();



	if (!nb)

		return 0;



	if (!netif_is_bridge_master(br_dev))

		return -EINVAL;



	if (!netif_is_bridge_master(dev) && !netif_is_bridge_port(dev))

		return -EINVAL;



	if (netif_is_bridge_master(dev)) {

		br = netdev_priv(dev);

		vg = br_vlan_group(br);

		p = NULL;

	} else {

		p = br_port_get_rtnl(dev);

		if (WARN_ON(!p))

			return -EINVAL;

		vg = nbp_vlan_group(p);

		br = p->br;

	}



	if (!vg)

		return 0;



	if (adding)

		action = SWITCHDEV_PORT_OBJ_ADD;

	else

		action = SWITCHDEV_PORT_OBJ_DEL;



	pvid = br_get_pvid(vg);



	list_for_each_entry(v, &vg->vlan_list, vlist) {
@@ -415,9 +384,50 @@ static int br_switchdev_vlan_replay(struct net_device *br_dev, 
			return err;

	}



	return 0;

}



static int br_switchdev_vlan_replay(struct net_device *br_dev,

				    const void *ctx, bool adding,

				    struct notifier_block *nb,

				    struct netlink_ext_ack *extack)

{

	struct net_bridge *br = netdev_priv(br_dev);

	struct net_bridge_port *p;

	unsigned long action;

	int err;



	ASSERT_RTNL();



	if (!nb)

		return 0;



	if (!netif_is_bridge_master(br_dev))

		return -EINVAL;



	if (adding)

		action = SWITCHDEV_PORT_OBJ_ADD;

	else

		action = SWITCHDEV_PORT_OBJ_DEL;



	err = br_switchdev_vlan_replay_group(nb, br_dev, br_vlan_group(br),

					     ctx, action, extack);

	if (err)

		return err;



	list_for_each_entry(p, &br->port_list, list) {

		struct net_device *dev = p->dev;



		err = br_switchdev_vlan_replay_group(nb, dev,

						     nbp_vlan_group(p),

						     ctx, action, extack);

		if (err)

			return err;

	}



	return 0;

}



#ifdef CONFIG_BRIDGE_IGMP_SNOOPING

struct br_switchdev_mdb_complete_info {

	struct net_bridge_port *port;
@@ -681,8 +691,7 @@ static int nbp_switchdev_sync_objs(struct net_bridge_port *p, const void *ctx, 
	struct net_device *dev = p->dev;

	int err;



	err = br_switchdev_vlan_replay(br_dev, dev, ctx, true, blocking_nb,

				       extack);

	err = br_switchdev_vlan_replay(br_dev, ctx, true, blocking_nb, extack);

	if (err && err != -EOPNOTSUPP)

		return err;
@@ -706,11 +715,11 @@ static void nbp_switchdev_unsync_objs(struct net_bridge_port *p, 
	struct net_device *br_dev = p->br->dev;

	struct net_device *dev = p->dev;



	br_switchdev_vlan_replay(br_dev, dev, ctx, false, blocking_nb, NULL);

	br_switchdev_fdb_replay(br_dev, ctx, false, atomic_nb);



	br_switchdev_mdb_replay(br_dev, dev, ctx, false, blocking_nb, NULL);



	br_switchdev_fdb_replay(br_dev, ctx, false, atomic_nb);

	br_switchdev_vlan_replay(br_dev, ctx, false, blocking_nb, NULL);

}



/* Let the bridge know that this port is offloaded, so that it can assign a

net/bridge/br_vlan.c

+73 −35
Original line number Diff line number Diff line
@@ -34,53 +34,70 @@ static struct net_bridge_vlan *br_vlan_lookup(struct rhashtable *tbl, u16 vid) 
	return rhashtable_lookup_fast(tbl, &vid, br_vlan_rht_params);

}



static bool __vlan_add_pvid(struct net_bridge_vlan_group *vg,

static void __vlan_add_pvid(struct net_bridge_vlan_group *vg,

			    const struct net_bridge_vlan *v)

{

	if (vg->pvid == v->vid)

		return false;

		return;



	smp_wmb();

	br_vlan_set_pvid_state(vg, v->state);

	vg->pvid = v->vid;



	return true;

}



static bool __vlan_delete_pvid(struct net_bridge_vlan_group *vg, u16 vid)

static void __vlan_delete_pvid(struct net_bridge_vlan_group *vg, u16 vid)

{

	if (vg->pvid != vid)

		return false;

		return;



	smp_wmb();

	vg->pvid = 0;



	return true;

}



/* return true if anything changed, false otherwise */

static bool __vlan_add_flags(struct net_bridge_vlan *v, u16 flags)

/* Update the BRIDGE_VLAN_INFO_PVID and BRIDGE_VLAN_INFO_UNTAGGED flags of @v.

 * If @commit is false, return just whether the BRIDGE_VLAN_INFO_PVID and

 * BRIDGE_VLAN_INFO_UNTAGGED bits of @flags would produce any change onto @v.

 */

static bool __vlan_flags_update(struct net_bridge_vlan *v, u16 flags,

				bool commit)

{

	struct net_bridge_vlan_group *vg;

	u16 old_flags = v->flags;

	bool ret;

	bool change;



	if (br_vlan_is_master(v))

		vg = br_vlan_group(v->br);

	else

		vg = nbp_vlan_group(v->port);



	/* check if anything would be changed on commit */

	change = !!(flags & BRIDGE_VLAN_INFO_PVID) == !!(vg->pvid != v->vid) ||

		 ((flags ^ v->flags) & BRIDGE_VLAN_INFO_UNTAGGED);



	if (!commit)

		goto out;



	if (flags & BRIDGE_VLAN_INFO_PVID)

		ret = __vlan_add_pvid(vg, v);

		__vlan_add_pvid(vg, v);

	else

		ret = __vlan_delete_pvid(vg, v->vid);

		__vlan_delete_pvid(vg, v->vid);



	if (flags & BRIDGE_VLAN_INFO_UNTAGGED)

		v->flags |= BRIDGE_VLAN_INFO_UNTAGGED;

	else

		v->flags &= ~BRIDGE_VLAN_INFO_UNTAGGED;



	return ret || !!(old_flags ^ v->flags);

out:

	return change;

}



static bool __vlan_flags_would_change(struct net_bridge_vlan *v, u16 flags)

{

	return __vlan_flags_update(v, flags, false);

}



static void __vlan_flags_commit(struct net_bridge_vlan *v, u16 flags)

{

	__vlan_flags_update(v, flags, true);

}



static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br,
@@ -92,7 +109,7 @@ static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br, 
	/* Try switchdev op first. In case it is not supported, fallback to

	 * 8021q add.

	 */

	err = br_switchdev_port_vlan_add(dev, v->vid, flags, extack);

	err = br_switchdev_port_vlan_add(dev, v->vid, flags, false, extack);

	if (err == -EOPNOTSUPP)

		return vlan_vid_add(dev, br->vlan_proto, v->vid);

	v->priv_flags |= BR_VLFLAG_ADDED_BY_SWITCHDEV;
@@ -284,9 +301,12 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags, 
		}

		br_multicast_port_ctx_init(p, v, &v->port_mcast_ctx);

	} else {

		err = br_switchdev_port_vlan_add(dev, v->vid, flags, extack);

		if (br_vlan_should_use(v)) {

			err = br_switchdev_port_vlan_add(dev, v->vid, flags,

							 false, extack);

			if (err && err != -EOPNOTSUPP)

				goto out;

		}

		br_multicast_ctx_init(br, v, &v->br_mcast_ctx);

		v->priv_flags |= BR_VLFLAG_GLOBAL_MCAST_ENABLED;

	}
@@ -310,7 +330,7 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags, 
		goto out_fdb_insert;



	__vlan_add_list(v);

	__vlan_add_flags(v, flags);

	__vlan_flags_commit(v, flags);

	br_multicast_toggle_one_vlan(v, true);



	if (p)
@@ -677,18 +697,29 @@ static int br_vlan_add_existing(struct net_bridge *br, 
				u16 flags, bool *changed,

				struct netlink_ext_ack *extack)

{

	bool would_change = __vlan_flags_would_change(vlan, flags);

	bool becomes_brentry = false;

	int err;



	err = br_switchdev_port_vlan_add(br->dev, vlan->vid, flags, extack);

	if (err && err != -EOPNOTSUPP)

		return err;



	if (!br_vlan_is_brentry(vlan)) {

		/* Trying to change flags of non-existent bridge vlan */

		if (!(flags & BRIDGE_VLAN_INFO_BRENTRY)) {

			err = -EINVAL;

			goto err_flags;

		if (!(flags & BRIDGE_VLAN_INFO_BRENTRY))

			return -EINVAL;



		becomes_brentry = true;

	}



	/* Master VLANs that aren't brentries weren't notified before,

	 * time to notify them now.

	 */

	if (becomes_brentry || would_change) {

		err = br_switchdev_port_vlan_add(br->dev, vlan->vid, flags,

						 would_change, extack);

		if (err && err != -EOPNOTSUPP)

			return err;

	}



	if (becomes_brentry) {

		/* It was only kept for port vlans, now make it real */

		err = br_fdb_add_local(br, NULL, br->dev->dev_addr, vlan->vid);

		if (err) {
@@ -703,13 +734,13 @@ static int br_vlan_add_existing(struct net_bridge *br, 
		br_multicast_toggle_one_vlan(vlan, true);

	}



	if (__vlan_add_flags(vlan, flags))

	__vlan_flags_commit(vlan, flags);

	if (would_change)

		*changed = true;



	return 0;



err_fdb_insert:

err_flags:

	br_switchdev_port_vlan_del(br->dev, vlan->vid);

	return err;

}
@@ -1254,11 +1285,18 @@ int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags, 
	*changed = false;

	vlan = br_vlan_find(nbp_vlan_group(port), vid);

	if (vlan) {

		bool would_change = __vlan_flags_would_change(vlan, flags);



		if (would_change) {

			/* Pass the flags to the hardware bridge */

		ret = br_switchdev_port_vlan_add(port->dev, vid, flags, extack);

			ret = br_switchdev_port_vlan_add(port->dev, vid, flags,

							 true, extack);

			if (ret && ret != -EOPNOTSUPP)

				return ret;

		*changed = __vlan_add_flags(vlan, flags);

		}



		__vlan_flags_commit(vlan, flags);

		*changed = would_change;



		return 0;

	}