From 1a207e19c2f0320ca97b31d21c4abc6d42aaf123 Mon Sep 17 00:00:00 2001
From: Balazs Gerofi <bgerofi@riken.jp>
Date: Wed, 17 Aug 2016 13:55:36 +0900
Subject: [PATCH] clean up a couple of debug messages

---
 arch/x86/kernel/memory.c |  2 ++
 kernel/mem.c             |  5 +++--
 kernel/process.c         |  4 ++++
 kernel/syscall.c         | 12 ++++++++++--
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/memory.c b/arch/x86/kernel/memory.c
index 79aac667..b2a362cb 100644
--- a/arch/x86/kernel/memory.c
+++ b/arch/x86/kernel/memory.c
@@ -1111,6 +1111,7 @@ static int clear_range_l1(void *args0, pte_t *ptep, uint64_t base,
 	if (!(old & PFL1_FILEOFF) && args->free_physical) {
 		if (page && page_unmap(page)) {
 			ihk_mc_free_pages(phys_to_virt(phys), 1);
+			dkprintf("%s: freeing regular page at 0x%lx\n", __FUNCTION__, base);
 		}
 		args->vm->currss -= PTL1_SIZE;
 	}
@@ -1159,6 +1160,7 @@ static int clear_range_l2(void *args0, pte_t *ptep, uint64_t base,
 		if (!(old & PFL2_FILEOFF) && args->free_physical) {
 			if (page && page_unmap(page)) {
 				ihk_mc_free_pages(phys_to_virt(phys), PTL2_SIZE/PTL1_SIZE);
+				dkprintf("%s: freeing large page at 0x%lx\n", __FUNCTION__, base);
 			}
 			args->vm->currss -= PTL2_SIZE;
 		}
diff --git a/kernel/mem.c b/kernel/mem.c
index 2df09209..6824e628 100644
--- a/kernel/mem.c
+++ b/kernel/mem.c
@@ -425,8 +425,9 @@ static void page_allocator_init(void)
 	
 	ihk_mc_reserve_arch_pages(pa_start, pa_end, reserve_pages);
 
-	kprintf("Available pages: %ld pages\n",
-	        ihk_pagealloc_count(pa_allocator));
+	kprintf("Available memory: %ld bytes in %ld pages\n",
+	        (ihk_pagealloc_count(pa_allocator) * PAGE_SIZE), 
+			ihk_pagealloc_count(pa_allocator));
 
 	/* Notify the ihk to use my page allocator */
 	ihk_mc_set_page_allocator(&allocator);
diff --git a/kernel/process.c b/kernel/process.c
index cf0e2089..fb1c30e0 100644
--- a/kernel/process.c
+++ b/kernel/process.c
@@ -1533,6 +1533,8 @@ retry:
 				kprintf("page_fault_process_memory_range(%p,%lx-%lx %lx,%lx,%lx):cannot allocate new page. %d\n", vm, range->start, range->end, range->flag, fault_addr, reason, error);
 				goto out;
 			}
+			dkprintf("%s: clearing 0x%lx:%lu\n",
+					__FUNCTION__, pgaddr, pgsize);
 			memset(virt, 0, pgsize);
 			phys = virt_to_phys(virt);
 			page_map(phys_to_page(phys));
@@ -1565,6 +1567,8 @@ retry:
 				kprintf("page_fault_process_memory_range(%p,%lx-%lx %lx,%lx,%lx):cannot allocate copy page. %d\n", vm, range->start, range->end, range->flag, fault_addr, reason, error);
 				goto out;
 			}
+			dkprintf("%s: copying 0x%lx:%lu\n",
+				__FUNCTION__, pgaddr, pgsize);
 			memcpy(virt, phys_to_virt(phys), pgsize);
 
 			phys = virt_to_phys(virt);
diff --git a/kernel/syscall.c b/kernel/syscall.c
index fa99d581..159f21ff 100644
--- a/kernel/syscall.c
+++ b/kernel/syscall.c
@@ -930,6 +930,8 @@ static int do_munmap(void *addr, size_t len)
 		}
 	}
 	finish_free_pages_pending();
+	dkprintf("%s: 0x%lx:%lu, error: %ld\n",
+		__FUNCTION__, addr, len, error);
 	return error;
 }
 
@@ -1171,6 +1173,8 @@ do_mmap(const intptr_t addr0, const size_t len0, const int prot,
 			error = -ENOMEM;
 			goto out;
 		}
+		dkprintf("%s: 0x%x:%lu allocated %d pages, p2align: %lx\n",
+				__FUNCTION__, addr, len, npages, p2align);
 		phys = virt_to_phys(p);
 	}
 	else if (flags & MAP_SHARED) {
@@ -1255,8 +1259,12 @@ out:
 	if (memobj) {
 		memobj_release(memobj);
 	}
-	dkprintf("do_mmap(%lx,%lx,%x,%x,%d,%lx): %ld %lx\n",
-			addr0, len0, prot, flags, fd, off0, error, addr);
+	dkprintf("%s: 0x%lx:%8lu, (req: 0x%lx:%lu), prot: %x, flags: %x, "
+			"fd: %d, off: %lu, error: %ld, addr: 0x%lx\n",
+			__FUNCTION__,
+			addr, len, addr0, len0, prot, flags,
+			fd, off0, error, addr);
+
 	return (!error)? addr: error;
 }