lkml.org 
[lkml]   [2017]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next 3/6] net: dsa: add switch mdb bitmap functions
    Date
    This patch brings no functional changes.
    It moves out the MDB code iterating on a multicast group into new
    dsa_switch_mdb_{prepare,add}_bitmap() functions.

    This gives us a better isolation of the two switchdev phases.

    Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
    ---
    net/dsa/switch.c | 48 +++++++++++++++++++++++++++++++++---------------
    1 file changed, 33 insertions(+), 15 deletions(-)

    diff --git a/net/dsa/switch.c b/net/dsa/switch.c
    index 0041aba5c339..8bfbbe408e82 100644
    --- a/net/dsa/switch.c
    +++ b/net/dsa/switch.c
    @@ -108,13 +108,42 @@ static int dsa_switch_fdb_del(struct dsa_switch *ds,
    info->vid);
    }

    +static int
    +dsa_switch_mdb_prepare_bitmap(struct dsa_switch *ds,
    + const struct switchdev_obj_port_mdb *mdb,
    + const unsigned long *bitmap)
    +{
    + int port, err;
    +
    + if (!ds->ops->port_mdb_prepare || !ds->ops->port_mdb_add)
    + return -EOPNOTSUPP;
    +
    + for_each_set_bit(port, bitmap, ds->num_ports) {
    + err = ds->ops->port_mdb_prepare(ds, port, mdb);
    + if (err)
    + return err;
    + }
    +
    + return 0;
    +}
    +
    +static void dsa_switch_mdb_add_bitmap(struct dsa_switch *ds,
    + const struct switchdev_obj_port_mdb *mdb,
    + const unsigned long *bitmap)
    +{
    + int port;
    +
    + for_each_set_bit(port, bitmap, ds->num_ports)
    + ds->ops->port_mdb_add(ds, port, mdb);
    +}
    +
    static int dsa_switch_mdb_add(struct dsa_switch *ds,
    struct dsa_notifier_mdb_info *info)
    {
    const struct switchdev_obj_port_mdb *mdb = info->mdb;
    struct switchdev_trans *trans = info->trans;
    DECLARE_BITMAP(group, ds->num_ports);
    - int port, err;
    + int port;

    /* Build a mask of Multicast group members */
    bitmap_zero(group, ds->num_ports);
    @@ -124,21 +153,10 @@ static int dsa_switch_mdb_add(struct dsa_switch *ds,
    if (dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port))
    set_bit(port, group);

    - if (switchdev_trans_ph_prepare(trans)) {
    - if (!ds->ops->port_mdb_prepare || !ds->ops->port_mdb_add)
    - return -EOPNOTSUPP;
    + if (switchdev_trans_ph_prepare(trans))
    + return dsa_switch_mdb_prepare_bitmap(ds, mdb, group);

    - for_each_set_bit(port, group, ds->num_ports) {
    - err = ds->ops->port_mdb_prepare(ds, port, mdb);
    - if (err)
    - return err;
    - }
    -
    - return 0;
    - }
    -
    - for_each_set_bit(port, group, ds->num_ports)
    - ds->ops->port_mdb_add(ds, port, mdb);
    + dsa_switch_mdb_add_bitmap(ds, mdb, group);

    return 0;
    }
    --
    2.15.0
    \
     
     \ /
      Last update: 2017-11-17 17:17    [W:2.858 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site