qcacld-3.0: Use request manager for BPF offload

We are transitioning to the new request manager framework. Change
hdd_get_bpf_offload() and hdd_get_bpf_offload_cb() to this framework.

Change-Id: I33f6d50299065c253265e0824e9e3d0483f1a561
CRs-Fixed: 2005314

core/hdd/inc/wlan_hdd_main.h

@@ -311,8 +311,6 @@
 
 extern spinlock_t hdd_context_lock;
 
-#define BPF_CONTEXT_MAGIC 0x4575354    /* BPF */
-
 /* MAX OS Q block time value in msec
  * Prevent from permanent stall, resume OS Q if timer expired
  */
@@ -1256,18 +1254,6 @@ struct hdd_offloaded_packets_ctx {
 };
 #endif
 
-/**
- * struct hdd_bpf_context - hdd Context for bpf
- * @magic: magic number
- * @completion: Completion variable for BPF Get Capability
- * @capability_response: capabilities response received from fw
- */
-struct hdd_bpf_context {
-	unsigned int magic;
-	struct completion completion;
-	struct sir_bpf_get_offload capability_response;
-};
-
 /**
  * enum driver_status: Driver Modules status
  * @DRIVER_MODULES_UNINITIALIZED: Driver CDS modules uninitialized

core/hdd/src/wlan_hdd_cfg80211.c

@@ -98,6 +98,7 @@
 #include "wlan_hdd_lpass.h"
 #include "wlan_hdd_nan_datapath.h"
 #include "wlan_hdd_disa.h"
+#include "wlan_hdd_request_manager.h"
 
 #include <cdp_txrx_cmn.h>
 #include <cdp_txrx_misc.h>
@@ -581,7 +582,6 @@ static struct ieee80211_iface_combination
 };
 
 static struct cfg80211_ops wlan_hdd_cfg80211_ops;
-struct hdd_bpf_context bpf_context;
 
 #ifdef WLAN_NL80211_TESTMODE
 enum wlan_hdd_tm_attr {
@@ -6825,9 +6825,14 @@ wlan_hdd_bpf_offload_policy[BPF_MAX + 1] = {
 	[BPF_PROGRAM] = {.type = NLA_U8},
 };
 
+struct bpf_offload_priv {
+	struct sir_bpf_get_offload bpf_get_offload;
+};
+
 /**
  * hdd_get_bpf_offload_cb() - Callback function to BPF Offload
- * @hdd_context: hdd_context
+ * @context: opaque context originally passed to SME.  HDD always passes
+ *	a cookie for the request context
  * @bpf_get_offload: struct for get offload
  *
  * This function receives the response/data from the lower layer and
@@ -6836,39 +6841,24 @@ wlan_hdd_bpf_offload_policy[BPF_MAX + 1] = {
  *
  * Return: None
  */
-static void hdd_get_bpf_offload_cb(void *hdd_context,
+static void hdd_get_bpf_offload_cb(void *context,
 				   struct sir_bpf_get_offload *data)
 {
-	hdd_context_t *hdd_ctx = hdd_context;
-	struct hdd_bpf_context *context;
+	struct hdd_request *request;
+	struct bpf_offload_priv *priv;
 
 	ENTER();
 
-	if (wlan_hdd_validate_context(hdd_ctx) || !data) {
-		hdd_err("HDD context is invalid or data(%p) is null",
-			data);
-		return;
-	}
-
-	spin_lock(&hdd_context_lock);
-
-	context = &bpf_context;
-	/* The caller presumably timed out so there is nothing we can do */
-	if (context->magic != BPF_CONTEXT_MAGIC) {
-		spin_unlock(&hdd_context_lock);
+	request = hdd_request_get(context);
+	if (!request) {
+		hdd_err("Obsolete request");
 		return;
 	}
 
-	/* context is valid so caller is still waiting */
-	/* paranoia: invalidate the magic */
-	context->magic = 0;
-
-	context->capability_response = *data;
-	complete(&context->completion);
-
-	spin_unlock(&hdd_context_lock);
-
-	return;
+	priv = hdd_request_priv(request);
+	priv->bpf_get_offload = *data;
+	hdd_request_complete(request);
+	hdd_request_put(request);
 }
 
 /**
@@ -6925,43 +6915,54 @@ nla_put_failure:
  */
 static int hdd_get_bpf_offload(hdd_context_t *hdd_ctx)
 {
-	unsigned long rc;
-	static struct hdd_bpf_context *context;
 	QDF_STATUS status;
 	int ret;
+	void *cookie;
+	struct hdd_request *request;
+	struct bpf_offload_priv *priv;
+	static const struct hdd_request_params params = {
+		.priv_size = sizeof(*priv),
+		.timeout_ms = WLAN_WAIT_TIME_BPF,
+	};
 
 	ENTER();
 
-	spin_lock(&hdd_context_lock);
-	context = &bpf_context;
-	context->magic = BPF_CONTEXT_MAGIC;
-	INIT_COMPLETION(context->completion);
-	spin_unlock(&hdd_context_lock);
+	request = hdd_request_alloc(&params);
+	if (!request) {
+		hdd_err("Unable to allocate request");
+		return -EINVAL;
+	}
+	cookie = hdd_request_cookie(request);
 
 	status = sme_get_bpf_offload_capabilities(hdd_ctx->hHal,
 						  hdd_get_bpf_offload_cb,
-						  hdd_ctx);
+						  cookie);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		hdd_err("Unable to retrieve BPF caps");
-		return -EINVAL;
+		ret = qdf_status_to_os_return(status);
+		goto cleanup;
 	}
-	/* request was sent -- wait for the response */
-	rc = wait_for_completion_timeout(&context->completion,
-			msecs_to_jiffies(WLAN_WAIT_TIME_BPF));
-	if (!rc) {
+	ret = hdd_request_wait_for_response(request);
+	if (ret) {
 		hdd_err("Target response timed out");
-		spin_lock(&hdd_context_lock);
-		context->magic = 0;
-		spin_unlock(&hdd_context_lock);
-
-		return -ETIMEDOUT;
+		goto cleanup;
 	}
+	priv = hdd_request_priv(request);
 	ret = hdd_post_get_bpf_capabilities_rsp(hdd_ctx,
-					&bpf_context.capability_response);
+						&priv->bpf_get_offload);
 	if (ret)
 		hdd_err("Failed to post get bpf capabilities");
 
+cleanup:
+	/*
+	 * either we never sent a request to SME, we sent a request to
+	 * SME and timed out, or we sent a request to SME, received a
+	 * response from SME, and posted the response to userspace.
+	 * regardless we are done with the request.
+	 */
+	hdd_request_put(request);
 	EXIT();
+
 	return ret;
 }
 
@@ -7610,16 +7611,6 @@ release_intf_addr_and_return_failure:
 	return -EINVAL;
 }
 
-/**
- * hdd_init_bpf_completion() - Initialize the completion event for bpf
- *
- * Return: None
- */
-void hdd_init_bpf_completion(void)
-{
-	init_completion(&bpf_context.completion);
-}
-
 static const struct nla_policy
 wlan_hdd_sap_config_policy[QCA_WLAN_VENDOR_ATTR_SAP_CONFIG_MAX + 1] = {
 	[QCA_WLAN_VENDOR_ATTR_SAP_CONFIG_CHANNEL] = {.type = NLA_U8 },

core/hdd/src/wlan_hdd_cfg80211.h

@@ -3693,8 +3693,6 @@ int wlan_hdd_disable_dfs_chan_scan(hdd_context_t *hdd_ctx,
 int wlan_hdd_cfg80211_update_band(struct wiphy *wiphy,
 				  eCsrBand eBand);
 
-void hdd_init_bpf_completion(void);
-
 #if defined(CFG80211_DISCONNECTED_V2) || \
 (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0))
 static inline void wlan_hdd_cfg80211_indicate_disconnect(struct net_device *dev,

core/hdd/src/wlan_hdd_main.c

@@ -6688,8 +6688,6 @@ static int hdd_context_init(hdd_context_t *hdd_ctx)
 	init_completion(&hdd_ctx->mc_sus_event_var);
 	init_completion(&hdd_ctx->ready_to_suspend);
 
-	hdd_init_bpf_completion();
-
 	qdf_spinlock_create(&hdd_ctx->connection_status_lock);
 	qdf_spinlock_create(&hdd_ctx->sta_update_info_lock);
 	qdf_spinlock_create(&hdd_ctx->hdd_adapter_lock);