Procházet zdrojové kódy

qcacmn: cdp: Convergence of cdp_throttle_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 throttle_ops
- throttle_init_period
- throttle_set_level

CRs-Fixed: 2539816
Change-Id: I2e4b3f88f6fdded6306710eb9f0c56f3354428aa
Rakesh Pillai před 5 roky
rodič
revize
20e302a62f
2 změnil soubory, kde provedl 18 přidání a 15 odebrání
  1. 8 6
      dp/inc/cdp_txrx_ops.h
  2. 10 9
      dp/inc/cdp_txrx_tx_throttle.h

+ 8 - 6
dp/inc/cdp_txrx_ops.h

@@ -1297,14 +1297,16 @@ struct cdp_lflowctl_ops {
 };
 
 /**
- * struct cdp_ocb_ops - mcl ocb ops
- * @throttle_init_period:
- * @throttle_set_level:
+ * struct cdp_throttle_ops - mcl throttle ops
+ * @throttle_init_period: handler to initialize tx throttle time
+ * @throttle_set_level: handler to set tx throttle level
  */
 struct cdp_throttle_ops {
-	void (*throttle_init_period)(struct cdp_pdev *pdev, int period,
-			uint8_t *dutycycle_level);
-	void (*throttle_set_level)(struct cdp_pdev *pdev, int level);
+	void (*throttle_init_period)(struct cdp_soc_t *soc_hdl,
+				     uint8_t pdev_id, int period,
+				     uint8_t *dutycycle_level);
+	void (*throttle_set_level)(struct cdp_soc_t *soc_hdl,
+				   uint8_t pdev_id, int level);
 };
 #endif
 

+ 10 - 9
dp/inc/cdp_txrx_tx_throttle.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017, 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
@@ -29,15 +29,15 @@
 /**
  * cdp_throttle_init_period() - init tx throttle period
  * @soc: data path soc handle
- * @pdev: physical device instance
+ * @pdev_id: id of data path pdev handle
  * @period: throttle period
  * @dutycycle_level: duty cycle level
  *
  * Return: NONE
  */
 static inline void
-cdp_throttle_init_period(ol_txrx_soc_handle soc, struct cdp_pdev *pdev,
-		int period, uint8_t *dutycycle_level)
+cdp_throttle_init_period(ol_txrx_soc_handle soc, uint8_t pdev_id,
+			 int period, uint8_t *dutycycle_level)
 {
 	if (!soc || !soc->ops || !soc->ops->throttle_ops) {
 		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
@@ -46,21 +46,21 @@ cdp_throttle_init_period(ol_txrx_soc_handle soc, struct cdp_pdev *pdev,
 	}
 
 	if (soc->ops->throttle_ops->throttle_init_period)
-		return soc->ops->throttle_ops->throttle_init_period(pdev,
-				period, dutycycle_level);
+		return soc->ops->throttle_ops->throttle_init_period(
+					soc, pdev_id, period, dutycycle_level);
 	return;
 }
 
 /**
  * cdp_throttle_init_period() - init tx throttle period
  * @soc: data path soc handle
- * @pdev: physical device instance
+ * @pdev_id: id of data path pdev handle
  * @level: throttle level
  *
  * Return: NONE
  */
 static inline void
-cdp_throttle_set_level(ol_txrx_soc_handle soc, struct cdp_pdev *pdev, int level)
+cdp_throttle_set_level(ol_txrx_soc_handle soc, uint8_t pdev_id, int level)
 {
 	if (!soc || !soc->ops || !soc->ops->throttle_ops) {
 		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
@@ -69,7 +69,8 @@ cdp_throttle_set_level(ol_txrx_soc_handle soc, struct cdp_pdev *pdev, int level)
 	}
 
 	if (soc->ops->throttle_ops->throttle_set_level)
-		return soc->ops->throttle_ops->throttle_set_level(pdev, level);
+		return soc->ops->throttle_ops->throttle_set_level(soc, pdev_id,
+								  level);
 	return;
 }