Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9fd7ec7 authored by Laurence Evans's avatar Laurence Evans Committed by David S. Miller
Browse files

sfc: Removed adhoc scheme to rate limit PTP event queue overflow message 



Use conventional net_ratelimit() instead.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarShradha Shah <sshah@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a146b591

drivers/net/ethernet/sfc/ptp.c

+2 −20
Original line number Diff line number Diff line
@@ -223,7 +223,6 @@ struct efx_ptp_timeset { 
 * @evt_list: List of MC receive events awaiting packets

 * @evt_free_list: List of free events

 * @evt_lock: Lock for manipulating evt_list and evt_free_list

 * @evt_overflow: Boolean indicating that event list has overflowed

 * @rx_evts: Instantiated events (on evt_list and evt_free_list)

 * @workwq: Work queue for processing pending PTP operations

 * @work: Work task
@@ -275,7 +274,6 @@ struct efx_ptp_data { 
	struct list_head evt_list;

	struct list_head evt_free_list;

	spinlock_t evt_lock;

	bool evt_overflow;

	struct efx_ptp_event_rx rx_evts[MAX_RECEIVE_EVENTS];

	struct workqueue_struct *workwq;

	struct work_struct work;
@@ -941,11 +939,6 @@ static void efx_ptp_drop_time_expired_events(struct efx_nic *efx) 
			}

		}

	}

	/* If the event overflow flag is set and the event list is now empty

	 * clear the flag to re-enable the overflow warning message.

	 */

	if (ptp->evt_overflow && list_empty(&ptp->evt_list))

		ptp->evt_overflow = false;

	spin_unlock_bh(&ptp->evt_lock);

}
@@ -989,11 +982,6 @@ static enum ptp_packet_state efx_ptp_match_rx(struct efx_nic *efx, 
			break;

		}

	}

	/* If the event overflow flag is set and the event list is now empty

	 * clear the flag to re-enable the overflow warning message.

	 */

	if (ptp->evt_overflow && list_empty(&ptp->evt_list))

		ptp->evt_overflow = false;

	spin_unlock_bh(&ptp->evt_lock);



	return rc;
@@ -1147,7 +1135,6 @@ static int efx_ptp_stop(struct efx_nic *efx) 
	list_for_each_safe(cursor, next, &efx->ptp_data->evt_list) {

		list_move(cursor, &efx->ptp_data->evt_free_list);

	}

	ptp->evt_overflow = false;

	spin_unlock_bh(&efx->ptp_data->evt_lock);



	return rc;
@@ -1253,7 +1240,6 @@ int efx_ptp_probe(struct efx_nic *efx, struct efx_channel *channel) 
	spin_lock_init(&ptp->evt_lock);

	for (pos = 0; pos < MAX_RECEIVE_EVENTS; pos++)

		list_add(&ptp->rx_evts[pos].link, &ptp->evt_free_list);

	ptp->evt_overflow = false;



	/* Get the NIC PTP attributes and set up time conversions */

	rc = efx_ptp_get_attributes(efx);
@@ -1635,13 +1621,9 @@ static void ptp_event_rx(struct efx_nic *efx, struct efx_ptp_data *ptp) 
		list_add_tail(&evt->link, &ptp->evt_list);



		queue_work(ptp->workwq, &ptp->work);

	} else if (!ptp->evt_overflow) {

		/* Log a warning message and set the event overflow flag.

		 * The message won't be logged again until the event queue

		 * becomes empty.

		 */

	} else if (net_ratelimit()) {

		/* Log a rate-limited warning message. */

		netif_err(efx, rx_err, efx->net_dev, "PTP event queue overflow\n");

		ptp->evt_overflow = true;

	}

	spin_unlock_bh(&ptp->evt_lock);

}