Merge pull request #2847 from krzycz/pmem-duplicate

pmem: do not crash if duplicated pmem entry found

src/common/mmap.c

@@ -355,7 +355,13 @@ util_range_register(const void *addr, size_t len, const char *path,
 	LOG(3, "addr %p len %zu path %s type %d", addr, len, path, type);
 
 	/* check if not tracked already */
-	ASSERTeq(util_range_find((uintptr_t)addr, len), NULL);
+	if (util_range_find((uintptr_t)addr, len) != NULL) {
+		ERR(
+		"duplicated persistent memory range; presumably unmapped with munmap() instead of pmem_unmap(): addr %p len %zu",
+			addr, len);
+		errno = ENOMEM;
+		return -1;
+	}
 
 	struct map_tracker *mt;
 	mt  = Malloc(sizeof(struct map_tracker));

src/test/pmem_is_pmem_posix/TEST4

@@ -74,7 +74,11 @@ expect_normal_exit ./pmem_is_pmem_posix$EXESUFFIX\
 	t 0x000000020000 0x10000\
 	t 0x000000030000 0x10000\
 	t 0x000000040000 0x10000\
-	t 0x000000010000 0x40000
+	t 0x000000010000 0x40000\
+	a 0x000000030000 0x20000 DEV_DAX\
+	a 0x000000020000 0x20000 DEV_DAX\
+	t 0x000000030000 0x20000\
+	t 0x000000020000 0x20000
 
 check
 

src/test/pmem_is_pmem_posix/out4.log.match

@@ -25,4 +25,7 @@ addr 0x20000 len 65536 is_pmem 0
 addr 0x30000 len 65536 is_pmem 0
 addr 0x40000 len 65536 is_pmem 0
 addr 0x10000 len 262144 is_pmem 0
+duplicated persistent memory range; presumably unmapped with munmap() instead of pmem_unmap(): addr 0x20000 len 131072
+addr 0x30000 len 131072 is_pmem 1
+addr 0x20000 len 131072 is_pmem 0
 pmem_is_pmem_posix/TEST4: DONE

src/test/pmem_is_pmem_posix/pmem_is_pmem_posix.c

@@ -81,7 +81,8 @@ main(int argc, char *argv[])
 		case 'a':
 			ret = util_range_register(addr, len, "",
 					str2type(argv[i + 3]));
-			UT_ASSERTeq(ret, 0);
+			if (ret != 0)
+				UT_OUT("%s", pmem_errormsg());
 			i += 4;
 			break;
 		case 'r':