Просмотр исходного кода

rocker: set FDB cleanup timer according to lowest ageing time

In rocker, ageing time is a per-port attribute, so the next time the FDB
cleanup timer fires should be set according to the lowest ageing time.

This will later allow us to delete the BR_MIN_AGEING_TIME macro, which was
added to guarantee minimum ageing time in the bridge layer, thereby breaking
existing behavior.

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Ido Schimmel 9 лет назад
Родитель
Сommit
88de1cd457

+ 1 - 0
drivers/net/ethernet/rocker/rocker.h

@@ -63,6 +63,7 @@ struct rocker {
 	struct {
 	struct {
 		u64 id;
 		u64 id;
 	} hw;
 	} hw;
+	unsigned long ageing_time;
 	spinlock_t cmd_ring_lock;		/* for cmd ring accesses */
 	spinlock_t cmd_ring_lock;		/* for cmd ring accesses */
 	struct rocker_dma_ring_info cmd_ring;
 	struct rocker_dma_ring_info cmd_ring;
 	struct rocker_dma_ring_info event_ring;
 	struct rocker_dma_ring_info event_ring;

+ 2 - 0
drivers/net/ethernet/rocker/rocker_main.c

@@ -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->hw.id = rocker_read64(rocker, SWITCH_ID);
 
 
+	rocker->ageing_time = BR_DEFAULT_AGEING_TIME;
+
 	err = rocker_probe_ports(rocker);
 	err = rocker_probe_ports(rocker);
 	if (err) {
 	if (err) {
 		dev_err(&pdev->dev, "failed to probe ports\n");
 		dev_err(&pdev->dev, "failed to probe ports\n");

+ 4 - 1
drivers/net/ethernet/rocker/rocker_ofdpa.c

@@ -2105,7 +2105,7 @@ static void ofdpa_fdb_cleanup(unsigned long data)
 	struct ofdpa_port *ofdpa_port;
 	struct ofdpa_port *ofdpa_port;
 	struct ofdpa_fdb_tbl_entry *entry;
 	struct ofdpa_fdb_tbl_entry *entry;
 	struct hlist_node *tmp;
 	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 expires;
 	unsigned long lock_flags;
 	unsigned long lock_flags;
 	int flags = OFDPA_OP_FLAG_NOWAIT | OFDPA_OP_FLAG_REMOVE |
 	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 switchdev_trans *trans)
 {
 {
 	struct ofdpa_port *ofdpa_port = rocker_port->wpriv;
 	struct ofdpa_port *ofdpa_port = rocker_port->wpriv;
+	struct rocker *rocker = rocker_port->rocker;
 
 
 	if (!switchdev_trans_ph_prepare(trans)) {
 	if (!switchdev_trans_ph_prepare(trans)) {
 		ofdpa_port->ageing_time = clock_t_to_jiffies(ageing_time);
 		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);
 		mod_timer(&ofdpa_port->ofdpa->fdb_cleanup_timer, jiffies);
 	}
 	}