DSPBRIDGE: Improved reserved memory cleanup
Subsystems (2)
v2 cover DSPBRIDGE: Improved reserved memory 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.
v2: Addresses following comments about reducing indentation
http://marc.info/?l=linux-omap&m=126624982331523&w=2
Ameya Palande (2):
DSPBRIDGE: Rename DMM_RES_OBJECT to DMM_MAP_OBJECT
DSPBRIDGE: New reserved memory accounting framework
arch/arm/plat-omap/include/dspbridge/drv.h | 25 ++++++-- arch/arm/plat-omap/include/dspbridge/proc.h | 5 +- drivers/dsp/bridge/pmgr/dmm.c | 3 +- drivers/dsp/bridge/pmgr/wcd.c | 7 +- drivers/dsp/bridge/rmgr/drv.c | 84 ++++++++++++++++----------- drivers/dsp/bridge/rmgr/drv_interface.c | 7 ++- drivers/dsp/bridge/rmgr/node.c | 5 +- drivers/dsp/bridge/rmgr/proc.c | 58 +++++++++++++++---- 8 files changed, 132 insertions(+), 62 deletions(-)
PATCH v2 1/2 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 | 12 +++--- drivers/dsp/bridge/rmgr/drv.c | 57 ++++++++++++++-------------- 2 files changed, 35 insertions(+), 34 deletions(-)
arch/arm/plat-omap/include/dspbridge/drv.h +6 -6
@@ -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 { +/* New structure (member of process context) abstracts DMM mapped memory 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 */
@@ -138,8 +138,8 @@ struct PROCESS_CONTEXT{/* DSP Node resources */ struct NODE_RES_OBJECT *pNodeList; -/* DMM resources */ -struct DMM_RES_OBJECT *pDMMList; +/* DMM mapped memory resources */ +struct DMM_MAP_OBJECT *dmm_map_list;/* DSP Heap resources */ struct DSPHEAP_RES_OBJECT *pDSPHEAPList;
drivers/dsp/bridge/rmgr/drv.c +29 -28
135 lines not on this page · raw message
Signature · 1 line
1.6.3.3
PATCH v2 2/2 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 | 13 ++++++ arch/arm/plat-omap/include/dspbridge/proc.h | 5 +- drivers/dsp/bridge/pmgr/dmm.c | 3 +- drivers/dsp/bridge/pmgr/wcd.c | 7 ++- drivers/dsp/bridge/rmgr/drv.c | 27 +++++++++--- drivers/dsp/bridge/rmgr/drv_interface.c | 7 ++- drivers/dsp/bridge/rmgr/node.c | 5 +- drivers/dsp/bridge/rmgr/proc.c | 58 +++++++++++++++++++++----- 8 files changed, 97 insertions(+), 28 deletions(-)
arch/arm/plat-omap/include/dspbridge/drv.h +13 -0
@@ -101,6 +101,15 @@ struct DMM_MAP_OBJECT {struct DMM_MAP_OBJECT *next; } ; +/* +* New structure (member of process context) used for accounting of DMM +* reserved memory information +*/ +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 */
@@ -141,6 +150,10 @@ struct PROCESS_CONTEXT{/* DMM mapped memory resources */ struct DMM_MAP_OBJECT *dmm_map_list; +/* DMM reserved memory resources */ +struct list_head dmm_rsv_list; +spinlock_t dmm_rsv_list_lock; +/* DSP Heap resources */ struct DSPHEAP_RES_OBJECT *pDSPHEAPList;
arch/arm/plat-omap/include/dspbridge/proc.h +3 -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,7 @@* Details: */ extern DSP_STATUS PROC_UnReserveMemory (DSP_HPROCESSOR hProcessor, -void *pRsvAddr); +void *pRsvAddr,struct PROCESS_CONTEXT *pr_ctxt, +int cleanup);#endif /* PROC_ */
drivers/dsp/bridge/pmgr/dmm.c +2 -1
@@ -386,9 +386,10 @@ DSP_STATUS DMM_ReserveMemory(struct DMM_OBJECT *hDmmMgr, u32 size, node->MappedSize =0 ;/* Return the chunk's starting address */ *pRsvAddr = rsvAddr; - }else + }else {/*dSP chunk of given size is not available */ status =DSP_EMEMORY ; + }SYNC_LeaveCS (pDmmObj->hDmmLock); GT_3trace(DMM_debugMask, GT_4CLASS,
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,1 ); } }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,1 );return status; }
drivers/dsp/bridge/rmgr/drv.c +20 -7
@@ -277,25 +277,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;
@@ -305,6 +300,24 @@ DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE hPCtxt)kfree (pTempDMMRes2); } pCtxt->dmm_map_list =NULL ; + +/* Free DMM reserved memory resources */ +spin_lock (&pCtxt->dmm_rsv_list_lock); +list_for_each_entry_safe (rsv_obj, temp, &pCtxt->dmm_rsv_list, link) { +/* +* Since we have already acquired spin lock for dmm_rsv_list, +* we don't want to perform cleanup in PROC_UnReserveMemory. +*/ + status =PROC_UnReserveMemory (pCtxt->hProcessor, + (void *)rsv_obj->dsp_reserved_addr, pCtxt,0 ); +if (DSP_FAILED (status)) +pr_err ("%s: PROC_UnReserveMemory failed!" +" status = 0x%xn" , __func__, status); +list_del (&rsv_obj->link); +kfree (rsv_obj); + } +spin_unlock (&pCtxt->dmm_rsv_list_lock); +return status; }
drivers/dsp/bridge/rmgr/drv_interface.c +5 -2
@@ -497,10 +497,13 @@ static int bridge_open(struct inode *ip, struct file *filp)* process context list. */ pr_ctxt =MEM_Calloc (sizeof (struct PROCESS_CONTEXT ),MEM_PAGED ); -if (pr_ctxt) +if (pr_ctxt) { pr_ctxt->resState =PROC_RES_ALLOCATED ; -else +spin_lock_init (&pr_ctxt->dmm_rsv_list_lock); +INIT_LIST_HEAD (&pr_ctxt->dmm_rsv_list); + }else { status = -ENOMEM ; + } filp->private_data = pr_ctxt;
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,1 );if (DSP_SUCCEEDED (status)) {GT_0trace (NODE_debugMask,GT_5CLASS , "DSPProcessor_UnReserveMemory "
drivers/dsp/bridge/rmgr/proc.c +47 -11
103 lines not on this page · raw message
Signature · 1 line
1.6.3.3
Re: [PATCH 2/2] DSPBRIDGE: New reserved memory accounting framework
Quoted 37 lines · Ameya Palande
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 | 13 ++++++arch/arm/plat-omap/include/dspbridge/proc.h| 5 +-drivers/dsp/bridge/pmgr/dmm.c | 3 +- drivers/dsp/bridge/pmgr/wcd.c | 7 ++- drivers/dsp/bridge/rmgr/drv.c | 27 +++++++++--- drivers/dsp/bridge/rmgr/drv_interface.c | 7 ++- drivers/dsp/bridge/rmgr/node.c | 5 +- drivers/dsp/bridge/rmgr/proc.c | 58 +++++++++++++++++++++----- 8 files changed, 97 insertions(+), 28 deletions(-)arch/arm/plat-omap/include/dspbridge/drv.h +9
-0@@ -101,6 +101,15 @@ struct DMM_MAP_OBJECT { struct DMM_MAP_OBJECT *next; } ; +/* +* New structure (member of process context) used for accounting of DMM +* reserved memory information +*/ +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 struct PROCESS_CONTEXT{ · line 156
Quoted 7 lines
arch/arm/plat-omap/include/dspbridge/drv.h +4
-0@@ -141,6 +150,10 @@ struct PROCESS_CONTEXT{ /* DMM mapped memory resources */ struct DMM_MAP_OBJECT *dmm_map_list; + /* DMM reserved memory resources */ + struct list_head dmm_rsv_list; + spinlock_t dmm_rsv_list_lock; +
Why rsv requires a spinlock, but not map?
I guess it would be needed if somehow PROC_UnReserveMemory() was called by user-space at the same time than bridge_close, but is that really possible? If it is, then the same danger is present with PROC_UnMap() unless I'm missing something.
Quoted 104 lines
arch/arm/plat-omap/include/dspbridge/drv.h +0
-0/* DSP Heap resources */ struct DSPHEAP_RES_OBJECT *pDSPHEAPList;arch/arm/plat-omap/include/dspbridge/proc.h +3
-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,7 @@* Details: */ extern DSP_STATUS PROC_UnReserveMemory(DSP_HPROCESSOR hProcessor, - void *pRsvAddr); + void *pRsvAddr, struct PROCESS_CONTEXT *pr_ctxt, + int cleanup); #endif /* PROC_ */drivers/dsp/bridge/pmgr/dmm.c +2
-1@@ -386,9 +386,10 @@ DSP_STATUS DMM_ReserveMemory(struct DMM_OBJECT *hDmmMgr, u32 size, node->MappedSize = 0; /* Return the chunk's starting address */ *pRsvAddr = rsvAddr; - } else + } else { /*dSP chunk of given size is not available */ status = DSP_EMEMORY; + } SYNC_LeaveCS(pDmmObj->hDmmLock); GT_3trace(DMM_debugMask, GT_4CLASS,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, 1); } } 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, 1); return status; }drivers/dsp/bridge/rmgr/drv.c +0
-0@@ -277,25 +277,20 @@ DSP_STATUS DRV_ProcFreeDMMRes(HANDLE hPCtxt) if (DSP_FAILED(status))pr_debug("%s:
PROC_UnMapfailed! status =" " 0x%xn",__func__, status);
- status = PROC_UnReserveMemory(pDMMRes->hProcessor,
- (void *)pDMMRes->ulDSPResAddr);
- if (DSP_FAILED(status))
- pr_debug("%s:PROC_UnReserveMemoryfailed!"
- " status = 0x%xn",__func__, status);pDMMRes->dmmAllocated= 0;
}
}
return status;
}drivers/dsp/bridge/rmgr/drv.c +1
-2-/* 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)
{
structPROCESS_CONTEXT*pCtxt = (structPROCESS_CONTEXT*)hPCtxt;DSP_STATUSstatus =DSP_SOK;
structDMM_MAP_OBJECT*pTempDMMRes2 = NULL;
structDMM_MAP_OBJECT*pTempDMMRes = NULL;
+ structDMM_RSV_OBJECT*temp,*rsv_obj;DRV_ProcFreeDMMRes(pCtxt);
pTempDMMRes =pCtxt->dmm_map_list;drivers/dsp/bridge/rmgr/drv.c +0
-0@@ -305,6 +300,24 @@ DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE hPCtxt) kfree(pTempDMMRes2);
drivers/dsp/bridge/rmgr/drv.c DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE hPCtxt) · line 310
Quoted 10 lines
drivers/dsp/bridge/rmgr/drv.c +8
-0} pCtxt->dmm_map_list = NULL; + + /* Free DMM reserved memory resources */ + spin_lock(&pCtxt->dmm_rsv_list_lock); + list_for_each_entry_safe(rsv_obj, temp, &pCtxt->dmm_rsv_list, link) { + /* +* Since we have already acquired spin lock for dmm_rsv_list, +* we don't want to perform cleanup in PROC_UnReserveMemory. +*/
Sure, but why did we acquire a spin lock in the first place?
drivers/dsp/bridge/rmgr/drv.c DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE hPCtxt) · line 312
Quoted 2 lines
drivers/dsp/bridge/rmgr/drv.c +2
-0+ status = PROC_UnReserveMemory(pCtxt->hProcessor, + (void *)rsv_obj->dsp_reserved_addr, pCtxt, 0);
If this behaved similarly to the unmap code, then 'cleanup' could be one and there wouldn't be any need to manually remove the entries.
drivers/dsp/bridge/rmgr/drv.c DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE hPCtxt) · line 322
Quoted 10 lines
drivers/dsp/bridge/rmgr/drv.c +8
-0+ if (DSP_FAILED(status)) + pr_err("%s: PROC_UnReserveMemory failed!" + " status = 0x%xn", __func__, status); + list_del(&rsv_obj->link); + kfree(rsv_obj); + } + spin_unlock(&pCtxt->dmm_rsv_list_lock); + return status; }
Cheers.
Signature · 5 lines
Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [PATCH 2/2] DSPBRIDGE: New reserved memory accounting framework
Hi,
Quoted 63 lines
-----Original Message-----
From: Felipe Contreras [mailto:[email protected]]
Sent: Tuesday, February 16, 2010 12:43 PM
To: Ameya Palande
Cc: [email protected]; [email protected]; Menon, Nishanth; Chitriki Rudramuni, Deepak; Ramirez Luna, Omar; Guzman Lugo, Fernando
Subject: Re: [PATCH 2/2] DSPBRIDGE: New reserved memory accounting frameworkQuoted 1 line · Ameya Palande
DSP_RSV_OBJECTis introduced to track reserved memory accountinginformation.
Quoted 7 lines
This will allow us to do proper cleanup for memory reserved using
PROC_ReserveMemory().Signed-off-by Ameya Palande <[email protected]>---
arch/arm/plat-omap/include/dspbridge/drv.h | 13 ++++++arch/arm/plat-omap/include/dspbridge/proc.h| 5 +-Quoted 6 lines
drivers/dsp/bridge/pmgr/dmm.c | 3 +- drivers/dsp/bridge/pmgr/wcd.c | 7 ++- drivers/dsp/bridge/rmgr/drv.c | 27 +++++++++---drivers/dsp/bridge/rmgr/drv_interface.c | 7 ++-
drivers/dsp/bridge/rmgr/node.c| 5 +-drivers/dsp/bridge/rmgr/proc.c| 58+++++++++++++++++++++-----
arch/arm/plat-
Quoted 3 lines
8 files changed, 97 insertions(+), 28 deletions(-)arch/arm/plat- renamed from arch/arm/plat-omap/include/dspbridge/drv.h +0
-0
omap/include/dspbridge/drv.hQuoted 7 lines
index 3069e74..6e8187d 100644
arch/arm/plat-omap/include/dspbridge/drv.h +0
-0@@ -101,6 +101,15 @@ struct DMM_MAP_OBJECT { struct DMM_MAP_OBJECT *next; } ;arch/arm/plat-omap/include/dspbridge/drv.h struct DMM_MAP_OBJECT { · line 113
Quoted 10 lines
arch/arm/plat-omap/include/dspbridge/drv.h +9
-0+/* +* New structure (member of process context) used for accounting of DMM +* reserved memory information +*/ +struct DMM_RSV_OBJECT { + struct list_head link; + u32 dsp_reserved_addr; +}; + /* New structure (member of process context) abstracts DMM resource info*/
arch/arm/plat-omap/include/dspbridge/drv.h struct PROCESS_CONTEXT{ · line 156
Quoted 10 lines
arch/arm/plat-omap/include/dspbridge/drv.h +0
-0struct DSPHEAP_RES_OBJECT {s32 heapAllocated; /* DMM status */
arch/arm/plat-omap/include/dspbridge/drv.h +4
-0@@ -141,6 +150,10 @@ struct PROCESS_CONTEXT{ /* DMM mapped memory resources */ struct DMM_MAP_OBJECT *dmm_map_list; + /* DMM reserved memory resources */ + struct list_head dmm_rsv_list; + spinlock_t dmm_rsv_list_lock; +Why rsv requires a spinlock, but not map?
Quoted 4 lines
I guess it would be needed if somehow
PROC_UnReserveMemory()was called by user-space at the same time thanbridge_close, but is that really possible? If it is, then the same danger is present withPROC_UnMap()unless I'm missing something.
No, that's not possible. However protection is still needed for PROC_ ReserveMemory/UnReserveMemory and also for PROC_Map/UnMap.
Regards,
Fernando.
Quoted 159 lines
arch/arm/plat-
Quoted 5 lines
arch/arm/plat-omap/include/dspbridge/drv.h +0
-0/* 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.harch/arm/plat-omap/include/dspbridge/proc.h line 563
Quoted 8 lines
index 8dbdaac..558c053 100644
arch/arm/plat-omap/include/dspbridge/proc.h +0
-1@@ -560,7 +560,7 @@* Details: */ extern DSP_STATUS PROC_ReserveMemory(DSP_HPROCESSOR hProcessor, - u32 ulSize, void**ppRsvAddr);
arch/arm/plat-omap/include/dspbridge/proc.h line 563
Quoted 1 line
arch/arm/plat-omap/include/dspbridge/proc.h +1
-0+ u32 ulSize, void **ppRsvAddr, struct PROCESS_CONTEXT
*pr_ctxt);Review
Quoted 13 lines
arch/arm/plat-omap/include/dspbridge/proc.h +2
-1/** ======== PROC_UnMap ======== @@ -604,6 +604,7 @@* Details: */ extern DSP_STATUS PROC_UnReserveMemory(DSP_HPROCESSOR hProcessor, - void *pRsvAddr); + void *pRsvAddr, struct PROCESS_CONTEXT *pr_ctxt, + int cleanup); #endif /* PROC_ */(quoted diff) +0
-0
b/drivers/dsp/bridge/pmgr/dmm.cdrivers/dsp/bridge/pmgr/dmm.c DSP_STATUS DMM_ReserveMemory(struct DMM_OBJECT
Quoted 4 lines
index d5a7275..72aee60 100644
drivers/dsp/bridge/pmgr/dmm.c +0
-0@@ -386,9 +386,10 @@ DSP_STATUS DMM_ReserveMemory(struct DMM_OBJECT*hDmmMgr, u32 size,
Review
Quoted 12 lines
drivers/dsp/bridge/pmgr/dmm.c +2
-1node->MappedSize = 0; /* Return the chunk's starting address */ *pRsvAddr = rsvAddr; - } else + } else { /*dSP chunk of given size is not available */ status = DSP_EMEMORY; + } SYNC_LeaveCS(pDmmObj->hDmmLock); GT_3trace(DMM_debugMask, GT_4CLASS,(quoted diff) +0
-0
b/drivers/dsp/bridge/pmgr/wcd.cdrivers/dsp/bridge/pmgr/wcd.c u32 PROCWRAP_ReserveMemory(union Trapped_Args
Quoted 4 lines
index beea23b..747d069 100644
drivers/dsp/bridge/pmgr/wcd.c +0
-0@@ -1054,12 +1054,13 @@ u32 PROCWRAP_ReserveMemory(union Trapped_Args*args, void
*pr_ctxt)Quoted 2 lines
GT_0trace(WCD_debugMask,
GT_ENTER, "PROCWRAP_ReserveMemory:entered\n");
Quoted 2 lines
status = PROC_ReserveMemory(args->ARGS_PROC_RSVMEM.hProcessor,
- args->ARGS_PROC_RSVMEM.ulSize,&pRsvAddr);
Quoted 1 line
+ args->ARGS_PROC_RSVMEM.ulSize,
&pRsvAddr,
Quoted 3 lines
+ pr_ctxt);
if (DSP_SUCCEEDED(status)) {
if (put_user(pRsvAddr, args->ARGS_PROC_RSVMEM.ppRsvAddr)){
drivers/dsp/bridge/pmgr/wcd.c u32 PROCWRAP_UnReserveMemory(union Trapped_Args
Quoted 9 lines
status =
DSP_EINVALIDARG; PROC_UnReserveMemory(args- ARGS_PROC_RSVMEM.hProcessor,
- pRsvAddr);
+ pRsvAddr,pr_ctxt, 1); }
}
return status;drivers/dsp/bridge/pmgr/wcd.c +0
-0@@ -1100,7 +1101,7 @@ u32 PROCWRAP_UnReserveMemory(union Trapped_Args*args, void
*pr_ctxt)Review
Quoted 9 lines
drivers/dsp/bridge/pmgr/wcd.c +1
-1GT_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, 1); return status; }(quoted diff) +0
-0
b/drivers/dsp/bridge/rmgr/drv.cQuoted 7 lines
index 3dc38d0..9d5c077 100644
drivers/dsp/bridge/rmgr/drv.c +0
-0@@ -277,25 +277,20 @@ DSP_STATUS DRV_ProcFreeDMMRes(HANDLE hPCtxt) if (DSP_FAILED(status))pr_debug("%s:
PROC_UnMapfailed! status =" " 0x%xn",__func__,status);
Quoted 5 lines
- status = PROC_UnReserveMemory(pDMMRes- hProcessor,
- (void *)pDMMRes->ulDSPResAddr);
- if (DSP_FAILED(status))
- pr_debug("%s:PROC_UnReserveMemoryfailed!"
Quoted 1 line
- " status = 0x%xn",
__func__,status);
drivers/dsp/bridge/rmgr/drv.c DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE
Quoted 20 lines
pDMMRes->dmmAllocated = 0;
}
}
return status;
}drivers/dsp/bridge/rmgr/drv.c +1
-2-/* 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)
{
structPROCESS_CONTEXT*pCtxt = (structPROCESS_CONTEXT*)hPCtxt;DSP_STATUSstatus =DSP_SOK;
structDMM_MAP_OBJECT*pTempDMMRes2 = NULL;
structDMM_MAP_OBJECT*pTempDMMRes = NULL;
+ structDMM_RSV_OBJECT*temp,*rsv_obj;DRV_ProcFreeDMMRes(pCtxt);
pTempDMMRes =pCtxt->dmm_map_list;drivers/dsp/bridge/rmgr/drv.c +0
-0@@ -305,6 +300,24 @@ DSP_STATUS DRV_RemoveAllDMMResElements(HANDLEhPCtxt)
drivers/dsp/bridge/rmgr/drv.c DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE hPCtxt)
Quoted 7 lines
drivers/dsp/bridge/rmgr/drv.c +4
-0kfree(pTempDMMRes2); } pCtxt->dmm_map_list = NULL; + + /* Free DMM reserved memory resources */ + spin_lock(&pCtxt->dmm_rsv_list_lock); + list_for_each_entry_safe(rsv_obj, temp, &pCtxt->dmm_rsv_list,link) {
drivers/dsp/bridge/rmgr/drv.c DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE · line 308
Quoted 2 lines
drivers/dsp/bridge/rmgr/drv.c +2
-0+ /* +* Since we have already acquired spin lock for
dmm_rsv_list,drivers/dsp/bridge/rmgr/drv.c DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE · line 309
Quoted 1 line
drivers/dsp/bridge/rmgr/drv.c +1
-0+ * we don't want to perform cleanup in
PROC_UnReserveMemory.drivers/dsp/bridge/rmgr/drv.c DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE · line 310
Quoted 1 line
drivers/dsp/bridge/rmgr/drv.c +1
-0+*/ Sure, but why did we acquire a spin lock in the first place?
drivers/dsp/bridge/rmgr/drv.c DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE · line 312
Quoted 2 lines
drivers/dsp/bridge/rmgr/drv.c +2
-0+ status = PROC_UnReserveMemory(pCtxt->hProcessor, + (void *)rsv_obj->dsp_reserved_addr,pCtxt, 0);
If this behaved similarly to the unmap code, then 'cleanup' could be one and there wouldn't be any need to manually remove the entries.
drivers/dsp/bridge/rmgr/drv.c DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE hPCtxt)
Quoted 3 lines
drivers/dsp/bridge/rmgr/drv.c +3
-0+ if (DSP_FAILED(status)) + pr_err("%s: PROC_UnReserveMemory failed!" + " status = 0x%xn", __func__,status);
drivers/dsp/bridge/rmgr/drv.c DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE hPCtxt) · line 322
Quoted 7 lines
drivers/dsp/bridge/rmgr/drv.c +5
-0+ list_del(&rsv_obj->link); + kfree(rsv_obj); + } + spin_unlock(&pCtxt->dmm_rsv_list_lock); + return status; }
Quoted 4 lines
Cheers.
--
Felipe Contreras
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] DSPBRIDGE: New reserved memory accounting framework
Quoted 13 lines · Fernando
Quoted 13 lines
arch/arm/plat-omap/include/dspbridge/drv.h struct PROCESS_CONTEXT{ · line 156
Quoted 10 lines
struct
DSPHEAP_RES_OBJECT{
s32 heapAllocated; /* DMM status */arch/arm/plat-omap/include/dspbridge/drv.h +4
-0@@ -141,6 +150,10 @@ struct PROCESS_CONTEXT{ /* DMM mapped memory resources */ struct DMM_MAP_OBJECT *dmm_map_list; + /* DMM reserved memory resources */ + struct list_head dmm_rsv_list; + spinlock_t dmm_rsv_list_lock; +Why rsv requires a spinlock, but not map?
Quoted 6 lines
Quoted 4 lines
I guess it would be needed if somehow
PROC_UnReserveMemory()was called by user-space at the same time thanbridge_close, but is that really possible? If it is, then the same danger is present withPROC_UnMap()unless I'm missing something.No, that's not possible. However protection is still needed for
PROC_ReserveMemory/UnReserveMemory and also for PROC_Map/UnMap.
Ok, then I guess it would make sense to have a patch for DMM_RSV_OBJECT, and another one to add the protection to both PROC_Map/UnMap/Reserve/UnReserve().
Signature · 5 lines
Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [PATCH 2/2] DSPBRIDGE: New reserved memory accounting framework
In reply to Ameya PalandeHi,
Quoted 165 lines
-----Original Message-----
From: Ameya Palande [mailto:[email protected]]
Sent: Tuesday, February 16, 2010 7:20 AM
To: [email protected]
Cc: [email protected]; Menon, Nishanth; Chitriki Rudramuni, Deepak; Ramirez Luna, Omar; Guzman Lugo, Fernando
Subject: [PATCH 2/2] 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 | 13 ++++++ arch/arm/plat-omap/include/dspbridge/proc.h | 5 +- drivers/dsp/bridge/pmgr/dmm.c | 3 +- drivers/dsp/bridge/pmgr/wcd.c | 7 ++- drivers/dsp/bridge/rmgr/drv.c | 27 +++++++++--- drivers/dsp/bridge/rmgr/drv_interface.c | 7 ++- drivers/dsp/bridge/rmgr/node.c | 5 +- drivers/dsp/bridge/rmgr/proc.c | 58 +++++++++++++++++++++-- --- 8 files changed, 97 insertions(+), 28 deletions(-)arch/arm/plat- renamed from arch/arm/plat-omap/include/dspbridge/drv.h +0
-0
omap/include/dspbridge/drv.h
index 3069e74..6e8187d 100644arch/arm/plat-omap/include/dspbridge/drv.h +9
-0@@ -101,6 +101,15 @@ struct DMM_MAP_OBJECT {struct DMM_MAP_OBJECT *next; } ; +/* +* New structure (member of process context) used for accounting of DMM +* reserved memory information +*/ +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@@ -141,6 +150,10 @@ struct PROCESS_CONTEXT{/* DMM mapped memory resources */ struct DMM_MAP_OBJECT *dmm_map_list; +/* DMM reserved memory resources */ +struct list_head dmm_rsv_list; +spinlock_t dmm_rsv_list_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..558c053 100644arch/arm/plat-omap/include/dspbridge/proc.h +3
-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,7 @@* Details: */ extern DSP_STATUS PROC_UnReserveMemory (DSP_HPROCESSOR hProcessor, -void *pRsvAddr); +void *pRsvAddr,struct PROCESS_CONTEXT *pr_ctxt, +int cleanup);#endif /* PROC_ */ drivers/dsp/bridge/pmgr/dmm.c +2
-1@@ -386,9 +386,10 @@ DSP_STATUS DMM_ReserveMemory(struct DMM_OBJECT *hDmmMgr, u32 size, node->MappedSize =0 ;/* Return the chunk's starting address */ *pRsvAddr = rsvAddr; - }else + }else {/*dSP chunk of given size is not available */ status =DSP_EMEMORY ; + }SYNC_LeaveCS (pDmmObj->hDmmLock);GT_3trace(DMM_debugMask,
GT_4CLASS,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,1 ); }} 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,1 );return status; }drivers/dsp/bridge/rmgr/drv.c +2
-7@@ -277,25 +277,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;@@ -305,6 +300,24 @@ DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE hPCtxt)kfree (pTempDMMRes2);
drivers/dsp/bridge/rmgr/drv.c DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE hPCtxt) · line 310
Quoted 10 lines
drivers/dsp/bridge/rmgr/drv.c +8
-0} pCtxt->dmm_map_list =NULL ; + +/* Free DMM reserved memory resources */ +spin_lock (&pCtxt->dmm_rsv_list_lock); +list_for_each_entry_safe (rsv_obj, temp, &pCtxt->dmm_rsv_list, link) { +/* +* Since we have already acquired spin lock for dmm_rsv_list, +* we don't want to perform cleanup in PROC_UnReserveMemory. +*/
DRV_ProcFreeDMMRes is only called from bridge_release and there is no other thread from the same process that can be executed concurrent. It is not needed lock at cleanup time.
After removing the lock, I think you don't need cleanup flag in PROC_UnReserveMemory. Because the cleanup can be done in PROC_UnReserveMemory without problems.
Regards,
Fernando.
Quoted 178 lines
drivers/dsp/bridge/rmgr/drv.c +10
-0+ status =PROC_UnReserveMemory (pCtxt->hProcessor, + (void *)rsv_obj->dsp_reserved_addr, pCtxt,0 ); +if (DSP_FAILED (status)) +pr_err ("%s: PROC_UnReserveMemory failed!" +" status = 0x%xn" , __func__, status); +list_del (&rsv_obj->link); +kfree (rsv_obj); + } +spin_unlock (&pCtxt->dmm_rsv_list_lock); +return status; }drivers/dsp/bridge/rmgr/drv_interface.c +5
-2@@ -497,10 +497,13 @@ static int bridge_open(struct inode *ip, struct file*filp) * process context list. */ pr_ctxt =MEM_Calloc (sizeof (struct PROCESS_CONTEXT ),MEM_PAGED ); -if (pr_ctxt) +if (pr_ctxt) { pr_ctxt->resState =PROC_RES_ALLOCATED ; -else +spin_lock_init (&pr_ctxt->dmm_rsv_list_lock); +INIT_LIST_HEAD (&pr_ctxt->dmm_rsv_list); + }else { status = -ENOMEM ; + } filp->private_data = pr_ctxt;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,1 );if (DSP_SUCCEEDED (status)) {GT_0trace (NODE_debugMask,GT_5CLASS , "DSPProcessor_UnReserveMemory "drivers/dsp/bridge/rmgr/proc.c +18
-4@@ -1430,11 +1430,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"@@ -1446,16 +1447,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_list_lock); +list_add (&rsv_obj->link, &pr_ctxt->dmm_rsv_list); +spin_unlock (&pr_ctxt->dmm_rsv_list_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 +27
-7@@ -1704,11 +1718,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,int cleanup) {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"@@ -1719,18 +1735,38 @@ 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; + } + + status =DMM_UnReserveMemory (hDmmMgr, (u32 ) pRsvAddr); + +/* +* cleanup flag handles the special case when this function +* is called while doing clenaup from +* DRV_RemoveAllDMMResElements +*/ +if (status !=DSP_SOK || !cleanup) + goto func_end; + +spin_lock (&pr_ctxt->dmm_rsv_list_lock); +list_for_each_entry_safe (rsv_obj, temp, &pr_ctxt->dmm_rsv_list, link) { +if (rsv_obj->dsp_reserved_addr == (u32 )pRsvAddr) { +list_del (&rsv_obj->link); +kfree (rsv_obj); +break ; + } + } +spin_unlock (&pr_ctxt->dmm_rsv_list_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: [PATCH 1/2] DSPBRIDGE: Rename DMM_RES_OBJECT to DMM_MAP_OBJECT
In reply to Ameya PalandeQuoted 7 lines · Ameya Palande
In its current state
DMM_RES_OBJECTis not correctly tracking reserve and unreserve but only map and unmap. So lets rename it toDMM_MAP_OBJECTto clarify what it is really doing!In addition to this, this patch also does some trivial code cleanup.
Signed-off-by Ameya Palande <[email protected]>
Signature · 1 line
Felipe Contreras