29 changed files with 1305 additions and 701 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,37 +1 @@
-/bdbb4da0979fbdc079cf98410cdb31cf799e83b3.tar.gz
-/v0.4.tar.gz
-/v0.5.tar.gz
-/v0.7.tar.gz
-/v0.8.tar.gz
-/v0.9.tar.gz
-/v1.0.tar.gz
-/v1.1.tar.gz
-/v1.2.tar.gz
-/v1.3.tar.gz
-/v1.4.tar.gz
-/v1.6.tar.gz
-/v1.7.tar.gz
-/v1.8.1.tar.gz
-/v1.9.tar.gz
-/v1.10.tar.gz
-/v1.10.1.tar.gz
-/v1.11.tar.gz
-/v1.11.1.tar.gz
-/nvme-cli-2.0-rc4.tar.gz
-/nvme-cli-2.0-rc5.tar.gz
-/nvme-cli-2.0-rc6.tar.gz
-/nvme-cli-2.0-rc8.tar.gz
-/nvme-cli-2.0.tar.gz
-/nvme-cli-2.1-rc0.tar.gz
-/nvme-cli-2.1.1.tar.gz
-/nvme-cli-2.1.2.tar.gz
-/nvme-cli-2.2.tar.gz
-/nvme-cli-2.2.1.tar.gz
-/nvme-cli-2.3.tar.gz
-/nvme-cli-2.4.tar.gz
-/nvme-cli-2.5.tar.gz
-/nvme-cli-2.6.tar.gz
-/nvme-cli-2.7.1.tar.gz
-/nvme-cli-2.9.1.tar.gz
-/nvme-cli-2.10.2.tar.gz
-/nvme-cli-2.11.tar.gz
+SOURCES/v1.16.tar.gz
--- a/99-nvme-nbft-connect.sh
+++ b/99-nvme-nbft-connect.sh
@ -1,5 +0,0 @@
-#!/bin/bash
-
-if [[ "$1" == nbft* ]] && [[ "$2" == "up" ]]; then
-    systemctl start nvmf-connect-nbft.service
-fi
--- a/99-nvme-nbft-no-ignore-carrier.conf
+++ b/99-nvme-nbft-no-ignore-carrier.conf
@ -1,15 +0,0 @@
-# Boot from NVMe over TCP (NBFT)
-#
-# For NVMe/TCP connections that provide namespaces containing rootfs
-# it is crucial to react on carrier events and reconnect any missing
-# NVMe/TCP connections as defined in the ACPI NBFT table. A custom
-# /usr/lib/NetworkManager/dispatcher.d/99-nvme-nbft-connect.sh hook
-# will respawn nvmf-connect-nbft.service on such occasion.
-
-[device-nbft-no-ignore-carrier]
-
-# only affects nbft0, nbft1, ... interfaces
-match-device=interface-name:nbft*
-
-# react on link up/down events
-ignore-carrier=no
--- a/SOURCES/0001-fabrics-fix-nvme-connect-segfault-if-transport-type-.patch
+++ b/SOURCES/0001-fabrics-fix-nvme-connect-segfault-if-transport-type-.patch
@ -0,0 +1,32 @@
+From f74ac1b841b0aae73969debaed0444f0ecb03dba Mon Sep 17 00:00:00 2001
+From: Martin George <marting@netapp.com>
+Date: Mon, 15 Nov 2021 16:00:47 +0530
+Subject: [PATCH] fabrics: fix 'nvme connect' segfault if transport type is
+ omitted
+
+Check if the transport type is available before dereferencing
+it in discovery_trsvcid().
+
+Fixes: 362c90f ("fabrics: add default port number for NVMe/TCP I/O
+controllers")
+Signed-off-by: Martin George <marting@netapp.com>
+---
+ fabrics.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/fabrics.c b/fabrics.c
+index d691191..adca89b 100644
+--- a/fabrics.c
+++ b/fabrics.c
+@@ -1070,6 +1070,8 @@ static void set_discovery_kato(struct fabrics_config *cfg)
+ 
+ static void discovery_trsvcid(struct fabrics_config *fabrics_cfg, bool discover)
+ {
+	if (!fabrics_cfg->transport)
+		return;
+ 	if (!strcmp(fabrics_cfg->transport, "tcp")) {
+ 		if (discover) {
+ 			/* Default port for NVMe/TCP discovery controllers */
+-- 
+2.27.0
+
--- a/SOURCES/0002-fabrics-fix-a-buffer-overrun.patch
+++ b/SOURCES/0002-fabrics-fix-a-buffer-overrun.patch
@ -0,0 +1,29 @@
+From ff8f9b6f59b574fda24a071fb0af4381c0cc6d9f Mon Sep 17 00:00:00 2001
+From: Maurizio Lombardi <mlombard@redhat.com>
+Date: Thu, 9 Dec 2021 12:21:51 +0100
+Subject: [PATCH 1/6] fabrics: fix a buffer overrun
+
+the uuid buffer size must be at least 37 bytes to avoid
+corrupting the memory
+
+Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
+---
+ fabrics.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fabrics.c b/fabrics.c
+index adca89b..0766729 100644
+--- a/fabrics.c
+++ b/fabrics.c
+@@ -883,7 +883,7 @@ static char *hostnqn_generate_systemd(void)
+ 
+ static char *hostnqn_read_dmi(void)
+ {
+-	char uuid[16];
+	char uuid[37];
+ 	char *ret = NULL;
+ 
+ 	if (uuid_from_dmi(uuid) < 0)
+-- 
+2.27.0
+
--- a/SOURCES/0003-bash-Fix-nvme-completion.patch
+++ b/SOURCES/0003-bash-Fix-nvme-completion.patch
@ -0,0 +1,36 @@
+From 821935cccfcad6b18da78d42f9ddf49f4cbe0b8e Mon Sep 17 00:00:00 2001
+From: Daniel Wagner <dwagner@suse.de>
+Date: Thu, 9 Dec 2021 15:40:26 +0100
+Subject: [PATCH 2/6] bash: Fix nvme completion
+
+Signed-off-by: Daniel Wagner <dwagner@suse.de>
+---
+ completions/bash-nvme-completion.sh | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/completions/bash-nvme-completion.sh b/completions/bash-nvme-completion.sh
+index 41938d7..902da01 100644
+--- a/completions/bash-nvme-completion.sh
+++ b/completions/bash-nvme-completion.sh
+@@ -101,8 +101,7 @@ _cmds="list list-subsys id-ctrl id-ns \
+ 	connect disconnect disconnect-all gen-hostnqn \
+ 	show-hostnqn dir-receive dir-send virt-mgmt \
+ 	rpmb boot-part-log fid-support-effects-log \
+-	supported-log-pages lockdown"
+-	supported-log-pages list-endgrp"
+	supported-log-pages lockdown list-endgrp"
+ 
+ # Add plugins:
+ for plugin in "${!_plugin_subcmds[@]}"; do
+@@ -1368,7 +1367,7 @@ plugin_ymtc_opts () {
+ 		opts+=" --namespace-id= -n --raw-binary -b"
+ 			;;
+ 		"help")
+-		opts+=NO_OPTS
+		opts+=$NO_OPTS
+ 			;;
+ 	esac
+ 
+-- 
+2.27.0
+
--- a/SOURCES/0004-nvme-do-not-leak-an-open-file-handle.patch
+++ b/SOURCES/0004-nvme-do-not-leak-an-open-file-handle.patch
@ -0,0 +1,39 @@
+From 45223fd3c5a13da9209c4f44d7593cb42cab94fb Mon Sep 17 00:00:00 2001
+From: Maurizio Lombardi <mlombard@redhat.com>
+Date: Tue, 14 Dec 2021 10:09:42 +0100
+Subject: [PATCH 3/6] nvme: do not leak an open file handle
+
+We performed a "sec_fd=open(cfg.file)" earlier, so we should not
+overwrite the handle.
+
+Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
+---
+ nvme.c | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/nvme.c b/nvme.c
+index 862f9b6..5beeac7 100644
+--- a/nvme.c
+++ b/nvme.c
+@@ -4379,17 +4379,10 @@ static int sec_send(int argc, char **argv, struct command *cmd, struct plugin *p
+ 		fprintf(stderr, "WARNING: --tl not dword aligned; unaligned bytes may be truncated\n");
+ 
+ 	if (strlen(cfg.file) == 0) {
+		close(sec_fd);
+ 		sec_fd = STDIN_FILENO;
+ 		sec_size = cfg.tl;
+ 	} else {
+-		sec_fd = open(cfg.file, O_RDONLY);
+-		if (sec_fd < 0) {
+-			fprintf(stderr, "Failed to open %s: %s\n",
+-					cfg.file, strerror(errno));
+-			err = -EINVAL;
+-			goto close_fd;
+-		}
+-
+ 		err = fstat(sec_fd, &sb);
+ 		if (err < 0) {
+ 			perror("fstat");
+-- 
+2.27.0
+
--- a/SOURCES/0005-nvme-topology-fix-memory-leaks-in-nvme_logical_block.patch
+++ b/SOURCES/0005-nvme-topology-fix-memory-leaks-in-nvme_logical_block.patch
@ -0,0 +1,35 @@
+From b580886dbc322b2a71d6c0c1b71f9fca7b750b02 Mon Sep 17 00:00:00 2001
+From: Maurizio Lombardi <mlombard@redhat.com>
+Date: Tue, 14 Dec 2021 09:58:09 +0100
+Subject: [PATCH 4/6] nvme-topology: fix memory leaks in
+ nvme_logical_block_size_from_ns_char()
+
+Free the allocated strings before returning from the function
+
+Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
+---
+ nvme-topology.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/nvme-topology.c b/nvme-topology.c
+index 0a22f6b..6be2b09 100644
+--- a/nvme-topology.c
+++ b/nvme-topology.c
+@@ -686,10 +686,13 @@ int nvme_logical_block_size_from_ns_char(const char *dev)
+ 		return -EINVAL;
+ 
+ 	s = nvme_get_ctrl_attr(path, "logical_block_size");
+	free(path);
+ 	if (!s)
+ 		return -EINVAL;
+ 
+-	return atoi(s);
+	ret = atoi(s);
+	free(s);
+	return ret;
+ }
+ 
+ void *mmap_registers(const char *dev)
+-- 
+2.27.0
+
--- a/SOURCES/0006-nvme-cli-nvmf-connect-.service-Remove-matching-from-.patch
+++ b/SOURCES/0006-nvme-cli-nvmf-connect-.service-Remove-matching-from-.patch
@ -0,0 +1,37 @@
+From 58c23ceb12d16756b2222a55d1d9dc5f34bb4fa4 Mon Sep 17 00:00:00 2001
+From: James Smart <jsmart2021@gmail.com>
+Date: Fri, 17 Dec 2021 11:32:32 -0800
+Subject: [PATCH 5/6] nvme-cli: nvmf-connect@.service: Remove matching from
+ default syntax
+
+commit 53aab69a0add added the "--matching" argument to the systemd
+connect script that issues connect-all to a discovery controller. When
+this argument is used, only discovery log entries whose target port
+traddr's match the traddr of the discovery controller will be connected
+to.  This eliminates the ability to do referrals by the discovery
+controller.
+
+Revert the commit so that the "--matching" argument is not default
+behavior.
+
+Signed-off-by: James Smart <jsmart2021@gmail.com>
+CC: Martin Wilck <mwilck@suse.com>
+Signed-off-by: Daniel Wagner <dwagner@suse.de>
+Link: https://lore.kernel.org/r/20211217193232.29034-1-jsmart2021@gmail.com
+---
+ nvmf-autoconnect/systemd/nvmf-connect@.service | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nvmf-autoconnect/systemd/nvmf-connect@.service b/nvmf-autoconnect/systemd/nvmf-connect@.service
+index 5fbf081..c60f146 100644
+--- a/nvmf-autoconnect/systemd/nvmf-connect@.service
+++ b/nvmf-autoconnect/systemd/nvmf-connect@.service
+@@ -11,4 +11,4 @@ Requires=nvmf-connect.target
+ [Service]
+ Type=simple
+ Environment="CONNECT_ARGS=%i"
+-ExecStart=/bin/sh -c "nvme connect-all --matching --quiet `/bin/echo -e '${CONNECT_ARGS}'`"
+ExecStart=/bin/sh -c "nvme connect-all --quiet `/bin/echo -e '${CONNECT_ARGS}'`"
+-- 
+2.27.0
+
--- a/SOURCES/0007-nvme-cli-Make-connect-all-matching-be-case-insensiti.patch
+++ b/SOURCES/0007-nvme-cli-Make-connect-all-matching-be-case-insensiti.patch
@ -0,0 +1,86 @@
+From 1264c6323937c4a0342174fdd9be5a66ab1eaf24 Mon Sep 17 00:00:00 2001
+From: James Smart <jsmart2021@gmail.com>
+Date: Fri, 17 Dec 2021 14:20:22 -0800
+Subject: [PATCH 6/6] nvme-cli: Make connect-all matching be case insensitive
+
+The comparison routine that checks discovery controller traddr with a
+discovery log traddr uses a simple strncmp.  For FC, which kicks off
+connect-all requests vay systemd, the nvme-fc transport will build
+traddr strings with lower case hexadecimal.  Some FC discovery
+controllers return traddr strings with upper case hexadecimal. There
+was is no rqmt in the NVME-FC spec that it be upper or lower case.
+Given the case difference, the connect-all fails the match logic and
+doesn't connect to storage.
+
+Revise the traddr comparison routine to duplicate the strings and
+convert them to lower case for comparison.
+
+Signed-off-by: James Smart <jsmart2021@gmail.com>
+Signed-off-by: Daniel Wagner <dwagner@suse.de>
+Link: https://lore.kernel.org/r/20211217222022.30516-1-jsmart2021@gmail.com
+---
+ fabrics.c | 26 +++++++++++++++++++++++++-
+ 1 file changed, 25 insertions(+), 1 deletion(-)
+
+diff --git a/fabrics.c b/fabrics.c
+index 0766729..a1e2593 100644
+--- a/fabrics.c
+++ b/fabrics.c
+@@ -34,6 +34,7 @@
+ #include <stddef.h>
+ #include <syslog.h>
+ #include <time.h>
+#include <ctype.h>
+ 
+ #include <sys/types.h>
+ #include <arpa/inet.h>
+@@ -681,6 +682,12 @@ static int space_strip_len(int max, const char *str)
+ 	return i + 1;
+ }
+ 
+static void strtolower(char *str)
+{
+	for ( ; *str; str++)
+		*str = tolower(*str);
+}
+
+ static void print_discovery_log(struct nvmf_disc_rsp_page_hdr *log, int numrec,
+ 				int instance)
+ {
+@@ -1385,7 +1392,9 @@ static bool cargs_match_found(struct nvmf_disc_rsp_page_entry *entry)
+ 
+ static bool should_connect(struct nvmf_disc_rsp_page_entry *entry)
+ {
+	char *dctrl_traddr, *log_traddr;
+ 	int len;
+	bool connect = true;
+ 
+ 	if (cargs_match_found(entry))
+ 		return false;
+@@ -1398,7 +1407,22 @@ static bool should_connect(struct nvmf_disc_rsp_page_entry *entry)
+ 		return true;
+ 
+ 	len = space_strip_len(NVMF_TRADDR_SIZE, entry->traddr);
+-	return !strncmp(fabrics_cfg.traddr, entry->traddr, len);
+
+	dctrl_traddr = strdup(fabrics_cfg.traddr);
+	log_traddr = strndup(entry->traddr, len);
+	if (!dctrl_traddr || !log_traddr)
+		goto free_exit;
+
+	strtolower(dctrl_traddr);
+	strtolower(log_traddr);
+
+	connect = (strlen(dctrl_traddr) == len) &&
+		  !strcmp(dctrl_traddr, log_traddr);
+
+free_exit:
+	free(log_traddr);
+	free(dctrl_traddr);
+	return connect;
+ }
+ 
+ static int connect_ctrls(struct nvmf_disc_rsp_page_hdr *log, int numrec)
+-- 
+2.27.0
+
--- a/SOURCES/0008-nvme-cli-nvme-gen-hostnqn-use-partition-UUID-on-IBM-.patch
+++ b/SOURCES/0008-nvme-cli-nvme-gen-hostnqn-use-partition-UUID-on-IBM-.patch
@ -0,0 +1,59 @@
+From db50dbf5692325cfef8fb77e56e1e44af83a022e Mon Sep 17 00:00:00 2001
+From: Maurizio Lombardi <mlombard@redhat.com>
+Date: Wed, 29 Jun 2022 16:47:30 +0200
+Subject: [PATCH 1/7] nvme-cli: nvme gen-hostnqn use partition UUID on IBM
+ POWER
+
+Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
+---
+ nvme.c | 27 +++++++++++++++++++++++++--
+ 1 file changed, 25 insertions(+), 2 deletions(-)
+
+diff --git a/nvme.c b/nvme.c
+index 5beeac78..0535ed2b 100644
+--- a/nvme.c
+++ b/nvme.c
+@@ -6516,6 +6516,26 @@ static int admin_passthru(int argc, char **argv, struct command *cmd, struct plu
+ 	return passthru(argc, argv, NVME_IOCTL_ADMIN_CMD, 1, desc, cmd);
+ }
+ 
+#define PATH_UUID_IBM	"/proc/device-tree/ibm,partition-uuid"
+
+static int uuid_from_device_tree(char *system_uuid)
+{
+	ssize_t len;
+	int f;
+
+	f = open(PATH_UUID_IBM, O_RDONLY);
+	if (f < 0)
+		return -ENXIO;
+
+	memset(system_uuid, 0, 37);
+	len = read(f, system_uuid, 37 - 1);
+	close(f);
+	if (len < 0)
+		return -ENXIO;
+
+	return strlen(system_uuid) ? 0 : -ENXIO;
+}
+
+ static int gen_hostnqn_cmd(int argc, char **argv, struct command *command, struct plugin *plugin)
+ {
+ 	int ret;
+@@ -6525,8 +6545,11 @@ static int gen_hostnqn_cmd(int argc, char **argv, struct command *command, struc
+ #endif
+ 
+ 	ret = uuid_from_dmi(uuid_str);
+-	if (ret < 0)
+-		ret = uuid_from_systemd(uuid_str);
+	if (ret < 0) {
+		ret = uuid_from_device_tree(uuid_str);
+		if (ret < 0)
+			ret = uuid_from_systemd(uuid_str);
+	}
+ #ifdef LIBUUID
+ 	if (ret < 0) {
+ 		uuid_generate_random(uuid);
+-- 
+2.31.1
+
--- a/SOURCES/0009-Add-new-events-support-in-PEL.patch
+++ b/SOURCES/0009-Add-new-events-support-in-PEL.patch
@ -0,0 +1,41 @@
+From f491884513bfba7bb007428e4664c2dfda21d424 Mon Sep 17 00:00:00 2001
+From: Maurizio Lombardi <mlombard@redhat.com>
+Date: Wed, 29 Jun 2022 17:33:10 +0200
+Subject: [PATCH 2/7] Add new events support in PEL
+
+Add two new events support in header file.
+
+Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
+---
+ linux/nvme.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/linux/nvme.h b/linux/nvme.h
+index 7a925c7a..8b4c6833 100644
+--- a/linux/nvme.h
+++ b/linux/nvme.h
+@@ -862,6 +862,12 @@ struct nvme_thermal_exc_event {
+     __u8 	threshold;
+ };
+ 
+/* persistent event type 0Bh */
+struct nvme_set_feature_event {
+	__le32	layout;
+	__le32	cdw_mem[0];
+};
+
+ /* persistent event entry head */
+ struct nvme_persistent_event_entry_head {
+ 	__u8	etype;
+@@ -909,6 +915,8 @@ enum nvme_persistent_event_types {
+     NVME_FORMAT_COMPLETION_EVENT    = 0x08,
+     NVME_SANITIZE_START_EVENT       = 0x09,
+     NVME_SANITIZE_COMPLETION_EVENT  = 0x0a,
+    NVME_SET_FEATURE_EVENT	    = 0x0b,
+    NVME_TELEMETRY_CRT		    = 0x0c,
+     NVME_THERMAL_EXCURSION_EVENT    = 0x0d
+ };
+ 
+-- 
+2.31.1
+
--- a/SOURCES/0010-nvme-cli-Decode-Supported-Events-Bitmap-in-PEL-heade.patch
+++ b/SOURCES/0010-nvme-cli-Decode-Supported-Events-Bitmap-in-PEL-heade.patch
@ -0,0 +1,146 @@
+From a0db61992c14b34fcf6787b957d5d5d0e77c6f33 Mon Sep 17 00:00:00 2001
+From: Maurizio Lombardi <mlombard@redhat.com>
+Date: Wed, 29 Jun 2022 18:00:44 +0200
+Subject: [PATCH 3/7] nvme-cli: Decode "Supported Events Bitmap" in PEL header
+
+"Supported Events Bitmap" in PEL header shows what events
+are supported in current nvme devices.
+
+Persistent Event Log for device: nvme0n1
+Action for Persistent Event Log: 0
+..
+..
+..
+Supported Events Bitmap:
+        Support SMART/Health Log Snapshot Event(0x1)
+        Support Firmware Commit Event(0x2)
+        Support Timestamp Change Event(0x3)
+        Support Power-on or Reset Event(0x4)
+        Support NVM Subsystem Hardware Error Event(0x5)
+        Support Change Namespace Event(0x6)
+        Support Format NVM Start Event(0x7)
+        Support Format NVM Completion Event(0x8)
+        Support Sanitize Start Event(0x9)
+        Support Sanitize Completion Event(0xa)
+        Support Set Feature Event(0xb)
+        Support Set Telemetry CRT  Event(0xc)
+        Support Thermal Excursion Event(0xd)
+
+Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
+---
+ nvme-print.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
+ nvme.c       |  4 ++--
+ 2 files changed, 48 insertions(+), 8 deletions(-)
+
+diff --git a/nvme-print.c b/nvme-print.c
+index f631b347..21524a50 100755
+--- a/nvme-print.c
+++ b/nvme-print.c
+@@ -1015,6 +1015,26 @@ void nvme_show_predictable_latency_event_agg_log(
+ 	}
+ }
+ 
+const char *nvme_pel_event_to_string(int type)
+{
+	switch (type) {
+	case NVME_SMART_HEALTH_EVENT:	return "SMART/Health Log Snapshot Event(0x1)";
+	case NVME_FW_COMMIT_EVENT:	return "Firmware Commit Event(0x2)";
+	case NVME_TIMESTAMP_EVENT:	return "Timestamp Change Event(0x3)";
+	case NVME_POWER_ON_RESET_EVENT:	return "Power-on or Reset Event(0x4)";
+	case NVME_NSS_HW_ERROR_EVENT:	return "NVM Subsystem Hardware Error Event(0x5)";
+	case NVME_CHANGE_NS_EVENT:	return "Change Namespace Event(0x6)";
+	case NVME_FORMAT_START_EVENT:	return "Format NVM Start Event(0x7)";
+	case NVME_FORMAT_COMPLETION_EVENT:	return "Format NVM Completion Event(0x8)";
+	case NVME_SANITIZE_START_EVENT:	return "Sanitize Start Event(0x9)";
+	case NVME_SANITIZE_COMPLETION_EVENT:	return "Sanitize Completion Event(0xa)";
+	case NVME_SET_FEATURE_EVENT:	return "Set Feature Event(0xb)";
+	case NVME_TELEMETRY_CRT:		return "Set Telemetry CRT  Event(0xc)";
+	case NVME_THERMAL_EXCURSION_EVENT:	return "Thermal Excursion Event(0xd)";
+	default:			return NULL;
+	}
+}
+
+ static const char *nvme_show_nss_hw_error(__u16 error_code)
+ {
+ 	switch (error_code) {
+@@ -1043,6 +1063,29 @@ static const char *nvme_show_nss_hw_error(__u16 error_code)
+ 	}
+ }
+ 
+static void add_bitmap(int i, __u8 seb, struct json_object *root, int json_flag)
+{
+	char evt_str[50];
+	char key[128];
+
+	for (int bit = 0; bit < 8; bit++) {
+		if (nvme_pel_event_to_string(bit + i * 8)) {
+			if (json_flag == 1) {
+				sprintf(key, "bitmap_%x", (bit + i * 8));
+				if ((seb >> bit) & 0x1)
+					snprintf(evt_str, sizeof(evt_str), "Support %s",
+						nvme_pel_event_to_string(bit + i * 8));
+				json_object_add_value_string(root, key, evt_str);
+			} else {
+				if (nvme_pel_event_to_string(bit + i * 8))
+					if ((seb >> bit) & 0x1)
+						printf("	Support %s\n",
+							nvme_pel_event_to_string(bit + i * 8));
+			}
+		}
+	}
+}
+
+ void json_persistent_event_log(void *pevent_log_info, __u32 size)
+ {
+ 	struct json_object *root;
+@@ -1112,9 +1155,7 @@ void json_persistent_event_log(void *pevent_log_info, __u32 size)
+ 		for (int i = 0; i < 32; i++) {
+ 			if (pevent_log_head->supp_event_bm[i] == 0)
+ 				continue;
+-			sprintf(key, "bitmap_%d", i);
+-			json_object_add_value_uint(root, key,
+-				pevent_log_head->supp_event_bm[i]);
+			add_bitmap(i, pevent_log_head->supp_event_bm[i], root, 1);
+ 		}
+ 	} else {
+ 		printf("No log data can be shown with this log len at least " \
+@@ -1440,12 +1481,11 @@ void nvme_show_persistent_event_log(void *pevent_log_info,
+ 			le32_to_cpu(pevent_log_head->rci));
+ 		if(human)
+ 			nvme_show_persistent_event_log_rci(pevent_log_head->rci);
+-		printf("Supported Events Bitmap: ");
+		printf("Supported Events Bitmap: \n");
+ 		for (int i = 0; i < 32; i++) {
+ 			if (pevent_log_head->supp_event_bm[i] == 0)
+ 				continue;
+-			printf("BitMap[%d] is 0x%x\n", i,
+-				pevent_log_head->supp_event_bm[i]);
+			add_bitmap(i, pevent_log_head->supp_event_bm[i], NULL, 0);
+ 		}
+ 	} else {
+ 		printf("No log data can be shown with this log len at least " \
+diff --git a/nvme.c b/nvme.c
+index 0535ed2b..44c53e6b 100644
+--- a/nvme.c
+++ b/nvme.c
+@@ -4808,7 +4808,7 @@ static int dsm(int argc, char **argv, struct command *cmd, struct plugin *plugin
+ 
+ 	nc = argconfig_parse_comma_sep_array(cfg.ctx_attrs, ctx_attrs, ARRAY_SIZE(ctx_attrs));
+ 	nb = argconfig_parse_comma_sep_array(cfg.blocks, nlbs, ARRAY_SIZE(nlbs));
+-	ns = argconfig_parse_comma_sep_array_long(cfg.slbas, slbas, ARRAY_SIZE(slbas));
+	ns = argconfig_parse_comma_sep_array_long(cfg.slbas, (long long unsigned int *)slbas, ARRAY_SIZE(slbas));
+ 	nr = max(nc, max(nb, ns));
+ 	if (!nr || nr > 256) {
+ 		fprintf(stderr, "No range definition provided\n");
+@@ -4963,7 +4963,7 @@ static int copy(int argc, char **argv, struct command *cmd, struct plugin *plugi
+ 		}
+ 	}
+ 
+-	copy = nvme_setup_copy_range(nlbs, slbas, eilbrts, elbatms, elbats, nr);
+	copy = nvme_setup_copy_range(nlbs, (__u64 *)slbas, eilbrts, elbatms, elbats, nr);
+ 	if (!copy) {
+ 		fprintf(stderr, "failed to allocate payload\n");
+ 		errno = ENOMEM;
+-- 
+2.31.1
+
--- a/SOURCES/0011-nvme-cli-Adds-event-number-in-persistent-event-entri.patch
+++ b/SOURCES/0011-nvme-cli-Adds-event-number-in-persistent-event-entri.patch
@ -0,0 +1,141 @@
+From 6c916ee527e14bf4c4640ffeef8efdd891ba9ef4 Mon Sep 17 00:00:00 2001
+From: Maurizio Lombardi <mlombard@redhat.com>
+Date: Thu, 30 Jun 2022 16:17:44 +0200
+Subject: [PATCH 4/7] nvme-cli: Adds event number in persistent event entries
+
+Persistent Event Entries:
+Event Number: 0
+Event Type: SMART/Health Log Snapshot Event(0x1)
+Event Type Revision: 1
+Event Header Length: 21
+Controller Identifier: 66
+Event Timestamp: 44392
+
+Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
+---
+ nvme-print.c | 30 ++++++++++++++++--------------
+ 1 file changed, 16 insertions(+), 14 deletions(-)
+
+diff --git a/nvme-print.c b/nvme-print.c
+index 21524a50..3b82b174 100755
+--- a/nvme-print.c
+++ b/nvme-print.c
+@@ -1174,8 +1174,9 @@ void json_persistent_event_log(void *pevent_log_info, __u32 size)
+ 			break;
+ 		valid_attrs = json_create_object();
+ 
+-		json_object_add_value_uint(valid_attrs, "event_type",
+-			pevent_entry_head->etype);
+		json_object_add_value_uint(valid_attrs, "event_number", i);
+		json_object_add_value_string(valid_attrs, "event_type",
+				nvme_pel_event_to_string(pevent_entry_head->etype));
+ 		json_object_add_value_uint(valid_attrs, "event_type_rev",
+ 			pevent_entry_head->etype_rev);
+ 		json_object_add_value_uint(valid_attrs, "event_header_len",
+@@ -1505,7 +1506,8 @@ void nvme_show_persistent_event_log(void *pevent_log_info,
+ 			le16_to_cpu(pevent_entry_head->el)) >= size)
+ 			break;
+ 
+-		printf("Event Type: %u\n", pevent_entry_head->etype);
+		printf("Event Number: %u\n", i);
+		printf("Event Type: %s\n", nvme_pel_event_to_string(pevent_entry_head->etype));
+ 		printf("Event Type Revision: %u\n", pevent_entry_head->etype_rev);
+ 		printf("Event Header Length: %u\n", pevent_entry_head->ehl);
+ 		printf("Controller Identifier: %u\n",
+@@ -1521,12 +1523,12 @@ void nvme_show_persistent_event_log(void *pevent_log_info,
+ 		switch (pevent_entry_head->etype) {
+ 		case NVME_SMART_HEALTH_EVENT:
+ 			smart_event = pevent_log_info + offset;
+-			printf("Smart Health Event: \n");
+			printf("Smart Health Event Entry: \n");
+ 			nvme_show_smart_log(smart_event, NVME_NSID_ALL, devname, flags);
+ 			break;
+ 		case NVME_FW_COMMIT_EVENT:
+ 			fw_commit_event = pevent_log_info + offset;
+-			printf("FW Commit Event: \n");
+			printf("FW Commit Event Entry: \n");
+ 			printf("Old Firmware Revision: %"PRIu64"\n",
+ 				le64_to_cpu(fw_commit_event->old_fw_rev));
+ 			printf("New Firmware Revision: %"PRIu64"\n",
+@@ -1543,7 +1545,7 @@ void nvme_show_persistent_event_log(void *pevent_log_info,
+ 			break;
+ 		case NVME_TIMESTAMP_EVENT:
+ 			ts_change_event = pevent_log_info + offset;
+-			printf("Time Stamp Change Event: \n");
+			printf("Time Stamp Change Event Entry: \n");
+ 			printf("Previous Timestamp: %"PRIu64"\n",
+ 				le64_to_cpu(ts_change_event->previous_timestamp));
+ 			printf("Milliseconds Since Reset: %"PRIu64"\n",
+@@ -1555,7 +1557,7 @@ void nvme_show_persistent_event_log(void *pevent_log_info,
+ 
+ 			por_info_list = por_info_len / sizeof(*por_event);
+ 
+-			printf("Power On Reset Event: \n");
+			printf("Power On Reset Event Entry: \n");
+ 			fw_rev = pevent_log_info + offset;
+ 			printf("Firmware Revision: %"PRIu64"\n", le64_to_cpu(*fw_rev));
+ 			printf("Reset Information List: \n");
+@@ -1578,13 +1580,13 @@ void nvme_show_persistent_event_log(void *pevent_log_info,
+ 			break;
+ 		case NVME_NSS_HW_ERROR_EVENT:
+ 			nss_hw_err_event = pevent_log_info + offset;
+-			printf("NVM Subsystem Hardware Error Event Code: %u, %s\n",
+			printf("NVM Subsystem Hardware Error Event Code Entry: %u, %s\n",
+ 				le16_to_cpu(nss_hw_err_event->nss_hw_err_event_code),
+ 				nvme_show_nss_hw_error(nss_hw_err_event->nss_hw_err_event_code));
+ 			break;
+ 		case NVME_CHANGE_NS_EVENT:
+ 			ns_event = pevent_log_info + offset;
+-			printf("Change Namespace Event: \n");
+			printf("Change Namespace Event Entry: \n");
+ 			printf("Namespace Management CDW10: %u\n",
+ 				le32_to_cpu(ns_event->nsmgt_cdw10));
+ 			printf("Namespace Size: %"PRIu64"\n",
+@@ -1603,7 +1605,7 @@ void nvme_show_persistent_event_log(void *pevent_log_info,
+ 			break;
+ 		case NVME_FORMAT_START_EVENT:
+ 			format_start_event = pevent_log_info + offset;
+-			printf("Format NVM Start Event: \n");
+			printf("Format NVM Start Event Entry: \n");
+ 			printf("Namespace Identifier: %u\n",
+ 				le32_to_cpu(format_start_event->nsid));
+ 			printf("Format NVM Attributes: %u\n",
+@@ -1613,7 +1615,7 @@ void nvme_show_persistent_event_log(void *pevent_log_info,
+ 			break;
+ 		case NVME_FORMAT_COMPLETION_EVENT:
+ 			format_cmpln_event = pevent_log_info + offset;
+-			printf("Format NVM Completion Event: \n");
+			printf("Format NVM Completion Event Entry: \n");
+ 			printf("Namespace Identifier: %u\n",
+ 				le32_to_cpu(format_cmpln_event->nsid));
+ 			printf("Smallest Format Progress Indicator: %u\n",
+@@ -1627,7 +1629,7 @@ void nvme_show_persistent_event_log(void *pevent_log_info,
+ 			break;
+ 		case NVME_SANITIZE_START_EVENT:
+ 			sanitize_start_event = pevent_log_info + offset;
+-			printf("Sanitize Start Event: \n");
+			printf("Sanitize Start Event Entry: \n");
+ 			printf("SANICAP: %u\n", sanitize_start_event->sani_cap);
+ 			printf("Sanitize CDW10: %u\n",
+ 				le32_to_cpu(sanitize_start_event->sani_cdw10));
+@@ -1636,7 +1638,7 @@ void nvme_show_persistent_event_log(void *pevent_log_info,
+ 			break;
+ 		case NVME_SANITIZE_COMPLETION_EVENT:
+ 			sanitize_cmpln_event = pevent_log_info + offset;
+-			printf("Sanitize Completion Event: \n");
+			printf("Sanitize Completion Event Entry: \n");
+ 			printf("Sanitize Progress: %u\n",
+ 				le16_to_cpu(sanitize_cmpln_event->sani_prog));
+ 			printf("Sanitize Status: %u\n",
+@@ -1646,7 +1648,7 @@ void nvme_show_persistent_event_log(void *pevent_log_info,
+ 			break;
+ 		case NVME_THERMAL_EXCURSION_EVENT:
+ 			thermal_exc_event = pevent_log_info + offset;
+-			printf("Thermal Excursion Event: \n");
+			printf("Thermal Excursion Event Entry: \n");
+ 			printf("Over Temperature: %u\n", thermal_exc_event->over_temp);
+ 			printf("Threshold: %u\n", thermal_exc_event->threshold);
+ 			break;
+-- 
+2.31.1
+
--- a/SOURCES/0012-nvme-cli-Adds-readable-firmware-level-in-persistent.patch
+++ b/SOURCES/0012-nvme-cli-Adds-readable-firmware-level-in-persistent.patch
@ -0,0 +1,113 @@
+From 7e858ab53eb23083205d75f590ca2c2b256c2a7b Mon Sep 17 00:00:00 2001
+From: Maurizio Lombardi <mlombard@redhat.com>
+Date: Thu, 30 Jun 2022 16:37:40 +0200
+Subject: [PATCH 5/7] nvme-cli: Adds readable firmware level in persistent
+
+For example, In Firmware Commit Event:
+
+Old Firmware Revision: 3617604718875264338
+New Firmware Revision: 3833777500989048146
+
+changes to
+Old Firmware Revision: 3617604718875264338 (REV.SP42)
+New Firmware Revision: 3833777500989048146 (REV.SP45)
+
+Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
+---
+ nvme-print.c | 43 ++++++++++++++++++++++++++++---------------
+ 1 file changed, 28 insertions(+), 15 deletions(-)
+
+diff --git a/nvme-print.c b/nvme-print.c
+index 3b82b174..74ecd95a 100755
+--- a/nvme-print.c
+++ b/nvme-print.c
+@@ -104,12 +104,15 @@ const char *nvme_cmd_to_string(int admin, __u8 opcode)
+ 	return "Unknown";
+ }
+ 
+-static char *fw_to_string(__u8 fw[])
+static const char *fw_to_string(char *c)
+ {
+-	static char frs[9];
+	static char ret[9];
+	int i;
+ 
+-	snprintf(frs, sizeof(frs), "%-.*s", 8, fw);
+-	return frs;
+	for (i = 0; i < 8; i++)
+		ret[i] = c[i] >= '!' && c[i] <= '~' ? c[i] : '.';
+	ret[i] = '\0';
+	return ret;
+ }
+ 
+ static const char *get_sanitize_log_sstat_status_str(__u16 status)
+@@ -1094,6 +1097,7 @@ void json_persistent_event_log(void *pevent_log_info, __u32 size)
+ 	__u32 offset, por_info_len, por_info_list;
+ 	__u64 *fw_rev;
+ 	char key[128];
+	char fw_str[50];
+ 	struct nvme_smart_log *smart_event;
+ 	struct nvme_fw_commit_event *fw_commit_event;
+ 	struct nvme_time_stamp_change_event *ts_change_event;
+@@ -1266,10 +1270,14 @@ void json_persistent_event_log(void *pevent_log_info, __u32 size)
+ 			break;
+ 		case NVME_FW_COMMIT_EVENT:
+ 			fw_commit_event = pevent_log_info + offset;
+-			json_object_add_value_uint(valid_attrs, "old_fw_rev",
+-				le64_to_cpu(fw_commit_event->old_fw_rev));
+-			json_object_add_value_uint(valid_attrs, "new_fw_rev",
+-				le64_to_cpu(fw_commit_event->new_fw_rev));
+			snprintf(fw_str, sizeof(fw_str), "%"PRIu64" (%s)",
+					le64_to_cpu(fw_commit_event->old_fw_rev),
+					fw_to_string((char *)&fw_commit_event->old_fw_rev));
+			json_object_add_value_string(valid_attrs, "old_fw_rev", fw_str);
+			snprintf(fw_str, sizeof(fw_str), "%"PRIu64" (%s)",
+					le64_to_cpu(fw_commit_event->new_fw_rev),
+					fw_to_string((char *)&fw_commit_event->new_fw_rev));
+			json_object_add_value_string(valid_attrs, "new_fw_rev", fw_str);
+ 			json_object_add_value_uint(valid_attrs, "fw_commit_action",
+ 				fw_commit_event->fw_commit_action);
+ 			json_object_add_value_uint(valid_attrs, "fw_slot",
+@@ -1297,8 +1305,10 @@ void json_persistent_event_log(void *pevent_log_info, __u32 size)
+ 			por_info_list = por_info_len / sizeof(*por_event);
+ 
+ 			fw_rev = pevent_log_info + offset;
+-			json_object_add_value_uint(valid_attrs, "fw_rev",
+-				le64_to_cpu(*fw_rev));
+			snprintf(fw_str, sizeof(fw_str), "%"PRIu64" (%s)",
+					le64_to_cpu(*fw_rev),
+					fw_to_string((char *)fw_rev));
+			json_object_add_value_string(valid_attrs, "fw_rev", fw_str);
+ 			for (int i = 0; i < por_info_list; i++) {
+ 				por_event = pevent_log_info + offset +
+ 					sizeof(*fw_rev) + i * sizeof(*por_event);
+@@ -1529,10 +1539,12 @@ void nvme_show_persistent_event_log(void *pevent_log_info,
+ 		case NVME_FW_COMMIT_EVENT:
+ 			fw_commit_event = pevent_log_info + offset;
+ 			printf("FW Commit Event Entry: \n");
+-			printf("Old Firmware Revision: %"PRIu64"\n",
+-				le64_to_cpu(fw_commit_event->old_fw_rev));
+-			printf("New Firmware Revision: %"PRIu64"\n",
+-				le64_to_cpu(fw_commit_event->new_fw_rev));
+			printf("Old Firmware Revision: %"PRIu64" (%s)\n",
+					le64_to_cpu(fw_commit_event->old_fw_rev),
+					fw_to_string((char *)&fw_commit_event->old_fw_rev));
+			printf("New Firmware Revision: %"PRIu64" (%s)\n",
+					le64_to_cpu(fw_commit_event->new_fw_rev),
+					fw_to_string((char *)&fw_commit_event->new_fw_rev));
+ 			printf("FW Commit Action: %u\n",
+ 				fw_commit_event->fw_commit_action);
+ 			printf("FW Slot: %u\n", fw_commit_event->fw_slot);
+@@ -1559,7 +1571,8 @@ void nvme_show_persistent_event_log(void *pevent_log_info,
+ 
+ 			printf("Power On Reset Event Entry: \n");
+ 			fw_rev = pevent_log_info + offset;
+-			printf("Firmware Revision: %"PRIu64"\n", le64_to_cpu(*fw_rev));
+			printf("Firmware Revision: %"PRIu64" (%s)\n", le64_to_cpu(*fw_rev),
+					fw_to_string((char *)fw_rev));
+ 			printf("Reset Information List: \n");
+ 
+ 			for (int i = 0; i < por_info_list; i++) {
+-- 
+2.31.1
+
--- a/SOURCES/0013-nvme-cli-Add-support-set-feature-event-in-PEL.patch
+++ b/SOURCES/0013-nvme-cli-Add-support-set-feature-event-in-PEL.patch
@ -0,0 +1,69 @@
+From 859b8ee99a725bdcfbb7c8352c50449d126cffc4 Mon Sep 17 00:00:00 2001
+From: Maurizio Lombardi <mlombard@redhat.com>
+Date: Thu, 30 Jun 2022 16:41:59 +0200
+Subject: [PATCH 6/7] nvme-cli: Add support set feature event in PEL
+
+Add "Set Feature" event in PEL.
+
+Persistent Event Entries:
+Event Number: 0
+Event Type: Set Feature Event(0xb)
+Event Type Revision: 1
+Event Header Length: 21
+Controller Identifier: 65
+Event Timestamp: 564587204146155
+Vendor Specific Information Length: 0
+Event Length: 16
+Set Feature Event Entry:
+Set Feature ID  :0x7 (Number of Queues),  value:0x270027
+        Number of IO Completion Queues Allocated (NCQA): 40
+        Number of IO Submission Queues Allocated (NSQA): 40
+
+Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
+---
+ nvme-print.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/nvme-print.c b/nvme-print.c
+index 74ecd95a..37011dbe 100755
+--- a/nvme-print.c
+++ b/nvme-print.c
+@@ -1436,6 +1436,8 @@ void nvme_show_persistent_event_log(void *pevent_log_info,
+ {
+ 	__u32 offset, por_info_len, por_info_list;
+ 	__u64 *fw_rev;
+	int fid, cdw11, dword_cnt;
+	unsigned char *mem_buf = NULL;
+ 	struct nvme_smart_log *smart_event;
+ 	struct nvme_fw_commit_event *fw_commit_event;
+ 	struct nvme_time_stamp_change_event *ts_change_event;
+@@ -1446,6 +1448,7 @@ void nvme_show_persistent_event_log(void *pevent_log_info,
+ 	struct nvme_format_nvm_compln_event *format_cmpln_event;
+ 	struct nvme_sanitize_start_event *sanitize_start_event;
+ 	struct nvme_sanitize_compln_event *sanitize_cmpln_event;
+	struct nvme_set_feature_event *set_feat_event;
+ 	struct nvme_thermal_exc_event *thermal_exc_event;
+ 	struct nvme_persistent_event_log_head *pevent_log_head;
+ 	struct nvme_persistent_event_entry_head *pevent_entry_head;
+@@ -1659,6 +1662,18 @@ void nvme_show_persistent_event_log(void *pevent_log_info,
+ 			printf("Completion Information: %u\n",
+ 				le16_to_cpu(sanitize_cmpln_event->cmpln_info));
+ 			break;
+		case NVME_SET_FEATURE_EVENT:
+			set_feat_event = pevent_log_info + offset;
+			printf("Set Feature Event Entry: \n");
+			dword_cnt =  set_feat_event->layout & 0x03;
+			fid = le32_to_cpu(set_feat_event->cdw_mem[0]) & 0x000f;
+			cdw11 = le32_to_cpu(set_feat_event->cdw_mem[1]);
+			if (((set_feat_event->layout & 0xff) >> 2) != 0)
+				mem_buf = (unsigned char *)(set_feat_event + 4 + dword_cnt * 4);
+			printf("Set Feature ID  :%#02x (%s),  value:%#08x\n", fid,
+					nvme_feature_to_string(fid), cdw11);
+			nvme_feature_show_fields(fid, cdw11, mem_buf);
+			break;
+ 		case NVME_THERMAL_EXCURSION_EVENT:
+ 			thermal_exc_event = pevent_log_info + offset;
+ 			printf("Thermal Excursion Event Entry: \n");
+-- 
+2.31.1
+
--- a/SOURCES/0014-nvme-cli-Add-support-Telemetry-CRT-in-PEL.patch
+++ b/SOURCES/0014-nvme-cli-Add-support-Telemetry-CRT-in-PEL.patch
@ -0,0 +1,29 @@
+From 44b23d2daf246db0ac09a4a79a9a5161843a4936 Mon Sep 17 00:00:00 2001
+From: Maurizio Lombardi <mlombard@redhat.com>
+Date: Thu, 30 Jun 2022 16:44:07 +0200
+Subject: [PATCH 7/7] nvme-cli: Add support Telemetry CRT in PEL
+
+Add "Telemetry CRT" event in PEL.
+
+Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
+---
+ nvme-print.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/nvme-print.c b/nvme-print.c
+index 37011dbe..992b9b83 100755
+--- a/nvme-print.c
+++ b/nvme-print.c
+@@ -1674,6 +1674,9 @@ void nvme_show_persistent_event_log(void *pevent_log_info,
+ 					nvme_feature_to_string(fid), cdw11);
+ 			nvme_feature_show_fields(fid, cdw11, mem_buf);
+ 			break;
+		case NVME_TELEMETRY_CRT:
+			d(pevent_log_info + offset, 512, 16, 1);
+			break;
+ 		case NVME_THERMAL_EXCURSION_EVENT:
+ 			thermal_exc_event = pevent_log_info + offset;
+ 			printf("Thermal Excursion Event Entry: \n");
+-- 
+2.31.1
+
--- a/SOURCES/0015-fix-firmware-log-page-frs-variable-sign.patch
+++ b/SOURCES/0015-fix-firmware-log-page-frs-variable-sign.patch
@ -0,0 +1,26 @@
+From b3db6509e1f70bdde9205ab97bd87fbb94a49f0a Mon Sep 17 00:00:00 2001
+From: Maurizio Lombardi <mlombard@redhat.com>
+Date: Fri, 15 Jul 2022 11:10:59 +0200
+Subject: [PATCH] fix firmware log page frs variable sign
+
+Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
+---
+ linux/nvme.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/linux/nvme.h b/linux/nvme.h
+index 8b4c6833..2c402688 100644
+--- a/linux/nvme.h
+++ b/linux/nvme.h
+@@ -1539,7 +1539,7 @@ struct nvme_error_log_page {
+ struct nvme_firmware_log_page {
+ 	__u8	afi;
+ 	__u8	resv[7];
+-	__u8    frs[7][8];
+	char    frs[7][8];
+ 	__u8	resv2[448];
+ };
+ 
+-- 
+2.31.1
+
--- a/SOURCES/0016-fix-file-permissions-nvme-print.c.patch
+++ b/SOURCES/0016-fix-file-permissions-nvme-print.c.patch
@ -0,0 +1,19 @@
+From f9b6c2100db88e9f317f15f17faaed59b725ac9b Mon Sep 17 00:00:00 2001
+From: Keith Busch <kbusch@kernel.org>
+Date: Tue, 24 Aug 2021 11:49:16 -0700
+Subject: [PATCH] fix file permissions (nvme-print.c)
+
+It's not executable.
+
+Signed-off-by: Keith Busch <kbusch@kernel.org>
+---
+ nvme-print.c | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100755 => 100644 nvme-print.c
+
+diff --git a/nvme-print.c b/nvme-print.c
+old mode 100755
+new mode 100644
+-- 
+2.31.1
+
--- a/SOURCES/0017-fabrics-Fix-ordering-for-auto-connect-services.patch
+++ b/SOURCES/0017-fabrics-Fix-ordering-for-auto-connect-services.patch
@ -0,0 +1,65 @@
+From ad9f35c0bf8a71c6a4b7586d7553b8e9d171f48e Mon Sep 17 00:00:00 2001
+From: Daniel Wagner <dwagner@suse.de>
+Date: Tue, 7 Mar 2023 10:24:01 +0100
+Subject: [PATCH] fabrics: Fix ordering for auto connect services
+
+In order to be able to mount file systems via /etc/fstab we have to
+make sure that the corresponding auto connect services have been
+executed. Because the mounting of the local filesystem happens very
+early in the boot we have to carefully sort these service file into the
+boot process.
+
+First, we have to disable the DefaultDependency as this will
+automatically add dependency on sysinit.target which is too late (after
+local mounts). Though without the default dependency we have to provide
+a Before and After conditions.
+
+The Before is simple as we have a local-fs-pre target. The After
+is a bit tricky as there are no targets available.
+
+Because the whole autoconnect machinery depends on udev events being
+delivered we place the service after systemd-udevd has been started.
+
+Link: https://www.freedesktop.org/software/systemd/man/bootup.html
+Reported-by: Maurizio Lombardi <mlombard@redhat.com>
+Reported-by: Wen Xiong <wenxiong@linux.ibm.com>
+Tested-by: Maurizio Lombardi <mlombard@redhat.com>
+Tested-by: Wen Xiong <wenxiong@linux.ibm.com>
+Signed-off-by: Daniel Wagner <dwagner@suse.de>
+---
+ nvmf-autoconnect/systemd/nvmefc-boot-connections.service.in | 3 +++
+ nvmf-autoconnect/systemd/nvmf-connect@.service.in           | 4 +++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/nvmf-autoconnect/systemd/nvmefc-boot-connections.service b/nvmf-autoconnect/systemd/nvmefc-boot-connections.service
+index 33ab8c1f..7036625c 100644
+--- a/nvmf-autoconnect/systemd/nvmefc-boot-connections.service
+++ b/nvmf-autoconnect/systemd/nvmefc-boot-connections.service
+@@ -1,6 +1,9 @@
+ [Unit]
+ Description=Auto-connect to subsystems on FC-NVME devices found during boot
+ ConditionPathExists=/sys/class/fc/fc_udev_device/nvme_discovery
+DefaultDependencies=no
+After=systemd-udevd.service
+Before=local-fs-pre.target
+ 
+ [Service]
+ Type=oneshot
+diff --git a/nvmf-autoconnect/systemd/nvmf-connect@.service b/nvmf-autoconnect/systemd/nvmf-connect@.service
+index 90f774c5..dd245ee6 100644
+--- a/nvmf-autoconnect/systemd/nvmf-connect@.service
+++ b/nvmf-autoconnect/systemd/nvmf-connect@.service
+@@ -4,7 +4,9 @@
+ 
+ [Unit]
+ Description=NVMf auto-connect scan upon nvme discovery controller Events
+-After=syslog.target
+DefaultDependencies=no
+After=systemd-udevd.service
+Before=local-fs-pre.target
+ PartOf=nvmf-connect.target
+ Requires=nvmf-connect.target
+ 
+-- 
+2.31.1
+
--- a/SOURCES/0018-nvme-fix-rnlpt-to_string-values.patch
+++ b/SOURCES/0018-nvme-fix-rnlpt-to_string-values.patch
@ -0,0 +1,35 @@
+From 00909e8bc7e5a1b7a1129f8e18c60eedca0248f7 Mon Sep 17 00:00:00 2001
+From: Maurizio Lombardi <mlombard@redhat.com>
+Date: Mon, 17 Apr 2023 15:39:56 +0200
+Subject: [PATCH] nvme: fix rnlpt to_string() values.
+
+"Reservation Notification Log Page Type" values do not start
+from 0x1 but from 0x0.
+
+Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
+---
+ nvme-print.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/nvme-print.c b/nvme-print.c
+index 8bd2174f..1ed34572 100644
+--- a/nvme-print.c
+++ b/nvme-print.c
+@@ -610,10 +610,10 @@ void nvme_show_lba_status_log(void *lba_status, __u32 size,
+ static const char *resv_notif_to_string(__u8 type)
+ {
+ 	switch (type) {
+-	case 0x1: return "Empty Log Page";
+-	case 0x2: return "Registration Preempted";
+-	case 0x3: return "Reservation Released";
+-	case 0x4: return "Reservation Preempted";
+	case 0x0: return "Empty Log Page";
+	case 0x1: return "Registration Preempted";
+	case 0x2: return "Reservation Released";
+	case 0x3: return "Reservation Preempted";
+ 	default:  return "Reserved";
+ 	}
+ }
+-- 
+2.31.1
+
--- a/SOURCES/nvme-cli-makefile-dont-install-host-params-patch
+++ b/SOURCES/nvme-cli-makefile-dont-install-host-params-patch
@ -0,0 +1,13 @@
+--- nvme-cli-1.9/Makefile.orig	2020-05-27 14:04:56.259961135 -0400
+++ nvme-cli-1.9/Makefile	2020-05-27 14:05:22.796185371 -0400
+@@ -125,8 +125,8 @@
+ 		$(INSTALL) -m 644 -T ./etc/discovery.conf.in $(DESTDIR)$(SYSCONFDIR)/nvme/discovery.conf; \
+ 	fi
+ 
+-install-spec: install-bin install-man install-bash-completion install-zsh-completion install-etc install-systemd install-udev install-dracut
+-install: install-spec install-hostparams
+install-spec: install-bin install-man install-bash-completion install-zsh-completion install-systemd install-udev install-dracut
+install: install-spec
+ 
+ nvme.spec: nvme.spec.in NVME-VERSION-FILE
+ 	sed -e 's/@@VERSION@@/$(NVME_VERSION)/g' < $< > $@+
--- a/SPECS/nvme-cli.spec
+++ b/SPECS/nvme-cli.spec
@ -0,0 +1,254 @@
+#%%global commit0 bdbb4da0979fbdc079cf98410cdb31cf799e83b3
+#%%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
+
+Name:           nvme-cli
+Version:        1.16
+Release:        9%{?dist}
+Summary:        NVMe management command line interface
+
+License:        GPLv2+
+URL:            https://github.com/linux-nvme/nvme-cli
+Source0:        https://github.com/linux-nvme/%{name}/archive/v%{version}.tar.gz
+
+Patch0:         nvme-cli-makefile-dont-install-host-params-patch
+Patch1:         0001-fabrics-fix-nvme-connect-segfault-if-transport-type-.patch
+Patch2:         0002-fabrics-fix-a-buffer-overrun.patch
+Patch3:         0003-bash-Fix-nvme-completion.patch
+Patch4:         0004-nvme-do-not-leak-an-open-file-handle.patch
+Patch5:         0005-nvme-topology-fix-memory-leaks-in-nvme_logical_block.patch
+Patch6:         0006-nvme-cli-nvmf-connect-.service-Remove-matching-from-.patch
+Patch7:         0007-nvme-cli-Make-connect-all-matching-be-case-insensiti.patch
+Patch8:         0008-nvme-cli-nvme-gen-hostnqn-use-partition-UUID-on-IBM-.patch
+Patch9:         0009-Add-new-events-support-in-PEL.patch
+Patch10:        0010-nvme-cli-Decode-Supported-Events-Bitmap-in-PEL-heade.patch
+Patch11:        0011-nvme-cli-Adds-event-number-in-persistent-event-entri.patch
+Patch12:        0012-nvme-cli-Adds-readable-firmware-level-in-persistent.patch
+Patch13:        0013-nvme-cli-Add-support-set-feature-event-in-PEL.patch
+Patch14:        0014-nvme-cli-Add-support-Telemetry-CRT-in-PEL.patch
+Patch15:        0015-fix-firmware-log-page-frs-variable-sign.patch
+Patch16:        0016-fix-file-permissions-nvme-print.c.patch
+Patch17:        0017-fabrics-Fix-ordering-for-auto-connect-services.patch
+Patch18:        0018-nvme-fix-rnlpt-to_string-values.patch
+
+BuildRequires:  libuuid-devel
+BuildRequires:  gcc
+BuildRequires:  systemd-devel
+Requires:       util-linux
+
+%description
+nvme-cli provides NVM-Express user space tooling for Linux.
+
+%prep
+#%%setup -qn %%{name}-%%{commit0}
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+
+%build
+
+# CFLAGS on the command line breaks the build.  It works okay as an
+# environment variable, though.  See:
+# https://github.com/linux-nvme/nvme-cli/pull/480
+CFLAGS="%{optflags}" make PREFIX=/usr LDFLAGS="%{__global_ldflags}" %{?_smp_mflags}
+
+
+%install
+%make_install PREFIX=/usr UDEVDIR="%{_udevrulesdir}/.." SYSTEMDDIR="%{_unitdir}/.."
+mkdir -p %{buildroot}%{_sysconfdir}/nvme
+
+# hostid and hostnqn are supposed to be unique per machine.  We obviously
+# can't package them.
+#rm -f %{buildroot}%{_sysconfdir}/nvme/hostid
+#rm -f %{buildroot}%{_sysconfdir}/nvme/hostnqn
+
+# Do not install the dracut rule yet.  See rhbz 1742764
+rm -f %{buildroot}/usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf
+
+
+%files
+%license LICENSE
+%doc README.md
+%{_sbindir}/nvme
+%{_mandir}/man1/nvme*.gz
+%{_datadir}/bash-completion/completions/nvme
+%{_datadir}/zsh/site-functions/_nvme
+%dir %{_sysconfdir}/nvme
+%{_unitdir}/nvmefc-boot-connections.service
+%{_unitdir}/nvmf-autoconnect.service
+%{_unitdir}/nvmf-connect.target
+%{_unitdir}/nvmf-connect@.service
+%{_udevrulesdir}/70-nvmf-autoconnect.rules
+%{_udevrulesdir}/71-nvmf-iopolicy-netapp.rules
+# Do not install the dracut rule yet.  See rhbz 1742764
+# /usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf
+
+%post
+if [ $1 -eq 1 ] || [ $1 -eq 2 ]; then
+        if [ ! -s %{_sysconfdir}/nvme/hostnqn ]; then
+		echo $(nvme gen-hostnqn) > %{_sysconfdir}/nvme/hostnqn
+        fi
+        if [ ! -s %{_sysconfdir}/nvme/hostid ]; then
+                uuidgen > %{_sysconfdir}/nvme/hostid
+        fi
+
+	# apply udev and systemd changes that we did
+	if [ $1 -eq 1 ]; then
+		systemctl enable nvmefc-boot-connections
+	fi
+	systemctl daemon-reload
+	udevadm control --reload-rules && udevadm trigger
+	exit 0
+fi
+
+%changelog
+* Thu Apr 20 2023 Maurizio Lombardi <mlombard@redhat.com> - 1.16-9
+- Fix BZ #2187288
+
+* Wed Apr 05 2023 Maurizio Lombardi <mlombard@redhat.com> - 1.16-8
+- Fix BZ #1954185
+
+* Wed Nov 09 2022 Maurizio Lombardi <mlombard@redhat.com> - 1.16-7
+- Do not re-enable the nvmefc-boot-connections service if
+  we are just upgrading the package.
+
+* Thu Oct 13 2022 Maurizio Lombardi <mlombard@redhat.com> - 1.16-6
+- Fix a file permission
+
+* Fri Jul 15 2022 Maurizio Lombardi <mlombard@redhat.com> - 1.16-5
+- Fix a compiler warning
+
+* Tue Jul 12 2022 Maurizio Lombardi <mlombard@redhat.com> - 1.16-4
+- Merge fixes for PowerPC
+
+* Fri Jan 07 2022 Maurizio Lombardi <mlombard@redhat.com> - 1.16-3
+- Merge a few bugfixes
+
+* Mon Nov 29 2021 Maurizio Lombardi <mlombard@redhat.com> - 1.16-2
+- Update to version 1.16
+
+* Thu Jul 22 2021 Maurizio Lombardi <mlombard@redhat.com> - 1.14-2
+- Merge various bugfixes
+
+* Wed Apr 28 2021 Maurizio Lombardi <mlombard@redhat.com> - 1.14-1
+- Update to version v1.14
+
+* Tue Apr 20 2021 Maurizio Lombardi <mlombard@redhat.com> - 1.13-4
+- Rebuild to mark bz1949462 as fixed
+
+* Fri Apr 16 2021 Maurizio Lombardi <mlombard@redhat.com> - 1.13-3
+- KATO values fixes for various controllers
+
+* Wed Apr 14 2021 Maurizio Lombardi <mlombard@redhat.com> - 1.13-2
+- Add dependency to util-linux and fix the post install script
+
+* Wed Apr 14 2021 Maurizio Lombardi <mlombard@redhat.com> - 1.13-1
+- Update to 1.13
+
+* Tue Jun 16 2020 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 1.12-1
+- Update to 1.12 (#1827581)
+
+* Sat Apr 25 2020 luto@kernel.org - 1.11.1-1
+- Update to 1.11
+
+* Thu Mar 19 2020 luto@kernel.org - 1.10.1-1
+- Update to 1.10.1
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Oct 02 2019 luto@kernel.org - 1.9-1
+- Update to 1.9
+- Certain fabric functionality may not work yet due to missing dracut
+  support and missing hostid and hostnqn configuration.
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Apr 15 2019 luto@kernel.org - 1.8.1-1
+- Update to 1.8.1-1.
+- Remove a build hack.
+
+* Sun Feb 24 2019 luto@kernel.org - 1.7-2
+- Create /etc/nvme
+
+* Sun Feb 24 2019 luto@kernel.org - 1.7-1
+- Bump to 1.7
+- Clean up some trivial rpmlint complaints
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jul 24 2018 luto@kernel.org - 1.6-1
+- Update to 1.6
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Nov 22 2017 luto@kernel.org - 1.4-1
+- Update to 1.4
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon May 22 2017 luto@kernel.org - 1.3-1
+- Update to 1.3
+
+* Wed Apr 19 2017 luto@kernel.org - 1.2-2
+- Update to 1.2
+- 1.2-1 never existed
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 01 2017 luto@kernel.org - 1.1-1
+- Update to 1.1
+
+* Sun Nov 20 2016 luto@kernel.org - 1.0-1
+- Update to 1.0
+
+* Mon Oct 31 2016 luto@kernel.org - 0.9-1
+- Update to 0.9
+
+* Thu Jun 30 2016 luto@kernel.org - 0.8-1
+- Update to 0.8
+
+* Tue May 31 2016 luto@kernel.org - 0.7-1
+- Update to 0.7
+
+* Fri Mar 18 2016 luto@kernel.org - 0.5-1
+- Update to 0.5
+
+* Sun Mar 06 2016 luto@kernel.org - 0.4-1
+- Update to 0.4
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.2-3.20160112gitbdbb4da
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jan 20 2016 luto@kernel.org - 0.2-2.20160112gitbdbb4da
+- Update to new upstream commit, fixing #49.  "nvme list" now works.
+
+* Wed Jan 13 2016 luto@kernel.org - 0.2-1.20160112gitde3e0f1
+- Initial import.
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +0,0 @@
--- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/nvme-cli.spec
+++ b/nvme-cli.spec
@ -1,318 +0,0 @@
-# RHEL 8 compatibility
-%{!?version_no_tilde: %define version_no_tilde %{shrink:%(echo '%{version}' | tr '~' '-')}}
-
-%global nmlibdir %{_prefix}/lib/NetworkManager
-
-Name:           nvme-cli
-Version:        2.11
-Release:        5%{?dist}
-Summary:        NVMe management command line interface
-
-License:        GPL-2.0-only
-URL:            https://github.com/linux-nvme/nvme-cli
-Source0:        %{url}/archive/v%{version_no_tilde}/%{name}-%{version_no_tilde}.tar.gz
-Source1:        99-nvme-nbft-connect.sh
-Source2:        99-nvme-nbft-no-ignore-carrier.conf
-
-BuildRequires:  meson >= 0.50.0
-BuildRequires:  gcc gcc-c++
-BuildRequires:  systemd-devel
-BuildRequires:  systemd-rpm-macros
-BuildRequires:  zlib-devel
-BuildRequires:  openssl-devel
-BuildRequires:  kernel-headers >= 6.12.0-37
-
-BuildRequires:  libnvme-devel >= 1.11-1
-BuildRequires:  json-c-devel >= 0.13
-
-BuildRequires:  asciidoc
-BuildRequires:  xmlto
-
-Requires:       util-linux
-
-
-%description
-nvme-cli provides NVM-Express user space tooling for Linux.
-
-%prep
-%autosetup -p1 -n %{name}-%{version_no_tilde}
-
-
-%build
-%meson -Dudevrulesdir=%{_udevrulesdir} -Dsystemddir=%{_unitdir} -Dpdc-enabled=true -Ddocs=all -Ddocs-build=true -Dhtmldir=%{_pkgdocdir}
-%meson_build
-
-
-%install
-%meson_install
-%{__install} -pm 644 README.md %{buildroot}%{_pkgdocdir}
-mkdir -p $RPM_BUILD_ROOT%{nmlibdir}/dispatcher.d
-mkdir -p $RPM_BUILD_ROOT%{nmlibdir}/conf.d
-%{__install} -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{nmlibdir}/dispatcher.d/
-%{__install} -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{nmlibdir}/conf.d/
-
-# Do not install the dracut rule yet.  See rhbz 1742764
-rm -f %{buildroot}/usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf
-
-# Move html docs into the right place
-mv %{buildroot}%{_pkgdocdir}/nvme %{buildroot}%{_pkgdocdir}/html
-rm -rf %{buildroot}%{_pkgdocdir}/nvme
-
-
-%files
-%license LICENSE
-%doc %{_pkgdocdir}
-%{_sbindir}/nvme
-%{_mandir}/man1/nvme*.gz
-%{_datadir}/bash-completion/completions/nvme
-%{_datadir}/zsh/site-functions/_nvme
-%dir %{_sysconfdir}/nvme
-%config(noreplace) %{_sysconfdir}/nvme/discovery.conf
-%{_unitdir}/nvmefc-boot-connections.service
-%{_unitdir}/nvmf-autoconnect.service
-%{_unitdir}/nvmf-connect.target
-%{_unitdir}/nvmf-connect@.service
-%{_unitdir}/nvmf-connect-nbft.service
-%{_udevrulesdir}/65-persistent-net-nbft.rules
-%{_udevrulesdir}/70-nvmf-autoconnect.rules
-%{_udevrulesdir}/70-nvmf-keys.rules
-%{_udevrulesdir}/71-nvmf-netapp.rules
-# Do not install the dracut rule yet.  See rhbz 1742764
-# /usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf
-%{nmlibdir}/dispatcher.d/99-nvme-nbft-connect.sh
-%{nmlibdir}/conf.d/99-nvme-nbft-no-ignore-carrier.conf
-
-%post
-%systemd_post nvmefc-boot-connections.service
-%systemd_post nvmf-autoconnect.service
-%systemd_post nvmf-connect@.service
-%systemd_post nvmf-connect-nbft.service
-if [ $1 -eq 1 ] || [ $1 -eq 2 ]; then
-    # apply udev and systemd changes that we did
-    systemctl daemon-reload
-    udevadm control --reload-rules && udevadm trigger
-    exit 0
-fi
-
-%preun
-%systemd_preun nvmefc-boot-connections.service
-%systemd_preun nvmf-autoconnect.service
-%systemd_preun nvmf-connect@.service
-%systemd_preun nvmf-connect-nbft.service
-
-%postun
-%systemd_postun nvmefc-boot-connections.service
-%systemd_postun nvmf-autoconnect.service
-%systemd_postun nvmf-connect@.service
-%systemd_postun nvmf-connect-nbft.service
-
-%changelog
-* Thu Jan 30 2025 Maurizio Lombardi <mlombard@redhat.com> - 2.11-5
- Partially restore the post install script (RHEL-78043)
-
-* Fri Jan 24 2025 Maurizio Lombardi <mlombard@redhat.com> - 2.11-4
- Add kernel-headers to BuildRequires (RHEL-70857)
-
-* Mon Dec 02 2024 Maurizio Lombardi <mlombard@redhat.com> - 2.11-3
- Remove the post script (RHEL-68495)
-
-* Wed Nov 20 2024 Maurizio Lombardi <mlombard@redhat.com> - 2.11-2
- Rebuild for RHEL-68310
-
-* Wed Nov 20 2024 Maurizio Lombardi <mlombard@redhat.com> - 2.11-1
- Update to version v2.11 (RHEL-68310)
-
-* Tue Oct 22 2024 Maurizio Lombardi <mlombard@redhat.com> - 2.10.2-1
- Update to version v2.10.2 (RHEL-63709)
-
-* Thu Aug 22 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.9.1-4
- Install NetworkManager override for nbft interfaces
- Rename reconnect NetworkManager hook to 99-nvme-nbft-connect.sh
-
-* Fri Jul 26 2024 Maurizio Lombardi <mlombard@redhat.com> - 2.9.1-3
- Fix RHEL-37603 (NBFT discovery support)
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.9.1-2
- Bump release for June 2024 mass rebuild
-
-* Fri May 03 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.9.1-1
- Update to 2.9.1
- Install custom nvmf-connect-nbft.sh NetworkManager hook
-
-* Tue Apr 23 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.8-2
- Harden the systemd units
-
-* Wed Feb 14 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.8-1
- Update to 2.8
-
-* Fri Feb 09 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.7.1-4
- Lower the verbosity of TP4126 hostnqn-hostid consistency checks
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Dec 28 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.7.1-1
- Update to 2.7.1
-
-* Fri Sep 29 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.6-1
- Update to 2.6
-
-* Thu Aug 17 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.5-4
- Mark /etc/nvme/discovery.conf as (noreplace)
-
-* Mon Aug 14 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.5-3
- Backport 'fabrics: Use corresponding hostid when hostnqn is generated'
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jul 04 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.5-1
- Update to 2.5
-
-* Thu Apr 20 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.4-2
- Backport the NBFT support from git master
-
-* Mon Apr 03 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.4-1
- Update to 2.4
-
-* Wed Feb 01 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.3-1
- Update to 2.3
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Nov 04 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.2.1-1
- Update to 2.2.1
-
-* Tue Nov 01 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.2-1
- Update to 2.2
-
-* Fri Aug 19 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.1.2-1
- Update to 2.1.2
-
-* Fri Aug 05 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.1.1-1
- Update to 2.1.1
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1~rc0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jul 15 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.1~rc0-1
- Update to 2.1-rc0
- Drop the hostnqn generate scriptlet (#2065886)
-
-* Mon Apr 11 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.0-1
- Update to 2.0
-
-* Mon Apr 04 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.0~rc8-1
- Update to 2.0-rc8
- Added scriptlet to generate /etc/nvme/hostnqn and hostid files (#2065886)
-
-* Tue Mar 15 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.0~rc6-1
- Update to 2.0-rc6
-
-* Fri Mar 04 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.0~rc5-1
- Update to 2.0-rc5
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Apr 25 2020 luto@kernel.org - 1.11.1-1
- Update to 1.11
-
-* Thu Mar 19 2020 luto@kernel.org - 1.10.1-1
- Update to 1.10.1
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Oct 02 2019 luto@kernel.org - 1.9-1
- Update to 1.9
- Certain fabric functionality may not work yet due to missing dracut
-  support and missing hostid and hostnqn configuration.
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Apr 15 2019 luto@kernel.org - 1.8.1-1
- Update to 1.8.1-1.
- Remove a build hack.
-
-* Sun Feb 24 2019 luto@kernel.org - 1.7-2
- Create /etc/nvme
-
-* Sun Feb 24 2019 luto@kernel.org - 1.7-1
- Bump to 1.7
- Clean up some trivial rpmlint complaints
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jul 24 2018 luto@kernel.org - 1.6-1
- Update to 1.6
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Nov 22 2017 luto@kernel.org - 1.4-1
- Update to 1.4
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon May 22 2017 luto@kernel.org - 1.3-1
- Update to 1.3
-
-* Wed Apr 19 2017 luto@kernel.org - 1.2-2
- Update to 1.2
- 1.2-1 never existed
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb 01 2017 luto@kernel.org - 1.1-1
- Update to 1.1
-
-* Sun Nov 20 2016 luto@kernel.org - 1.0-1
- Update to 1.0
-
-* Mon Oct 31 2016 luto@kernel.org - 0.9-1
- Update to 0.9
-
-* Thu Jun 30 2016 luto@kernel.org - 0.8-1
- Update to 0.8
-
-* Tue May 31 2016 luto@kernel.org - 0.7-1
- Update to 0.7
-
-* Fri Mar 18 2016 luto@kernel.org - 0.5-1
- Update to 0.5
-
-* Sun Mar 06 2016 luto@kernel.org - 0.4-1
- Update to 0.4
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.2-3.20160112gitbdbb4da
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jan 20 2016 luto@kernel.org - 0.2-2.20160112gitbdbb4da
- Update to new upstream commit, fixing #49.  "nvme list" now works.
-
-* Wed Jan 13 2016 luto@kernel.org - 0.2-1.20160112gitde3e0f1
- Initial import.
--- a/1
+++ b/1
@ -1 +0,0 @@
-SHA512 (nvme-cli-2.11.tar.gz) = 33de20ad990a3b87fef46fa486832edde41907223aa6b8a47606e605b360745fd7e2054226bf93a59b2a09c6bc04d0b684e4b3bb27c3fc0e6110c64a558cadc0
--- a/tests/include/tc.sh
+++ b/tests/include/tc.sh
@ -1,272 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2016 Red Hat, Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Author: Yi Zhang  <yizhan@redhat.com>
-
-# filename: function
-
-# USAGE
-
-test x$LXT_TC = x || return
-LXT_TC=1
-
-#
-# print the current date
-# usage: d=$(tdate)
-#
-tdate ()
-{
-    date '+%T' 2>/dev/null
-}
-
-#
-# print the log information
-# usage: tlog "hello world" "WARNING"
-#
-tlog ()
-{
-    local msg=$1
-    local log_level=${2:-INFO}
-    local cur_date=$(tdate)
-
-    echo "[$log_level][$cur_date]$msg"
-
-    return 0
-}
-
-#
-# run the cmd and format the log. return the exitint status of cmd
-# use the global variables: tSTDOUT and tSTDERR to return the stdout and stderr
-# usage: trun "ls"
-#        trun "ls"; echo $?
-#        stdout=$tSTDOUT
-#        stderr=$tSTDERR
-#
-trun ()
-{
-    local cmd="$*"
-
-    _trun_ "$cmd"
-}
-
-#
-# verify the execution of command
-# if the cmd return 0, mark this checkpoint failed and return 1
-# if not, mark it passed and return 0
-# usage: tnot "ls /not_existing"
-#
-tnot () {
-    local cmd="$*"
-    _trun_ "$cmd" 1
-    if test $? -eq 0; then
-        tfail_ "$cmd" ;
-    else
-        tpass_ "$cmd" ;
-    fi
-}
-
-#
-# verify the execution of command
-# if the cmd return 0, mark this checkpoint passed and return 0
-# if not, mark it failed and return 1
-# usage: tok "ls /"
-#
-tok ()
-{
-    local cmd="$*"
-    _trun_ "$cmd" 0
-    if test $? -eq 0; then
-        tpass_ "$cmd" ;
-    else
-        tfail_ "$cmd" ;
-    fi
-}
-
-#
-# verify the execution of command
-# if the cmd return 0, mark this checkpoint passed and return 0
-# if not, mark it failes and exit
-# usage: terr "ls"
-#
-#terr ()
-#{
-#    tok "$*" || tend
-#}
-
-#
-# verify the execution of command
-# if the cmd return 0, will continue to run the script
-# if not, mark it failes and exit
-# usage: terr "ls"
-#
-terr ()
-{
-    local cmd="$*"
-    _trun_ "$cmd" 0
-    if test $? -ne 0; then
-        tfail_ "$cmd" ;
-        tend ;
-    fi
-}
-
-#
-# exit the program and print the log message
-# usage: texit "error message" 100
-# similar to the exception
-#
-texit ()
-{
-    msg=$1
-    err=$2
-    is_null $err && err=1
-    test $err -lt 1 || err=1
-
-    tlog "$msg" "ERROR"
-    exit $2
-}
-
-#
-# print the test report, cleanup the testing bed and  close the testing.
-# usage: tend
-#
-tend ()
-{
-    local pcount=$(wc -l $tPASS_FILE | awk '{print $1}')
-    local fcount=$(wc -l $tFAIL_FILE | awk '{print $1}')
-    local total=$(( $pcount + $fcount ))
-
-    echo "#################################Test Report###############################"
-    echo "TOTAL   : $total"
-    echo "PASSED  : $pcount"
-    echo "FAILED  : $fcount"
-    cat $tPASS_FILE $tFAIL_FILE
-    echo "###########################End of running $0########################"
-
-#cleanup
-    rm -f $tPASS_FILE $tFAIL_FILE $tRETURN_FILE $tSTDERR_FILE
-#   rm -rf $LXT_TMP_DIR
-	if [[ $pcount -eq 0 ]] && [[ $total -eq 0 ]];then
-	  exit 0
-    fi
-    test $pcount -eq 0 && exit 1
-    test $pcount -eq $total && exit 0
-    exit 1
-}
-
-#
-# private function
-#
-
-#
-# print the error message and call stack. return 1
-#
-tfail_ ()
-{
-    local msg=$*
-    tlog "$msg" "ERROR" >>$tFAIL_FILE
-
-    return 1
-}
-
-#
-# print the sucessful message. return 0
-#
-tpass_ ()
-{
-    local msg=$*
-    tlog "$msg" "PASS" >> $tPASS_FILE
-
-    return 0
-}
-
-_trun_ ()
-{
-    local cmd="$1"
-    local chk="$2"
-    local cur_date=$(tdate)
-
-    local stdout=$(eval "$cmd" 2>$tSTDERR_FILE; echo $? >$tRETURN_FILE 2>/dev/null)
-#timeout -- how to set timeout?
-    local exit_status=$(< $tRETURN_FILE)
-    local stderr=$(< $tSTDERR_FILE)
-    local msg=CMD
-#tnot
-    if test x$chk = x1; then
-        test $exit_status -eq 0 || msg=PASS
-        test $exit_status -eq 0 && msg=FAIL
-#should let the tester know this is the negative testing
-#if cmd return 0 we will return 1 and vice versa
-        cmd="[NOT] $cmd"
-    fi
-#tok
-    if test x$chk = x0; then
-        test $exit_status -eq 0 && msg=PASS
-        test $exit_status -eq 0 || msg=FAIL
-    fi
-
-    tSTDOUT=$stdout
-    tSTDERR=$stderr
-
-    test $tIGNORE_STDOUT -eq 1 && stdout='redirect the stdout to /dev/null'
-    test $tIGNORE_STDERR -eq 1 && stderr='redirect the stderr to /dev/null'
-
-    echo "[$msg][$cur_date][$HOSTNAME]$cmd"
-    echo "STDOUT:"
-    test "x$stdout" = x || echo "$stdout"
-    echo "STDERR:$stderr"
-    echo "RETURN:$exit_status"
-    echo
-
-    return $exit_status
-}
-
-#
-# setup the testing environment
-#
-_tsetup_ ()
-{
-
-    LXT_TMP_DIR="/mnt/testarea/lxt";
-
-    test -z "$HOSTNAME" && HOSTNAME=$(hostname)
-    test -d "$LXT_TMP_DIR" || mkdir -p "$LXT_TMP_DIR" >& /dev/null || exit 1
-
-    tSTDERR_FILE="$LXT_TMP_DIR/stderr.$$"
-    test -e "$tSTDERR_FILE" || > "$tSTDERR_FILE" || exit 1
-    tRETURN_FILE="$LXT_TMP_DIR/return.$$"
-    test -e "$tRETURN_FILE" || > "$tRETURN_FILE" || exit 1
-    tPASS_FILE="$LXT_TMP_DIR/tc.pass.$$"
-    test -e "$tPASS_FILE" || > "$tPASS_FILE" || exit 1
-    tFAIL_FILE="$LXT_TMP_DIR/tc.fail.$$"
-    test -e "$tFAIL_FILE" || > "$tFAIL_FILE" || exit 1
-}
-
-#
-# main
-#
-
-# global variables
-tIGNORE_STDOUT=0
-tIGNORE_STDERR=0
-tSTDOUT=
-tSTDERR=
-#LXT_TMP_DIR
-# only used in this file
-tPASS_FILE=
-tFAIL_FILE=
-
-_tsetup_
--- a/tests/sanity/runtest.sh
+++ b/tests/sanity/runtest.sh
@ -1,36 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2016 Red Hat, Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Author: Yi Zhang  <yizhan@redhat.com>
-
-set -x
-source ../include/tc.sh || exit 200
-
-tlog "running $0"
-
-tok "yum -y reinstall nvme-cli"
-tok "yum -y remove nvme-cli"
-tok "yum -y install nvme-cli"
-tok "which nvme"
-tok "yum info nvme-cli"
-tok "[[ -f "/usr/sbin/nvme" ]]"
-trun "nvme list"
-trun "nvme list-subsys"
-tok "nvme version"
-tok "nvme help"
-
-tend
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -1,11 +0,0 @@
- hosts: localhost
-  roles:
-  - role: standard-test-basic
-    tags:
-    - classic
-    tests:
-    - simple:
-        dir: sanity
-        run: ./runtest.sh
-    required_packages:
-     - which
				`@ -1 +0,0 @@`
				`SHA512 (nvme-cli-2.11.tar.gz) = 33de20ad990a3b87fef46fa486832edde41907223aa6b8a47606e605b360745fd7e2054226bf93a59b2a09c6bc04d0b684e4b3bb27c3fc0e6110c64a558cadc0`