lkml.org 
[lkml]   [2022]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next v2 7/7] net: lan966x: Extend MAC to support also lag interfaces.
    Date
    Extend MAC support to support also lag interfaces:
    1. In case an entry is learned on a port that is part of lag interface,
    then notify the upper layers that the entry is learned on the bond
    interface
    2. If a port leaves the bond and the port is the first port in the lag
    group, then it is required to update all MAC entries to change the
    destination port.

    Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
    ---
    .../ethernet/microchip/lan966x/lan966x_lag.c | 14 ++++
    .../ethernet/microchip/lan966x/lan966x_mac.c | 66 ++++++++++++++++---
    .../ethernet/microchip/lan966x/lan966x_main.h | 5 ++
    3 files changed, 77 insertions(+), 8 deletions(-)

    diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_lag.c b/drivers/net/ethernet/microchip/lan966x/lan966x_lag.c
    index dd372a6497bb..6360fa3c5013 100644
    --- a/drivers/net/ethernet/microchip/lan966x/lan966x_lag.c
    +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_lag.c
    @@ -131,6 +131,20 @@ int lan966x_lag_port_join(struct lan966x_port *port,
    void lan966x_lag_port_leave(struct lan966x_port *port, struct net_device *bond)
    {
    struct lan966x *lan966x = port->lan966x;
    + u32 bond_mask;
    + u32 lag_id;
    +
    + if (lan966x_lag_first_port(port->bond, port->dev)) {
    + bond_mask = lan966x_lag_get_mask(lan966x, port->bond);
    + bond_mask &= ~BIT(port->chip_port);
    + if (bond_mask) {
    + lag_id = __ffs(bond_mask);
    + lan966x_mac_lag_replace_port_entry(lan966x, port,
    + lan966x->ports[lag_id]);
    + } else {
    + lan966x_mac_lag_remove_port_entry(lan966x, port);
    + }
    + }

    port->bond = NULL;
    lan966x_lag_set_port_ids(lan966x);
    diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_mac.c b/drivers/net/ethernet/microchip/lan966x/lan966x_mac.c
    index 005e56ea5da1..3348453d89df 100644
    --- a/drivers/net/ethernet/microchip/lan966x/lan966x_mac.c
    +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_mac.c
    @@ -22,6 +22,7 @@ struct lan966x_mac_entry {
    u16 vid;
    u16 port_index;
    int row;
    + bool lag;
    };

    struct lan966x_mac_raw_entry {
    @@ -156,8 +157,9 @@ void lan966x_mac_init(struct lan966x *lan966x)
    INIT_LIST_HEAD(&lan966x->mac_entries);
    }

    -static struct lan966x_mac_entry *lan966x_mac_alloc_entry(const unsigned char *mac,
    - u16 vid, u16 port_index)
    +static struct lan966x_mac_entry *lan966x_mac_alloc_entry(struct lan966x_port *port,
    + const unsigned char *mac,
    + u16 vid)
    {
    struct lan966x_mac_entry *mac_entry;

    @@ -167,8 +169,9 @@ static struct lan966x_mac_entry *lan966x_mac_alloc_entry(const unsigned char *ma

    memcpy(mac_entry->mac, mac, ETH_ALEN);
    mac_entry->vid = vid;
    - mac_entry->port_index = port_index;
    + mac_entry->port_index = port->chip_port;
    mac_entry->row = LAN966X_MAC_INVALID_ROW;
    + mac_entry->lag = port->bond ? true : false;
    return mac_entry;
    }

    @@ -245,7 +248,7 @@ int lan966x_mac_add_entry(struct lan966x *lan966x, struct lan966x_port *port,
    return lan966x_mac_learn(lan966x, port->chip_port,
    addr, vid, ENTRYTYPE_LOCKED);

    - mac_entry = lan966x_mac_alloc_entry(addr, vid, port->chip_port);
    + mac_entry = lan966x_mac_alloc_entry(port, addr, vid);
    if (!mac_entry)
    return -ENOMEM;

    @@ -254,7 +257,8 @@ int lan966x_mac_add_entry(struct lan966x *lan966x, struct lan966x_port *port,
    spin_unlock(&lan966x->mac_lock);

    lan966x_mac_learn(lan966x, port->chip_port, addr, vid, ENTRYTYPE_LOCKED);
    - lan966x_fdb_call_notifiers(SWITCHDEV_FDB_OFFLOADED, addr, vid, port->dev);
    + lan966x_fdb_call_notifiers(SWITCHDEV_FDB_OFFLOADED, addr, vid,
    + port->bond ?: port->dev);

    return 0;
    }
    @@ -281,6 +285,48 @@ int lan966x_mac_del_entry(struct lan966x *lan966x, const unsigned char *addr,
    return 0;
    }

    +void lan966x_mac_lag_replace_port_entry(struct lan966x *lan966x,
    + struct lan966x_port *src,
    + struct lan966x_port *dst)
    +{
    + struct lan966x_mac_entry *mac_entry;
    +
    + spin_lock(&lan966x->mac_lock);
    + list_for_each_entry(mac_entry, &lan966x->mac_entries, list) {
    + if (mac_entry->port_index == src->chip_port &&
    + mac_entry->lag) {
    + lan966x_mac_forget(lan966x, mac_entry->mac, mac_entry->vid,
    + ENTRYTYPE_LOCKED);
    +
    + lan966x_mac_learn(lan966x, dst->chip_port,
    + mac_entry->mac, mac_entry->vid,
    + ENTRYTYPE_LOCKED);
    + mac_entry->port_index = dst->chip_port;
    + }
    + }
    + spin_unlock(&lan966x->mac_lock);
    +}
    +
    +void lan966x_mac_lag_remove_port_entry(struct lan966x *lan966x,
    + struct lan966x_port *src)
    +{
    + struct lan966x_mac_entry *mac_entry, *tmp;
    +
    + spin_lock(&lan966x->mac_lock);
    + list_for_each_entry_safe(mac_entry, tmp, &lan966x->mac_entries,
    + list) {
    + if (mac_entry->port_index == src->chip_port &&
    + mac_entry->lag) {
    + lan966x_mac_forget(lan966x, mac_entry->mac, mac_entry->vid,
    + ENTRYTYPE_LOCKED);
    +
    + list_del(&mac_entry->list);
    + kfree(mac_entry);
    + }
    + }
    + spin_unlock(&lan966x->mac_lock);
    +}
    +
    void lan966x_mac_purge_entries(struct lan966x *lan966x)
    {
    struct lan966x_mac_entry *mac_entry, *tmp;
    @@ -325,6 +371,7 @@ static void lan966x_mac_irq_process(struct lan966x *lan966x, u32 row,
    {
    struct lan966x_mac_entry *mac_entry, *tmp;
    unsigned char mac[ETH_ALEN] __aligned(2);
    + struct lan966x_port *port;
    u32 dest_idx;
    u32 column;
    u16 vid;
    @@ -366,9 +413,10 @@ static void lan966x_mac_irq_process(struct lan966x *lan966x, u32 row,
    * anymore in the HW and remove the entry from the SW
    * list
    */
    + port = lan966x->ports[mac_entry->port_index];
    lan966x_mac_notifiers(SWITCHDEV_FDB_DEL_TO_BRIDGE,
    mac_entry->mac, mac_entry->vid,
    - lan966x->ports[mac_entry->port_index]->dev);
    + port->bond ?: port->dev);

    list_del(&mac_entry->list);
    kfree(mac_entry);
    @@ -396,7 +444,8 @@ static void lan966x_mac_irq_process(struct lan966x *lan966x, u32 row,
    if (WARN_ON(dest_idx >= lan966x->num_phys_ports))
    continue;

    - mac_entry = lan966x_mac_alloc_entry(mac, vid, dest_idx);
    + port = lan966x->ports[dest_idx];
    + mac_entry = lan966x_mac_alloc_entry(port, mac, vid);
    if (!mac_entry)
    return;

    @@ -407,7 +456,8 @@ static void lan966x_mac_irq_process(struct lan966x *lan966x, u32 row,
    spin_unlock(&lan966x->mac_lock);

    lan966x_mac_notifiers(SWITCHDEV_FDB_ADD_TO_BRIDGE,
    - mac, vid, lan966x->ports[dest_idx]->dev);
    + mac, vid,
    + port->bond ?: port->dev);
    }
    }

    diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.h b/drivers/net/ethernet/microchip/lan966x/lan966x_main.h
    index 1d7fe0e2a243..d361dd7c8eae 100644
    --- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.h
    +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.h
    @@ -349,6 +349,11 @@ int lan966x_mac_add_entry(struct lan966x *lan966x,
    struct lan966x_port *port,
    const unsigned char *addr,
    u16 vid);
    +void lan966x_mac_lag_replace_port_entry(struct lan966x *lan966x,
    + struct lan966x_port *src,
    + struct lan966x_port *dst);
    +void lan966x_mac_lag_remove_port_entry(struct lan966x *lan966x,
    + struct lan966x_port *src);
    void lan966x_mac_purge_entries(struct lan966x *lan966x);
    irqreturn_t lan966x_mac_irq_handler(struct lan966x *lan966x);

    --
    2.33.0
    \
     
     \ /
      Last update: 2022-06-27 22:12    [W:2.631 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site