On 06/05/2017 04:35 PM, Nikolay Aleksandrov wrote:
> On 05/06/17 12:20, Jiri Pirko wrote:
>> From: Arkadi Sharshevsky <arka...@mellanox.com>
>>
>> Currently the bridge doesn't notify the underlying devices about new
>> FDBs learned. The FDB sync is placed on the switchdev notifier chain
>> because devices may potentially learn FDB that are not directly related
>> to their ports, for example:
>>
>> 1. Mixed SW/HW bridge - FDBs that point to the ASICs external devices
>> should be offloaded as CPU traps in order to
>> perform forwarding in slow path.
>> 2. EVPN - Externally learned FDBs for the vtep device.
>>
>> Notification is sent only about static FDB add/del. This is done due
>> to fact that currently this is the only scenario supported by switch
>> drivers.
>>
>> Signed-off-by: Arkadi Sharshevsky <arka...@mellanox.com>
>> Reviewed-by: Ido Schimmel <ido...@mellanox.com>
>> Signed-off-by: Jiri Pirko <j...@mellanox.com>
>> ---
>> .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 2 +-
>> drivers/net/ethernet/rocker/rocker_ofdpa.c | 4 ++--
>> include/net/switchdev.h | 6 ++++--
>> net/bridge/br.c | 4 ++--
>> net/bridge/br_fdb.c | 22
>> ++++++++++++++++++++++
>> net/bridge/br_private.h | 8 ++++++++
>> net/bridge/br_switchdev.c | 13 +++++++++++++
>> 7 files changed, 52 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
>> b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
>> index edcc273..0111a77 100644
>> --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
>> +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
>> @@ -1867,7 +1867,7 @@ static void mlxsw_sp_fdb_call_notifiers(bool
>> learning_sync, bool adding,
>> if (learning_sync) {
>> info.addr = mac;
>> info.vid = vid;
>> - notifier_type = adding ? SWITCHDEV_FDB_ADD : SWITCHDEV_FDB_DEL;
>> + notifier_type = adding ? SWITCHDEV_FDB_ADD_TO_BRIDGE :
>> SWITCHDEV_FDB_DEL_TO_BRIDGE;
>> call_switchdev_notifiers(notifier_type, dev, &info.info);
>> }
>> }
>> diff --git a/drivers/net/ethernet/rocker/rocker_ofdpa.c
>> b/drivers/net/ethernet/rocker/rocker_ofdpa.c
>> index 2ae8524..f659dad 100644
>> --- a/drivers/net/ethernet/rocker/rocker_ofdpa.c
>> +++ b/drivers/net/ethernet/rocker/rocker_ofdpa.c
>> @@ -1939,10 +1939,10 @@ static void ofdpa_port_fdb_learn_work(struct
>> work_struct *work)
>>
>> rtnl_lock();
>> if (learned && removing)
>> - call_switchdev_notifiers(SWITCHDEV_FDB_DEL,
>> + call_switchdev_notifiers(SWITCHDEV_FDB_DEL_TO_BRIDGE,
>> lw->ofdpa_port->dev, &info.info);
>> else if (learned && !removing)
>> - call_switchdev_notifiers(SWITCHDEV_FDB_ADD,
>> + call_switchdev_notifiers(SWITCHDEV_FDB_ADD_TO_BRIDGE,
>> lw->ofdpa_port->dev, &info.info);
>> rtnl_unlock();
>>
>> diff --git a/include/net/switchdev.h b/include/net/switchdev.h
>> index 63a754d..8165ed9 100644
>> --- a/include/net/switchdev.h
>> +++ b/include/net/switchdev.h
>> @@ -155,8 +155,10 @@ struct switchdev_ops {
>> };
>>
>> enum switchdev_notifier_type {
>> - SWITCHDEV_FDB_ADD = 1,
>> - SWITCHDEV_FDB_DEL,
>> + SWITCHDEV_FDB_ADD_TO_BRIDGE = 1,
>> + SWITCHDEV_FDB_DEL_TO_BRIDGE,
>> + SWITCHDEV_FDB_ADD_TO_DEVICE,
>> + SWITCHDEV_FDB_DEL_TO_DEVICE,
>> };
>>
>> struct switchdev_notifier_info {
>> diff --git a/net/bridge/br.c b/net/bridge/br.c
>> index e962fff..96d209c 100644
>> --- a/net/bridge/br.c
>> +++ b/net/bridge/br.c
>> @@ -138,14 +138,14 @@ static int br_switchdev_event(struct notifier_block
>> *unused,
>> br = p->br;
>>
>> switch (event) {
>> - case SWITCHDEV_FDB_ADD:
>> + case SWITCHDEV_FDB_ADD_TO_BRIDGE:
>> fdb_info = ptr;
>> err = br_fdb_external_learn_add(br, p, fdb_info->addr,
>> fdb_info->vid);
>> if (err)
>> err = notifier_from_errno(err);
>> break;
>> - case SWITCHDEV_FDB_DEL:
>> + case SWITCHDEV_FDB_DEL_TO_BRIDGE:
>> fdb_info = ptr;
>> err = br_fdb_external_learn_del(br, p, fdb_info->addr,
>> fdb_info->vid);
>> diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
>> index 5c780cd..21bf9d2 100644
>> --- a/net/bridge/br_fdb.c
>> +++ b/net/bridge/br_fdb.c
>> @@ -683,6 +683,26 @@ static inline size_t fdb_nlmsg_size(void)
>> + nla_total_size(sizeof(struct nda_cacheinfo));
>> }
>>
>> +static void
>> +fdb_notify_switchdev(const struct net_bridge_fdb_entry *fdb, int type)
>> +{
>> + if (!fdb->added_by_user)
>> + return;
>> +
>> + switch (type) {
>> + case RTM_DELNEIGH:
>> + br_switchdev_fdb_call_notifiers(false, fdb->addr.addr,
>> + fdb->vlan_id,
>> + fdb->dst->dev);
>> + break;
>> + case RTM_NEWNEIGH:
>> + br_switchdev_fdb_call_notifiers(true, fdb->addr.addr,
>> + fdb->vlan_id,
>> + fdb->dst->dev);
>> + break;
>> + }
>> +}
>
> Same comment here, this switchdev-specific logic can be contained in
> br_switchdev_fdb_call_notifiers().
>
Thanks, will move it to br_switchdev.c.
>> +
>> static void fdb_notify(struct net_bridge *br,
>> const struct net_bridge_fdb_entry *fdb, int type)
>> {
>> @@ -690,6 +710,8 @@ static void fdb_notify(struct net_bridge *br,
>> struct sk_buff *skb;
>> int err = -ENOBUFS;
>>
>> + fdb_notify_switchdev(fdb, type);
>> +
>> skb = nlmsg_new(fdb_nlmsg_size(), GFP_ATOMIC);
>> if (skb == NULL)
>> goto errout;
>> diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
>> index 69ba3ba..5e944e9 100644
>> --- a/net/bridge/br_private.h
>> +++ b/net/bridge/br_private.h
>> @@ -1086,6 +1086,8 @@ void nbp_switchdev_frame_mark(const struct
>> net_bridge_port *p,
>> struct sk_buff *skb);
>> bool nbp_switchdev_allowed_egress(const struct net_bridge_port *p,
>> const struct sk_buff *skb);
>> +void br_switchdev_fdb_call_notifiers(bool adding, const unsigned char *mac,
>> + u16 vid, struct net_device *dev);
>> #else
>> static inline int nbp_switchdev_mark_set(struct net_bridge_port *p)
>> {
>> @@ -1102,6 +1104,12 @@ static inline bool nbp_switchdev_allowed_egress(const
>> struct net_bridge_port *p,
>> {
>> return true;
>> }
>> +
>> +static inline void
>> +br_switchdev_fdb_call_notifiers(bool adding, const unsigned char *mac,
>> + u16 vid, struct net_device *dev)
>> +{
>> +}
>> #endif /* CONFIG_NET_SWITCHDEV */
>>
>> #endif
>> diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c
>> index f4097b9..c07dceb 100644
>> --- a/net/bridge/br_switchdev.c
>> +++ b/net/bridge/br_switchdev.c
>> @@ -55,3 +55,16 @@ bool nbp_switchdev_allowed_egress(const struct
>> net_bridge_port *p,
>> return !skb->offload_fwd_mark ||
>> BR_INPUT_SKB_CB(skb)->offload_fwd_mark != p->offload_fwd_mark;
>> }
>> +
>> +void
>> +br_switchdev_fdb_call_notifiers(bool adding, const unsigned char *mac,
>> + u16 vid, struct net_device *dev)
>> +{
>> + struct switchdev_notifier_fdb_info info;
>> + unsigned long notifier_type;
>> +
>> + info.addr = mac;
>> + info.vid = vid;
>> + notifier_type = adding ? SWITCHDEV_FDB_ADD_TO_DEVICE :
>> SWITCHDEV_FDB_DEL_TO_DEVICE;
>> + call_switchdev_notifiers(notifier_type, dev, &info.info);
>> +}
>>
>
