lkml.org 
[lkml]   [2022]   [Apr]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 209/219] Revert "net: dsa: setup master before ports"
    Date
    From: Vladimir Oltean <vladimir.oltean@nxp.com>

    commit 762c2998c9625f642f0d23da7d3f7e4f90665fdf upstream.

    This reverts commit 11fd667dac315ea3f2469961f6d2869271a46cae.

    dsa_slave_change_mtu() updates the MTU of the DSA master and of the
    associated CPU port, but only if it detects a change to the master MTU.

    The blamed commit in the Fixes: tag below addressed a regression where
    dsa_slave_change_mtu() would return early and not do anything due to
    ds->ops->port_change_mtu() not being implemented.

    However, that commit also had the effect that the master MTU got set up
    to the correct value by dsa_master_setup(), but the associated CPU port's
    MTU did not get updated. This causes breakage for drivers that rely on
    the ->port_change_mtu() DSA call to account for the tagging overhead on
    the CPU port, and don't set up the initial MTU during the setup phase.

    Things actually worked before because they were in a fragile equilibrium
    where dsa_slave_change_mtu() was called before dsa_master_setup() was.
    So dsa_slave_change_mtu() could actually detect a change and update the
    CPU port MTU too.

    Restore the code to the way things used to work by reverting the reorder
    of dsa_tree_setup_master() and dsa_tree_setup_ports(). That change did
    not have a concrete motivation going for it anyway, it just looked
    better.

    Fixes: 066dfc429040 ("Revert "net: dsa: stop updating master MTU from master.c"")
    Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/dsa/dsa2.c | 23 ++++++++++-------------
    1 file changed, 10 insertions(+), 13 deletions(-)

    --- a/net/dsa/dsa2.c
    +++ b/net/dsa/dsa2.c
    @@ -561,7 +561,6 @@ static void dsa_port_teardown(struct dsa
    struct devlink_port *dlp = &dp->devlink_port;
    struct dsa_switch *ds = dp->ds;
    struct dsa_mac_addr *a, *tmp;
    - struct net_device *slave;

    if (!dp->setup)
    return;
    @@ -583,11 +582,9 @@ static void dsa_port_teardown(struct dsa
    dsa_port_link_unregister_of(dp);
    break;
    case DSA_PORT_TYPE_USER:
    - slave = dp->slave;
    -
    - if (slave) {
    + if (dp->slave) {
    + dsa_slave_destroy(dp->slave);
    dp->slave = NULL;
    - dsa_slave_destroy(slave);
    }
    break;
    }
    @@ -1137,17 +1134,17 @@ static int dsa_tree_setup(struct dsa_swi
    if (err)
    goto teardown_cpu_ports;

    - err = dsa_tree_setup_master(dst);
    + err = dsa_tree_setup_ports(dst);
    if (err)
    goto teardown_switches;

    - err = dsa_tree_setup_ports(dst);
    + err = dsa_tree_setup_master(dst);
    if (err)
    - goto teardown_master;
    + goto teardown_ports;

    err = dsa_tree_setup_lags(dst);
    if (err)
    - goto teardown_ports;
    + goto teardown_master;

    dst->setup = true;

    @@ -1155,10 +1152,10 @@ static int dsa_tree_setup(struct dsa_swi

    return 0;

    -teardown_ports:
    - dsa_tree_teardown_ports(dst);
    teardown_master:
    dsa_tree_teardown_master(dst);
    +teardown_ports:
    + dsa_tree_teardown_ports(dst);
    teardown_switches:
    dsa_tree_teardown_switches(dst);
    teardown_cpu_ports:
    @@ -1176,10 +1173,10 @@ static void dsa_tree_teardown(struct dsa

    dsa_tree_teardown_lags(dst);

    - dsa_tree_teardown_ports(dst);
    -
    dsa_tree_teardown_master(dst);

    + dsa_tree_teardown_ports(dst);
    +
    dsa_tree_teardown_switches(dst);

    dsa_tree_teardown_cpu_ports(dst);

    \
     
     \ /
      Last update: 2022-04-18 14:40    [W:2.855 / U:0.916 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site