yystopf
/
openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!438 解决shm接口死锁问题 

Merge pull request !438 from JerryH/shm
This commit is contained in:
openharmony_ci 2021-07-21 01:50:28 +00:00 committed by Gitee
parent 650d2b91cd 7a6e4c8155
commit 3b9e3f8471
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/base/vm/shm.c
View File

@ -742,6 +742,7 @@ INT32 ShmDt(const VOID *shmaddr)
/* remove it from aspace */ /* remove it from aspace */
LOS_RbDelNode(&space->regionRbTree, &region->rbNode); LOS_RbDelNode(&space->regionRbTree, &region->rbNode);
LOS_ArchMmuUnmap(&space->archMmu, region->range.base, region->range.size >> PAGE_SHIFT); LOS_ArchMmuUnmap(&space->archMmu, region->range.base, region->range.size >> PAGE_SHIFT);
(VOID)LOS_MuxRelease(&space->regionMux);
/* free it */ /* free it */
free(region); free(region);
@ -750,7 +751,7 @@ INT32 ShmDt(const VOID *shmaddr)
if (seg == NULL) { if (seg == NULL) {
ret = EINVAL; ret = EINVAL;
SYSV_SHM_UNLOCK(); SYSV_SHM_UNLOCK();
goto ERROR_WITH_LOCK; goto ERROR;
} }
ShmPagesRefDec(seg); ShmPagesRefDec(seg);
@ -763,7 +764,7 @@ INT32 ShmDt(const VOID *shmaddr)
seg->ds.shm_lpid = LOS_GetCurrProcessID(); seg->ds.shm_lpid = LOS_GetCurrProcessID();
} }
SYSV_SHM_UNLOCK(); SYSV_SHM_UNLOCK();
(VOID)LOS_MuxRelease(&space->regionMux);
return 0; return 0;
ERROR_WITH_LOCK: ERROR_WITH_LOCK: