From a0a2fe53927dd7ed189adcf1c79ffac2b514ae09 Mon Sep 17 00:00:00 2001 From: Rakesh Pillai Date: Thu, 4 Jul 2019 20:11:58 +0530 Subject: [PATCH] qcacmn: cdp: Convergence of cdp_delay_ops Currently the cdp apis are given pdev/vdev/peer handle as its arguments, which is directly accessed in those APIs. This can cause a race-condition in access of the respective handles if it has been deleted in parallel. Hence as a part of cdp convergence, pass only the pdev/vdev id or peer mac address, which will be used to get the respective handles, and hence avoiding the unwanted access of the handles if it has been deleted. Converged delay_ops - tx_delay - tx_delay_hist - tx_packet_count - tx_set_compute_interval CRs-Fixed: 2539814 Change-Id: I15f4395f03f7321d047a230b41a5c939b52ce271 --- dp/inc/cdp_txrx_ops.h | 29 +++++++++++++++------------ dp/inc/cdp_txrx_tx_delay.h | 41 +++++++++++++++++++------------------- 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/dp/inc/cdp_txrx_ops.h b/dp/inc/cdp_txrx_ops.h index 4c88215ba26c..60a61a6846a4 100644 --- a/dp/inc/cdp_txrx_ops.h +++ b/dp/inc/cdp_txrx_ops.h @@ -1372,21 +1372,24 @@ struct cdp_ipa_ops { #ifdef DP_POWER_SAVE /** * struct cdp_tx_delay_ops - mcl tx delay ops - * @tx_delay: - * @tx_delay_hist: - * @tx_packet_count: - * @tx_set_compute_interval: + * @tx_delay: handler to get tx packet delay + * @tx_delay_hist: handler to get tx packet delay histogram + * @tx_packet_count: handler to get tx packet count + * @tx_set_compute_interval: update compute interval period for TSM stats + * + * Function pointer for operations related to tx delay. */ struct cdp_tx_delay_ops { - void (*tx_delay)(struct cdp_pdev *pdev, uint32_t *queue_delay_microsec, - uint32_t *tx_delay_microsec, int category); - void (*tx_delay_hist)(struct cdp_pdev *pdev, - uint16_t *bin_values, int category); - void (*tx_packet_count)(struct cdp_pdev *pdev, - uint16_t *out_packet_count, - uint16_t *out_packet_loss_count, int category); - void (*tx_set_compute_interval)(struct cdp_pdev *pdev, - uint32_t interval); + void (*tx_delay)(struct cdp_soc_t *soc_hdl, uint8_t pdev_id, + uint32_t *queue_delay_microsec, + uint32_t *tx_delay_microsec, int category); + void (*tx_delay_hist)(struct cdp_soc_t *soc_hdl, uint8_t pdev_id, + uint16_t *bin_values, int category); + void (*tx_packet_count)(struct cdp_soc_t *soc_hdl, uint8_t pdev_id, + uint16_t *out_packet_count, + uint16_t *out_packet_loss_count, int category); + void (*tx_set_compute_interval)(struct cdp_soc_t *soc_hdl, + uint8_t pdev_id, uint32_t interval); }; /** diff --git a/dp/inc/cdp_txrx_tx_delay.h b/dp/inc/cdp_txrx_tx_delay.h index 34e3cbe9355b..044052dd7d14 100644 --- a/dp/inc/cdp_txrx_tx_delay.h +++ b/dp/inc/cdp_txrx_tx_delay.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -27,7 +27,7 @@ /** * cdp_tx_delay() - get tx packet delay * @soc: data path soc handle - * @pdev: physical device instance + * @pdev_id: id of data path pdev handle * @queue_delay_microsec: tx packet delay within queue, usec * @tx_delay_microsec: tx packet delay, usec * @category: packet category @@ -35,9 +35,9 @@ * Return: NONE */ static inline void -cdp_tx_delay(ol_txrx_soc_handle soc, struct cdp_pdev *pdev, - uint32_t *queue_delay_microsec, uint32_t *tx_delay_microsec, - int category) +cdp_tx_delay(ol_txrx_soc_handle soc, uint8_t pdev_id, + uint32_t *queue_delay_microsec, uint32_t *tx_delay_microsec, + int category) { if (!soc || !soc->ops || !soc->ops->delay_ops) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL, @@ -46,7 +46,7 @@ cdp_tx_delay(ol_txrx_soc_handle soc, struct cdp_pdev *pdev, } if (soc->ops->delay_ops->tx_delay) - return soc->ops->delay_ops->tx_delay(pdev, + return soc->ops->delay_ops->tx_delay(soc, pdev_id, queue_delay_microsec, tx_delay_microsec, category); return; } @@ -54,15 +54,15 @@ cdp_tx_delay(ol_txrx_soc_handle soc, struct cdp_pdev *pdev, /** * cdp_tx_delay_hist() - get tx packet delay histogram * @soc: data path soc handle - * @pdev: physical device instance + * @pdev_id: id of data path pdev handle * @bin_values: bin * @category: packet category * * Return: NONE */ static inline void -cdp_tx_delay_hist(ol_txrx_soc_handle soc, struct cdp_pdev *pdev, - uint16_t *bin_values, int category) +cdp_tx_delay_hist(ol_txrx_soc_handle soc, uint8_t pdev_id, + uint16_t *bin_values, int category) { if (!soc || !soc->ops || !soc->ops->delay_ops) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL, @@ -71,7 +71,7 @@ cdp_tx_delay_hist(ol_txrx_soc_handle soc, struct cdp_pdev *pdev, } if (soc->ops->delay_ops->tx_delay_hist) - return soc->ops->delay_ops->tx_delay_hist(pdev, + return soc->ops->delay_ops->tx_delay_hist(soc, pdev_id, bin_values, category); return; } @@ -79,16 +79,16 @@ cdp_tx_delay_hist(ol_txrx_soc_handle soc, struct cdp_pdev *pdev, /** * cdp_tx_packet_count() - get tx packet count * @soc: data path soc handle - * @pdev: physical device instance + * @pdev_id: id of data path pdev handle * @out_packet_loss_count: packet loss count * @category: packet category * * Return: NONE */ static inline void -cdp_tx_packet_count(ol_txrx_soc_handle soc, struct cdp_pdev *pdev, - uint16_t *out_packet_count, uint16_t *out_packet_loss_count, - int category) +cdp_tx_packet_count(ol_txrx_soc_handle soc, uint8_t pdev_id, + uint16_t *out_packet_count, uint16_t *out_packet_loss_count, + int category) { if (!soc || !soc->ops || !soc->ops->delay_ops) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL, @@ -97,7 +97,7 @@ cdp_tx_packet_count(ol_txrx_soc_handle soc, struct cdp_pdev *pdev, } if (soc->ops->delay_ops->tx_packet_count) - return soc->ops->delay_ops->tx_packet_count(pdev, + return soc->ops->delay_ops->tx_packet_count(soc, pdev_id, out_packet_count, out_packet_loss_count, category); return; } @@ -105,14 +105,14 @@ cdp_tx_packet_count(ol_txrx_soc_handle soc, struct cdp_pdev *pdev, /** * cdp_tx_set_compute_interval() - set tx packet stat compute interval * @soc: data path soc handle - * @pdev: physical device instance + * @pdev_id: id of data path pdev handle * @interval: compute interval * * Return: NONE */ static inline void -cdp_tx_set_compute_interval(ol_txrx_soc_handle soc, struct cdp_pdev *pdev, - uint32_t interval) +cdp_tx_set_compute_interval(ol_txrx_soc_handle soc, uint8_t pdev_id, + uint32_t interval) { if (!soc || !soc->ops || !soc->ops->delay_ops) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL, @@ -121,8 +121,9 @@ cdp_tx_set_compute_interval(ol_txrx_soc_handle soc, struct cdp_pdev *pdev, } if (soc->ops->delay_ops->tx_set_compute_interval) - return soc->ops->delay_ops->tx_set_compute_interval(pdev, - interval); + return soc->ops->delay_ops->tx_set_compute_interval(soc, + pdev_id, + interval); return; } #endif /* _CDP_TXRX_COMPUTE_TX_DELAY_H_ */