Commit 90502d43 authored by Rahul Rameshbabu's avatar Rahul Rameshbabu Committed by Saeed Mahameed
Browse files

net/mlx5e: Switch to using _bh variant of of spinlock API in port timestamping NAPI poll context 



The NAPI poll context is a softirq context. Do not use normal spinlock API
in this context to prevent concurrency issues.

Fixes: 3178308a ("net/mlx5e: Make tx_port_ts logic resilient to out-of-order CQEs")
Signed-off-by: default avatarRahul Rameshbabu <rrameshbabu@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
CC: Vadim Fedorenko <vadfed@meta.com>
parent b7cf0758

drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c

+6 −6
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ mlx5e_ptp_port_ts_cqe_list_add(struct mlx5e_ptp_port_ts_cqe_list *list, u8 metad 


	WARN_ON_ONCE(tracker->inuse);

	tracker->inuse = true;

	spin_lock(&list->tracker_list_lock);

	spin_lock_bh(&list->tracker_list_lock);

	list_add_tail(&tracker->entry, &list->tracker_list_head);

	spin_unlock(&list->tracker_list_lock);

	spin_unlock_bh(&list->tracker_list_lock);

}



static void
@@ -54,9 +54,9 @@ mlx5e_ptp_port_ts_cqe_list_remove(struct mlx5e_ptp_port_ts_cqe_list *list, u8 me 


	WARN_ON_ONCE(!tracker->inuse);

	tracker->inuse = false;

	spin_lock(&list->tracker_list_lock);

	spin_lock_bh(&list->tracker_list_lock);

	list_del(&tracker->entry);

	spin_unlock(&list->tracker_list_lock);

	spin_unlock_bh(&list->tracker_list_lock);

}



void mlx5e_ptpsq_track_metadata(struct mlx5e_ptpsq *ptpsq, u8 metadata)
@@ -155,7 +155,7 @@ static void mlx5e_ptpsq_mark_ts_cqes_undelivered(struct mlx5e_ptpsq *ptpsq, 
	struct mlx5e_ptp_metadata_map *metadata_map = &ptpsq->metadata_map;

	struct mlx5e_ptp_port_ts_cqe_tracker *pos, *n;



	spin_lock(&cqe_list->tracker_list_lock);

	spin_lock_bh(&cqe_list->tracker_list_lock);

	list_for_each_entry_safe(pos, n, &cqe_list->tracker_list_head, entry) {

		struct sk_buff *skb =

			mlx5e_ptp_metadata_map_lookup(metadata_map, pos->metadata_id);
@@ -170,7 +170,7 @@ static void mlx5e_ptpsq_mark_ts_cqes_undelivered(struct mlx5e_ptpsq *ptpsq, 
		pos->inuse = false;

		list_del(&pos->entry);

	}

	spin_unlock(&cqe_list->tracker_list_lock);

	spin_unlock_bh(&cqe_list->tracker_list_lock);

}



#define PTP_WQE_CTR2IDX(val) ((val) & ptpsq->ts_cqe_ctr_mask)