Commit 1fb39d4c authored by Li RongQing's avatar Li RongQing Committed by Jakub Kicinski
Browse files

eth: nfp: Remove u64_stats_update_begin()/end() for stats fetch 



This place is fetching the stats, u64_stats_update_begin()/end()
should not be used, and the fetcher of stats is in the same
context as the updater of the stats, so don't need any protection

Signed-off-by: default avatarLi RongQing <lirongqing@baidu.com>
Link: https://patch.msgid.link/20250815015619.2713-1-lirongqing@baidu.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 661bfb46

drivers/net/ethernet/netronome/nfp/nfd3/dp.c

+4 −12
Original line number Diff line number Diff line
@@ -1169,14 +1169,10 @@ int nfp_nfd3_poll(struct napi_struct *napi, int budget) 


	if (r_vec->nfp_net->rx_coalesce_adapt_on && r_vec->rx_ring) {

		struct dim_sample dim_sample = {};

		unsigned int start;

		u64 pkts, bytes;



		do {

			start = u64_stats_fetch_begin(&r_vec->rx_sync);

		pkts = r_vec->rx_pkts;

		bytes = r_vec->rx_bytes;

		} while (u64_stats_fetch_retry(&r_vec->rx_sync, start));



		dim_update_sample(r_vec->event_ctr, pkts, bytes, &dim_sample);

		net_dim(&r_vec->rx_dim, &dim_sample);
@@ -1184,14 +1180,10 @@ int nfp_nfd3_poll(struct napi_struct *napi, int budget) 


	if (r_vec->nfp_net->tx_coalesce_adapt_on && r_vec->tx_ring) {

		struct dim_sample dim_sample = {};

		unsigned int start;

		u64 pkts, bytes;



		do {

			start = u64_stats_fetch_begin(&r_vec->tx_sync);

		pkts = r_vec->tx_pkts;

		bytes = r_vec->tx_bytes;

		} while (u64_stats_fetch_retry(&r_vec->tx_sync, start));



		dim_update_sample(r_vec->event_ctr, pkts, bytes, &dim_sample);

		net_dim(&r_vec->tx_dim, &dim_sample);

drivers/net/ethernet/netronome/nfp/nfdk/dp.c

+4 −12
Original line number Diff line number Diff line
@@ -1279,14 +1279,10 @@ int nfp_nfdk_poll(struct napi_struct *napi, int budget) 


	if (r_vec->nfp_net->rx_coalesce_adapt_on && r_vec->rx_ring) {

		struct dim_sample dim_sample = {};

		unsigned int start;

		u64 pkts, bytes;



		do {

			start = u64_stats_fetch_begin(&r_vec->rx_sync);

		pkts = r_vec->rx_pkts;

		bytes = r_vec->rx_bytes;

		} while (u64_stats_fetch_retry(&r_vec->rx_sync, start));



		dim_update_sample(r_vec->event_ctr, pkts, bytes, &dim_sample);

		net_dim(&r_vec->rx_dim, &dim_sample);
@@ -1294,14 +1290,10 @@ int nfp_nfdk_poll(struct napi_struct *napi, int budget) 


	if (r_vec->nfp_net->tx_coalesce_adapt_on && r_vec->tx_ring) {

		struct dim_sample dim_sample = {};

		unsigned int start;

		u64 pkts, bytes;



		do {

			start = u64_stats_fetch_begin(&r_vec->tx_sync);

		pkts = r_vec->tx_pkts;

		bytes = r_vec->tx_bytes;

		} while (u64_stats_fetch_retry(&r_vec->tx_sync, start));



		dim_update_sample(r_vec->event_ctr, pkts, bytes, &dim_sample);

		net_dim(&r_vec->tx_dim, &dim_sample);