Merge pull request #2 from NVSL/tiering-merge

Merge with Morteza's code
NVSL · Apr 5, 2018 · bf772cc · bf772cc
2 parents b95b801 + a976b78
commit bf772cc
Show file tree

Hide file tree

Showing 3 changed files with 91 additions and 114 deletions.
diff --git a/fs/nova/file.c b/fs/nova/file.c
@@ -817,6 +817,8 @@ static ssize_t do_nova_cow_file_write(struct file *filp,
 
 	epoch_id = nova_get_epoch_id(sb);
 
+	write_tier = TIER_BDEV_LOW;
+
 	if (MODE_FORE_ALLOC) {			
 		if (MODE_KEEP_STAT) sbi->stat->write += len;
 

diff --git a/fs/nova/mprotect.h b/fs/nova/mprotect.h
@@ -35,9 +35,11 @@ static inline int nova_range_check(struct super_block *sb, void *p,
 
 	if ((p < sbi->virt_addr || p + len > sbi->virt_addr + sbi->initsize) &&
 	(p < sbi->vpmem || p + len > sbi->vpmem + (unsigned long)(sbi->vpmem_num_blocks << PAGE_SHIFT))) {
-		nova_err(sb, "access pmem out of range: pmem range %p - %p, access range %p - %p\n",
+		nova_err(sb, "access pmem out of range: pmem range %p - %p, vpmem range %p - %p, access range %p - %p\n",
 				sbi->virt_addr,
 				sbi->virt_addr + sbi->initsize,
+				sbi->vpmem,
+				sbi->vpmem + (unsigned long)(sbi->vpmem_num_blocks << PAGE_SHIFT),
 				p, p + len);
 		dump_stack();
 		return -EINVAL;