p71924506
/
kernel_liteos_a1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复SYSV shm函数：OsShmRegionFree物理页解映射、共享段删除条件，ShmGet操作标志检查，ShmatVmmAlloc对已存在映射的处理。

This commit is contained in:
laokz 2020-12-01 18:59:22 +08:00
parent 8271a069f2
commit bd9b180b27
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -337,10 +337,14 @@ VOID OsShmRegionFree(LosVmSpace *space, LosVmMapRegion *region)
return; return;
} }
LOS_ArchMmuUnmap(&space->archMmu, region->range.base, region->range.size >> PAGE_SHIFT);
ShmPagesRefDec(seg); ShmPagesRefDec(seg);
seg->ds.shm_nattch--; seg->ds.shm_nattch--;
if (seg->ds.shm_nattch <= 0) { if (seg->ds.shm_nattch <= 0 && (seg->status & SHM_SEG_REMOVE)) {
ShmFreeSeg(seg); ShmFreeSeg(seg);
} else {
seg->ds.shm_dtime = time(NULL);
seg->ds.shm_lpid = LOS_GetCurrProcessID();/* may not be the space's PID. */
} }
SYSV_SHM_UNLOCK(); SYSV_SHM_UNLOCK();
} }
@ -411,7 +415,7 @@ INT32 ShmGet(key_t key, size_t size, INT32 shmflg)
SYSV_SHM_LOCK(); SYSV_SHM_LOCK();
if ((((UINT32)shmflg & IPC_CREAT) == 0) && if ((((UINT32)shmflg & IPC_CREAT) == 0) &&
(((UINT32)shmflg & IPC_EXCL) == 0)) { (((UINT32)shmflg & IPC_EXCL) == 1)) {
ret = -EINVAL; ret = -EINVAL;
goto ERROR; goto ERROR;
} }
@ -487,13 +491,15 @@ LosVmMapRegion *ShmatVmmAlloc(struct shmIDSource *seg, const VOID *shmaddr,
} else { } else {
vaddr = (VADDR_T)(UINTPTR)shmaddr; vaddr = (VADDR_T)(UINTPTR)shmaddr;
} }
if ((shmflg & SHM_REMAP)) { if (!(shmflg & SHM_REMAP) && (LOS_RegionFind(space, vaddr) ||
vaddr = (VADDR_T)LOS_MMap(vaddr, seg->ds.shm_segsz, prot, LOS_RegionFind(space, vaddr + seg->ds.shm_segsz - 1) ||
MAP_ANONYMOUS | MAP_SHARED, -1, 0); LOS_RegionRangeFind(space, vaddr, seg->ds.shm_segsz - 1))) {
region = LOS_RegionFind(space, vaddr); ret = EINVAL;
} else { goto ERROR;
region = LOS_RegionAlloc(space, vaddr, seg->ds.shm_segsz, regionFlags, 0);
} }
vaddr = (VADDR_T)LOS_MMap(vaddr, seg->ds.shm_segsz, prot,
MAP_ANONYMOUS | MAP_SHARED, -1, 0);
region = LOS_RegionFind(space, vaddr);
} }
if (region == NULL) { if (region == NULL) {
@ -718,10 +724,10 @@ INT32 ShmDt(const VOID *shmaddr)
if ((seg->ds.shm_nattch <= 0) && if ((seg->ds.shm_nattch <= 0) &&
(seg->status & SHM_SEG_REMOVE)) { (seg->status & SHM_SEG_REMOVE)) {
ShmFreeSeg(seg); ShmFreeSeg(seg);
} else {
seg->ds.shm_dtime = time(NULL);
seg->ds.shm_lpid = LOS_GetCurrProcessID();
} }
seg->ds.shm_dtime = time(NULL);
seg->ds.shm_lpid = LOS_GetCurrProcessID();
SYSV_SHM_UNLOCK(); SYSV_SHM_UNLOCK();
(VOID)LOS_MuxRelease(&space->regionMux); (VOID)LOS_MuxRelease(&space->regionMux);
return 0; return 0;