Commit 5390dba1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bridge_ageing_time' 



Stephen Hemminger says:

====================
bridge: ageing timer regression fix

This fixes regression in how ageing timer is managed.
Backing out the change required fixing switch drivers as well.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8e2ad411 4c656c13

drivers/net/ethernet/mellanox/mlxsw/spectrum.h

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ struct mlxsw_sp { 
#define MLXSW_SP_DEFAULT_LEARNING_INTERVAL 100

		unsigned int interval; /* ms */

	} fdb_notify;

#define MLXSW_SP_MIN_AGEING_TIME 10

#define MLXSW_SP_MAX_AGEING_TIME 1000000

#define MLXSW_SP_DEFAULT_AGEING_TIME 300

	u32 ageing_time;

	struct mlxsw_sp_upper master_bridge;

drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c

+7 −2
Original line number Diff line number Diff line
@@ -311,8 +311,13 @@ static int mlxsw_sp_port_attr_br_ageing_set(struct mlxsw_sp_port *mlxsw_sp_port, 
	unsigned long ageing_jiffies = clock_t_to_jiffies(ageing_clock_t);

	u32 ageing_time = jiffies_to_msecs(ageing_jiffies) / 1000;



	if (switchdev_trans_ph_prepare(trans))

	if (switchdev_trans_ph_prepare(trans)) {

		if (ageing_time < MLXSW_SP_MIN_AGEING_TIME ||

		    ageing_time > MLXSW_SP_MAX_AGEING_TIME)

			return -ERANGE;

		else

			return 0;

	}



	return mlxsw_sp_ageing_set(mlxsw_sp, ageing_time);

}

drivers/net/ethernet/rocker/rocker.h

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ struct rocker { 
	struct {

		u64 id;

	} hw;

	unsigned long ageing_time;

	spinlock_t cmd_ring_lock;		/* for cmd ring accesses */

	struct rocker_dma_ring_info cmd_ring;

	struct rocker_dma_ring_info event_ring;

drivers/net/ethernet/rocker/rocker_main.c

+2 −0
Original line number Diff line number Diff line
@@ -2733,6 +2733,8 @@ static int rocker_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	rocker->hw.id = rocker_read64(rocker, SWITCH_ID);



	rocker->ageing_time = BR_DEFAULT_AGEING_TIME;



	err = rocker_probe_ports(rocker);

	if (err) {

		dev_err(&pdev->dev, "failed to probe ports\n");

drivers/net/ethernet/rocker/rocker_ofdpa.c

+4 −1
Original line number Diff line number Diff line
@@ -2105,7 +2105,7 @@ static void ofdpa_fdb_cleanup(unsigned long data) 
	struct ofdpa_port *ofdpa_port;

	struct ofdpa_fdb_tbl_entry *entry;

	struct hlist_node *tmp;

	unsigned long next_timer = jiffies + BR_MIN_AGEING_TIME;

	unsigned long next_timer = jiffies + ofdpa->rocker->ageing_time;

	unsigned long expires;

	unsigned long lock_flags;

	int flags = OFDPA_OP_FLAG_NOWAIT | OFDPA_OP_FLAG_REMOVE |
@@ -2648,9 +2648,12 @@ ofdpa_port_attr_bridge_ageing_time_set(struct rocker_port *rocker_port, 
				       struct switchdev_trans *trans)

{

	struct ofdpa_port *ofdpa_port = rocker_port->wpriv;

	struct rocker *rocker = rocker_port->rocker;



	if (!switchdev_trans_ph_prepare(trans)) {

		ofdpa_port->ageing_time = clock_t_to_jiffies(ageing_time);

		if (ofdpa_port->ageing_time < rocker->ageing_time)

			rocker->ageing_time = ofdpa_port->ageing_time;

		mod_timer(&ofdpa_port->ofdpa->fdb_cleanup_timer, jiffies);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE