qcacld-3.0: Use try_get_ref API in hdd_vdev_create
hdd_vdev_create currently uses the unconditional vdev ref grabbing API,
wlan_objmgr_vdev_get_ref. While this may be the single valid use case
for the API outside of objmgr core, it is better to avoid using the
uncondional API outside of objmgr core at all. This sets a good example
for future consumers of the vdev ref APIs, and makes it easier to spot
incorrect usages of the unconditional API. In hdd_vdev_create, use
wlan_objmgr_vdev_try_get_ref and abort the vdev create operation if a
reference cannot be obtained.
Change-Id: Iafdcec9752b7189f8c74b8838b2d9261676184f9
CRs-Fixed: 2150258
diff --git a/core/hdd/src/wlan_hdd_object_manager.c b/core/hdd/src/wlan_hdd_object_manager.c
index f02e489..20b2822 100644
--- a/core/hdd/src/wlan_hdd_object_manager.c
+++ b/core/hdd/src/wlan_hdd_object_manager.c
@@ -162,54 +162,75 @@
int hdd_objmgr_create_and_store_vdev(struct wlan_objmgr_pdev *pdev,
struct hdd_adapter *adapter)
{
+ QDF_STATUS status;
+ int errno;
struct wlan_objmgr_vdev *vdev;
struct wlan_objmgr_peer *peer;
struct vdev_osif_priv *osif_priv;
- struct wlan_vdev_create_params vdev_params;
+ struct wlan_vdev_create_params vdev_params = {0};
- vdev_params.opmode = adapter->device_mode;
- qdf_mem_copy(vdev_params.macaddr, adapter->mac_addr.bytes,
- QDF_NET_MAC_ADDR_MAX_LEN);
+ QDF_BUG(pdev);
if (!pdev) {
- hdd_err("pdev NULL");
+ hdd_err("pdev is null");
return -EINVAL;
}
osif_priv = qdf_mem_malloc(sizeof(*osif_priv));
if (!osif_priv) {
- hdd_err("vdev os obj create failed");
+ hdd_err("Failed to allocate osif_priv; out of memory");
return -ENOMEM;
}
-
hdd_init_vdev_os_priv(adapter, osif_priv);
+
+ vdev_params.opmode = adapter->device_mode;
vdev_params.osifp = osif_priv;
+ qdf_mem_copy(vdev_params.macaddr,
+ adapter->mac_addr.bytes,
+ QDF_NET_MAC_ADDR_MAX_LEN);
vdev = wlan_objmgr_vdev_obj_create(pdev, &vdev_params);
if (!vdev) {
- hdd_err("vdev obj create fails");
- return -ENOMEM;
- }
-
- peer = wlan_objmgr_peer_obj_create(vdev, WLAN_PEER_SELF,
- vdev_params.macaddr);
- if (!peer) {
- hdd_err("obj manager self peer create fails for adapter %d",
- adapter->device_mode);
- wlan_objmgr_vdev_obj_delete(vdev);
- return -ENOMEM;
+ hdd_err("Failed to create vdev object");
+ errno = -ENOMEM;
+ goto osif_priv_free;
}
/*
* To enable legacy use cases, we need to delay physical vdev destroy
* until after the sme session has been closed. We accomplish this by
- * getting an additional reference here.
+ * getting a reference here.
*/
- wlan_objmgr_vdev_get_ref(vdev, WLAN_HDD_ID_OBJ_MGR);
+ status = wlan_objmgr_vdev_try_get_ref(vdev, WLAN_HDD_ID_OBJ_MGR);
+ if (QDF_IS_STATUS_ERROR(status)) {
+ hdd_err("Failed to acquire vdev ref; status:%d", status);
+ errno = qdf_status_to_os_return(status);
+ goto vdev_destroy;
+ }
+
+ peer = wlan_objmgr_peer_obj_create(vdev, WLAN_PEER_SELF,
+ vdev_params.macaddr);
+ if (!peer) {
+ hdd_err("Failed to create self peer for adapter mode %d",
+ adapter->device_mode);
+ errno = -ENOMEM;
+ goto vdev_put_ref;
+ }
adapter->hdd_vdev = vdev;
adapter->session_id = wlan_vdev_get_id(vdev);
return 0;
+
+vdev_put_ref:
+ wlan_objmgr_vdev_release_ref(vdev, WLAN_HDD_ID_OBJ_MGR);
+
+vdev_destroy:
+ wlan_objmgr_vdev_obj_delete(vdev);
+
+osif_priv_free:
+ qdf_mem_free(osif_priv);
+
+ return errno;
}
int hdd_objmgr_destroy_vdev(struct hdd_adapter *adapter)