rocker: Explicitly mark learned FDB entries as offloaded
Subsystems (3)
PATCH 1/1 rocker: Explicitly mark learned FDB entries as offloaded
Currently, FDB entries that are notified to the bridge driver via 'SWITCHDEV_FDB_ADD_TO_BRIDGE' are always marked as offloaded by the bridge. With MAB enabled, this will no longer be universally true. Device drivers will report locked FDB entries to the bridge to let it know that the corresponding hosts required authorization, but it does not mean that these entries are necessarily programmed in the underlying hardware.
We would like to solve it by having the bridge driver determine the offload indication based of the 'offloaded' bit in the FDB notification [1].
Prepare for that change by having rocker explicitly mark learned FDB entries as offloaded. This is consistent with all the other switchdev drivers.
[1] https://lore.kernel.org/netdev/[email protected]/
--- drivers/net/ethernet/rocker/rocker_ofdpa.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/rocker/rocker_ofdpa.c +4 -2
@@ -1828,12 +1828,14 @@ static void ofdpa_port_fdb_learn_work(struct work_struct *work) info.vid = lw->vid;rtnl_lock (); -if (learned && removing) +if (learned && removing) {call_switchdev_notifiers (SWITCHDEV_FDB_DEL_TO_BRIDGE , lw->ofdpa_port->dev, &info.info,NULL ); -else if (learned && !removing) + }else if (learned && !removing) { + info.offloaded = true;call_switchdev_notifiers (SWITCHDEV_FDB_ADD_TO_BRIDGE , lw->ofdpa_port->dev, &info.info,NULL ); + }rtnl_unlock ();kfree (work);
Signature · 1 line
2.37.3
Quoted 11 lines · Ido Schimmel
drivers/net/ethernet/rocker/rocker_ofdpa.c +1
-1@@ -1828,12 +1828,14 @@ static void ofdpa_port_fdb_learn_work(struct work_struct *work) info.vid = lw->vid;rtnl_lock (); -if (learned && removing) +if (learned && removing) { call_switchdev_notifiers(SWITCHDEV_FDB_DEL_TO_BRIDGE,
drivers/net/ethernet/rocker/rocker_ofdpa.c static void ofdpa_port_fdb_learn_work(struct work_struct *work) · line 1841
Quoted 10 lines
drivers/net/ethernet/rocker/rocker_ofdpa.c +3
-1lw->ofdpa_port->dev, &info.info, NULL); - else if (learned && !removing) + }else if (learned && !removing) { + info.offloaded = true;call_switchdev_notifiers (SWITCHDEV_FDB_ADD_TO_BRIDGE , lw->ofdpa_port->dev, &info.info,NULL ); + }rtnl_unlock ();kfree (work);
Looking at it again, this is better:
drivers/net/ethernet/rocker/rocker_ofdpa.c +1 -0
@@ -1826,6 +1826,7 @@ static void ofdpa_port_fdb_learn_work(struct work_struct *work) info.addr = lw->addr; info.vid = lw->vid; + info.offloaded = learned && !removing;rtnl_lock ();if (learned && removing)
Will send another version tomorrow assuming no other comments.
Quoted 38 lines · Ido Schimmel
Quoted 11 lines · Ido Schimmel
drivers/net/ethernet/rocker/rocker_ofdpa.c +1
-1@@ -1828,12 +1828,14 @@ static void ofdpa_port_fdb_learn_work(struct work_struct *work) info.vid = lw->vid;rtnl_lock (); -if (learned && removing) +if (learned && removing) { call_switchdev_notifiers(SWITCHDEV_FDB_DEL_TO_BRIDGE,drivers/net/ethernet/rocker/rocker_ofdpa.c static void ofdpa_port_fdb_learn_work(struct work_struct *work) · line 1841
Quoted 10 lines
drivers/net/ethernet/rocker/rocker_ofdpa.c +3
-1lw->ofdpa_port->dev, &info.info, NULL); - else if (learned && !removing) + }else if (learned && !removing) { + info.offloaded = true;call_switchdev_notifiers (SWITCHDEV_FDB_ADD_TO_BRIDGE , lw->ofdpa_port->dev, &info.info,NULL ); + }rtnl_unlock ();kfree (work);Looking at it again, this is better:
drivers/net/ethernet/rocker/rocker_ofdpa.c +1
-0@@ -1826,6 +1826,7 @@ static void ofdpa_port_fdb_learn_work(struct work_struct *work) info.addr = lw->addr; info.vid = lw->vid; + info.offloaded = learned && !removing;rtnl_lock ();if (learned && removing)
Quoted 1 line
Will send another version tomorrow assuming no other comments.
It may also be an opportunity to not take rtnl_lock() if (!learned), and this will in turn simplify the condition to just "info.offloaded = !removing"?
Actually this elimination of useless work should be done at the level of ofdpa_port_fdb_learn(), if "flags" does not contain OFDPA_OP_FLAG_LEARNED.
Quoted 39 lines · Vladimir Oltean
Quoted 38 lines · Ido Schimmel
Quoted 11 lines · Ido Schimmel
drivers/net/ethernet/rocker/rocker_ofdpa.c +1
-1@@ -1828,12 +1828,14 @@ static void ofdpa_port_fdb_learn_work(struct work_struct *work) info.vid = lw->vid;rtnl_lock (); -if (learned && removing) +if (learned && removing) { call_switchdev_notifiers(SWITCHDEV_FDB_DEL_TO_BRIDGE,drivers/net/ethernet/rocker/rocker_ofdpa.c static void ofdpa_port_fdb_learn_work(struct work_struct *work) · line 1841
Quoted 10 lines
drivers/net/ethernet/rocker/rocker_ofdpa.c +3
-1lw->ofdpa_port->dev, &info.info, NULL); - else if (learned && !removing) + }else if (learned && !removing) { + info.offloaded = true;call_switchdev_notifiers (SWITCHDEV_FDB_ADD_TO_BRIDGE , lw->ofdpa_port->dev, &info.info,NULL ); + }rtnl_unlock ();kfree (work);Looking at it again, this is better:
drivers/net/ethernet/rocker/rocker_ofdpa.c +1
-0@@ -1826,6 +1826,7 @@ static void ofdpa_port_fdb_learn_work(struct work_struct *work) info.addr = lw->addr; info.vid = lw->vid; + info.offloaded = learned && !removing;rtnl_lock ();if (learned && removing)
Quoted 7 lines
Quoted 1 line
Will send another version tomorrow assuming no other comments.
It may also be an opportunity to not take
rtnl_lock()if (!learned), and this will in turn simplify the condition to just "info.offloaded = !removing"?Actually this elimination of useless work should be done at the level of
ofdpa_port_fdb_learn(), if "flags" does not containOFDPA_OP_FLAG_LEARNED.
OK, I have this as the first patch:
drivers/net/ethernet/rocker/rocker_ofdpa.c +7 -7
@@ -1821,19 +1821,16 @@ static void ofdpa_port_fdb_learn_work(struct work_struct *work)const struct ofdpa_fdb_learn_work *lw = container_of(work, struct ofdpa_fdb_learn_work, work);bool removing = (lw->flags &OFDPA_OP_FLAG_REMOVE ); -bool learned = (lw->flags &OFDPA_OP_FLAG_LEARNED );struct switchdev_notifier_fdb_info info = {}; +enum switchdev_notifier_type event; info.addr = lw->addr; info.vid = lw->vid; + event = removing ?SWITCHDEV_FDB_DEL_TO_BRIDGE : +SWITCHDEV_FDB_ADD_TO_BRIDGE ;rtnl_lock (); -if (learned && removing) -call_switchdev_notifiers (SWITCHDEV_FDB_DEL_TO_BRIDGE , - lw->ofdpa_port->dev, &info.info,NULL ); -else if (learned && !removing) -call_switchdev_notifiers (SWITCHDEV_FDB_ADD_TO_BRIDGE , - lw->ofdpa_port->dev, &info.info,NULL ); +call_switchdev_notifiers (event, lw->ofdpa_port->dev, &info.info,NULL );rtnl_unlock ();kfree (work);
@@ -1865,6 +1862,9 @@ static int ofdpa_port_fdb_learn(struct ofdpa_port *ofdpa_port,if (!ofdpa_port_is_bridged (ofdpa_port))return 0 ; +if (!(flags &OFDPA_OP_FLAG_LEARNED )) +return 0 ; + lw =kzalloc (sizeof (*lw),GFP_ATOMIC );if (!lw)return -ENOMEM ;