net: bridge: Mark FDB entries that were added by user as such

idosch · davem330 · commit 710ae7287737 · 2019-01-18T15:12:16.000-08:00
Externally learned entries can be added by a user or by a switch driver that is notifying the bridge driver about entries that were learned in hardware. In the first case, the entries are not marked with the 'added_by_user' flag, which causes switch drivers to ignore them and not offload them. The 'added_by_user' flag can be set on externally learned FDB entries based on the 'swdev_notify' parameter in br_fdb_external_learn_add(), which effectively means if the created / updated FDB entry was added by a user or not. Fixes: 816a3be ("switchdev: Add fdb.added_by_user to switchdev notifications") Signed-off-by: Ido Schimmel <idosch@mellanox.com> Reported-by: Alexander Petrovskiy <alexpe@mellanox.com> Reviewed-by: Petr Machata <petrm@mellanox.com> Cc: Roopa Prabhu <roopa@cumulusnetworks.com> Cc: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Cc: bridge@lists.linux-foundation.org Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
@@ -1128,6 +1128,8 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p,
 			err = -ENOMEM;
 			goto err_unlock;
 		}
+		if (swdev_notify)
+			fdb->added_by_user = 1;
 		fdb->added_by_external_learn = 1;
 		fdb_notify(br, fdb, RTM_NEWNEIGH, swdev_notify);
 	} else {
@@ -1147,6 +1149,9 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p,
 			modified = true;
 		}
 
+		if (swdev_notify)
+			fdb->added_by_user = 1;
+
 		if (modified)
 			fdb_notify(br, fdb, RTM_NEWNEIGH, swdev_notify);
 	}

Original file line number	Diff line number	Diff line change
`@@ -1128,6 +1128,8 @@ int br_fdb_external_learn_add(struct net_bridge br, struct net_bridge_port p,`
`1128`	`1128`	`err = -ENOMEM;`
`1129`	`1129`	`goto err_unlock;`
`1130`	`1130`	`}`
	`1131`	`+ if (swdev_notify)`
	`1132`	`+ fdb->added_by_user = 1;`
`1131`	`1133`	`fdb->added_by_external_learn = 1;`
`1132`	`1134`	`fdb_notify(br, fdb, RTM_NEWNEIGH, swdev_notify);`
`1133`	`1135`	`} else {`
`@@ -1147,6 +1149,9 @@ int br_fdb_external_learn_add(struct net_bridge br, struct net_bridge_port p,`
`1147`	`1149`	`modified = true;`
`1148`	`1150`	`}`
`1149`	`1151`
	`1152`	`+ if (swdev_notify)`
	`1153`	`+ fdb->added_by_user = 1;`
	`1154`	`+`
`1150`	`1155`	`if (modified)`
`1151`	`1156`	`fdb_notify(br, fdb, RTM_NEWNEIGH, swdev_notify);`
`1152`	`1157`	`}`