wlan: Use vmalloc for size larger than 4k.
Currently for dynamic memory allocation even
large memory blocks are allocated through malloc.
This might create low resource condition as large
continuous memory may not be available. As a part
of fix, use vmalloc for large memory allocation.
Change-Id: I98065a46a821077a80d5b616812378ea47db5247
CRs-Fixed: 823488
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index af352a3..dd273ac 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -3427,7 +3427,7 @@
hddLog(LOGE, "%s: qcom_cfg.ini Size %zu", __func__, fw->size);
- buffer = (char*)vos_mem_malloc(fw->size);
+ buffer = (char*)vos_mem_vmalloc(fw->size);
if(NULL == buffer) {
hddLog(VOS_TRACE_LEVEL_FATAL, "%s: kmalloc failure",__func__);
@@ -3506,7 +3506,7 @@
config_exit:
release_firmware(fw);
- vos_mem_free(pTemp);
+ vos_mem_vfree(pTemp);
return vos_status;
}
diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index 29df5f7..f4f1572 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -860,7 +860,7 @@
// free up preAuth table
if (pMac->lim.gLimPreAuthTimerTable.pTable != NULL)
{
- vos_mem_free(pMac->lim.gLimPreAuthTimerTable.pTable);
+ vos_mem_vfree(pMac->lim.gLimPreAuthTimerTable.pTable);
pMac->lim.gLimPreAuthTimerTable.pTable = NULL;
pMac->lim.gLimPreAuthTimerTable.numEntry = 0;
}
@@ -1002,50 +1002,29 @@
return eSIR_FAILURE;
}
- pMac->lim.limTimers.gpLimCnfWaitTimer = vos_mem_malloc(sizeof(TX_TIMER) * pMac->lim.maxStation);
+ pMac->lim.limTimers.gpLimCnfWaitTimer = vos_mem_vmalloc(sizeof(TX_TIMER) * pMac->lim.maxStation);
if (NULL == pMac->lim.limTimers.gpLimCnfWaitTimer)
{
PELOGE(limLog(pMac, LOGE, FL("memory allocate failed!"));)
return eSIR_FAILURE;
}
-#if 0
- pMac->lim.gpLimAIDpool = vos_mem_malloc(sizeof(*pMac->lim.gpLimAIDpool) * (WNI_CFG_ASSOC_STA_LIMIT_STAMAX+1));
- if (NULL == pMac->lim.gpLimAIDpool)
- {
- PELOGE(limLog(pMac, LOGE, FL("memory allocate failed!"));)
- return eSIR_FAILURE;
- }
-#endif
- pMac->lim.gpSession = vos_mem_malloc(sizeof(tPESession)* pMac->lim.maxBssId);
+ pMac->lim.gpSession = vos_mem_vmalloc(sizeof(tPESession)* pMac->lim.maxBssId);
if (NULL == pMac->lim.gpSession)
{
limLog(pMac, LOGE, FL("memory allocate failed!"));
+ vos_mem_vfree(pMac->lim.limTimers.gpLimCnfWaitTimer);
return eSIR_FAILURE;
}
vos_mem_set(pMac->lim.gpSession, sizeof(tPESession)*pMac->lim.maxBssId, 0);
-
- /*
- pMac->dph.dphHashTable.pHashTable = vos_mem_malloc(sizeof(tpDphHashNode)*pMac->lim.maxStation);
- if (NULL == pMac->dph.dphHashTable.pHashTable)
- {
- PELOGE(limLog(pMac, LOGE, FL("memory allocate failed!"));)
- return eSIR_FAILURE;
- }
-
- pMac->dph.dphHashTable.pDphNodeArray = vos_mem_malloc(sizeof(tDphHashNode)*pMac->lim.maxStation);
- if (NULL == pMac->dph.dphHashTable.pDphNodeArray)
- {
- PELOGE(limLog(pMac, LOGE, FL("memory allocate failed!"));)
- return eSIR_FAILURE;
- }
- */
pMac->pmm.gPmmTim.pTim = vos_mem_malloc(sizeof(tANI_U8)*pMac->lim.maxStation);
if (NULL == pMac->pmm.gPmmTim.pTim)
{
PELOGE(limLog(pMac, LOGE, FL("memory allocate failed for pTim!"));)
+ vos_mem_vfree(pMac->lim.limTimers.gpLimCnfWaitTimer);
+ vos_mem_vfree(pMac->lim.gpSession);
return eSIR_FAILURE;
}
vos_mem_set(pMac->pmm.gPmmTim.pTim, sizeof(tANI_U8)*pMac->lim.maxStation, 0);
@@ -1056,9 +1035,9 @@
if( !VOS_IS_STATUS_SUCCESS( vos_lock_init( &pMac->lim.lkPeGlobalLock ) ) )
{
PELOGE(limLog(pMac, LOGE, FL("pe lock init failed!"));)
- vos_mem_free(pMac->lim.limTimers.gpLimCnfWaitTimer);
+ vos_mem_vfree(pMac->lim.limTimers.gpLimCnfWaitTimer);
pMac->lim.limTimers.gpLimCnfWaitTimer = NULL;
- vos_mem_free(pMac->lim.gpSession);
+ vos_mem_vfree(pMac->lim.gpSession);
pMac->lim.gpSession = NULL;
vos_mem_free(pMac->pmm.gPmmTim.pTim);
pMac->pmm.gPmmTim.pTim = NULL;
@@ -1102,21 +1081,11 @@
peDeleteSession(pMac,&pMac->lim.gpSession[i]);
}
}
- vos_mem_free(pMac->lim.limTimers.gpLimCnfWaitTimer);
+ vos_mem_vfree(pMac->lim.limTimers.gpLimCnfWaitTimer);
pMac->lim.limTimers.gpLimCnfWaitTimer = NULL;
-#if 0
- vos_mem_free(pMac->lim.gpLimAIDpool);
- pMac->lim.gpLimAIDpool = NULL;
-#endif
-
- vos_mem_free(pMac->lim.gpSession);
+ vos_mem_vfree(pMac->lim.gpSession);
pMac->lim.gpSession = NULL;
- /*
- vos_mem_free(pMac->dph.dphHashTable.pHashTable);
- pMac->dph.dphHashTable.pHashTable = NULL;
- vos_mem_free(pMac->dph.dphHashTable.pDphNodeArray);
- pMac->dph.dphHashTable.pDphNodeArray = NULL;
- */
+
vos_mem_free(pMac->pmm.gPmmTim.pTim);
pMac->pmm.gPmmTim.pTim = NULL;
if( !VOS_IS_STATUS_SUCCESS( vos_lock_destroy( &pMac->lim.lkPeGlobalLock ) ) )
diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.c b/CORE/MAC/src/pe/lim/limTimerUtils.c
index e4f2c1f..65e3be1 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.c
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.c
@@ -593,7 +593,7 @@
FL("could not retrieve mac preauth value"));
}
pMac->lim.gLimPreAuthTimerTable.numEntry = cfgValue;
- pMac->lim.gLimPreAuthTimerTable.pTable = vos_mem_malloc(cfgValue*sizeof(tLimPreAuthNode));
+ pMac->lim.gLimPreAuthTimerTable.pTable = vos_mem_vmalloc(cfgValue*sizeof(tLimPreAuthNode));
if(pMac->lim.gLimPreAuthTimerTable.pTable == NULL)
{
limLog(pMac, LOGP, FL("AllocateMemory failed!"));
@@ -758,7 +758,7 @@
if(NULL != pMac->lim.gLimPreAuthTimerTable.pTable)
{
- vos_mem_free(pMac->lim.gLimPreAuthTimerTable.pTable);
+ vos_mem_vfree(pMac->lim.gLimPreAuthTimerTable.pTable);
pMac->lim.gLimPreAuthTimerTable.pTable = NULL;
}
diff --git a/CORE/SYS/legacy/src/system/src/macInitApi.c b/CORE/SYS/legacy/src/system/src/macInitApi.c
index 79b5f03..ced0a48 100644
--- a/CORE/SYS/legacy/src/system/src/macInitApi.c
+++ b/CORE/SYS/legacy/src/system/src/macInitApi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -197,7 +197,7 @@
*/
/* Allocate pMac */
- pMac = vos_mem_malloc(sizeof(tAniSirGlobal));
+ pMac = vos_mem_vmalloc(sizeof(tAniSirGlobal));
if ( NULL == pMac )
return eSIR_FAILURE;
@@ -219,11 +219,17 @@
{
/* Call various PE (and other layer init here) */
if( eSIR_SUCCESS != logInit(pMac))
+ {
+ vos_mem_vfree(pMac);
return eSIR_FAILURE;
+ }
/* Call routine to initialize CFG data structures */
if( eSIR_SUCCESS != cfgInit(pMac) )
+ {
+ vos_mem_vfree(pMac);
return eSIR_FAILURE;
+ }
sysInitGlobals(pMac);
}
@@ -253,7 +259,7 @@
logDeinit(pMac);
// Finally, de-allocate the global MAC datastructure:
- vos_mem_free( pMac );
+ vos_mem_vfree( pMac );
return eSIR_SUCCESS;
}
diff --git a/CORE/TL/src/wlan_qct_tl.c b/CORE/TL/src/wlan_qct_tl.c
index fd189a2..f1f8448 100644
--- a/CORE/TL/src/wlan_qct_tl.c
+++ b/CORE/TL/src/wlan_qct_tl.c
@@ -516,7 +516,7 @@
}
}
- pTLCb->reorderBufferPool = vos_mem_malloc(sizeof(WLANTL_REORDER_BUFFER_T) * WLANTL_MAX_BA_SESSION);
+ pTLCb->reorderBufferPool = vos_mem_vmalloc(sizeof(WLANTL_REORDER_BUFFER_T) * WLANTL_MAX_BA_SESSION);
if (NULL == pTLCb->reorderBufferPool)
{
TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, "WLAN TL: Reorder buffer allocation failed"));
@@ -578,7 +578,7 @@
TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
"Handoff support module init fail"));
WLANTL_FreeClientMemory(pTLCb->atlSTAClients);
- vos_mem_free(pTLCb->reorderBufferPool);
+ vos_mem_vfree(pTLCb->reorderBufferPool);
vos_free_context(pvosGCtx, VOS_MODULE_ID_TL, pTLCb);
return status;
}
@@ -850,7 +850,7 @@
WLANTL_FreeClientMemory(pTLCb->atlSTAClients);
- vos_mem_free(pTLCb->reorderBufferPool);
+ vos_mem_vfree(pTLCb->reorderBufferPool);
/*------------------------------------------------------------------------
Free TL context from VOSS global
diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c
index 3e08c6f..34ef6d8 100644
--- a/CORE/VOSS/src/vos_nvitem.c
+++ b/CORE/VOSS/src/vos_nvitem.c
@@ -1127,7 +1127,7 @@
return VOS_STATUS_E_RESOURCES;
}
- pnvEncodedBuf = (v_U8_t *)vmalloc(nvReadBufSize);
+ pnvEncodedBuf = (v_U8_t *)vos_mem_vmalloc(nvReadBufSize);
if (NULL == pnvEncodedBuf) {
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
@@ -1141,23 +1141,26 @@
vos_mem_copy(&magicNumber, &pnvEncodedBuf[sizeof(v_U32_t)], sizeof(v_U32_t));
/// Allocate buffer with maximum length..
- pEncodedBuf = (v_U8_t *)vos_mem_malloc(nvReadBufSize);
+ pEncodedBuf = (v_U8_t *)vos_mem_vmalloc(nvReadBufSize);
if (NULL == pEncodedBuf)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"%s : failed to allocate memory for NV", __func__);
+ vos_mem_vfree(pnvEncodedBuf);
return VOS_STATUS_E_NOMEM;
}
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO,
"NV Table Size %zu", sizeof(nvEFSTable_t));
- pnvEFSTable = (nvEFSTable_t *)vos_mem_malloc(sizeof(nvEFSTable_t));
+ pnvEFSTable = (nvEFSTable_t *)vos_mem_vmalloc(sizeof(nvEFSTable_t));
if (NULL == pnvEFSTable)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"%s : failed to allocate memory for NV", __func__);
+ vos_mem_vfree(pnvEncodedBuf);
+ vos_mem_vfree(pEncodedBuf);
return VOS_STATUS_E_NOMEM;
}
vos_mem_zero((void *)pnvEFSTable, sizeof(nvEFSTable_t));
@@ -1174,6 +1177,9 @@
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"%s : failed to allocate memory for NV", __func__);
+ vos_mem_vfree(pnvEncodedBuf);
+ vos_mem_vfree(pEncodedBuf);
+ vos_mem_vfree(pnvEFSTable);
return VOS_STATUS_E_NOMEM;
}
@@ -1211,13 +1217,15 @@
"nvParser failed %d",status);
if (nvReadBufSize != sizeof(sHalNv)) {
- vos_mem_free(pEncodedBuf);
- pEncodedBuf = (v_U8_t *)vos_mem_malloc(sizeof(sHalNv));
+ vos_mem_vfree(pEncodedBuf);
+ pEncodedBuf = (v_U8_t *)vos_mem_vmalloc(sizeof(sHalNv));
if (!pEncodedBuf) {
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"%s : failed to allocate memory for NV", __func__);
vos_mem_free(pnvData);
+ vos_mem_vfree(pnvEncodedBuf);
+ vos_mem_vfree(pnvEFSTable);
return VOS_STATUS_E_NOMEM;
}
}
@@ -1250,6 +1258,9 @@
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
"Size mismatch INVALID NV FILE %d %d!!!",
nvReadBufSize, bufSize);
+ vos_mem_vfree(pnvEncodedBuf);
+ vos_mem_vfree(pEncodedBuf);
+ vos_mem_vfree(pnvEFSTable);
return VOS_STATUS_E_FAILURE;
}
@@ -1262,12 +1273,14 @@
nvReadEncodeBufSize = sizeof(sHalNvV2);
if (nvReadBufSize != nvReadEncodeBufSize)
{
- vos_mem_free(pEncodedBuf);
- pEncodedBuf = (v_U8_t *)vos_mem_malloc(nvReadEncodeBufSize);
+ vos_mem_vfree(pEncodedBuf);
+ pEncodedBuf = (v_U8_t *)vos_mem_vmalloc(nvReadEncodeBufSize);
if (!pEncodedBuf)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"%s : failed to allocate memory for NV", __func__);
+ vos_mem_vfree(pnvEncodedBuf);
+ vos_mem_vfree(pnvEFSTable);
return VOS_STATUS_E_NOMEM;
}
}
@@ -1536,9 +1549,9 @@
return VOS_STATUS_SUCCESS;
error:
- vos_mem_free(pnvEFSTable);
- vos_mem_free(pEncodedBuf);
- vfree(pnvEncodedBuf);
+ vos_mem_vfree(pnvEFSTable);
+ vos_mem_vfree(pEncodedBuf);
+ vos_mem_vfree(pnvEncodedBuf);
return eHAL_STATUS_FAILURE ;
}
@@ -1549,10 +1562,10 @@
pVosContext = vos_get_global_context(VOS_MODULE_ID_SYS, NULL);
((hdd_context_t*)((VosContextType*)(pVosContext))->pHDDContext)->nv = NULL;
- vos_mem_free(pnvEFSTable);
- vos_mem_free(pEncodedBuf);
+ vos_mem_vfree(pnvEFSTable);
+ vos_mem_vfree(pEncodedBuf);
vos_mem_free(pDictFile);
- vfree(pnvEncodedBuf);
+ vos_mem_vfree(pnvEncodedBuf);
gnvEFSTable=NULL;
return VOS_STATUS_SUCCESS;