gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shmobj: Clean up code around memory_stat_rss_sub call

Browse Source 
Change-Id: I6f678568c3c27799cd2a81f5574b96fd218e942f
This commit is contained in:
Masamichi Takagi
2018-12-13 17:13:27 +09:00
committed by Dominique Martinet
parent 9cfc373538
commit 022e04b62b
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/shmobj.c
View File

@ -269,9 +269,14 @@ static void shmobj_destroy(struct shmobj *obj)
if (page_unmap(page)) {
ihk_mc_free_pages_user(page_va, npages);
/* Track change in page->count for shmobj.
It is decremented in here or shmobj_invalidate() or clear_range(). */
dkprintf("%lx-,%s: calling memory_stat_rss_sub(),phys=%lx,size=%ld,pgsize=%ld\n", phys, __FUNCTION__, phys, npages * PAGE_SIZE, PAGE_SIZE);
memory_stat_rss_sub(npages * PAGE_SIZE, npages * PAGE_SIZE);
* It is decremented in here or shmobj_invalidate()
* or clear_range().
*/
dkprintf("%lx-,%s: calling memory_stat_rss_sub(),phys=%lx,size=%ld,pgsize=%ld\n",
phys, __func__, phys, 1UL << obj->pgshift,
1UL << obj->pgshift);
memory_stat_rss_sub(1UL << obj->pgshift,
1UL << obj->pgshift);
}
#if 0
dkprintf("shmobj_destroy(%p):"
@ -396,8 +401,6 @@ static int shmobj_get_page(struct memobj *memobj, off_t off, int p2align,
}
phys = virt_to_phys(virt);
page = phys_to_page_insert_hash(phys);
/* Track change in page->count for shmobj.
Add when setting the PTE for a page with count of one in ihk_mc_pt_set_range(). */
if (page->mode != PM_NONE) {
ekprintf("shmobj_get_page(%p,%#lx,%d,%p):"
@ -457,8 +460,11 @@ static int shmobj_invalidate_page(struct memobj *memobj, uintptr_t phys,
ihk_mc_free_pages_user(phys_to_virt(phys),
pgsize/PAGE_SIZE);
/* Track change in page->count for shmobj.
It is decremented in here or shmobj_destroy() or clear_range(). */
dkprintf("%lx-,%s: calling memory_stat_rss_sub(),phys=%lx,size=%ld,pgsize=%ld\n", phys, __FUNCTION__, phys, pgsize, PAGE_SIZE);
* It is decremented in here or shmobj_destroy() or
* clear_range().
*/
dkprintf("%lx-,%s: calling memory_stat_rss_sub(),phys=%lx,size=%ld,pgsize=%ld\n",
phys, __func__, phys, pgsize, pgsize);
memory_stat_rss_sub(pgsize, pgsize);
}
}