|
 |
107cfb |
diff --git a/test/core.c b/test/core.c
|
|
|
107cfb |
index b9e3bbf..4b36b2d 100644
|
|
|
107cfb |
--- a/test/core.c
|
|
|
107cfb |
+++ b/test/core.c
|
|
|
107cfb |
@@ -129,8 +129,6 @@ int nfit_test_init(struct kmod_ctx **ctx, struct kmod_module **mod,
|
|
|
107cfb |
"nfit",
|
|
|
107cfb |
"device_dax",
|
|
|
107cfb |
"dax_pmem",
|
|
|
107cfb |
- "dax_pmem_core",
|
|
|
107cfb |
- "dax_pmem_compat",
|
|
|
107cfb |
"libnvdimm",
|
|
|
107cfb |
"nd_blk",
|
|
|
107cfb |
"nd_btt",
|
|
|
107cfb |
diff --git a/test/device-dax.c b/test/device-dax.c
|
|
|
107cfb |
index b19c1ed..d85862b 100644
|
|
|
107cfb |
--- a/test/device-dax.c
|
|
|
107cfb |
+++ b/test/device-dax.c
|
|
|
107cfb |
@@ -166,6 +166,7 @@ static int __test_device_dax(unsigned long align, int loglevel,
|
|
|
107cfb |
if (!ndctl_test_attempt(test, KERNEL_VERSION(4, 7, 0)))
|
|
|
107cfb |
return 77;
|
|
|
107cfb |
|
|
|
107cfb |
+#if 0
|
|
|
107cfb |
/* setup up fsdax mode pmem device and seed with verification data */
|
|
|
107cfb |
rc = setup_pmem_fsdax_mode(ndns, align);
|
|
|
107cfb |
if (rc < 0 || !(pfn = ndctl_namespace_get_pfn(ndns))) {
|
|
|
107cfb |
@@ -199,7 +200,7 @@ static int __test_device_dax(unsigned long align, int loglevel,
|
|
|
107cfb |
}
|
|
|
107cfb |
fsync(fd);
|
|
|
107cfb |
close(fd);
|
|
|
107cfb |
-
|
|
|
107cfb |
+#endif
|
|
|
107cfb |
/* switch the namespace to device-dax mode and verify data via mmap */
|
|
|
107cfb |
rc = setup_device_dax(ndns, align);
|
|
|
107cfb |
if (rc < 0) {
|
|
|
107cfb |
@@ -219,6 +220,7 @@ static int __test_device_dax(unsigned long align, int loglevel,
|
|
|
107cfb |
}
|
|
|
107cfb |
|
|
|
107cfb |
sprintf(path, "/dev/%s", daxctl_dev_get_devname(dev));
|
|
|
107cfb |
+#if 0
|
|
|
107cfb |
fd = open(path, O_RDONLY);
|
|
|
107cfb |
if (fd < 0) {
|
|
|
107cfb |
fprintf(stderr, "%s: failed to open(O_RDONLY) device-dax instance\n",
|
|
|
107cfb |
@@ -246,7 +248,7 @@ static int __test_device_dax(unsigned long align, int loglevel,
|
|
|
107cfb |
|
|
|
107cfb |
close(fd);
|
|
|
107cfb |
munmap(buf, VERIFY_SIZE(align));
|
|
|
107cfb |
-
|
|
|
107cfb |
+#endif
|
|
|
107cfb |
/*
|
|
|
107cfb |
* Prior to 4.8-final these tests cause crashes, or are
|
|
|
107cfb |
* otherwise not supported.
|
|
|
107cfb |
@@ -262,6 +264,7 @@ static int __test_device_dax(unsigned long align, int loglevel,
|
|
|
107cfb |
rc = -ENXIO;
|
|
|
107cfb |
goto out;
|
|
|
107cfb |
}
|
|
|
107cfb |
+
|
|
|
107cfb |
rc = test_dax_directio(fd, align, NULL, 0);
|
|
|
107cfb |
if (rc) {
|
|
|
107cfb |
fprintf(stderr, "%s: failed dax direct-i/o\n",
|
|
|
107cfb |
diff --git a/test/libndctl.c b/test/libndctl.c
|
|
|
107cfb |
index 02bb9cc..2a20941 100644
|
|
|
107cfb |
--- a/test/libndctl.c
|
|
|
107cfb |
+++ b/test/libndctl.c
|
|
|
107cfb |
@@ -160,9 +160,9 @@ static struct btt {
|
|
|
107cfb |
int enabled;
|
|
|
107cfb |
uuid_t uuid;
|
|
|
107cfb |
int num_sector_sizes;
|
|
|
107cfb |
- unsigned int sector_sizes[7];
|
|
|
107cfb |
+ unsigned int sector_sizes[2];
|
|
|
107cfb |
} default_btt = {
|
|
|
107cfb |
- 0, { 0, }, 7, { 512, 520, 528, 4096, 4104, 4160, 4224, },
|
|
|
107cfb |
+ 0, { 0, }, 2, { 512, 4096, },
|
|
|
107cfb |
};
|
|
|
107cfb |
|
|
|
107cfb |
struct pfn {
|
|
|
107cfb |
@@ -214,8 +214,8 @@ static struct btt btt_settings = {
|
|
|
107cfb |
.uuid = { 0, 1, 2, 3, 4, 5, 6, 7,
|
|
|
107cfb |
8, 9, 10, 11, 12, 13, 14, 15
|
|
|
107cfb |
},
|
|
|
107cfb |
- .num_sector_sizes = 7,
|
|
|
107cfb |
- .sector_sizes = { 512, 520, 528, 4096, 4104, 4160, 4224, },
|
|
|
107cfb |
+ .num_sector_sizes = 2,
|
|
|
107cfb |
+ .sector_sizes = { 512, 4096, },
|
|
|
107cfb |
};
|
|
|
107cfb |
|
|
|
107cfb |
static struct pfn pfn_settings = {
|
|
|
107cfb |
@@ -250,7 +250,7 @@ struct namespace {
|
|
|
107cfb |
};
|
|
|
107cfb |
|
|
|
107cfb |
static uuid_t null_uuid;
|
|
|
107cfb |
-static unsigned long blk_sector_sizes[] = { 512, 520, 528, 4096, 4104, 4160, 4224, };
|
|
|
107cfb |
+static unsigned long blk_sector_sizes[] = { 512, 4096, };
|
|
|
107cfb |
static unsigned long pmem_sector_sizes[] = { 512, 4096 };
|
|
|
107cfb |
static unsigned long io_sector_sizes[] = { 0 };
|
|
|
107cfb |
|