From 2e05cd6b4aee656f69e11cf8b5e280dd47a14b1b Mon Sep 17 00:00:00 2001

From: Dan Williams <dan.j.williams@intel.com>

Date: Wed, 5 Jan 2022 13:32:15 -0800

Subject: [PATCH 075/217] ndctl: Deprecate BLK aperture support

The kernel is dropping its BLK aperture support, so deprecate the same in

ndctl. The options will still be supported, and the library calls will not

be deleted in case code needs them to compile. However the documentation

and the tests for BLK mode can be removed.

Link: https://lore.kernel.org/r/164141833579.3990253.17885822648406789915.stgit@dwillia2-desk3.amr.corp.intel.com

Tested-by: Alison Schofield <alison.schofield@intel.com>

Tested-by: Vaibhav Jain <vaibhav@linux.ibm.com>

Signed-off-by: Dan Williams <dan.j.williams@intel.com>

Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>

---

 .gitignore                                    |   4 -

 Documentation/ndctl/labels-description.txt    |   5 +-

 .../ndctl/ndctl-create-namespace.txt          |  29 +-

 Documentation/ndctl/ndctl-init-labels.txt     |   7 +-

 Documentation/ndctl/ndctl-list.txt            |   4 -

 Documentation/ndctl/region-description.txt    |  10 +-

 README.md                                     |   1 -

 contrib/nfit_test_depmod.conf                 |   1 -

 ndctl/Makefile.am                             |   6 +-

 ndctl/bat.c                                   |   5 -

 ndctl/test.c                                  |  11 -

 test.h                                        |   3 -

 test/Makefile.am                              |  31 --

 test/blk-exhaust.sh                           |  30 --

 test/blk_namespaces.c                         | 357 ------------------

 test/core.c                                   |   1 -

 test/create.sh                                |  13 -

 test/dpa-alloc.c                              | 326 ----------------

 test/libndctl.c                               | 198 ++--------

 test/multi-pmem.c                             | 285 --------------

 test/parent-uuid.c                            | 254 -------------

 21 files changed, 51 insertions(+), 1530 deletions(-)

 delete mode 100755 test/blk-exhaust.sh

 delete mode 100644 test/blk_namespaces.c

 delete mode 100644 test/dpa-alloc.c

 delete mode 100644 test/multi-pmem.c

 delete mode 100644 test/parent-uuid.c

diff --git a/.gitignore b/.gitignore

index 6468c7a..6b19d90 100644

--- a/.gitignore

+++ b/.gitignore

@@ -42,20 +42,16 @@ cscope*.out

 tags

 test/*.log

 test/*.trs

-test/blk-ns

 test/dax-dev

 test/dax-errors

 test/dax-pmd

 test/daxdev-errors

 test/device-dax

-test/dpa-alloc

 test/dsm-fail

 test/hugetlb

 test/image

 test/libndctl

 test/mmap

-test/multi-pmem

-test/parent-uuid

 test/pmem-ns

 test/smart-listen

 test/smart-notify

diff --git a/Documentation/ndctl/labels-description.txt b/Documentation/ndctl/labels-description.txt

index 6244a49..a246edc 100644

--- a/Documentation/ndctl/labels-description.txt

+++ b/Documentation/ndctl/labels-description.txt

@@ -3,6 +3,5 @@

 DESCRIPTION

 -----------

 The namespace label area is a small persistent partition of capacity

-available on some NVDIMM devices.  The label area is used to resolve

-aliasing between 'pmem' and 'blk' capacity by delineating namespace

-boundaries.

+available on some NVDIMM devices.  The label area is used to provision

+one, or more, namespaces from regions.

diff --git a/Documentation/ndctl/ndctl-create-namespace.txt b/Documentation/ndctl/ndctl-create-namespace.txt

index 92a89dd..afb085e 100644

--- a/Documentation/ndctl/ndctl-create-namespace.txt

+++ b/Documentation/ndctl/ndctl-create-namespace.txt

@@ -28,27 +28,17 @@ ndctl create-namespace -f -e namespace0.0 --mode=sector

 OPTIONS

 -------

--t::

---type=::

-	Create a 'pmem' or 'blk' namespace (subject to available

-	capacity).  A pmem namespace supports the dax (direct access)

-	capability to linkndctl:mmap[2] persistent memory directly into

-	a process address space.  A blk namespace access persistent

-	memory through a block-window-aperture.  Compared to pmem it

-	supports a traditional storage error model (EIO on error rather

-	than a cpu exception on a bad memory access), but it does not

-	support dax.

-

 -m::

 --mode=::

 	- "raw": expose the namespace capacity directly with

-	  limitations.  Neither a raw pmem namepace nor raw blk

-	  namespace support sector atomicity by default (see "sector"

-	  mode below).  A raw pmem namespace may have limited to no dax

-	  support depending the kernel. In other words operations like

-	  direct-I/O targeting a dax buffer may fail for a pmem

-	  namespace in raw mode or indirect through a page-cache buffer.

-	  See "fsdax" and "devdax" mode for dax operation.

+	  limitations. A raw pmem namepace namespace does not support

+	  sector atomicity (see "sector" mode below). A raw pmem

+	  namespace may have limited to no dax support depending the

+	  kernel. In other words operations like direct-I/O targeting a

+	  dax buffer may fail for a pmem namespace in raw mode or

+	  indirect through a page-cache buffer.  See "fsdax" and

+	  "devdax" mode for dax operation.

+

 	- "sector": persistent memory, given that it is byte

 	  addressable, does not support sector atomicity.  The

@@ -206,8 +196,7 @@ OPTIONS

 	  * NVDIMM does not support labels

 	  * The NVDIMM supports labels, but the Label Index Block (see

-	    UEFI 2.7) is not present and there is no capacity aliasing

-	    between 'blk' and 'pmem' regions.

+	    UEFI 2.7) is not present.

 	- In the latter case the configuration can be upgraded to

 	  labelled operation by writing an index block on all DIMMs in a

diff --git a/Documentation/ndctl/ndctl-init-labels.txt b/Documentation/ndctl/ndctl-init-labels.txt

index 733ef0e..73685b3 100644

--- a/Documentation/ndctl/ndctl-init-labels.txt

+++ b/Documentation/ndctl/ndctl-init-labels.txt

@@ -13,10 +13,9 @@ SYNOPSIS

 'ndctl init-labels' <nmem0> [<nmem1>..<nmemN>] [<options>]

 include::labels-description.txt[]

-By default, and in kernels prior to v4.10, the kernel only honors labels

-when a DIMM aliases PMEM and BLK capacity. Starting with v4.10 the

-kernel will honor labels for sub-dividing PMEM if all the DIMMs in an

-interleave set / region have a valid namespace index block.

+Starting with v4.10 the kernel will honor labels for sub-dividing PMEM

+if all the DIMMs in an interleave set / region have a valid namespace

+index block.

 This command can be used to initialize the namespace index block if it

 is missing or reinitialize it if it is damaged.  Note that

diff --git a/Documentation/ndctl/ndctl-list.txt b/Documentation/ndctl/ndctl-list.txt

index b8d517d..2922f10 100644

--- a/Documentation/ndctl/ndctl-list.txt

+++ b/Documentation/ndctl/ndctl-list.txt

@@ -82,10 +82,6 @@ include::xable-bus-options.txt[]

 	'X.Y'. Limit the namespace list to the single identified device

 	if present.

--t::

---type=::

-	Filter listing by region type ('pmem' or 'blk')

-

 -m::

 --mode=::

 	Filter listing by the mode ('raw', 'fsdax', 'sector' or 'devdax')

diff --git a/Documentation/ndctl/region-description.txt b/Documentation/ndctl/region-description.txt

index c14416a..ce268a0 100644

--- a/Documentation/ndctl/region-description.txt

+++ b/Documentation/ndctl/region-description.txt

@@ -2,9 +2,7 @@

 DESCRIPTION

 -----------

-A generic REGION device is registered for each PMEM range or

-BLK-aperture set.  LIBNVDIMM provides a built-in driver for these REGION

-devices.  This driver is responsible for reconciling the aliased DPA

-mappings across all regions, parsing the LABEL, if present, and then

-emitting NAMESPACE devices with the resolved/exclusive DPA-boundaries

-for the nd_pmem or nd_blk device driver to consume.

+A generic REGION device is registered for each PMEM range /

+interleave-set. LIBNVDIMM provides a built-in driver for these REGION

+devices. This driver is responsible for parsing namespace labels and

+instantiating PMEM namespaces for each coherent set of labels.

diff --git a/README.md b/README.md

index 89dfc87..6f36a6d 100644

--- a/README.md

+++ b/README.md

@@ -110,7 +110,6 @@ override dax_pmem * extra

 override dax_pmem_core * extra

 override dax_pmem_compat * extra

 override libnvdimm * extra

-override nd_blk * extra

 override nd_btt * extra

 override nd_e820 * extra

 override nd_pmem * extra

diff --git a/contrib/nfit_test_depmod.conf b/contrib/nfit_test_depmod.conf

index 9f8498e..0e0574e 100644

--- a/contrib/nfit_test_depmod.conf

+++ b/contrib/nfit_test_depmod.conf

@@ -5,7 +5,6 @@ override dax_pmem * extra

 override dax_pmem_core * extra

 override dax_pmem_compat * extra

 override libnvdimm * extra

-override nd_blk * extra

 override nd_btt * extra

 override nd_e820 * extra

 override nd_pmem * extra

diff --git a/ndctl/Makefile.am b/ndctl/Makefile.am

index 4e99510..93b682e 100644

--- a/ndctl/Makefile.am

+++ b/ndctl/Makefile.am

@@ -45,8 +45,7 @@ endif

 EXTRA_DIST += keys.readme monitor.conf ndctl-monitor.service

 if ENABLE_DESTRUCTIVE

-ndctl_SOURCES += ../test/blk_namespaces.c \

-		 ../test/pmem_namespaces.c

+ndctl_SOURCES += ../test/pmem_namespaces.c

 ndctl_SOURCES += bat.c

 endif

@@ -67,9 +66,6 @@ if ENABLE_TEST

 ndctl_SOURCES += ../test/libndctl.c \

 		 ../test/dsm-fail.c \

 		 ../util/sysfs.c \

-		 ../test/dpa-alloc.c \

-		 ../test/parent-uuid.c \

-		 ../test/multi-pmem.c \

 		 ../test/core.c \

 		 test.c

 endif

diff --git a/ndctl/bat.c b/ndctl/bat.c

index ef00a3b..13e964d 100644

--- a/ndctl/bat.c

+++ b/ndctl/bat.c

@@ -41,11 +41,6 @@ int cmd_bat(int argc, const char **argv, struct ndctl_ctx *ctx)

 		return EXIT_FAILURE;

 	}

-	rc = test_blk_namespaces(loglevel, test, ctx);

-	fprintf(stderr, "test_blk_namespaces: %s\n", rc ? "FAIL" : "PASS");

-	if (rc && rc != 77)

-		return rc;

-

 	rc = test_pmem_namespaces(loglevel, test, ctx);

 	fprintf(stderr, "test_pmem_namespaces: %s\n", rc ? "FAIL" : "PASS");

 	return ndctl_test_result(test, rc);

diff --git a/ndctl/test.c b/ndctl/test.c

index 6a05d8d..a0f5bc9 100644

--- a/ndctl/test.c

+++ b/ndctl/test.c

@@ -58,16 +58,5 @@ int cmd_test(int argc, const char **argv, struct ndctl_ctx *ctx)

 	if (rc && rc != 77)

 		return rc;

-	rc = test_dpa_alloc(loglevel, test, ctx);

-	fprintf(stderr, "test-dpa-alloc: %s\n", result(rc));

-	if (rc && rc != 77)

-		return rc;

-

-	rc = test_parent_uuid(loglevel, test, ctx);

-	fprintf(stderr, "test-parent-uuid: %s\n", result(rc));

-

-	rc = test_multi_pmem(loglevel, test, ctx);

-	fprintf(stderr, "test-multi-pmem: %s\n", result(rc));

-

 	return ndctl_test_result(test, rc);

 }

diff --git a/test.h b/test.h

index 7de13fe..b2267e6 100644

--- a/test.h

+++ b/test.h

@@ -26,7 +26,6 @@ int ndctl_test_init(struct kmod_ctx **ctx, struct kmod_module **mod,

 struct ndctl_ctx;

 int test_parent_uuid(int loglevel, struct ndctl_test *test, struct ndctl_ctx *ctx);

-int test_multi_pmem(int loglevel, struct ndctl_test *test, struct ndctl_ctx *ctx);

 int test_dax_directio(int dax_fd, unsigned long align, void *dax_addr, off_t offset);

 int test_dax_remap(struct ndctl_test *test, int dax_fd, unsigned long align, void *dax_addr,

 		off_t offset, bool fsdax);

@@ -40,9 +39,7 @@ static inline int test_dax_poison(struct ndctl_test *test, int dax_fd,

 	return 0;

 }

 #endif

-int test_dpa_alloc(int loglevel, struct ndctl_test *test, struct ndctl_ctx *ctx);

 int test_dsm_fail(int loglevel, struct ndctl_test *test, struct ndctl_ctx *ctx);

 int test_libndctl(int loglevel, struct ndctl_test *test, struct ndctl_ctx *ctx);

-int test_blk_namespaces(int loglevel, struct ndctl_test *test, struct ndctl_ctx *ctx);

 int test_pmem_namespaces(int loglevel, struct ndctl_test *test, struct ndctl_ctx *ctx);

 #endif /* __TEST_H__ */

diff --git a/test/Makefile.am b/test/Makefile.am

index c5b8764..a5a54df 100644

--- a/test/Makefile.am

+++ b/test/Makefile.am

@@ -3,9 +3,6 @@ include $(top_srcdir)/Makefile.am.in

 TESTS =\

 	libndctl \

 	dsm-fail \

-	dpa-alloc \

-	parent-uuid \

-	multi-pmem \

 	create.sh \

 	clear.sh \

 	pmem-errors.sh \

@@ -13,7 +10,6 @@ TESTS =\

 	multi-dax.sh \

 	btt-check.sh \

 	label-compat.sh \

-	blk-exhaust.sh \

 	sector-mode.sh \

 	inject-error.sh \

 	btt-errors.sh \

@@ -35,9 +31,6 @@ EXTRA_DIST += $(TESTS) common \

 check_PROGRAMS =\

 	libndctl \

 	dsm-fail \

-	dpa-alloc \

-	parent-uuid \

-	multi-pmem \

 	dax-errors \

 	smart-notify \

 	smart-listen \

@@ -48,7 +41,6 @@ check_PROGRAMS =\

 if ENABLE_DESTRUCTIVE

 TESTS +=\

-	blk-ns \

 	pmem-ns \

 	sub-section.sh \

 	dax-dev \

@@ -68,7 +60,6 @@ TESTS += security.sh

 endif

 check_PROGRAMS +=\

-	blk-ns \

 	pmem-ns \

 	dax-dev \

 	dax-pmd \

@@ -108,18 +99,9 @@ ack_shutdown_count_set_SOURCES =\

 ack_shutdown_count_set_LDADD = $(LIBNDCTL_LIB) $(KMOD_LIBS)

-blk_ns_SOURCES = blk_namespaces.c $(testcore)

-blk_ns_LDADD = $(LIBNDCTL_LIB) $(KMOD_LIBS) $(UUID_LIBS)

-

 pmem_ns_SOURCES = pmem_namespaces.c $(testcore)

 pmem_ns_LDADD = $(LIBNDCTL_LIB) $(KMOD_LIBS) $(UUID_LIBS)

-dpa_alloc_SOURCES = dpa-alloc.c $(testcore)

-dpa_alloc_LDADD = $(LIBNDCTL_LIB) $(UUID_LIBS) $(KMOD_LIBS)

-

-parent_uuid_SOURCES = parent-uuid.c $(testcore)

-parent_uuid_LDADD = $(LIBNDCTL_LIB) $(UUID_LIBS) $(KMOD_LIBS)

-

 dax_dev_SOURCES = dax-dev.c $(testcore)

 dax_dev_LDADD = $(LIBNDCTL_LIB) $(KMOD_LIBS)

@@ -169,19 +151,6 @@ smart_notify_LDADD = $(LIBNDCTL_LIB)

 smart_listen_SOURCES = smart-listen.c

 smart_listen_LDADD = $(LIBNDCTL_LIB)

-multi_pmem_SOURCES = \

-		multi-pmem.c \

-		$(testcore) \

-		../ndctl/namespace.c \

-		../ndctl/check.c \

-		../util/json.c

-multi_pmem_LDADD = \

-		$(LIBNDCTL_LIB) \

-		$(JSON_LIBS) \

-		$(UUID_LIBS) \

-		$(KMOD_LIBS) \

-		../libutil.a

-

 list_smart_dimm_SOURCES = \

 		list-smart-dimm.c \

 		../util/json.c

diff --git a/test/blk-exhaust.sh b/test/blk-exhaust.sh

deleted file mode 100755

index b6d3808..0000000

--- a/test/blk-exhaust.sh

+++ /dev/null

@@ -1,30 +0,0 @@

-#!/bin/bash -x

-# SPDX-License-Identifier: GPL-2.0

-# Copyright (C) 2015-2020 Intel Corporation. All rights reserved.

-

-set -e

-

-rc=77

-

-. $(dirname $0)/common

-

-check_min_kver "4.11" || do_skip "may lack blk-exhaustion fix"

-

-trap 'err $LINENO' ERR

-

-# setup (reset nfit_test dimms)

-modprobe nfit_test

-reset

-

-# if the kernel accounting is correct we should be able to create two

-# pmem and two blk namespaces on nfit_test.0

-rc=1

-$NDCTL create-namespace -b $NFIT_TEST_BUS0 -t pmem

-$NDCTL create-namespace -b $NFIT_TEST_BUS0 -t pmem

-$NDCTL create-namespace -b $NFIT_TEST_BUS0 -t blk -m raw

-$NDCTL create-namespace -b $NFIT_TEST_BUS0 -t blk -m raw

-

-# clearnup and exit

-_cleanup

-

-exit 0

diff --git a/test/blk_namespaces.c b/test/blk_namespaces.c

deleted file mode 100644

index f076e85..0000000

--- a/test/blk_namespaces.c

+++ /dev/null

@@ -1,357 +0,0 @@

-// SPDX-License-Identifier: LGPL-2.1

-// Copyright (C) 2015-2020, Intel Corporation. All rights reserved.

-#include <errno.h>

-#include <fcntl.h>

-#include <linux/fs.h>

-#include <ndctl/libndctl.h>

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include <sys/ioctl.h>

-#include <syslog.h>

-#include <sys/stat.h>

-#include <sys/types.h>

-#include <ndctl.h>

-#include <unistd.h>

-#include <uuid/uuid.h>

-#include <linux/version.h>

-#include <test.h>

-#include <libkmod.h>

-#include <ccan/array_size/array_size.h>

-

-/* The purpose of this test is to verify that we can successfully do I/O to

- * multiple nd_blk namespaces that have discontiguous segments.  It first

- * sets up two namespaces, each 1/2 the total size of the NVDIMM and each with

- * two discontiguous segments, arranged like this:

- *

- * +-------+-------+-------+-------+

- * |  nd0  |  nd1  |  nd0  |  nd1  |

- * +-------+-------+-------+-------+

- *

- * It then runs some I/O to the beginning, middle and end of each of these

- * namespaces, checking data integrity.  The I/O to the middle of the

- * namespace will hit two pages, one on either side of the segment boundary.

- */

-#define err(msg)\

-	fprintf(stderr, "%s:%d: %s (%s)\n", __func__, __LINE__, msg, strerror(errno))

-

-static struct ndctl_namespace *create_blk_namespace(int region_fraction,

-		struct ndctl_region *region)

-{

-	struct ndctl_namespace *ndns, *seed_ns = NULL;

-	unsigned long long size;

-	uuid_t uuid;

-

-	ndctl_region_set_align(region, sysconf(_SC_PAGESIZE));

-	ndctl_namespace_foreach(region, ndns)

-		if (ndctl_namespace_get_size(ndns) == 0) {

-			seed_ns = ndns;

-			break;

-		}

-

-	if (!seed_ns)

-		return NULL;

-

-	uuid_generate(uuid);

-	size = ndctl_region_get_size(region)/region_fraction;

-

-	if (ndctl_namespace_set_uuid(seed_ns, uuid) < 0)

-		return NULL;

-

-	if (ndctl_namespace_set_size(seed_ns, size) < 0)

-		return NULL;

-

-	if (ndctl_namespace_set_sector_size(seed_ns, 512) < 0)

-		return NULL;

-

-	if (ndctl_namespace_enable(seed_ns) < 0)

-		return NULL;

-

-	return seed_ns;

-}

-

-static int disable_blk_namespace(struct ndctl_namespace *ndns)

-{

-	if (ndctl_namespace_disable_invalidate(ndns) < 0)

-		return -ENODEV;

-

-	if (ndctl_namespace_delete(ndns) < 0)

-		return -ENODEV;

-

-	return 0;

-}

-

-static int ns_do_io(const char *bdev)

-{

-	int fd, i;

-	int rc = 0;

-	const int page_size = 4096;

-	const int num_pages = 4;

-	unsigned long num_dev_pages, num_blocks;

-	off_t addr;

-

-	void *random_page[num_pages];

-	void *blk_page[num_pages];

-

-	rc = posix_memalign(random_page, page_size, page_size * num_pages);

-	if (rc) {

-		fprintf(stderr, "posix_memalign failure\n");

-		return rc;

-	}

-

-	rc = posix_memalign(blk_page, page_size, page_size * num_pages);

-	if (rc) {

-		fprintf(stderr, "posix_memalign failure\n");

-		goto err_free_blk;

-	}

-

-	for (i = 1; i < num_pages; i++) {

-		random_page[i] = (char*)random_page[0] + page_size * i;

-		blk_page[i] = (char*)blk_page[0] + page_size * i;

-	}

-

-	/* read random data into random_page */

-	if ((fd = open("/dev/urandom", O_RDONLY)) < 0) {

-		err("open");

-		rc = -ENODEV;

-		goto err_free_all;

-	}

-

-	rc = read(fd, random_page[0], page_size * num_pages);

-	if (rc < 0) {

-		err("read");

-		close(fd);

-		goto err_free_all;

-	}

-

-	close(fd);

-

-	if ((fd = open(bdev, O_RDWR|O_DIRECT)) < 0) {

-		err("open");

-		rc = -ENODEV;

-		goto err_free_all;

-	}

-

-	ioctl(fd, BLKGETSIZE, &num_blocks);

-	num_dev_pages = num_blocks / 8;

-

-	/* write the random data out to each of the segments */

-	rc = pwrite(fd, random_page[0], page_size, 0);

-	if (rc < 0) {

-		err("write");

-		goto err_close;

-	}

-

-	/* two pages that span the region discontinuity */

-	addr = page_size * (num_dev_pages/2 - 1);

-	rc = pwrite(fd, random_page[1], page_size*2, addr);

-	if (rc < 0) {

-		err("write");

-		goto err_close;

-	}

-

-	addr = page_size * (num_dev_pages - 1);

-	rc = pwrite(fd, random_page[3], page_size, addr);

-	if (rc < 0) {

-		err("write");

-		goto err_close;

-	}

-

-	/* read back the random data into blk_page */

-	rc = pread(fd, blk_page[0], page_size, 0);

-	if (rc < 0) {

-		err("read");

-		goto err_close;

-	}

-

-	/* two pages that span the region discontinuity */

-	addr = page_size * (num_dev_pages/2 - 1);

-	rc = pread(fd, blk_page[1], page_size*2, addr);

-	if (rc < 0) {

-		err("read");

-		goto err_close;

-	}

-

-	addr = page_size * (num_dev_pages - 1);

-	rc = pread(fd, blk_page[3], page_size, addr);

-	if (rc < 0) {

-		err("read");

-		goto err_close;

-	}

-

-	/* verify the data */

-	if (memcmp(random_page[0], blk_page[0], page_size * num_pages)) {

-		fprintf(stderr, "Block data miscompare\n");

-		rc = -EIO;

-		goto err_close;

-	}

-

-	rc = 0;

- err_close:

-	close(fd);

- err_free_all:

-	free(random_page[0]);

- err_free_blk:

-	free(blk_page[0]);

-	return rc;

-}

-

-static const char *comm = "test-blk-namespaces";

-

-int test_blk_namespaces(int log_level, struct ndctl_test *test,

-		struct ndctl_ctx *ctx)

-{

-	char bdev[50];

-	int rc = -ENXIO;

-	struct ndctl_bus *bus;

-	struct ndctl_dimm *dimm;

-	struct kmod_module *mod = NULL;

-	struct kmod_ctx *kmod_ctx = NULL;

-	struct ndctl_namespace *ndns[2];

-	struct ndctl_region *region, *blk_region = NULL;

-

-	if (!ndctl_test_attempt(test, KERNEL_VERSION(4, 2, 0)))

-		return 77;

-

-	ndctl_set_log_priority(ctx, log_level);

-

-	bus = ndctl_bus_get_by_provider(ctx, "ACPI.NFIT");

-	if (bus) {

-		/* skip this bus if no BLK regions */

-		ndctl_region_foreach(bus, region)

-			if (ndctl_region_get_nstype(region)

-					== ND_DEVICE_NAMESPACE_BLK)

-				break;

-		if (!region)

-			bus = NULL;

-	}

-

-	if (!bus) {

-		fprintf(stderr, "ACPI.NFIT unavailable falling back to nfit_test\n");

-		rc = ndctl_test_init(&kmod_ctx, &mod, NULL, log_level, test);

-		ndctl_invalidate(ctx);

-		bus = ndctl_bus_get_by_provider(ctx, "nfit_test.0");

-		if (rc < 0 || !bus) {

-			ndctl_test_skip(test);

-			fprintf(stderr, "nfit_test unavailable skipping tests\n");

-			return 77;

-		}

-	}

-

-	fprintf(stderr, "%s: found provider: %s\n", comm,

-			ndctl_bus_get_provider(bus));

-

-	/* get the system to a clean state */

-        ndctl_region_foreach(bus, region)

-                ndctl_region_disable_invalidate(region);

-

-        ndctl_dimm_foreach(bus, dimm) {

-                rc = ndctl_dimm_zero_labels(dimm);

-                if (rc < 0) {

-                        fprintf(stderr, "failed to zero %s\n",

-                                        ndctl_dimm_get_devname(dimm));

-			goto err_module;

-                }

-        }

-

-	/* create our config */

-	ndctl_region_foreach(bus, region)

-		if (strcmp(ndctl_region_get_type_name(region), "blk") == 0) {

-			blk_region = region;

-			break;

-		}

-

-	if (!blk_region || ndctl_region_enable(blk_region) < 0) {

-		fprintf(stderr, "%s: failed to find block region\n", comm);

-		rc = -ENODEV;

-		goto err_cleanup;

-	}

-

-	rc = -ENODEV;

-	ndns[0] = create_blk_namespace(4, blk_region);

-	if (!ndns[0]) {

-		fprintf(stderr, "%s: failed to create block namespace\n", comm);

-		goto err_cleanup;

-	}

-

-	ndns[1] = create_blk_namespace(4, blk_region);

-	if (!ndns[1]) {

-		fprintf(stderr, "%s: failed to create block namespace\n", comm);

-		goto err_cleanup;

-	}

-

-	rc = disable_blk_namespace(ndns[0]);

-	if (rc < 0) {

-		fprintf(stderr, "%s: failed to disable block namespace\n", comm);

-		goto err_cleanup;

-	}

-

-	ndns[0] = create_blk_namespace(2, blk_region);

-	if (!ndns[0]) {

-		fprintf(stderr, "%s: failed to create block namespace\n", comm);

-		rc = -ENODEV;

-		goto err_cleanup;

-	}

-

-	rc = disable_blk_namespace(ndns[1]);

-	if (rc < 0) {

-		fprintf(stderr, "%s: failed to disable block namespace\n", comm);

-		goto err_cleanup;

-	}

-

-	rc = -ENODEV;

-	ndns[1] = create_blk_namespace(2, blk_region);

-	if (!ndns[1]) {

-		fprintf(stderr, "%s: failed to create block namespace\n", comm);

-		goto err_cleanup;

-	}

-

-	/* okay, all set up, do some I/O */

-	rc = -EIO;

-	sprintf(bdev, "/dev/%s", ndctl_namespace_get_block_device(ndns[0]));

-	if (ns_do_io(bdev))

-		goto err_cleanup;

-	sprintf(bdev, "/dev/%s", ndctl_namespace_get_block_device(ndns[1]));

-	if (ns_do_io(bdev))

-		goto err_cleanup;

-	rc = 0;

-

- err_cleanup:

-	/* unload nfit_test */

-	bus = ndctl_bus_get_by_provider(ctx, "nfit_test.0");

-	if (bus)

-		ndctl_region_foreach(bus, region)

-			ndctl_region_disable_invalidate(region);

-	bus = ndctl_bus_get_by_provider(ctx, "nfit_test.1");

-	if (bus)

-		ndctl_region_foreach(bus, region)

-			ndctl_region_disable_invalidate(region);

-	if (mod)

-		kmod_module_remove_module(mod, 0);

-

- err_module:

-	if (kmod_ctx)

-		kmod_unref(kmod_ctx);

-	return rc;

-}

-

-int __attribute__((weak)) main(int argc, char *argv[])

-{

-	struct ndctl_test *test = ndctl_test_new(0);

-	struct ndctl_ctx *ctx;

-	int rc;

-

-	comm = argv[0];

-	if (!test) {

-		fprintf(stderr, "failed to initialize test\n");

-		return EXIT_FAILURE;

-	}

-

-	rc = ndctl_new(&ctx;;

-	if (rc)

-		return ndctl_test_result(test, rc);

-

-	rc = test_blk_namespaces(LOG_DEBUG, test, ctx);

-	ndctl_unref(ctx);

-	return ndctl_test_result(test, rc);

-}

diff --git a/test/core.c b/test/core.c

index 93e1dae..dc1405d 100644

--- a/test/core.c

+++ b/test/core.c

@@ -123,7 +123,6 @@ int ndctl_test_init(struct kmod_ctx **ctx, struct kmod_module **mod,

 		"dax_pmem_core",

 		"dax_pmem_compat",

 		"libnvdimm",

-		"nd_blk",

 		"nd_btt",

 		"nd_e820",

 		"nd_pmem",

diff --git a/test/create.sh b/test/create.sh

index e9baaa0..9a6f373 100755

--- a/test/create.sh

+++ b/test/create.sh

@@ -40,19 +40,6 @@ eval $(echo $json | json2var)

 # free capacity for blk creation

 $NDCTL destroy-namespace -f $dev

-# create blk

-dev="x"

-json=$($NDCTL create-namespace -b $NFIT_TEST_BUS0 -t blk -m raw -v)

-eval $(echo $json | json2var)

-[ $dev = "x" ] && echo "fail: $LINENO" && exit 1

-[ $mode != "raw" ] && echo "fail: $LINENO" &&  exit 1

-

-# convert blk to sector mode

-json=$($NDCTL create-namespace -m sector -l $SECTOR_SIZE -f -e $dev)

-eval $(echo $json | json2var)

-[ $sector_size != $SECTOR_SIZE ] && echo "fail: $LINENO" &&  exit 1

-[ $mode != "sector" ] && echo "fail: $LINENO" &&  exit 1

-

 _cleanup

 exit 0

diff --git a/test/dpa-alloc.c b/test/dpa-alloc.c

deleted file mode 100644

index 59185cf..0000000

--- a/test/dpa-alloc.c

+++ /dev/null

@@ -1,326 +0,0 @@

-// SPDX-License-Identifier: LGPL-2.1

-// Copyright (C) 2014-2020, Intel Corporation. All rights reserved.

-#include <stdio.h>

-#include <stddef.h>

-#include <stdlib.h>

-#include <string.h>

-#include <fcntl.h>

-#include <ctype.h>

-#include <errno.h>

-#include <unistd.h>

-#include <limits.h>

-#include <syslog.h>

-#include <libkmod.h>

-#include <uuid/uuid.h>

-

-#include <test.h>

-#include <ndctl.h>

-#include <util/size.h>

-#include <linux/version.h>

-#include <ndctl/libndctl.h>

-#include <ccan/array_size/array_size.h>

-

-static const char *NFIT_PROVIDER0 = "nfit_test.0";

-static const char *NFIT_PROVIDER1 = "nfit_test.1";

-#define NUM_NAMESPACES 4

-

-struct test_dpa_namespace {

-	struct ndctl_namespace *ndns;

-	unsigned long long size;

-	uuid_t uuid;

-} namespaces[NUM_NAMESPACES];

-

-#define MIN_SIZE SZ_4M

-

-static int do_test(struct ndctl_ctx *ctx, struct ndctl_test *test)

-{

-	unsigned int default_available_slots, available_slots, i;

-	struct ndctl_region *region, *blk_region = NULL;

-	struct ndctl_namespace *ndns;

-	struct ndctl_dimm *dimm;

-	unsigned long size, page_size;

-	struct ndctl_bus *bus;

-	char uuid_str[40];

-	int round;

-	int rc;

-

-	page_size = sysconf(_SC_PAGESIZE);

-	/* disable nfit_test.1, not used in this test */

-	bus = ndctl_bus_get_by_provider(ctx, NFIT_PROVIDER1);

-	if (!bus)

-		return -ENXIO;

-	ndctl_region_foreach(bus, region) {

-		ndctl_region_disable_invalidate(region);

-		ndctl_region_set_align(region, sysconf(_SC_PAGESIZE)

-				* ndctl_region_get_interleave_ways(region));

-	}

-

-	/* init nfit_test.0 */

-	bus = ndctl_bus_get_by_provider(ctx, NFIT_PROVIDER0);

-	if (!bus)

-		return -ENXIO;