DSPBRIDGE: Improved reserved and mapped resource cleanup
Subsystems (2)
v4 cover DSPBRIDGE: Improved reserved and mapped resource cleanup
This patch series splits DMM_RES_OBJECT into DMM_MAP_OBJECT and DMM_RSV_OBJECT which are used independently for mapped and reserved memory resources accounting. This will help in cleanup of reserved memory resources which was not handled properly before. With these patches resource cleanup mechanism will work perfectly in a use case where a big chunk of memory is reserved and then lot of mappings are created inside it.
Changes since v3:
1. Improved mapped memory resource cleanup
Changes since v2:
1. Removed locking from DRV_RemoveAllDMMResElements()
2. Removed cleanup variable from PROC_UnReserveMemory()
http://marc.info/?l=linux-omap&m=126637211831587&w=2
3. Rebased patchset on top of following commit:
DSPBRIDGE: Remove conditional check from the InputMsg function
Changed since v1:
1. Reduced indentation
http://marc.info/?l=linux-omap&m=126624982331523&w=2
Ameya Palande (4):
DSPBRIDGE: Rename DMM_RES_OBJECT to DMM_MAP_OBJECT
DSPBRIDGE: New reserved memory accounting framework
DSPBRIDGE: Fix memory corruption in DRV_ProcFreeDMMRes
DSPBRIDGE: Improved mapped memory cleanup
arch/arm/plat-omap/include/dspbridge/drv.h | 44 ++--- arch/arm/plat-omap/include/dspbridge/proc.h | 4 +- .../plat-omap/include/dspbridge/resourcecleanup.h | 11 -- drivers/dsp/bridge/pmgr/wcd.c | 7 +- drivers/dsp/bridge/rmgr/drv.c | 176 +++----------------- drivers/dsp/bridge/rmgr/drv_interface.c | 5 +- drivers/dsp/bridge/rmgr/node.c | 5 +- drivers/dsp/bridge/rmgr/proc.c | 85 +++++++--- 8 files changed, 114 insertions(+), 223 deletions(-)
PATCH v4 1/4 DSPBRIDGE: Rename DMM_RES_OBJECT to DMM_MAP_OBJECT
In its current state DMM_RES_OBJECT is not correctly tracking reserve and unreserve but only map and unmap. So lets rename it to DMM_MAP_OBJECT to clarify what it is really doing!
In addition to this, this patch also does some trivial code cleanup.
--- arch/arm/plat-omap/include/dspbridge/drv.h | 14 +++--- drivers/dsp/bridge/rmgr/drv.c | 69 ++++++++++++++-------------- drivers/dsp/bridge/rmgr/drv_interface.c | 2 +- 3 files changed, 43 insertions(+), 42 deletions(-)
arch/arm/plat-omap/include/dspbridge/drv.h +7 -7
@@ -90,15 +90,15 @@ struct NODE_RES_OBJECT {struct NODE_RES_OBJECT *next; } ; -/* New structure (member of process context) abstracts DMM resource info */ -struct DMM_RES_OBJECT { +/* Abstracts DMM resource info */ +struct DMM_MAP_OBJECT {s32 dmmAllocated;/* DMM status */ u32 ulMpuAddr;u32 ulDSPAddr;u32 ulDSPResAddr; -u32 dmmSize; +u32 size;HANDLE hProcessor; -struct DMM_RES_OBJECT *next; +struct DMM_MAP_OBJECT *next; } ;/* New structure (member of process context) abstracts DMM resource info */
@@ -139,9 +139,9 @@ struct PROCESS_CONTEXT{struct NODE_RES_OBJECT *pNodeList;struct mutex node_mutex; -/* DMM resources */ -struct DMM_RES_OBJECT *pDMMList; -struct mutex dmm_mutex; +/* DMM mapped memory resources */ +struct DMM_MAP_OBJECT *dmm_map_list; +struct mutex dmm_map_mutex;/* DSP Heap resources */ struct DSPHEAP_RES_OBJECT *pDSPHEAPList;
drivers/dsp/bridge/rmgr/drv.c +35 -34
165 lines not on this page · raw message
drivers/dsp/bridge/rmgr/drv_interface.c +1 -1
@@ -499,7 +499,7 @@ static int bridge_open(struct inode *ip, struct file *filp) pr_ctxt =MEM_Calloc (sizeof (struct PROCESS_CONTEXT ),MEM_PAGED );if (pr_ctxt) { pr_ctxt->resState =PROC_RES_ALLOCATED ; -mutex_init (&pr_ctxt->dmm_mutex); +mutex_init (&pr_ctxt->dmm_map_mutex);mutex_init (&pr_ctxt->node_mutex);mutex_init (&pr_ctxt->strm_mutex); }else {
Signature · 1 line
1.6.3.3
PATCH v4 2/4 DSPBRIDGE: New reserved memory accounting framework
DSP_RSV_OBJECT is introduced to track reserved memory accounting information. This will allow us to do proper cleanup for memory reserved using PROC_ReserveMemory().
--- arch/arm/plat-omap/include/dspbridge/drv.h | 10 +++++ arch/arm/plat-omap/include/dspbridge/proc.h | 4 +- drivers/dsp/bridge/pmgr/wcd.c | 7 ++-- drivers/dsp/bridge/rmgr/drv.c | 18 ++++++---- drivers/dsp/bridge/rmgr/drv_interface.c | 2 + drivers/dsp/bridge/rmgr/node.c | 5 ++- drivers/dsp/bridge/rmgr/proc.c | 52 +++++++++++++++++++++------ 7 files changed, 73 insertions(+), 25 deletions(-)
arch/arm/plat-omap/include/dspbridge/drv.h +10 -0
@@ -101,6 +101,12 @@ struct DMM_MAP_OBJECT {struct DMM_MAP_OBJECT *next; } ; +/* Used for DMM reserved memory accounting */ +struct DMM_RSV_OBJECT { +struct list_head link; +u32 dsp_reserved_addr; +}; +/* New structure (member of process context) abstracts DMM resource info */ struct DSPHEAP_RES_OBJECT {s32 heapAllocated;/* DMM status */
@@ -143,6 +149,10 @@ struct PROCESS_CONTEXT{struct DMM_MAP_OBJECT *dmm_map_list;struct mutex dmm_map_mutex; +/* DMM reserved memory resources */ +struct list_head dmm_rsv_list; +spinlock_t dmm_rsv_lock; +/* DSP Heap resources */ struct DSPHEAP_RES_OBJECT *pDSPHEAPList;
arch/arm/plat-omap/include/dspbridge/proc.h +2 -2
@@ -560,7 +560,7 @@* Details: */ extern DSP_STATUS PROC_ReserveMemory (DSP_HPROCESSOR hProcessor, -u32 ulSize,void **ppRsvAddr); +u32 ulSize,void **ppRsvAddr,struct PROCESS_CONTEXT *pr_ctxt);/* * ======== PROC_UnMap ========
@@ -604,6 +604,6 @@* Details: */ extern DSP_STATUS PROC_UnReserveMemory (DSP_HPROCESSOR hProcessor, -void *pRsvAddr); +void *pRsvAddr,struct PROCESS_CONTEXT *pr_ctxt);#endif /* PROC_ */
drivers/dsp/bridge/pmgr/wcd.c +4 -3
@@ -1054,12 +1054,13 @@ u32 PROCWRAP_ReserveMemory(union Trapped_Args *args, void *pr_ctxt)GT_0trace (WCD_debugMask,GT_ENTER ,"PROCWRAP_ReserveMemory: entered\n" ); status =PROC_ReserveMemory (args->ARGS_PROC_RSVMEM.hProcessor, - args->ARGS_PROC_RSVMEM.ulSize, &pRsvAddr); + args->ARGS_PROC_RSVMEM.ulSize, &pRsvAddr, + pr_ctxt);if (DSP_SUCCEEDED (status)) {if (put_user (pRsvAddr, args->ARGS_PROC_RSVMEM.ppRsvAddr)) { status =DSP_EINVALIDARG ;PROC_UnReserveMemory (args->ARGS_PROC_RSVMEM.hProcessor, - pRsvAddr); + pRsvAddr, pr_ctxt); } }return status;
@@ -1100,7 +1101,7 @@ u32 PROCWRAP_UnReserveMemory(union Trapped_Args *args, void *pr_ctxt)GT_0trace (WCD_debugMask,GT_ENTER ,"PROCWRAP_UnReserveMemory: entered\n" ); status =PROC_UnReserveMemory (args->ARGS_PROC_UNRSVMEM.hProcessor, - args->ARGS_PROC_UNRSVMEM.pRsvAddr); + args->ARGS_PROC_UNRSVMEM.pRsvAddr, pr_ctxt);return status; }
drivers/dsp/bridge/rmgr/drv.c +11 -7
@@ -298,25 +298,20 @@ DSP_STATUS DRV_ProcFreeDMMRes(HANDLE hPCtxt)if (DSP_FAILED (status))pr_debug ("%s: PROC_UnMap failed! status =" " 0x%xn" , __func__, status); - status =PROC_UnReserveMemory (pDMMRes->hProcessor, - (void *)pDMMRes->ulDSPResAddr); -if (DSP_FAILED (status)) -pr_debug ("%s: PROC_UnReserveMemory failed!" -" status = 0x%xn" , __func__, status); pDMMRes->dmmAllocated =0 ; } }return status; } -/* Release all DMM resources and its context -* This is called from .bridge_release. */ +/* Release all Mapped and Reserved DMM resources */ DSP_STATUS DRV_RemoveAllDMMResElements (HANDLE hPCtxt) {struct PROCESS_CONTEXT *pCtxt = (struct PROCESS_CONTEXT *)hPCtxt;DSP_STATUS status =DSP_SOK ;struct DMM_MAP_OBJECT *pTempDMMRes2 =NULL ;struct DMM_MAP_OBJECT *pTempDMMRes =NULL ; +struct DMM_RSV_OBJECT *temp, *rsv_obj;DRV_ProcFreeDMMRes (pCtxt); pTempDMMRes = pCtxt->dmm_map_list;
@@ -326,6 +321,15 @@ DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE hPCtxt)kfree (pTempDMMRes2); } pCtxt->dmm_map_list =NULL ; + +/* Free DMM reserved memory resources */ +list_for_each_entry_safe (rsv_obj, temp, &pCtxt->dmm_rsv_list, link) { + status =PROC_UnReserveMemory (pCtxt->hProcessor, + (void *)rsv_obj->dsp_reserved_addr, pCtxt); +if (DSP_FAILED (status)) +pr_err ("%s: PROC_UnReserveMemory failed!" +" status = 0x%xn" , __func__, status); + }return status; }
drivers/dsp/bridge/rmgr/drv_interface.c +2 -0
@@ -500,6 +500,8 @@ static int bridge_open(struct inode *ip, struct file *filp)if (pr_ctxt) { pr_ctxt->resState =PROC_RES_ALLOCATED ;mutex_init (&pr_ctxt->dmm_map_mutex); +spin_lock_init (&pr_ctxt->dmm_rsv_lock); +INIT_LIST_HEAD (&pr_ctxt->dmm_rsv_list);mutex_init (&pr_ctxt->node_mutex);mutex_init (&pr_ctxt->strm_mutex); }else {
drivers/dsp/bridge/rmgr/node.c +3 -2
@@ -454,7 +454,7 @@ DSP_STATUS NODE_Allocate(struct PROC_OBJECT *hProcessor, status =PROC_ReserveMemory (hProcessor, pNode->createArgs.asa.taskArgs.uHeapSize +PAGE_SIZE , (void **)&(pNode->createArgs.asa.taskArgs. - uDSPHeapResAddr)); + uDSPHeapResAddr), pr_ctxt);if (DSP_FAILED (status)) {GT_1trace (NODE_debugMask,GT_5CLASS , "NODE_Allocate:Failed to reserve "
@@ -2726,7 +2726,8 @@ static void DeleteNode(struct NODE_OBJECT *hNode, " Status = 0x%x\n", (u32)status); } status =PROC_UnReserveMemory (hNode->hProcessor, - (void *)taskArgs.uDSPHeapResAddr); + (void *)taskArgs.uDSPHeapResAddr, + pr_ctxt);if (DSP_SUCCEEDED (status)) {GT_0trace (NODE_debugMask,GT_5CLASS , "DSPProcessor_UnReserveMemory "
drivers/dsp/bridge/rmgr/proc.c +41 -11
97 lines not on this page · raw message
Signature · 1 line
1.6.3.3
PATCH v4 3/4 DSPBRIDGE: Fix memory corruption in DRV_ProcFreeDMMRes
This patch fixes following issues:
1. pDMMRes was dereferenced and modified when it was already freed by PROC_Ummap(). This results in memory corruption.
2. Instead of passing ulDSPAddr, ulDSPResAddr was passed to PROC_UnMap() which will not retrieve correct DMMRes element.
--- drivers/dsp/bridge/rmgr/drv.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-)
drivers/dsp/bridge/rmgr/drv.c +2 -10
@@ -293,12 +293,12 @@ DSP_STATUS DRV_ProcFreeDMMRes(HANDLE hPCtxt) pDMMRes = pDMMList; pDMMList = pDMMList->next;if (pDMMRes->dmmAllocated) { +/* PROC_UnMap will free pDMMRes pointer */ status =PROC_UnMap (pDMMRes->hProcessor, - (void *)pDMMRes->ulDSPResAddr, pCtxt); + (void *)pDMMRes->ulDSPAddr, pCtxt);if (DSP_FAILED (status))pr_debug ("%s: PROC_UnMap failed! status =" " 0x%xn" , __func__, status); - pDMMRes->dmmAllocated =0 ; } }return status;
@@ -309,17 +309,9 @@ DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE hPCtxt) {struct PROCESS_CONTEXT *pCtxt = (struct PROCESS_CONTEXT *)hPCtxt;DSP_STATUS status =DSP_SOK ; -struct DMM_MAP_OBJECT *pTempDMMRes2 =NULL ; -struct DMM_MAP_OBJECT *pTempDMMRes =NULL ;struct DMM_RSV_OBJECT *temp, *rsv_obj;DRV_ProcFreeDMMRes (pCtxt); - pTempDMMRes = pCtxt->dmm_map_list; -while (pTempDMMRes !=NULL ) { - pTempDMMRes2 = pTempDMMRes; - pTempDMMRes = pTempDMMRes->next; -kfree (pTempDMMRes2); - } pCtxt->dmm_map_list =NULL ;/* Free DMM reserved memory resources */
Signature · 1 line
1.6.3.3
PATCH v4 4/4 DSPBRIDGE: Improved mapped memory cleanup
This patch improves current mapped memory cleanup mechanism by using linux native list implementation. As a side effect we also get following benefits:
1. Unnecessary data members in DMM_MAP_OBJECT are removed which results in memory saving.
2. Following functions are removed as they are not needed anymore:
DRV_ProcFreeDMMRes()
DRV_UpdateDMMResElement()
DRV_InsertDMMResElement()
DRV_GetDMMResElement()
DRV_RemoveDMMResElement()
--- arch/arm/plat-omap/include/dspbridge/drv.h | 30 +--- .../plat-omap/include/dspbridge/resourcecleanup.h | 11 -- drivers/dsp/bridge/rmgr/drv.c | 161 ++------------------ drivers/dsp/bridge/rmgr/drv_interface.c | 3 +- drivers/dsp/bridge/rmgr/proc.c | 33 +++-- 5 files changed, 44 insertions(+), 194 deletions(-)
arch/arm/plat-omap/include/dspbridge/drv.h +6 -24
@@ -90,16 +90,11 @@ struct NODE_RES_OBJECT {struct NODE_RES_OBJECT *next; } ; -/* Abstracts DMM resource info */ +/* Used for DMM mapped memory accounting */ struct DMM_MAP_OBJECT { -s32 dmmAllocated;/* DMM status */ -u32 ulMpuAddr; -u32 ulDSPAddr; -u32 ulDSPResAddr; -u32 size; -HANDLE hProcessor; -struct DMM_MAP_OBJECT *next; -} ; +struct list_head link; +u32 dsp_addr; +};/* Used for DMM reserved memory accounting */ struct DMM_RSV_OBJECT {
@@ -146,8 +141,8 @@ struct PROCESS_CONTEXT{struct mutex node_mutex;/* DMM mapped memory resources */ -struct DMM_MAP_OBJECT *dmm_map_list; -struct mutex dmm_map_mutex; +struct list_head dmm_map_list; +spinlock_t dmm_map_lock;/* DMM reserved memory resources */ struct list_head dmm_rsv_list;
@@ -398,17 +393,4 @@ struct PROCESS_CONTEXT{ extern DSP_STATUS DRV_ReleaseResources(IN u32 dwContext,struct DRV_OBJECT *hDrvObject); -/* -* ======== DRV_ProcFreeDMMRes ======== -* Purpose: -* Actual DMM De-Allocation. -* Parameters: -* hPCtxt: Path to the driver Registry Key. -* Returns: -* DSP_SOK if success; -*/ - - -extern DSP_STATUS DRV_ProcFreeDMMRes (HANDLE hPCtxt); -#endif /* DRV_ */
arch/arm/plat-omap/include/dspbridge/resourcecleanup.h +0 -11
@@ -48,17 +48,6 @@ extern DSP_STATUS DRV_RemoveNodeResElement(HANDLE nodeRes, HANDLE status);extern void DRV_ProcNodeUpdateStatus (HANDLE hNodeRes,s32 status); -extern DSP_STATUS DRV_UpdateDMMResElement (HANDLE dmmRes,u32 pMpuAddr, -u32 ulSize,u32 pReqAddr, -u32 ppMapAddr,HANDLE hProcesso); - -extern DSP_STATUS DRV_InsertDMMResElement (HANDLE dmmRes,HANDLE pCtxt); - -extern DSP_STATUS DRV_GetDMMResElement (u32 pMapAddr,HANDLE dmmRes, -HANDLE pCtxt); - -extern DSP_STATUS DRV_RemoveDMMResElement (HANDLE dmmRes,HANDLE pCtxt); -extern DSP_STATUS DRV_ProcUpdateSTRMRes (u32 uNumBufs,HANDLE STRMRes); extern DSP_STATUS DRV_ProcInsertSTRMResElement(HANDLE hStrm, HANDLE STRMRes,
drivers/dsp/bridge/rmgr/drv.c +14 -147
180 lines not on this page · raw message
drivers/dsp/bridge/rmgr/drv_interface.c +2 -1
@@ -499,7 +499,8 @@ static int bridge_open(struct inode *ip, struct file *filp) pr_ctxt =MEM_Calloc (sizeof (struct PROCESS_CONTEXT ),MEM_PAGED );if (pr_ctxt) { pr_ctxt->resState =PROC_RES_ALLOCATED ; -mutex_init (&pr_ctxt->dmm_map_mutex); +spin_lock_init (&pr_ctxt->dmm_map_lock); +INIT_LIST_HEAD (&pr_ctxt->dmm_map_list);spin_lock_init (&pr_ctxt->dmm_rsv_lock);INIT_LIST_HEAD (&pr_ctxt->dmm_rsv_list);mutex_init (&pr_ctxt->node_mutex);
drivers/dsp/bridge/rmgr/proc.c +22 -11
@@ -1286,8 +1286,7 @@ DSP_STATUS PROC_Map(DSP_HPROCESSOR hProcessor, void *pMpuAddr, u32 ulSize,u32 sizeAlign;DSP_STATUS status =DSP_SOK ;struct PROC_OBJECT *pProcObject = (struct PROC_OBJECT *)hProcessor; - -HANDLE dmmRes; +struct DMM_MAP_OBJECT *map_obj;GT_6trace (PROC_DebugMask,GT_ENTER ,"Entered PROC_Map, args:\n\t" "hProcessor %x, pMpuAddr %x, ulSize %x, pReqAddr %x, "
@@ -1334,11 +1333,17 @@ DSP_STATUS PROC_Map(DSP_HPROCESSOR hProcessor, void *pMpuAddr, u32 ulSize, } (void )SYNC_LeaveCS (hProcLock); -if (DSP_SUCCEEDED (status)) { -DRV_InsertDMMResElement (&dmmRes, pr_ctxt); -DRV_UpdateDMMResElement (dmmRes, (u32 )pMpuAddr, ulSize, - (u32 )pReqAddr, (u32)*ppMapAddr, hProcessor); +if (DSP_FAILED (status)) + goto func_end; + + map_obj =kmalloc (sizeof (struct DMM_MAP_OBJECT ),GFP_KERNEL ); +if (map_obj) { + map_obj->dsp_addr = (u32)*ppMapAddr; +spin_lock (&pr_ctxt->dmm_map_lock); +list_add (&map_obj->link, &pr_ctxt->dmm_map_list); +spin_unlock (&pr_ctxt->dmm_map_lock); } + func_end:GT_1trace (PROC_DebugMask,GT_ENTER ,"Leaving PROC_Map [0x%x]" , status);return status;
@@ -1664,8 +1669,7 @@ DSP_STATUS PROC_UnMap(DSP_HPROCESSOR hProcessor, void *pMapAddr,struct DMM_OBJECT *hDmmMgr;u32 vaAlign;u32 sizeAlign; - -HANDLE dmmRes; +struct DMM_MAP_OBJECT *temp, *map_obj;GT_2trace (PROC_DebugMask,GT_ENTER , "Entered PROC_UnMap, args:\n\thProcessor:"
@@ -1705,9 +1709,16 @@ DSP_STATUS PROC_UnMap(DSP_HPROCESSOR hProcessor, void *pMapAddr,if (DSP_FAILED (status)) goto func_end; -if (DRV_GetDMMResElement ((u32 )pMapAddr, &dmmRes, pr_ctxt) - !=DSP_ENOTFOUND ) -DRV_RemoveDMMResElement (dmmRes, pr_ctxt); +spin_lock (&pr_ctxt->dmm_map_lock); +list_for_each_entry_safe (map_obj, temp, &pr_ctxt->dmm_map_list, link) { +if (map_obj->dsp_addr == (u32 )pMapAddr) { +list_del (&map_obj->link); +kfree (map_obj); +break ; + } + } +spin_unlock (&pr_ctxt->dmm_map_lock); + func_end:GT_1trace (PROC_DebugMask,GT_ENTER ,"Leaving PROC_UnMap [0x%x]" , status);
Signature · 1 line
1.6.3.3
RE: [PATCHv4 4/4] DSPBRIDGE: Improved mapped memory cleanup
Hi,
Quoted 341 lines
-----Original Message-----
From: Ameya Palande [mailto:[email protected]]
Sent: Wednesday, February 17, 2010 12:06 PM
To: [email protected]
Cc: [email protected]; Menon, Nishanth; Chitriki Rudramuni, Deepak; Guzman Lugo, Fernando; Ramirez Luna, Omar
Subject: [PATCHv4 4/4] DSPBRIDGE: Improved mapped memory cleanupThis patch improves current mapped memory cleanup mechanism by using linux native list implementation. As a side effect we also get following benefits:
1. Unnecessary data members in
DMM_MAP_OBJECTare removed which results in memory saving.2. Following functions are removed as they are not needed anymore:
DRV_ProcFreeDMMRes()
DRV_UpdateDMMResElement()
DRV_InsertDMMResElement()
DRV_GetDMMResElement()
DRV_RemoveDMMResElement()Signed-off-by Ameya Palande <[email protected]>---
arch/arm/plat-omap/include/dspbridge/drv.h | 30 +--- .../plat-omap/include/dspbridge/resourcecleanup.h | 11 -- drivers/dsp/bridge/rmgr/drv.c | 161 ++-------------- ---- drivers/dsp/bridge/rmgr/drv_interface.c | 3 +- drivers/dsp/bridge/rmgr/proc.c | 33 +++-- 5 files changed, 44 insertions(+), 194 deletions(-)arch/arm/plat- renamed from arch/arm/plat-omap/include/dspbridge/drv.h +0
-0
omap/include/dspbridge/drv.h
index f7d0e3e..854923a 100644arch/arm/plat-omap/include/dspbridge/drv.h +6
-24@@ -90,16 +90,11 @@ struct NODE_RES_OBJECT {struct NODE_RES_OBJECT *next; } ; -/* Abstracts DMM resource info */ +/* Used for DMM mapped memory accounting */ struct DMM_MAP_OBJECT { -s32 dmmAllocated;/* DMM status */ -u32 ulMpuAddr; -u32 ulDSPAddr; -u32 ulDSPResAddr; -u32 size; -HANDLE hProcessor; -struct DMM_MAP_OBJECT *next; -} ; +struct list_head link; +u32 dsp_addr; +};/* Used for DMM reserved memory accounting */ struct DMM_RSV_OBJECT {@@ -146,8 +141,8 @@ struct PROCESS_CONTEXT{struct mutex node_mutex;/* DMM mapped memory resources */ -struct DMM_MAP_OBJECT *dmm_map_list; -struct mutex dmm_map_mutex; +struct list_head dmm_map_list; +spinlock_t dmm_map_lock;/* DMM reserved memory resources */ struct list_head dmm_rsv_list;@@ -398,17 +393,4 @@ struct PROCESS_CONTEXT{ extern DSP_STATUS DRV_ReleaseResources(IN u32 dwContext,struct DRV_OBJECT *hDrvObject); -/* -* ======== DRV_ProcFreeDMMRes ======== -* Purpose: -* Actual DMM De-Allocation. -* Parameters: -* hPCtxt: Path to the driver Registry Key. -* Returns: -* DSP_SOK if success; -*/ - - -extern DSP_STATUS DRV_ProcFreeDMMRes (HANDLE hPCtxt); -#endif /* DRV_ */ arch/arm/plat-omap/include/dspbridge/resourcecleanup.h +0
-11@@ -48,17 +48,6 @@ extern DSP_STATUS DRV_RemoveNodeResElement(HANDLE nodeRes, HANDLE status);extern void DRV_ProcNodeUpdateStatus (HANDLE hNodeRes,s32 status); -extern DSP_STATUS DRV_UpdateDMMResElement (HANDLE dmmRes,u32 pMpuAddr, -u32 ulSize,u32 pReqAddr, -u32 ppMapAddr,HANDLE hProcesso); - -extern DSP_STATUS DRV_InsertDMMResElement (HANDLE dmmRes,HANDLE pCtxt); - -extern DSP_STATUS DRV_GetDMMResElement (u32 pMapAddr,HANDLE dmmRes, -HANDLE pCtxt); - -extern DSP_STATUS DRV_RemoveDMMResElement (HANDLE dmmRes,HANDLE pCtxt); -extern DSP_STATUS DRV_ProcUpdateSTRMRes (u32 uNumBufs,HANDLE STRMRes);extern
DSP_STATUSDRV_ProcInsertSTRMResElement(HANDLE hStrm, HANDLE STRMRes,drivers/dsp/bridge/rmgr/drv.c +14
-116@@ -193,129 +193,27 @@ static DSP_STATUS DRV_ProcFreeNodeRes(HANDLE hPCtxt)return status; } -/* Allocate the DMM resource element -* This is called from Proc_Map. after the actual resource is allocated */ -DSP_STATUS DRV_InsertDMMResElement (HANDLE hDMMRes,HANDLE hPCtxt) -{ -struct PROCESS_CONTEXT *pCtxt = (struct PROCESS_CONTEXT *)hPCtxt; -struct DMM_MAP_OBJECT **pDMMRes = (struct DMM_MAP_OBJECT **)hDMMRes; -DSP_STATUS status =DSP_SOK ; -struct DMM_MAP_OBJECT *pTempDMMRes =NULL ; - - *pDMMRes = (struct DMM_MAP_OBJECT *) -MEM_Calloc (1 *sizeof (struct DMM_MAP_OBJECT ),MEM_PAGED ); -GT_0trace (curTrace,GT_ENTER ,"DRV_InsertDMMResElement: 1" ); -if (*pDMMRes ==NULL ) { -GT_0trace (curTrace,GT_5CLASS ,"DRV_InsertDMMResElement: 2" ); - status =DSP_EHANDLE ; - } -if (DSP_SUCCEEDED (status)) { -if (mutex_lock_interruptible (&pCtxt->dmm_map_mutex)) { -kfree (*pDMMRes); -return DSP_EFAIL ; - } - -if (pCtxt->dmm_map_list) { -GT_0trace (curTrace,GT_5CLASS , -"DRV_InsertDMMResElement: 3" ); - pTempDMMRes = pCtxt->dmm_map_list; -while (pTempDMMRes->next) - pTempDMMRes = pTempDMMRes->next; - - pTempDMMRes->next = *pDMMRes; - }else { - pCtxt->dmm_map_list = *pDMMRes; -GT_0trace (curTrace,GT_5CLASS , -"DRV_InsertDMMResElement: 4" ); - } -mutex_unlock (&pCtxt->dmm_map_mutex); - } -GT_0trace (curTrace,GT_ENTER ,"DRV_InsertDMMResElement: 5" ); -return status; -} - -/* Release DMM resource element context -* This is called from Proc_UnMap. after the actual resource is freed */ -DSP_STATUS DRV_RemoveDMMResElement (HANDLE hDMMRes,HANDLE hPCtxt) -{ -struct PROCESS_CONTEXT *pCtxt = (struct PROCESS_CONTEXT *)hPCtxt; -struct DMM_MAP_OBJECT *pDMMRes = (struct DMM_MAP_OBJECT *)hDMMRes; -struct DMM_MAP_OBJECT *pTempDMMRes =NULL ; -DSP_STATUS status =DSP_SOK ; - -if (mutex_lock_interruptible (&pCtxt->dmm_map_mutex)) -return DSP_EFAIL ; - pTempDMMRes = pCtxt->dmm_map_list; -if (pCtxt->dmm_map_list == pDMMRes) { - pCtxt->dmm_map_list = pDMMRes->next; - }else { -while (pTempDMMRes && pTempDMMRes->next != pDMMRes) - pTempDMMRes = pTempDMMRes->next; -if (!pTempDMMRes) - status =DSP_ENOTFOUND ; -else - pTempDMMRes->next = pDMMRes->next; - } -mutex_unlock (&pCtxt->dmm_map_mutex); -kfree (pDMMRes); -return status; -} - -/* Update DMM resource status */ -DSP_STATUS DRV_UpdateDMMResElement (HANDLE hDMMRes,u32 pMpuAddr,u32 ulSize, -u32 pReqAddr,u32 pMapAddr, -HANDLE hProcessor) -{ -struct DMM_MAP_OBJECT *pDMMRes = (struct DMM_MAP_OBJECT *)hDMMRes; -DSP_STATUS status =DSP_SOK ; - -DBC_Assert (hDMMRes !=NULL ); - pDMMRes->ulMpuAddr = pMpuAddr; - pDMMRes->ulDSPAddr = pMapAddr; - pDMMRes->ulDSPResAddr = pReqAddr; - pDMMRes->size = ulSize; - pDMMRes->hProcessor = hProcessor; - pDMMRes->dmmAllocated =1 ; - -return status; -} - -/* Actual DMM De-Allocation */ -DSP_STATUS DRV_ProcFreeDMMRes (HANDLE hPCtxt) -{ -struct PROCESS_CONTEXT *pCtxt = (struct PROCESS_CONTEXT *)hPCtxt; -DSP_STATUS status =DSP_SOK ; -struct DMM_MAP_OBJECT *pDMMList = pCtxt->dmm_map_list; -struct DMM_MAP_OBJECT *pDMMRes =NULL ; - -GT_0trace (curTrace,GT_ENTER ,"\nDRV_ProcFreeDMMRes: 1\n" ); -while (pDMMList) { - pDMMRes = pDMMList; - pDMMList = pDMMList->next; -if (pDMMRes->dmmAllocated) { -/* PROC_UnMap will free pDMMRes pointer */ - status =PROC_UnMap (pDMMRes->hProcessor, - (void *)pDMMRes->ulDSPAddr, pCtxt); -if (DSP_FAILED (status)) -pr_debug ("%s: PROC_UnMap failed! status =" -" 0x%xn" , __func__, status); - } - } -return status; -} -/* Release all Mapped and Reserved DMM resources */ DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE hPCtxt) {struct PROCESS_CONTEXT *pCtxt = (struct PROCESS_CONTEXT *)hPCtxt;DSP_STATUS status =DSP_SOK ; -struct DMM_RSV_OBJECT *temp, *rsv_obj; - -DRV_ProcFreeDMMRes (pCtxt); - pCtxt->dmm_map_list =NULL ; +struct DMM_MAP_OBJECT *temp_map, *map_obj; +struct DMM_RSV_OBJECT *temp_rsv, *rsv_obj; + +/* Free DMM mapped memory resources */ +list_for_each_entry_safe (map_obj, temp_map, &pCtxt->dmm_map_list, + link) { + status =PROC_UnMap (pCtxt->hProcessor, + (void *)map_obj->dsp_addr, pCtxt); +if (DSP_FAILED (status)) +pr_err ("%s: PROC_UnMap failed!" +" status = 0x%xn" , __func__, status); + }/* Free DMM reserved memory resources */ -list_for_each_entry_safe (rsv_obj, temp, &pCtxt->dmm_rsv_list, link) { +list_for_each_entry_safe (rsv_obj, temp_rsv, &pCtxt->dmm_rsv_list, + link) { status =PROC_UnReserveMemory (pCtxt->hProcessor, (void *)rsv_obj->dsp_reserved_addr, pCtxt);if (
DSP_FAILED(status))drivers/dsp/bridge/rmgr/drv.c +0
-31@@ -325,37 +223,6 @@ DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE hPCtxt)return status; } -DSP_STATUS DRV_GetDMMResElement (u32 pMapAddr,HANDLE hDMMRes,HANDLE hPCtxt) -{ -struct PROCESS_CONTEXT *pCtxt = (struct PROCESS_CONTEXT *)hPCtxt; -struct DMM_MAP_OBJECT **pDMMRes = (struct DMM_MAP_OBJECT **)hDMMRes; -DSP_STATUS status =DSP_SOK ; -struct DMM_MAP_OBJECT *pTempDMM =NULL ; - -if (mutex_lock_interruptible (&pCtxt->dmm_map_mutex)) -return DSP_EFAIL ; - - pTempDMM = pCtxt->dmm_map_list; -while (pTempDMM && (pTempDMM->ulDSPAddr != pMapAddr)) { -GT_3trace (curTrace,GT_ENTER , -"DRV_GetDMMResElement: 2 pTempDMM:%x " -"pTempDMM->ulDSPAddr:%x pMapAddr:%x\n" , pTempDMM, - pTempDMM->ulDSPAddr, pMapAddr); - pTempDMM = pTempDMM->next; - } - -mutex_unlock (&pCtxt->dmm_map_mutex); - -if (pTempDMM) { -GT_0trace (curTrace,GT_ENTER ,"DRV_GetDMMResElement: 3" ); - *pDMMRes = pTempDMM; - }else { - status =DSP_ENOTFOUND ; -GT_0trace (curTrace,GT_ENTER ,"DRV_GetDMMResElement: 4" ); - } -return status; -} -/* Update Node allocation status */ void DRV_ProcNodeUpdateStatus (HANDLE hNodeRes,s32 status){
drivers/dsp/bridge/rmgr/drv_interface.c +2
-1@@ -499,7 +499,8 @@ static int bridge_open(struct inode *ip, struct file *filp) pr_ctxt =MEM_Calloc (sizeof (struct PROCESS_CONTEXT ),MEM_PAGED );if (pr_ctxt) { pr_ctxt->resState =PROC_RES_ALLOCATED ; -mutex_init (&pr_ctxt->dmm_map_mutex); +spin_lock_init (&pr_ctxt->dmm_map_lock); +INIT_LIST_HEAD (&pr_ctxt->dmm_map_list);spin_lock_init (&pr_ctxt->dmm_rsv_lock);INIT_LIST_HEAD (&pr_ctxt->dmm_rsv_list);mutex_init(&pr_ctxt->node_mutex);drivers/dsp/bridge/rmgr/proc.c +1
-2@@ -1286,8 +1286,7 @@ DSP_STATUS PROC_Map(DSP_HPROCESSOR hProcessor, void *pMpuAddr, u32 ulSize, u32 sizeAlign;DSP_STATUS status =DSP_SOK ;struct PROC_OBJECT *pProcObject = (struct PROC_OBJECT *)hProcessor; - -HANDLE dmmRes; +struct DMM_MAP_OBJECT *map_obj; GT_6trace(PROC_DebugMask, GT_ENTER, "Entered PROC_Map, args:\n\t""hProcessor %x, pMpuAddr %x, ulSize %x, pReqAddr %x, "
drivers/dsp/bridge/rmgr/proc.c +0
-4@@ -1334,11 +1333,17 @@ DSP_STATUS PROC_Map(DSP_HPROCESSOR hProcessor, void *pMpuAddr, u32 ulSize, } (void )SYNC_LeaveCS (hProcLock); -if (DSP_SUCCEEDED (status)) { -DRV_InsertDMMResElement (&dmmRes, pr_ctxt); -DRV_UpdateDMMResElement (dmmRes, (u32 )pMpuAddr, ulSize, - (u32 )pReqAddr, (u32)*ppMapAddr, hProcessor);
drivers/dsp/bridge/rmgr/proc.c DSP_STATUS PROC_Map(DSP_HPROCESSOR hProcessor, void · line 1346
Quoted 10 lines
drivers/dsp/bridge/rmgr/proc.c +9
-0+if (DSP_FAILED (status)) + goto func_end; + + map_obj =kmalloc (sizeof (struct DMM_MAP_OBJECT ),GFP_KERNEL ); +if (map_obj) { + map_obj->dsp_addr = (u32)*ppMapAddr; +spin_lock (&pr_ctxt->dmm_map_lock); +list_add (&map_obj->link, &pr_ctxt->dmm_map_list); +spin_unlock (&pr_ctxt->dmm_map_lock); }
What do you think about it?
Instead of removing DRV_InsertDMMResElement make it an inline function with your code inside:
inline void DRV_InsertDMMResElement(u32 ppMapAddr)
{
map_obj = kmalloc(sizeof(struct DMM_MAP_OBJECT), GFP_KERNEL);
if (map_obj) {
map_obj->dsp_addr = (u32)*ppMapAddr;
spin_lock(&pr_ctxt->dmm_map_lock);
list_add(&map_obj->link, &pr_ctxt->dmm_map_list);
spin_unlock(&pr_ctxt->dmm_map_lock);
}
}It could make the code more understandable about what it is actually doing. It also applies to the functions which removes this patch.
Regards,
Fenando
Quoted 40 lines
drivers/dsp/bridge/rmgr/proc.c +1
-0+
func_end:GT_1trace(PROC_DebugMask, GT_ENTER, "Leaving PROC_Map [0x%x]", status); return status;drivers/dsp/bridge/rmgr/proc.c +1
-2@@ -1664,8 +1669,7 @@ DSP_STATUS PROC_UnMap(DSP_HPROCESSOR hProcessor, void *pMapAddr, struct DMM_OBJECT *hDmmMgr;u32 vaAlign;u32 sizeAlign; - -HANDLE dmmRes; +struct DMM_MAP_OBJECT *temp, *map_obj; GT_2trace(PROC_DebugMask, GT_ENTER,"Entered
PROC_UnMap, args:\n\thProcessor:"drivers/dsp/bridge/rmgr/proc.c +10
-3@@ -1705,9 +1709,16 @@ DSP_STATUS PROC_UnMap(DSP_HPROCESSOR hProcessor, void *pMapAddr, if (DSP_FAILED(status)) goto func_end; -if (DRV_GetDMMResElement ((u32 )pMapAddr, &dmmRes, pr_ctxt) - !=DSP_ENOTFOUND ) -DRV_RemoveDMMResElement (dmmRes, pr_ctxt); +spin_lock (&pr_ctxt->dmm_map_lock); +list_for_each_entry_safe (map_obj, temp, &pr_ctxt->dmm_map_list, link) { +if (map_obj->dsp_addr == (u32 )pMapAddr) { +list_del (&map_obj->link); +kfree (map_obj); +break ; + } + } +spin_unlock (&pr_ctxt->dmm_map_lock); +
func_end:GT_1trace(PROC_DebugMask, GT_ENTER, "Leaving PROC_UnMap [0x%x]", status);--
1.6.3.3
RE: [PATCHv4 4/4] DSPBRIDGE: Improved mapped memory cleanup
Hi Fernando,
Quoted 40 lines · Fernando
Hi,
Quoted 38 lines
-----Original Message-----
From: Ameya Palande [mailto:[email protected]]
Sent: Wednesday, February 17, 2010 12:06 PM
To: [email protected]
Cc: [email protected]; Menon, Nishanth; Chitriki Rudramuni, Deepak; Guzman Lugo, Fernando; Ramirez Luna, Omar
Subject: [PATCHv4 4/4] DSPBRIDGE: Improved mapped memory cleanupThis patch improves current mapped memory cleanup mechanism by using linux native list implementation. As a side effect we also get following benefits:
1. Unnecessary data members in
DMM_MAP_OBJECTare removed which results in memory saving.2. Following functions are removed as they are not needed anymore:
DRV_ProcFreeDMMRes()
DRV_UpdateDMMResElement()
DRV_InsertDMMResElement()
DRV_GetDMMResElement()
DRV_RemoveDMMResElement()Signed-off-by Ameya Palande <[email protected]>---
drivers/dsp/bridge/rmgr/proc.c +5
-4@@ -1334,11 +1333,17 @@ DSP_STATUS PROC_Map(DSP_HPROCESSOR hProcessor, void *pMpuAddr, u32 ulSize, } (void )SYNC_LeaveCS (hProcLock); -if (DSP_SUCCEEDED (status)) { -DRV_InsertDMMResElement (&dmmRes, pr_ctxt); -DRV_UpdateDMMResElement (dmmRes, (u32 )pMpuAddr, ulSize, - (u32 )pReqAddr, (u32)*ppMapAddr, hProcessor); +if (DSP_FAILED (status)) + goto func_end; + + map_obj =kmalloc (sizeof (struct DMM_MAP_OBJECT ),GFP_KERNEL ); +if (map_obj) {
Quoted 8 lines
drivers/dsp/bridge/rmgr/proc.c DSP_STATUS PROC_Map(DSP_HPROCESSOR hProcessor, void *pMpuAddr, u32 ulSize, · line 1345
Quoted 5 lines
drivers/dsp/bridge/rmgr/proc.c +4
-0+ map_obj->dsp_addr = (u32)*ppMapAddr; +spin_lock (&pr_ctxt->dmm_map_lock); +list_add (&map_obj->link, &pr_ctxt->dmm_map_list); +spin_unlock (&pr_ctxt->dmm_map_lock); }What do you think about it?
Instead of removingDRV_InsertDMMResElementmake it an inline function with your code inside:
Making DRV_InsertDMMResElement inline doesn't make sense since we are not calling it multiple times.
Quoted 11 lines
inline void
DRV_InsertDMMResElement(u32 ppMapAddr){ map_obj = kmalloc(sizeof(struct DMM_MAP_OBJECT), GFP_KERNEL); if (map_obj) { map_obj->dsp_addr = (u32)*ppMapAddr; spin_lock(&pr_ctxt->dmm_map_lock); list_add(&map_obj->link, &pr_ctxt->dmm_map_list); spin_unlock(&pr_ctxt->dmm_map_lock); } }
Quoted 2 lines
It could make the code more understandable about what it is actually doing. It also applies to the functions which removes this patch.
I can put a comment here to clarify what this code is doing ;)
Cheers,
Ameya.
Re: [PATCHv4 4/4] DSPBRIDGE: Improved mapped memory cleanup
Quoted 6 lines · Ameya Palande
Quoted 2 lines · Fernando
What do you think about it?
Instead of removingDRV_InsertDMMResElementmake it an inline function with your code inside:Making
DRV_InsertDMMResElementinline doesn't make sense since we are not calling it multiple times.
I agree with Fernando; the code would be more readable. Even more if we rename the function to instert_map_element().
note: should be 'static inline'
Quoted 11 lines
Quoted 11 lines
inline void
DRV_InsertDMMResElement(u32 ppMapAddr){ map_obj = kmalloc(sizeof(struct DMM_MAP_OBJECT), GFP_KERNEL); if (map_obj) { map_obj->dsp_addr = (u32)*ppMapAddr; spin_lock(&pr_ctxt->dmm_map_lock); list_add(&map_obj->link, &pr_ctxt->dmm_map_list); spin_unlock(&pr_ctxt->dmm_map_lock); } }
Quoted 4 lines
Quoted 2 lines
It could make the code more understandable about what it is actually doing. It also applies to the functions which removes this patch.
I can put a comment here to clarify what this code is doing ;)
AFAIK in linux, self-documenting code is preferred over comments.
Cheers.
Signature · 1 line
Felipe Contreras
Re: [PATCHv4 4/4] DSPBRIDGE: Improved mapped memory cleanup
Hi Felipe,
Quoted 10 lines · Contreras Felipe (Nokia-D/Helsinki)
Quoted 6 lines · Ameya Palande
Quoted 2 lines · Fernando
What do you think about it?
Instead of removingDRV_InsertDMMResElementmake it an inline function with your code inside:Making
DRV_InsertDMMResElementinline doesn't make sense since we are not calling it multiple times.I agree with Fernando; the code would be more readable. Even more if we rename the function to
instert_map_element().
I guess the issue is about why this code is doing it rather than the readability of code. I have sent V5 of the patchset with comment explaining the purpose of doing this.
If you think that by creating a new static inline function like insert_map_element(), we can understand it better then following comment also does the same thing:
/* Following code inserts a map element ... and explain why */
Anyways insert_map_element() function doesn't explain why it is required :(
Cheers,
Ameya.
RE: [PATCHv4 2/4] DSPBRIDGE: New reserved memory accounting framework
In reply to Ameya PalandeHi,
Quoted 279 lines
-----Original Message-----
From: Ameya Palande [mailto:[email protected]]
Sent: Wednesday, February 17, 2010 12:06 PM
To: [email protected]
Cc: [email protected]; Menon, Nishanth; Chitriki Rudramuni, Deepak; Guzman Lugo, Fernando; Ramirez Luna, Omar
Subject: [PATCHv4 2/4] DSPBRIDGE: New reserved memory accounting framework
DSP_RSV_OBJECTis introduced to track reserved memory accounting information.
This will allow us to do proper cleanup for memory reserved usingPROC_ReserveMemory().Signed-off-by Ameya Palande <[email protected]>---
arch/arm/plat-omap/include/dspbridge/drv.h | 10 +++++ arch/arm/plat-omap/include/dspbridge/proc.h | 4 +- drivers/dsp/bridge/pmgr/wcd.c | 7 ++-- drivers/dsp/bridge/rmgr/drv.c | 18 ++++++---- drivers/dsp/bridge/rmgr/drv_interface.c | 2 + drivers/dsp/bridge/rmgr/node.c | 5 ++- drivers/dsp/bridge/rmgr/proc.c | 52 +++++++++++++++++++++-- ---- 7 files changed, 73 insertions(+), 25 deletions(-)arch/arm/plat- renamed from arch/arm/plat-omap/include/dspbridge/drv.h +0
-0
omap/include/dspbridge/drv.h
index d5f5277..f7d0e3e 100644arch/arm/plat-omap/include/dspbridge/drv.h +6
-0@@ -101,6 +101,12 @@ struct DMM_MAP_OBJECT {struct DMM_MAP_OBJECT *next; } ; +/* Used for DMM reserved memory accounting */ +struct DMM_RSV_OBJECT { +struct list_head link; +u32 dsp_reserved_addr; +}; +/* New structure (member of process context) abstracts DMM resource info */ struct DSPHEAP_RES_OBJECT {s32 heapAllocated; /* DMM status */
arch/arm/plat-omap/include/dspbridge/drv.h +4
-0@@ -143,6 +149,10 @@ struct PROCESS_CONTEXT{struct DMM_MAP_OBJECT *dmm_map_list;struct mutex dmm_map_mutex; +/* DMM reserved memory resources */ +struct list_head dmm_rsv_list; +spinlock_t dmm_rsv_lock; +/* DSP Heap resources */ struct DSPHEAP_RES_OBJECT *pDSPHEAPList;arch/arm/plat- renamed from arch/arm/plat-omap/include/dspbridge/proc.h +0
-0
omap/include/dspbridge/proc.h
index 8dbdaac..1ffe763 100644arch/arm/plat-omap/include/dspbridge/proc.h +2
-2@@ -560,7 +560,7 @@* Details: */ extern DSP_STATUS PROC_ReserveMemory (DSP_HPROCESSOR hProcessor, -u32 ulSize,void **ppRsvAddr); +u32 ulSize,void **ppRsvAddr,struct PROCESS_CONTEXT *pr_ctxt);/* * ======== PROC_UnMap ======== @@ -604,6 +604,6 @@* Details: */ extern DSP_STATUS PROC_UnReserveMemory (DSP_HPROCESSOR hProcessor, -void *pRsvAddr); +void *pRsvAddr,struct PROCESS_CONTEXT *pr_ctxt);#endif /* PROC_ */ drivers/dsp/bridge/pmgr/wcd.c +3
-2@@ -1054,12 +1054,13 @@ u32 PROCWRAP_ReserveMemory(union Trapped_Args *args, void *pr_ctxt)GT_0trace (WCD_debugMask,GT_ENTER ,"PROCWRAP_ReserveMemory: entered\n"); status =PROC_ReserveMemory (args->ARGS_PROC_RSVMEM.hProcessor, - args->ARGS_PROC_RSVMEM.ulSize, &pRsvAddr); + args->ARGS_PROC_RSVMEM.ulSize, &pRsvAddr, + pr_ctxt);if (DSP_SUCCEEDED (status)) {if (put_user (pRsvAddr, args->ARGS_PROC_RSVMEM.ppRsvAddr)) { status =DSP_EINVALIDARG ;PROC_UnReserveMemory (args->ARGS_PROC_RSVMEM.hProcessor, - pRsvAddr); + pRsvAddr, pr_ctxt); }} return status;drivers/dsp/bridge/pmgr/wcd.c +1
-1@@ -1100,7 +1101,7 @@ u32 PROCWRAP_UnReserveMemory(union Trapped_Args *args, void *pr_ctxt)GT_0trace (WCD_debugMask,GT_ENTER ,"PROCWRAP_UnReserveMemory: entered\n" ); status =PROC_UnReserveMemory (args->ARGS_PROC_UNRSVMEM.hProcessor, - args->ARGS_PROC_UNRSVMEM.pRsvAddr); + args->ARGS_PROC_UNRSVMEM.pRsvAddr, pr_ctxt);return status; }drivers/dsp/bridge/rmgr/drv.c +11
-7@@ -298,25 +298,20 @@ DSP_STATUS DRV_ProcFreeDMMRes(HANDLE hPCtxt)if (DSP_FAILED (status))pr_debug ("%s: PROC_UnMap failed! status =" " 0x%xn" , __func__, status); - status =PROC_UnReserveMemory (pDMMRes->hProcessor, - (void *)pDMMRes->ulDSPResAddr); -if (DSP_FAILED (status)) -pr_debug ("%s: PROC_UnReserveMemory failed!" -" status = 0x%xn" , __func__, status); pDMMRes->dmmAllocated =0 ; } }return status; } -/* Release all DMM resources and its context -* This is called from .bridge_release. */ +/* Release all Mapped and Reserved DMM resources */ DSP_STATUS DRV_RemoveAllDMMResElements (HANDLE hPCtxt) {struct PROCESS_CONTEXT *pCtxt = (struct PROCESS_CONTEXT *)hPCtxt;DSP_STATUS status =DSP_SOK ;struct DMM_MAP_OBJECT *pTempDMMRes2 =NULL ;struct DMM_MAP_OBJECT *pTempDMMRes =NULL ; +struct DMM_RSV_OBJECT *temp, *rsv_obj;DRV_ProcFreeDMMRes (pCtxt); pTempDMMRes = pCtxt->dmm_map_list;@@ -326,6 +321,15 @@ DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE hPCtxt)kfree (pTempDMMRes2); } pCtxt->dmm_map_list =NULL ; + +/* Free DMM reserved memory resources */ +list_for_each_entry_safe (rsv_obj, temp, &pCtxt->dmm_rsv_list, link) { + status =PROC_UnReserveMemory (pCtxt->hProcessor, + (void *)rsv_obj->dsp_reserved_addr, pCtxt); +if (DSP_FAILED (status)) +pr_err ("%s: PROC_UnReserveMemory failed!" +" status = 0x%xn" , __func__, status); + }return status; }drivers/dsp/bridge/rmgr/drv_interface.c +2
-0@@ -500,6 +500,8 @@ static int bridge_open(struct inode *ip, struct file *filp)if (pr_ctxt) { pr_ctxt->resState =PROC_RES_ALLOCATED ;mutex_init (&pr_ctxt->dmm_map_mutex); +spin_lock_init (&pr_ctxt->dmm_rsv_lock); +INIT_LIST_HEAD (&pr_ctxt->dmm_rsv_list);mutex_init (&pr_ctxt->node_mutex);mutex_init (&pr_ctxt->strm_mutex);} else {drivers/dsp/bridge/rmgr/node.c +1
-1@@ -454,7 +454,7 @@ DSP_STATUS NODE_Allocate(struct PROC_OBJECT *hProcessor, status =PROC_ReserveMemory (hProcessor, pNode->createArgs.asa.taskArgs.uHeapSize +PAGE_SIZE , (void **)&(pNode->createArgs.asa.taskArgs. - uDSPHeapResAddr)); + uDSPHeapResAddr), pr_ctxt);if (DSP_FAILED (status)) { GT_1trace(NODE_debugMask, GT_5CLASS,"NODE_Allocate:Failed to reserve "
drivers/dsp/bridge/rmgr/node.c +2
-1@@ -2726,7 +2726,8 @@ static void DeleteNode(struct NODE_OBJECT *hNode, " Status = 0x%x\n", (u32)status); } status =PROC_UnReserveMemory (hNode->hProcessor, - (void *)taskArgs.uDSPHeapResAddr); + (void *)taskArgs.uDSPHeapResAddr, + pr_ctxt);if (DSP_SUCCEEDED (status)) {GT_0trace (NODE_debugMask,GT_5CLASS , "DSPProcessor_UnReserveMemory "drivers/dsp/bridge/rmgr/proc.c +18
-4@@ -1431,11 +1431,12 @@ func_end:* Reserve a virtually contiguous region of DSP address space. */ DSP_STATUS PROC_ReserveMemory (DSP_HPROCESSOR hProcessor,u32 ulSize, -void **ppRsvAddr) +void **ppRsvAddr,struct PROCESS_CONTEXT *pr_ctxt) {struct DMM_OBJECT *hDmmMgr;DSP_STATUS status =DSP_SOK ;struct PROC_OBJECT *pProcObject = (struct PROC_OBJECT *)hProcessor; +struct DMM_RSV_OBJECT *rsv_obj;GT_3trace (PROC_DebugMask,GT_ENTER , "Entered PROC_ReserveMemory, args:\n\t"@@ -1447,16 +1448,29 @@ DSP_STATUS PROC_ReserveMemory(DSP_HPROCESSOR hProcessor, u32 ulSize, "InValid Processor Handle \n"); goto func_end; } + status =DMM_GetHandle (pProcObject, &hDmmMgr);if (DSP_FAILED (status)) {GT_1trace (PROC_DebugMask,GT_7CLASS ,"PROC_ReserveMemory: " "Failed to get DMM Mgr handle: 0x%x\n" , status); - }else - status =DMM_ReserveMemory (hDmmMgr, ulSize, (u32 *)ppRsvAddr); + goto func_end; + } + + status =DMM_ReserveMemory (hDmmMgr, ulSize, (u32 *)ppRsvAddr); +if (status !=DSP_SOK ) + goto func_end; + + rsv_obj =kmalloc (sizeof (struct DMM_RSV_OBJECT ),GFP_KERNEL ); +if (rsv_obj) { + rsv_obj->dsp_reserved_addr = (u32) *ppRsvAddr; +spin_lock (&pr_ctxt->dmm_rsv_lock); +list_add (&rsv_obj->link, &pr_ctxt->dmm_rsv_list); +spin_unlock (&pr_ctxt->dmm_rsv_lock); + } +func_end: GT_1trace(PROC_DebugMask, GT_ENTER, "Leaving PROC_ReserveMemory [0x%x]", status); -func_end:return status;}
drivers/dsp/bridge/rmgr/proc.c +5
-3@@ -1705,11 +1719,13 @@ func_end:* Purpose: * Frees a previously reserved region of DSP address space. */ -DSP_STATUS PROC_UnReserveMemory (DSP_HPROCESSOR hProcessor,void *pRsvAddr) +DSP_STATUS PROC_UnReserveMemory (DSP_HPROCESSOR hProcessor,void *pRsvAddr, +struct PROCESS_CONTEXT *pr_ctxt) {struct DMM_OBJECT *hDmmMgr;DSP_STATUS status =DSP_SOK ;struct PROC_OBJECT *pProcObject = (struct PROC_OBJECT *)hProcessor; +struct DMM_RSV_OBJECT *temp, *rsv_obj;GT_2trace (PROC_DebugMask,GT_ENTER , "Entered PROC_UnReserveMemory, args:\n\t"@@ -1720,18 +1736,32 @@ DSP_STATUS PROC_UnReserveMemory(DSP_HPROCESSOR hProcessor, void *pRsvAddr) "InValid Processor Handle \n"); goto func_end; } + status =DMM_GetHandle (pProcObject, &hDmmMgr); -if (DSP_FAILED (status)) +if (DSP_FAILED (status)) {GT_1trace (PROC_DebugMask,GT_7CLASS ,"PROC_UnReserveMemory: Failed to get DMM Mgr " "handle: 0x%x\n" , status); -else
drivers/dsp/bridge/rmgr/proc.c DSP_STATUS PROC_UnReserveMemory(DSP_HPROCESSOR · line 1754
Quoted 10 lines
drivers/dsp/bridge/rmgr/proc.c +9
-1- status =DMM_UnReserveMemory (hDmmMgr, (u32 ) pRsvAddr); + goto func_end; + } + + status =DMM_UnReserveMemory (hDmmMgr, (u32 ) pRsvAddr); +if (status !=DSP_SOK ) + goto func_end; + +spin_lock (&pr_ctxt->dmm_rsv_lock); +list_for_each_entry_safe (rsv_obj, temp, &pr_ctxt->dmm_rsv_list, link)
list_for_each_entry_safe is used when you delete a element from the list and continue but this is not the case. You should use list_for_each_entry instead, which has simpler logic and we can get ride of temp variable.
Regards,
Fernando.
Quoted 20 lines
drivers/dsp/bridge/rmgr/proc.c +7
-3{ +if (rsv_obj->dsp_reserved_addr == (u32 )pRsvAddr) { +list_del (&rsv_obj->link); +kfree (rsv_obj); +break ; + } + } +spin_unlock (&pr_ctxt->dmm_rsv_lock); -GT_1trace (PROC_DebugMask,GT_ENTER , -"Leaving PROC_UnReserveMemory [0x%x]" , - status);
func_end:drivers/dsp/bridge/rmgr/proc.c +2
-0+GT_1trace (PROC_DebugMask,GT_ENTER , +"Leaving PROC_UnReserveMemory [0x%x]" , status);return status; }--
1.6.3.3
RE: [PATCHv4 2/4] DSPBRIDGE: New reserved memory accounting framework
Hi Fernando,
Quoted 34 lines · Fernando
Hi,
Quoted 32 lines
-----Original Message-----
From: Ameya Palande [mailto:[email protected]]
Sent: Wednesday, February 17, 2010 12:06 PM
To: [email protected]
Cc: [email protected]; Menon, Nishanth; Chitriki Rudramuni, Deepak; Guzman Lugo, Fernando; Ramirez Luna, Omar
Subject: [PATCHv4 2/4] DSPBRIDGE: New reserved memory accounting framework
DSP_RSV_OBJECTis introduced to track reserved memory accounting information.
This will allow us to do proper cleanup for memory reserved usingPROC_ReserveMemory().Signed-off-by Ameya Palande <[email protected]>---
drivers/dsp/bridge/rmgr/proc.c +5
-3@@ -1720,18 +1736,32 @@ DSP_STATUS PROC_UnReserveMemory(DSP_HPROCESSOR hProcessor, void *pRsvAddr) "InValid Processor Handle \n"); goto func_end; } + status =DMM_GetHandle (pProcObject, &hDmmMgr); -if (DSP_FAILED (status)) +if (DSP_FAILED (status)) {GT_1trace (PROC_DebugMask,GT_7CLASS ,"PROC_UnReserveMemory: Failed to get DMM Mgr " "handle: 0x%x\n" , status); -else - status =DMM_UnReserveMemory (hDmmMgr, (u32 ) pRsvAddr); + goto func_end; + } +
Quoted 8 lines
drivers/dsp/bridge/rmgr/proc.c DSP_STATUS PROC_UnReserveMemory(DSP_HPROCESSOR hProcessor, void *pRsvAddr)
Quoted 6 lines
drivers/dsp/bridge/rmgr/proc.c +6
-0+ status =DMM_UnReserveMemory (hDmmMgr, (u32 ) pRsvAddr); +if (status !=DSP_SOK ) + goto func_end; + +spin_lock (&pr_ctxt->dmm_rsv_lock); +list_for_each_entry_safe (rsv_obj, temp, &pr_ctxt->dmm_rsv_list, link)
list_for_each_entry_safeis used when you delete a element from the list and continue but this is not the case. You should uselist_for_each_entryinstead, which has simpler logic and we can get ride of temp variable.
Thanks! V5 should take care of this :)
Cheers,
Ameya.