+ From ee7fabed859d07809dc3cfe6b23b7ad3b0c6cd73 Mon Sep 17 00:00:00 2001

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

+ Date: Tue, 12 Jan 2021 23:14:58 -0800

+ Subject: [PATCH 003/217] ndctl/test: Fix btt expect table compile warning

+ 

+ ../test/libndctl.c:989:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]

+   989 |  unsigned long long expect_table[][2] = {

+       |  ^~~~~~~~

+ 

+ ...just move the declaration a few lines up.

+ 

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

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

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

+ ---

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

+  1 file changed, 6 insertions(+), 6 deletions(-)

+ 

+ diff --git a/test/libndctl.c b/test/libndctl.c

+ index 24d72b3..fc65149 100644

+ --- a/test/libndctl.c

+ +++ b/test/libndctl.c

+ @@ -980,12 +980,6 @@ static int check_btt_size(struct ndctl_btt *btt)

+  	struct ndctl_ctx *ctx = ndctl_btt_get_ctx(btt);

+  	struct ndctl_test *test = ndctl_get_private_data(ctx);

+  	struct ndctl_namespace *ndns = ndctl_btt_get_namespace(btt);

+ -

+ -	if (!ndns)

+ -		return -ENXIO;

+ -

+ -	ns_size = ndctl_namespace_get_size(ndns);

+ -	sect_size = ndctl_btt_get_sector_size(btt);

+  	unsigned long long expect_table[][2] = {

+  		[0] = {

+  			[0] = 0x11b5400,

+ @@ -1001,6 +995,12 @@ static int check_btt_size(struct ndctl_btt *btt)

+  		},

+  	};

+  

+ +	if (!ndns)

+ +		return -ENXIO;

+ +

+ +	ns_size = ndctl_namespace_get_size(ndns);

+ +	sect_size = ndctl_btt_get_sector_size(btt);

+ +

+  	if (sect_size >= SZ_4K)

+  		sect_select = 1;

+  	else if (sect_size >= 512)

+ -- 

+ 2.27.0

+ 

+ From ff4030e88da2cdcaf52c0d7457cd30264ea8915b Mon Sep 17 00:00:00 2001

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

+ Date: Tue, 12 Jan 2021 23:15:03 -0800

+ Subject: [PATCH 004/217] ndctl/test: Cleanup unnecessary out label

+ 

+ There are no cleanup actions to take in test_dax_remap(), and it is already

+ inconsistent for having a single return point, so remove the out label.

+ 

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

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

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

+ ---

+  test/dax-pmd.c | 12 ++++--------

+  1 file changed, 4 insertions(+), 8 deletions(-)

+ 

+ diff --git a/test/dax-pmd.c b/test/dax-pmd.c

+ index 401826d..b1251db 100644

+ --- a/test/dax-pmd.c

+ +++ b/test/dax-pmd.c

+ @@ -83,20 +83,18 @@ int test_dax_remap(struct ndctl_test *test, int dax_fd, unsigned long align, voi

+  	act.sa_flags = SA_SIGINFO;

+  	if (sigaction(SIGBUS, &act, 0)) {

+  		perror("sigaction");

+ -		rc = EXIT_FAILURE;

+ -		goto out;

+ +		return EXIT_FAILURE;

+  	}

+  

+  	/* test fault after device-dax instance disabled */

+  	if (sigsetjmp(sj_env, 1)) {

+  		if (!fsdax && align > SZ_4K) {

+  			fprintf(stderr, "got expected SIGBUS after mremap() of device-dax\n");

+ -			rc = 0;

+ +			return 0;

+  		} else {

+  			fprintf(stderr, "unpexpected SIGBUS after mremap()\n");

+ -			rc = -EIO;

+ +			return -EIO;

+  		}

+ -		goto out;

+  	}

+  

+  	*(int *) anon = 0xAA;

+ @@ -107,9 +105,7 @@ int test_dax_remap(struct ndctl_test *test, int dax_fd, unsigned long align, voi

+  		return -ENXIO;

+  	}

+  

+ -	rc = 0;

+ -out:

+ -	return rc;

+ +	return 0;

+  }

+  

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

+ -- 

+ 2.27.0

+ 

+ From 6694afe31dd67d186199a58d2252be5ea3472692 Mon Sep 17 00:00:00 2001

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

+ Date: Tue, 12 Jan 2021 23:15:09 -0800

+ Subject: [PATCH 005/217] ndctl/test: Fix device-dax mremap() test

+ 

+ The test_dax_remap() test is a regression check for mishandling of mremap()

+ in the presence of pmd_devmap(). My understanding is that it was a fuzzing

+ condition not something an application would want to do in practice.

+ 

+ On recent kernels with commit 73d5e0629919 ("mremap: check if it's possible

+ to split original vma"), the test fails for device-dax. That seems an

+ equally acceptable result of attempting this remap, so update the test

+ rather than ask the kernel to preserve the old behaviour.

+ 

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

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

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

+ ---

+  test/dax-pmd.c | 5 +++++

+  1 file changed, 5 insertions(+)

+ 

+ diff --git a/test/dax-pmd.c b/test/dax-pmd.c

+ index b1251db..7648e34 100644

+ --- a/test/dax-pmd.c

+ +++ b/test/dax-pmd.c

+ @@ -69,6 +69,11 @@ int test_dax_remap(struct ndctl_test *test, int dax_fd, unsigned long align, voi

+  

+  	remap = mremap(addr, REMAP_SIZE, REMAP_SIZE, MREMAP_MAYMOVE|MREMAP_FIXED, anon);

+  

+ +	if (remap == MAP_FAILED) {

+ +		fprintf(stderr, "%s: mremap failed, that's ok too\n", __func__);

+ +		return 0;

+ +	}

+ +

+  	if (remap != anon) {

+  		rc = -ENXIO;

+  		perror("mremap");

+ -- 

+ 2.27.0

+ 

+ From 940acf65a61595e8c0db3aebe1c74307acbbef68 Mon Sep 17 00:00:00 2001

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

+ Date: Tue, 12 Jan 2021 23:15:14 -0800

+ Subject: [PATCH 006/217] ndctl/test: Exercise soft_offline_page() corner cases

+ 

+ Test soft-offline injection into PMEM namespace metadata and user mapped

+ space. Both attempts should fail on kernels with a pfn_to_online_page()

+ implementation that considers subsection ZONE_DEVICE ranges.

+ 

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

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

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

+ ---

+  test/dax-poison.c | 19 +++++++++++++++++++

+  test/device-dax.c | 45 +++++++++++++++++++++++++++++++++++++++++++++

+  2 files changed, 64 insertions(+)

+ 

+ diff --git a/test/dax-poison.c b/test/dax-poison.c

+ index a4ef12e..4e09761 100644

+ --- a/test/dax-poison.c

+ +++ b/test/dax-poison.c

+ @@ -5,6 +5,7 @@

+  #include <signal.h>

+  #include <setjmp.h>

+  #include <sys/mman.h>

+ +#include <linux/mman.h>

+  #include <fcntl.h>

+  #include <string.h>

+  #include <errno.h>

+ @@ -49,6 +50,7 @@ int test_dax_poison(struct ndctl_test *test, int dax_fd, unsigned long align,

+  	unsigned char *addr = MAP_FAILED;

+  	struct sigaction act;

+  	unsigned x = x;

+ +	FILE *smaps;

+  	void *buf;

+  	int rc;

+  

+ @@ -94,6 +96,9 @@ int test_dax_poison(struct ndctl_test *test, int dax_fd, unsigned long align,

+  		goto out;

+  	}

+  

+ +	fprintf(stderr, "%s: mmap got %p align: %ld offset: %zd\n",

+ +			__func__, addr, align, offset);

+ +

+  	if (sigsetjmp(sj_env, 1)) {

+  		if (sig_mcerr_ar) {

+  			fprintf(stderr, "madvise triggered 'action required' sigbus\n");

+ @@ -104,6 +109,20 @@ int test_dax_poison(struct ndctl_test *test, int dax_fd, unsigned long align,

+  		}

+  	}

+  

+ +	rc = madvise(addr + align / 2, 4096, MADV_SOFT_OFFLINE);

+ +	if (rc == 0) {

+ +		fprintf(stderr, "softoffline should always fail for dax\n");

+ +		smaps = fopen("/proc/self/smaps", "r");

+ +		do {

+ +			rc = fread(buf, 1, 4096, smaps);

+ +			fwrite(buf, 1, rc, stderr);

+ +		} while (rc);

+ +		fclose(smaps);

+ +		fail();

+ +		rc = -ENXIO;

+ +		goto out;

+ +	}

+ +

+  	rc = madvise(addr + align / 2, 4096, MADV_HWPOISON);

+  	if (rc) {

+  		fail();

+ diff --git a/test/device-dax.c b/test/device-dax.c

+ index 5f0da29..aad8fa5 100644

+ --- a/test/device-dax.c

+ +++ b/test/device-dax.c

+ @@ -128,6 +128,44 @@ static int verify_data(struct daxctl_dev *dev, char *dax_buf,

+  	return 0;

+  }

+  

+ +static int test_dax_soft_offline(struct ndctl_test *test, struct ndctl_namespace *ndns)

+ +{

+ +	unsigned long long resource = ndctl_namespace_get_resource(ndns);

+ +	int fd, rc;

+ +	char *buf;

+ +

+ +	if (resource == ULLONG_MAX) {

+ +		fprintf(stderr, "failed to get resource: %s\n",

+ +				ndctl_namespace_get_devname(ndns));

+ +		return -ENXIO;

+ +	}

+ +

+ +	fd = open("/sys/devices/system/memory/soft_offline_page", O_WRONLY);

+ +	if (fd < 0) {

+ +		fprintf(stderr, "failed to open soft_offline_page\n");

+ +		return -ENOENT;

+ +	}

+ +

+ +	rc = asprintf(&buf, "%#llx\n", resource);

+ +	if (rc < 0) {

+ +		fprintf(stderr, "failed to alloc resource\n");

+ +		close(fd);

+ +		return -ENOMEM;

+ +	}

+ +

+ +	fprintf(stderr, "%s: try to offline page @%#llx\n", __func__, resource);

+ +	rc = write(fd, buf, rc);

+ +	free(buf);

+ +	close(fd);

+ +

+ +	if (rc >= 0) {

+ +		fprintf(stderr, "%s: should have failed\n", __func__);

+ +		return -ENXIO;

+ +	}

+ +

+ +	return 0;

+ +}

+ +

+  static int __test_device_dax(unsigned long align, int loglevel,

+  		struct ndctl_test *test, struct ndctl_ctx *ctx)

+  {

+ @@ -278,6 +316,13 @@ static int __test_device_dax(unsigned long align, int loglevel,

+  			goto out;

+  		}

+  

+ +		rc = test_dax_soft_offline(test, ndns);

+ +		if (rc) {

+ +			fprintf(stderr, "%s: failed dax soft offline\n",

+ +					ndctl_namespace_get_devname(ndns));

+ +			goto out;

+ +		}

+ +

+  		rc = test_dax_poison(test, fd, align, NULL, 0, devdax);

+  		if (rc) {

+  			fprintf(stderr, "%s: failed dax poison\n",

+ -- 

+ 2.27.0

+ 

+ From 11357d68b77392e4360ae2824e75bf8397a84885 Mon Sep 17 00:00:00 2001

+ From: Redhairer Li <redhairer.li@intel.com>

+ Date: Sat, 9 Jan 2021 23:36:33 +0800

+ Subject: [PATCH 007/217] msft: Add xlat_firmware_status for JEDEC Byte

+  Addressable Energy Backed DSM

+ 

+ Translate the status codes of the result of JEDEC Byte Addressable Energy Backed

+ DSM to generic errno style error codes.

+ 

+ Signed-off-by: Li Redhairer <redhairer.li@intel.com>

+ Reviewed-by: Dan Williams <dan.j.williams@intel.com>

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

+ Link: https://lore.kernel.org/r/20210109153633.8493-1-redhairer.li@intel.com

+ ---

+  ndctl/lib/msft.c | 22 ++++++++++++++++++++++

+  ndctl/lib/msft.h |  6 ++++++

+  2 files changed, 28 insertions(+)

+ 

+ diff --git a/ndctl/lib/msft.c b/ndctl/lib/msft.c

+ index 145872c..3112799 100644

+ --- a/ndctl/lib/msft.c

+ +++ b/ndctl/lib/msft.c

+ @@ -149,10 +149,32 @@ static unsigned int msft_cmd_smart_get_life_used(struct ndctl_cmd *cmd)

+  	return 100 - CMD_MSFT_SMART(cmd)->nvm_lifetime;

+  }

+  

+ +static int msft_cmd_xlat_firmware_status(struct ndctl_cmd *cmd)

+ +{

+ +	unsigned int status;

+ +

+ +	status = cmd->get_firmware_status(cmd) & NDN_MSFT_STATUS_MASK;

+ +

+ +	/* Common statuses */

+ +	switch (status) {

+ +	case NDN_MSFT_STATUS_SUCCESS:

+ +		return 0;

+ +	case NDN_MSFT_STATUS_NOTSUPP:

+ +		return -EOPNOTSUPP;

+ +	case NDN_MSFT_STATUS_INVALPARM:

+ +		return -EINVAL;

+ +	case NDN_MSFT_STATUS_I2CERR:

+ +		return -EIO;

+ +	}

+ +

+ +	return -ENOMSG;

+ +}

+ +

+  struct ndctl_dimm_ops * const msft_dimm_ops = &(struct ndctl_dimm_ops) {

+  	.new_smart = msft_dimm_cmd_new_smart,

+  	.smart_get_flags = msft_cmd_smart_get_flags,

+  	.smart_get_health = msft_cmd_smart_get_health,

+  	.smart_get_media_temperature = msft_cmd_smart_get_media_temperature,

+  	.smart_get_life_used = msft_cmd_smart_get_life_used,

+ +	.xlat_firmware_status = msft_cmd_xlat_firmware_status,

+  };

+ diff --git a/ndctl/lib/msft.h b/ndctl/lib/msft.h

+ index 7cfd26f..978cc11 100644

+ --- a/ndctl/lib/msft.h

+ +++ b/ndctl/lib/msft.h

+ @@ -50,4 +50,10 @@ struct ndn_pkg_msft {

+  	union ndn_msft_cmd	u;

+  } __attribute__((packed));

+  

+ +#define NDN_MSFT_STATUS_MASK		0xffff

+ +#define NDN_MSFT_STATUS_SUCCESS	0

+ +#define NDN_MSFT_STATUS_NOTSUPP	1

+ +#define NDN_MSFT_STATUS_INVALPARM	2

+ +#define NDN_MSFT_STATUS_I2CERR		3

+ +

+  #endif /* __NDCTL_MSFT_H__ */

+ -- 

+ 2.27.0

+ 

+ From fe626a8a8a1b1bc94ea95c693ec672109909e3dc Mon Sep 17 00:00:00 2001

+ From: Redhairer Li <redhairer.li@intel.com>

+ Date: Thu, 28 Jan 2021 22:03:39 +0800

+ Subject: [PATCH 008/217] ndctl/namespace: Fix disable-namespace accounting

+  relative to seed devices

+ 

+ Seed namespaces are included in "ndctl disable-namespace all". However

+ since the user never "creates" them it is surprising to see

+ "disable-namespace" report 1 more namespace relative to the number that

+ have been created. Catch attempts to disable a zero-sized namespace:

+ 

+ Before:

+ {

+   "dev":"namespace1.0",

+   "size":"492.00 MiB (515.90 MB)",

+   "blockdev":"pmem1"

+ }

+ {

+   "dev":"namespace1.1",

+   "size":"492.00 MiB (515.90 MB)",

+   "blockdev":"pmem1.1"

+ }

+ {

+   "dev":"namespace1.2",

+   "size":"492.00 MiB (515.90 MB)",

+   "blockdev":"pmem1.2"

+ }

+ disabled 4 namespaces

+ 

+ After:

+ {

+   "dev":"namespace1.0",

+   "size":"492.00 MiB (515.90 MB)",

+   "blockdev":"pmem1"

+ }

+ {

+   "dev":"namespace1.3",

+   "size":"492.00 MiB (515.90 MB)",

+   "blockdev":"pmem1.3"

+ }

+ {

+   "dev":"namespace1.1",

+   "size":"492.00 MiB (515.90 MB)",

+   "blockdev":"pmem1.1"

+ }

+ disabled 3 namespaces

+ 

+ Signed-off-by: Redhairer Li <redhairer.li@intel.com>

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

+ Link: https://lore.kernel.org/linux-nvdimm/20210128140339.3080-1-redhairer.li@intel.com/

+ ---

+  ndctl/lib/libndctl.c | 10 ++++++++--

+  ndctl/namespace.c    |  8 ++++----

+  ndctl/region.c       |  2 +-

+  3 files changed, 13 insertions(+), 7 deletions(-)

+ 

+ diff --git a/ndctl/lib/libndctl.c b/ndctl/lib/libndctl.c

+ index 36fb6fe..2f6d806 100644

+ --- a/ndctl/lib/libndctl.c

+ +++ b/ndctl/lib/libndctl.c

+ @@ -4602,6 +4602,7 @@ NDCTL_EXPORT int ndctl_namespace_disable_safe(struct ndctl_namespace *ndns)

+  	const char *bdev = NULL;

+  	char path[50];

+  	int fd;

+ +	unsigned long long size = ndctl_namespace_get_size(ndns);

+  

+  	if (pfn && ndctl_pfn_is_enabled(pfn))

+  		bdev = ndctl_pfn_get_block_device(pfn);

+ @@ -4631,8 +4632,13 @@ NDCTL_EXPORT int ndctl_namespace_disable_safe(struct ndctl_namespace *ndns)

+  					devname, bdev, strerror(errno));

+  			return -errno;

+  		}

+ -	} else

+ -		ndctl_namespace_disable_invalidate(ndns);

+ +	} else {

+ +		if (size == 0)

+ +			/* No disable necessary due to no capacity allocated */

+ +			return 1;

+ +		else

+ +			ndctl_namespace_disable_invalidate(ndns);

+ +	}

+  

+  	return 0;

+  }

+ diff --git a/ndctl/namespace.c b/ndctl/namespace.c

+ index 0c8df9f..1feb74d 100644

+ --- a/ndctl/namespace.c

+ +++ b/ndctl/namespace.c

+ @@ -1125,7 +1125,7 @@ static int namespace_prep_reconfig(struct ndctl_region *region,

+  	}

+  

+  	rc = ndctl_namespace_disable_safe(ndns);

+ -	if (rc)

+ +	if (rc < 0)

+  		return rc;

+  

+  	ndctl_namespace_set_enforce_mode(ndns, NDCTL_NS_MODE_RAW);

+ @@ -1431,7 +1431,7 @@ static int dax_clear_badblocks(struct ndctl_dax *dax)

+  		return -ENXIO;

+  

+  	rc = ndctl_namespace_disable_safe(ndns);

+ -	if (rc) {

+ +	if (rc < 0) {

+  		error("%s: unable to disable namespace: %s\n", devname,

+  			strerror(-rc));

+  		return rc;

+ @@ -1455,7 +1455,7 @@ static int pfn_clear_badblocks(struct ndctl_pfn *pfn)

+  		return -ENXIO;

+  

+  	rc = ndctl_namespace_disable_safe(ndns);

+ -	if (rc) {

+ +	if (rc < 0) {

+  		error("%s: unable to disable namespace: %s\n", devname,

+  			strerror(-rc));

+  		return rc;

+ @@ -1478,7 +1478,7 @@ static int raw_clear_badblocks(struct ndctl_namespace *ndns)

+  		return -ENXIO;

+  

+  	rc = ndctl_namespace_disable_safe(ndns);

+ -	if (rc) {

+ +	if (rc < 0) {

+  		error("%s: unable to disable namespace: %s\n", devname,

+  			strerror(-rc));

+  		return rc;

+ diff --git a/ndctl/region.c b/ndctl/region.c

+ index 3edb9b3..4552c4a 100644

+ --- a/ndctl/region.c

+ +++ b/ndctl/region.c

+ @@ -70,7 +70,7 @@ static int region_action(struct ndctl_region *region, enum device_action mode)

+  	case ACTION_DISABLE:

+  		ndctl_namespace_foreach(region, ndns) {

+  			rc = ndctl_namespace_disable_safe(ndns);

+ -			if (rc)

+ +			if (rc < 0)

+  				return rc;

+  		}

+  		rc = ndctl_region_disable_invalidate(region);

+ -- 

+ 2.27.0

+ 

+ From fb13dfb8d84c4f0a749665c8f07179450b199f3e Mon Sep 17 00:00:00 2001

+ From: Jeff Moyer <jmoyer@redhat.com>

+ Date: Tue, 9 Feb 2021 16:51:53 -0500

+ Subject: [PATCH 009/217] zero_info_block: skip seed devices

+ 

+ Currently, ndctl destroy-namespace -f all will output errors of the

+ form:

+ 

+   Error: destroy namespace: namespace0.0 failed to enable for zeroing, continuing

+ 

+ for any zero-sized namespace.  That particular namespace looks like this:

+ 

+   {

+     "dev":"namespace0.0",

+     "mode":"raw",

+     "size":0,

+     "uuid":"00000000-0000-0000-0000-000000000000",

+     "sector_size":512,

+     "state":"disabled"

+   }

+ 

+ This patch skips over namespaces with size=0 when zeroing out info

+ blocks.

+ 

+ Fixes: 46654c2d60b70 ("ndctl/namespace: Always zero info-blocks")

+ Reported-by: Zhang Yi <yizhan@redhat.com>

+ Signed-off-by: Jeff Moyer <jmoyer@redhat.com>

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

+ Link: https://lore.kernel.org/r/x49r1lohpty.fsf@segfault.boston.devel.redhat.com

+ ---

+  ndctl/namespace.c | 3 +++

+  1 file changed, 3 insertions(+)

+ 

+ diff --git a/ndctl/namespace.c b/ndctl/namespace.c

+ index 1feb74d..1e8a2cd 100644

+ --- a/ndctl/namespace.c

+ +++ b/ndctl/namespace.c

+ @@ -1052,6 +1052,9 @@ static int zero_info_block(struct ndctl_namespace *ndns)

+  	void *buf = NULL, *read_buf = NULL;

+  	char path[50];

+  

+ +	if (ndctl_namespace_get_size(ndns) == 0)

+ +		return 1;

+ +

+  	ndctl_namespace_set_raw_mode(ndns, 1);

+  	rc = ndctl_namespace_enable(ndns);

+  	if (rc < 0) {

+ -- 

+ 2.27.0

+ 

+ From 5d0d4dc5ae1de82de92212c98297b24fbba09227 Mon Sep 17 00:00:00 2001

+ From: QI Fuli <qi.fuli@fujitsu.com>

+ Date: Tue, 2 Feb 2021 22:02:06 +0900

+ Subject: [PATCH 010/217] ndctl: update .gitignore

+ 

+ Add Documentation/ndctl/attrs.adoc and *.lo to .gitignore.

+ 

+ Signed-off-by: QI Fuli <qi.fuli@fujitsu.com>

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

+ Link: https://lore.kernel.org/r/20210202130206.3761-1-qi.fuli@fujitsu.com

+ ---

+  .gitignore | 5 ++---

+  1 file changed, 2 insertions(+), 3 deletions(-)

+ 

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

+ index 3ef9ff7..53512b2 100644

+ --- a/.gitignore

+ +++ b/.gitignore

+ @@ -1,4 +1,5 @@

+  *.o

+ +*.lo

+  *.xml

+  .deps/

+  .libs/

+ @@ -15,13 +16,13 @@ Makefile.in

+  *.1

+  Documentation/daxctl/asciidoc.conf

+  Documentation/ndctl/asciidoc.conf

+ +Documentation/ndctl/attrs.adoc

+  Documentation/daxctl/asciidoctor-extensions.rb

+  Documentation/ndctl/asciidoctor-extensions.rb

+  .dirstamp

+  daxctl/config.h

+  daxctl/daxctl

+  daxctl/lib/libdaxctl.la

+ -daxctl/lib/libdaxctl.lo

+  daxctl/lib/libdaxctl.pc

+  *.a

+  ndctl/config.h

+ @@ -29,8 +30,6 @@ ndctl/lib/libndctl.pc

+  ndctl/ndctl

+  rhel/

+  sles/ndctl.spec

+ -util/log.lo

+ -util/sysfs.lo

+  version.m4

+  *.swp

+  cscope.files

+ -- 

+ 2.27.0

+ 

+ From 7ce2fddfa3f108036a2d81de4d2e66ac29e4631e Mon Sep 17 00:00:00 2001

+ From: QI Fuli <qi.fuli@fujitsu.com>

+ Date: Wed, 3 Feb 2021 22:21:08 +0900

+ Subject: [PATCH 011/217] ndctl/test: add checking the presence of jq command

+  ahead

+ 

+ Due to the lack of jq command, the result of the test will be 'fail'.

+ This patch adds checking the presence of jq commmand ahead.

+ If there is no jq command in the system, the test will be marked as 'skip'.

+ 

+ Signed-off-by: QI Fuli <qi.fuli@fujitsu.com>

+ Link: https://github.com/pmem/ndctl/issues/141

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

+ Link: https://lore.kernel.org/r/20210203132108.6246-1-qi.fuli@fujitsu.com

+ ---

+  test/daxdev-errors.sh           | 1 +

+  test/inject-error.sh            | 2 ++

+  test/inject-smart.sh            | 1 +

+  test/label-compat.sh            | 1 +

+  test/max_available_extent_ns.sh | 1 +

+  test/monitor.sh                 | 2 ++

+  test/multi-dax.sh               | 1 +

+  test/sector-mode.sh             | 2 ++

+  8 files changed, 11 insertions(+)

+ 

+ diff --git a/test/daxdev-errors.sh b/test/daxdev-errors.sh

+ index 6281f32..9547d78 100755

+ --- a/test/daxdev-errors.sh

+ +++ b/test/daxdev-errors.sh

+ @@ -9,6 +9,7 @@ rc=77

+  . $(dirname $0)/common

+  

+  check_min_kver "4.12" || do_skip "lacks dax dev error handling"

+ +check_prereq "jq"

+  

+  trap 'err $LINENO' ERR

+  

+ diff --git a/test/inject-error.sh b/test/inject-error.sh

+ index c636033..7d0b826 100755

+ --- a/test/inject-error.sh

+ +++ b/test/inject-error.sh

+ @@ -11,6 +11,8 @@ err_count=8

+  

+  . $(dirname $0)/common

+  

+ +check_prereq "jq"

+ +

+  trap 'err $LINENO' ERR

+  

+  # sample json:

+ diff --git a/test/inject-smart.sh b/test/inject-smart.sh

+ index 94705df..4ca83b8 100755

+ --- a/test/inject-smart.sh

+ +++ b/test/inject-smart.sh

+ @@ -166,6 +166,7 @@ do_tests()

+  }

+  

+  check_min_kver "4.19" || do_skip "kernel $KVER may not support smart (un)injection"

+ +check_prereq "jq"

+  modprobe nfit_test

+  rc=1

+  

+ diff --git a/test/label-compat.sh b/test/label-compat.sh

+ index 340b93d..8ab2858 100755

+ --- a/test/label-compat.sh

+ +++ b/test/label-compat.sh

+ @@ -10,6 +10,7 @@ BASE=$(dirname $0)

+  . $BASE/common

+  

+  check_min_kver "4.11" || do_skip "may not provide reliable isetcookie values"

+ +check_prereq "jq"

+  

+  trap 'err $LINENO' ERR

+  

+ diff --git a/test/max_available_extent_ns.sh b/test/max_available_extent_ns.sh

+ index 14d741d..343f3c9 100755

+ --- a/test/max_available_extent_ns.sh

+ +++ b/test/max_available_extent_ns.sh

+ @@ -9,6 +9,7 @@ rc=77

+  trap 'err $LINENO' ERR

+  

+  check_min_kver "4.19" || do_skip "kernel $KVER may not support max_available_size"

+ +check_prereq "jq"

+  

+  init()

+  {

+ diff --git a/test/monitor.sh b/test/monitor.sh

+ index cdab5e1..28c5541 100755

+ --- a/test/monitor.sh

+ +++ b/test/monitor.sh

+ @@ -13,6 +13,8 @@ smart_supported_bus=""

+  

+  . $(dirname $0)/common

+  

+ +check_prereq "jq"

+ +

+  trap 'err $LINENO' ERR

+  

+  check_min_kver "4.15" || do_skip "kernel $KVER may not support monitor service"

+ diff --git a/test/multi-dax.sh b/test/multi-dax.sh

+ index e932569..8496619 100755

+ --- a/test/multi-dax.sh

+ +++ b/test/multi-dax.sh

+ @@ -9,6 +9,7 @@ rc=77

+  . $(dirname $0)/common

+  

+  check_min_kver "4.13" || do_skip "may lack multi-dax support"

+ +check_prereq "jq"

+  

+  trap 'err $LINENO' ERR

+  

+ diff --git a/test/sector-mode.sh b/test/sector-mode.sh

+ index dd7013e..54fa806 100755

+ --- a/test/sector-mode.sh

+ +++ b/test/sector-mode.sh

+ @@ -6,6 +6,8 @@ rc=77

+  

+  . $(dirname $0)/common

+  

+ +check_prereq "jq"

+ +

+  set -e

+  trap 'err $LINENO' ERR

+  

+ -- 

+ 2.27.0

+ 

+ From c81fa15bafb1295aaa7d7f09500c3fbdd68b0011 Mon Sep 17 00:00:00 2001

+ From: "Tsaur, Erwin" <erwin.tsaur@intel.com>

+ Date: Thu, 4 Mar 2021 17:18:04 -0800

+ Subject: [PATCH 012/217] Expose ndctl_bus_nfit_translate_spa as a public

+  function.

+ 

+ The motivation is to allow access to ACPI defined NVDIMM Root Device

+ _DSM Function Index 5(Translate SPA).  The rest of the _DSM functions,

+ which are mostly ARS related, are already public.

+ 

+ Basically move ndctl_bus_nfit_translate_spa declaration from private.h

+ to libndctl.h.

+ 

+ Reviewed-by: Dan Williams <dan.j.williams@intel.com>

+ Signed-off-by: "Tsaur, Erwin" <erwin.tsaur@intel.com>

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

+ Link: https://lore.kernel.org/r/20210305011804.3573-1-erwin.tsaur@intel.com

+ ---

+  ndctl/lib/libndctl.sym | 4 ++++

+  ndctl/lib/nfit.c       | 2 +-

+  ndctl/lib/private.h    | 2 --

+  ndctl/libndctl.h       | 2 ++

+  4 files changed, 7 insertions(+), 3 deletions(-)

+ 

+ diff --git a/ndctl/lib/libndctl.sym b/ndctl/lib/libndctl.sym

+ index 0a82616..58afb74 100644

+ --- a/ndctl/lib/libndctl.sym

+ +++ b/ndctl/lib/libndctl.sym

+ @@ -451,3 +451,7 @@ LIBNDCTL_25 {

+  	ndctl_bus_clear_fw_activate_nosuspend;

+  	ndctl_bus_activate_firmware;

+  } LIBNDCTL_24;

+ +

+ +LIBNDCTL_26 {

+ +	ndctl_bus_nfit_translate_spa;

+ +} LIBNDCTL_25;

+ diff --git a/ndctl/lib/nfit.c b/ndctl/lib/nfit.c

+ index 6f68fcf..d85682f 100644

+ --- a/ndctl/lib/nfit.c

+ +++ b/ndctl/lib/nfit.c

+ @@ -114,7 +114,7 @@ static int is_valid_spa(struct ndctl_bus *bus, unsigned long long spa)

+   *

+   * If success, returns zero, store dimm's @handle, and @dpa.

+   */

+ -int ndctl_bus_nfit_translate_spa(struct ndctl_bus *bus,

+ +NDCTL_EXPORT int ndctl_bus_nfit_translate_spa(struct ndctl_bus *bus,

+  	unsigned long long address, unsigned int *handle, unsigned long long *dpa)

+  {

+  

+ diff --git a/ndctl/lib/private.h b/ndctl/lib/private.h

+ index ede1300..8f4510e 100644

+ --- a/ndctl/lib/private.h

+ +++ b/ndctl/lib/private.h

+ @@ -370,8 +370,6 @@ static inline int check_kmod(struct kmod_ctx *kmod_ctx)

+  	return kmod_ctx ? 0 : -ENXIO;

+  }

+  

+ -int ndctl_bus_nfit_translate_spa(struct ndctl_bus *bus, unsigned long long addr,

+ -		unsigned int *handle, unsigned long long *dpa);

+  struct ndctl_cmd *ndctl_bus_cmd_new_err_inj(struct ndctl_bus *bus);

+  struct ndctl_cmd *ndctl_bus_cmd_new_err_inj_clr(struct ndctl_bus *bus);

+  struct ndctl_cmd *ndctl_bus_cmd_new_err_inj_stat(struct ndctl_bus *bus,

+ diff --git a/ndctl/libndctl.h b/ndctl/libndctl.h

+ index 60e1288..87d07b7 100644

+ --- a/ndctl/libndctl.h

+ +++ b/ndctl/libndctl.h

+ @@ -152,6 +152,8 @@ int ndctl_bus_clear_fw_activate_noidle(struct ndctl_bus *bus);

+  int ndctl_bus_set_fw_activate_nosuspend(struct ndctl_bus *bus);

+  int ndctl_bus_clear_fw_activate_nosuspend(struct ndctl_bus *bus);

+  int ndctl_bus_activate_firmware(struct ndctl_bus *bus, enum ndctl_fwa_method method);

+ +int ndctl_bus_nfit_translate_spa(struct ndctl_bus *bus, unsigned long long addr,

+ +		unsigned int *handle, unsigned long long *dpa);

+  

+  struct ndctl_dimm;

+  struct ndctl_dimm *ndctl_dimm_get_first(struct ndctl_bus *bus);

+ -- 

+ 2.27.0

+ 

+ From 43e48c0d2f271cba4237f6eefc3e4912a74c102b Mon Sep 17 00:00:00 2001

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

+ Date: Tue, 9 Mar 2021 22:09:49 -0800

+ Subject: [PATCH 013/217] test/libndctl: Use ndctl_region_set_ro() to change

+  disk read-only state

+ 

+ Kernel commit 52f019d43c22 ("block: add a hard-readonly flag to struct

+ gendisk") broke the read-only management test, by fixing the broken

+ behavior that BLKROSET could make a block device read-write even when the

+ disk is read-only. The fix [1] propagates changes of the region

+ read-only state to the underlying disk. Add ndctl_region_set_ro() ahead of

+ BLKROSET so that BLKROSET does not conflict the block_device state with the

+ disk state.

+ 

+ [1]: http://lore.kernel.org/r/161534060720.528671.2341213328968989192.stgit@dwillia2-desk3.amr.corp.intel.com

+ 

+ Reported-by: kernel test robot <lkp@intel.com>

+ Reported-by: Vishal Verma <vishal.l.verma@intel.com>

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

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

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

+ ---

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

+  1 file changed, 17 insertions(+), 1 deletion(-)

+ 

+ diff --git a/test/libndctl.c b/test/libndctl.c

+ index fc65149..c42f785 100644

+ --- a/test/libndctl.c

+ +++ b/test/libndctl.c

+ @@ -1541,6 +1541,7 @@ static int validate_bdev(const char *devname, struct ndctl_btt *btt,

+  		struct ndctl_pfn *pfn, struct ndctl_namespace *ndns,

+  		struct namespace *namespace, void *buf)

+  {

+ +	struct ndctl_region *region = ndctl_namespace_get_region(ndns);

+  	char bdevpath[50];

+  	int fd, rc, ro;

+