DSPBRIDGE: Improved reserved memory cleanup
Subsystems (2)
v3 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.
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 (2):
DSPBRIDGE: Rename DMM_RES_OBJECT to DMM_MAP_OBJECT
DSPBRIDGE: New reserved memory accounting framework
arch/arm/plat-omap/include/dspbridge/drv.h | 24 +++++-- arch/arm/plat-omap/include/dspbridge/proc.h | 4 +- drivers/dsp/bridge/pmgr/wcd.c | 7 +- drivers/dsp/bridge/rmgr/drv.c | 87 ++++++++++++++------------- drivers/dsp/bridge/rmgr/drv_interface.c | 4 +- drivers/dsp/bridge/rmgr/node.c | 5 +- drivers/dsp/bridge/rmgr/proc.c | 52 +++++++++++++---- 7 files changed, 116 insertions(+), 67 deletions(-)
PATCH v3 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 | 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 v3 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 | 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