MSVSphere Packaging Team
1 year ago
parent
e6c4faa548
commit
8c931b07e5
@ -1 +1 @@
|
||||
SOURCES/libnvme-1.2.tar.gz
|
||||
SOURCES/libnvme-1.4.tar.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
32d5f81b7af835e5596cb390f7dd2ac889414e1d SOURCES/libnvme-1.2.tar.gz
|
||||
1708e8659912cb695c3ac618a28518027f5833db SOURCES/libnvme-1.4.tar.gz
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
From 78ce3528d00bb433c661fd24672a1b5c6795b59f Mon Sep 17 00:00:00 2001
|
||||
From: Martin Belanger <martin.belanger@dell.com>
|
||||
Date: Fri, 18 Nov 2022 10:41:32 -0500
|
||||
Subject: [PATCH] fabrics: Fix bad UUID size introduced in recent UUID changes
|
||||
Content-type: text/plain
|
||||
|
||||
71c25d1cf741 ("util: Add simple UUID type") introduced a regression in
|
||||
nvmf_get_tel(). nvmf_get_tel() returns the lenght of the binary
|
||||
representation. Hence use NVME_UUID_LEN instead.
|
||||
|
||||
Signed-off-by: Martin Belanger <martin.belanger@dell.com>
|
||||
[dwagner: massaged commit message]
|
||||
Signed-off-by: Daniel Wagner <dwagner@suse.de>
|
||||
---
|
||||
src/nvme/fabrics.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c
|
||||
index f943090..36bdc2d 100644
|
||||
--- a/src/nvme/fabrics.c
|
||||
+++ b/src/nvme/fabrics.c
|
||||
@@ -1127,7 +1127,7 @@ static __u32 nvmf_get_tel(const char *hostsymname)
|
||||
__u16 len;
|
||||
|
||||
/* Host ID is mandatory */
|
||||
- tel += nvmf_exat_size(NVME_UUID_LEN_STRING);
|
||||
+ tel += nvmf_exat_size(NVME_UUID_LEN);
|
||||
|
||||
/* Symbolic name is optional */
|
||||
len = hostsymname ? strlen(hostsymname) : 0;
|
||||
--
|
||||
2.31.1
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,37 @@
|
||||
From 670ec98ebc986e62267145abb059b66ac5e51380 Mon Sep 17 00:00:00 2001
|
||||
From: Tomas Bzatek <tbzatek@redhat.com>
|
||||
Date: Thu, 13 Apr 2023 15:39:28 +0200
|
||||
Subject: [PATCH] nbft: Move added symbols to LIBNVME_1_5
|
||||
|
||||
---
|
||||
src/libnvme.map | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/libnvme.map b/src/libnvme.map
|
||||
index 6aa9fd0..28de595 100644
|
||||
--- a/src/libnvme.map
|
||||
+++ b/src/libnvme.map
|
||||
@@ -1,5 +1,11 @@
|
||||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
|
||||
+LIBNVME_1_5 {
|
||||
+ global:
|
||||
+ nvme_nbft_read;
|
||||
+ nvme_nbft_free;
|
||||
+};
|
||||
+
|
||||
LIBNVME_1_4 {
|
||||
global:
|
||||
nvme_lookup_keyring;
|
||||
@@ -7,8 +13,6 @@ LIBNVME_1_4 {
|
||||
nvme_lookup_key;
|
||||
nvme_set_keyring;
|
||||
nvme_insert_tls_key;
|
||||
- nvme_nbft_read;
|
||||
- nvme_nbft_free;
|
||||
};
|
||||
|
||||
LIBNVME_1_3 {
|
||||
--
|
||||
2.39.1
|
||||
|
||||
@ -0,0 +1,36 @@
|
||||
From 26e4343c2ba2db7a3c5696bbf61bb87942ac02bb Mon Sep 17 00:00:00 2001
|
||||
From: Tomas Bzatek <tbzatek@redhat.com>
|
||||
Date: Thu, 13 Apr 2023 17:28:42 +0200
|
||||
Subject: [PATCH] nbft: Fix nbft_ssns_flags endianness test
|
||||
|
||||
Missing flags endianness conversion leading to ssns_ext_info
|
||||
not being parsed on s390x and armhf.
|
||||
---
|
||||
src/nvme/nbft.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/nvme/nbft.c b/src/nvme/nbft.c
|
||||
index f91d21b..940dd8e 100644
|
||||
--- a/src/nvme/nbft.c
|
||||
+++ b/src/nvme/nbft.c
|
||||
@@ -169,7 +169,7 @@ static int read_ssns_exended_info(struct nbft_info *nbft,
|
||||
"invalid ID in SSNS extended info descriptor");
|
||||
verify(raw_ssns_ei->version == 1,
|
||||
"invalid version in SSNS extended info descriptor");
|
||||
- verify(le16_to_cpu(raw_ssns_ei->ssns_index) == le16_to_cpu(ssns->index),
|
||||
+ verify(le16_to_cpu(raw_ssns_ei->ssns_index) == ssns->index,
|
||||
"SSNS index doesn't match extended info descriptor index");
|
||||
|
||||
if (!(le32_to_cpu(raw_ssns_ei->flags) & NBFT_SSNS_EXT_INFO_VALID))
|
||||
@@ -292,7 +292,7 @@ static int read_ssns(struct nbft_info *nbft,
|
||||
goto fail;
|
||||
|
||||
/* SSNS extended info */
|
||||
- if (raw_ssns->flags & NBFT_SSNS_EXTENDED_INFO_IN_USE) {
|
||||
+ if (le16_to_cpu(raw_ssns->flags) & NBFT_SSNS_EXTENDED_INFO_IN_USE) {
|
||||
struct nbft_ssns_ext_info *ssns_extended_info;
|
||||
|
||||
if (!get_heap_obj(raw_ssns, ssns_extended_info_desc_obj, 0,
|
||||
--
|
||||
2.39.1
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
From 1617d1a3f42a25a2e99073811174609abcffc34d Mon Sep 17 00:00:00 2001
|
||||
From: Tomas Bzatek <tbzatek@redhat.com>
|
||||
Date: Thu, 13 Apr 2023 18:27:39 +0200
|
||||
Subject: [PATCH] nbft: Parse the {HOSTID,HOSTNQN}_CONFIGURED flags
|
||||
|
||||
---
|
||||
src/nvme/nbft.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/nvme/nbft.c b/src/nvme/nbft.c
|
||||
index 940dd8e..c0af2b3 100644
|
||||
--- a/src/nvme/nbft.c
|
||||
+++ b/src/nvme/nbft.c
|
||||
@@ -560,6 +560,8 @@ static int parse_raw_nbft(struct nbft_info *nbft)
|
||||
nbft->host.id = (unsigned char *) &(host->host_id);
|
||||
if (get_heap_obj(host, host_nqn_obj, 1, &nbft->host.nqn) != 0)
|
||||
return -EINVAL;
|
||||
+ nbft->host.host_id_configured = host->flags & NBFT_HOST_HOSTID_CONFIGURED;
|
||||
+ nbft->host.host_nqn_configured = host->flags & NBFT_HOST_HOSTNQN_CONFIGURED;
|
||||
|
||||
/*
|
||||
* HFI
|
||||
--
|
||||
2.39.1
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
From 00b48dd3c217a9271c1888e8dbeb4aa9d307e5bf Mon Sep 17 00:00:00 2001
|
||||
From: Martin Belanger <martin.belanger@dell.com>
|
||||
Date: Thu, 13 Apr 2023 09:27:04 -0400
|
||||
Subject: [PATCH] nbft: Doc typo - Use nvme_nbft_free() instead of nbft_free()
|
||||
|
||||
Signed-off-by: Martin Belanger <martin.belanger@dell.com>
|
||||
---
|
||||
src/nvme/nbft.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/nvme/nbft.c b/src/nvme/nbft.c
|
||||
index c0af2b3..a085768 100644
|
||||
--- a/src/nvme/nbft.c
|
||||
+++ b/src/nvme/nbft.c
|
||||
@@ -663,7 +663,7 @@ void nvme_nbft_free(struct nbft_info *nbft)
|
||||
* @filename: Filename of the raw NBFT table to read.
|
||||
*
|
||||
* Read and parse the specified NBFT file into a struct nbft_info.
|
||||
- * Free with nbft_free().
|
||||
+ * Free with nvme_nbft_free().
|
||||
*
|
||||
* Return: 0 on success, errno otherwise.
|
||||
*/
|
||||
--
|
||||
2.39.1
|
||||
|
||||
@ -0,0 +1,64 @@
|
||||
From 961606f0d0547c3eebd47b79c363ab28c95a94ea Mon Sep 17 00:00:00 2001
|
||||
From: Martin Belanger <martin.belanger@dell.com>
|
||||
Date: Fri, 14 Apr 2023 11:19:23 -0400
|
||||
Subject: [PATCH] NBFT: Remove documentation from nbft.c since it's also in
|
||||
nbft.h
|
||||
|
||||
Also, replace nbft_free() by nvme_nbft_free() in documentation
|
||||
found in nbft.h.
|
||||
|
||||
Signed-off-by: Martin Belanger <martin.belanger@dell.com>
|
||||
---
|
||||
src/nvme/nbft.c | 15 ---------------
|
||||
src/nvme/nbft.h | 2 +-
|
||||
2 files changed, 1 insertion(+), 16 deletions(-)
|
||||
|
||||
diff --git a/src/nvme/nbft.c b/src/nvme/nbft.c
|
||||
index a085768..a1e17cd 100644
|
||||
--- a/src/nvme/nbft.c
|
||||
+++ b/src/nvme/nbft.c
|
||||
@@ -626,10 +626,6 @@ static int parse_raw_nbft(struct nbft_info *nbft)
|
||||
return 0;
|
||||
}
|
||||
|
||||
-/**
|
||||
- * nvme_nbft_free() - Free the struct nbft_info and its contents
|
||||
- * @nbft: Parsed NBFT table data.
|
||||
- */
|
||||
void nvme_nbft_free(struct nbft_info *nbft)
|
||||
{
|
||||
struct nbft_info_hfi **hfi;
|
||||
@@ -656,17 +652,6 @@ void nvme_nbft_free(struct nbft_info *nbft)
|
||||
free(nbft);
|
||||
}
|
||||
|
||||
-/**
|
||||
- * nvme_nbft_read() - Read and parse contents of an ACPI NBFT table
|
||||
- *
|
||||
- * @nbft: Parsed NBFT table data.
|
||||
- * @filename: Filename of the raw NBFT table to read.
|
||||
- *
|
||||
- * Read and parse the specified NBFT file into a struct nbft_info.
|
||||
- * Free with nvme_nbft_free().
|
||||
- *
|
||||
- * Return: 0 on success, errno otherwise.
|
||||
- */
|
||||
int nvme_nbft_read(struct nbft_info **nbft, const char *filename)
|
||||
{
|
||||
__u8 *raw_nbft = NULL;
|
||||
diff --git a/src/nvme/nbft.h b/src/nvme/nbft.h
|
||||
index c3caa85..6012e16 100644
|
||||
--- a/src/nvme/nbft.h
|
||||
+++ b/src/nvme/nbft.h
|
||||
@@ -1223,7 +1223,7 @@ struct nbft_info {
|
||||
* @filename: Filename of the raw NBFT table to read.
|
||||
*
|
||||
* Read and parse the specified NBFT file into a struct nbft_info.
|
||||
- * Free with nbft_free().
|
||||
+ * Free with nvme_nbft_free().
|
||||
*
|
||||
* Return: 0 on success, errno otherwise.
|
||||
*/
|
||||
--
|
||||
2.39.1
|
||||
|
||||
@ -0,0 +1,105 @@
|
||||
From 4204cb3c79219926f750ede2d7e8b23a3852e72d Mon Sep 17 00:00:00 2001
|
||||
From: Caleb Sander <csander@purestorage.com>
|
||||
Date: Fri, 12 May 2023 10:49:46 -0600
|
||||
Subject: [PATCH] fabrics: check genctr after getting discovery entries
|
||||
Content-type: text/plain
|
||||
|
||||
From the NVMe base spec (version 2.0c, section 5.16.1.23):
|
||||
If the host reads the Discovery Log Page using multiple Get Log Page
|
||||
commands the host should ensure that there has not been a change in the
|
||||
contents of the data. The host should read the Discovery Log Page
|
||||
contents in order (i.e., with increasing Log Page Offset values) and
|
||||
then re-read the Generation Counter after the entire log page is
|
||||
transferred. If the Generation Counter does not match the original value
|
||||
read, the host should discard the log page read as the entries may be
|
||||
inconsistent.
|
||||
|
||||
nvme_get_log_page() will issue multiple Get Log Page commands
|
||||
to fetch the discovery log page if it exceeds 4 KB.
|
||||
Since GENCTR is at the start of the log page, this ordering is possible:
|
||||
- GENCTR is read by a Get Log Page command for the first 4 KB
|
||||
- The log page is modified, changing GENCTR
|
||||
- Other Get Log Page commands read the remainder of the log page
|
||||
So the check that GENCTR hasn't changed will incorrectly pass,
|
||||
despite the log page having been modified.
|
||||
This can lead to inconsistent, missing, or duplicate log page entries.
|
||||
|
||||
Ensure a GENCTR update is not missed
|
||||
by fetching log page header again after all entries.
|
||||
|
||||
Also use NVME_LOG_PAGE_PDU_SIZE to match other nvme_get_log_page() calls
|
||||
instead of hard-coding the 4 KB max transfer length.
|
||||
And ensure LPO is correctly reset if the log page is read again.
|
||||
|
||||
Signed-off-by: Caleb Sander <csander@purestorage.com>
|
||||
---
|
||||
src/nvme/fabrics.c | 32 ++++++++++++++++++++++++++------
|
||||
1 file changed, 26 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c
|
||||
index 1762898..eaee29b 100644
|
||||
--- a/src/nvme/fabrics.c
|
||||
+++ b/src/nvme/fabrics.c
|
||||
@@ -1036,9 +1036,10 @@ static struct nvmf_discovery_log *nvme_discovery_log(nvme_ctrl_t c,
|
||||
nvme_msg(r, LOG_DEBUG, "%s: get header (try %d/%d)\n",
|
||||
name, retries, max_retries);
|
||||
args->rae = true;
|
||||
+ args->lpo = 0;
|
||||
args->len = size;
|
||||
args->log = log;
|
||||
- ret = nvme_get_log_page(fd, 4096, args);
|
||||
+ ret = nvme_get_log_page(fd, NVME_LOG_PAGE_PDU_SIZE, args);
|
||||
if (ret) {
|
||||
nvme_msg(r, LOG_INFO,
|
||||
"%s: discover try %d/%d failed, error %d\n",
|
||||
@@ -1065,15 +1066,33 @@ static struct nvmf_discovery_log *nvme_discovery_log(nvme_ctrl_t c,
|
||||
}
|
||||
|
||||
nvme_msg(r, LOG_DEBUG,
|
||||
- "%s: get header and %" PRIu64
|
||||
+ "%s: get %" PRIu64
|
||||
" records (length %d genctr %" PRIu64 ")\n",
|
||||
name, numrec, size, genctr);
|
||||
|
||||
+ args->rae = true;
|
||||
+ args->lpo = sizeof(struct nvmf_discovery_log);
|
||||
+ args->len = size - sizeof(struct nvmf_discovery_log);
|
||||
+ args->log = log->entries;
|
||||
+ ret = nvme_get_log_page(fd, NVME_LOG_PAGE_PDU_SIZE, args);
|
||||
+ if (ret) {
|
||||
+ nvme_msg(r, LOG_INFO,
|
||||
+ "%s: discover try %d/%d failed, error %d\n",
|
||||
+ name, retries, max_retries, errno);
|
||||
+ goto out_free_log;
|
||||
+ }
|
||||
+
|
||||
+ /*
|
||||
+ * If the log page was read with multiple Get Log Page commands,
|
||||
+ * genctr must be checked afterwards to ensure atomicity
|
||||
+ */
|
||||
+ nvme_msg(r, LOG_DEBUG, "%s: get header again\n", name);
|
||||
+
|
||||
args->rae = false;
|
||||
- args->len = size;
|
||||
+ args->lpo = 0;
|
||||
+ args->len = sizeof(struct nvmf_discovery_log);
|
||||
args->log = log;
|
||||
- ret = nvme_get_log_page(fd, 4096, args);
|
||||
-
|
||||
+ ret = nvme_get_log_page(fd, NVME_LOG_PAGE_PDU_SIZE, args);
|
||||
if (ret) {
|
||||
nvme_msg(r, LOG_INFO,
|
||||
"%s: discover try %d/%d failed, error %d\n",
|
||||
@@ -1088,7 +1107,8 @@ static struct nvmf_discovery_log *nvme_discovery_log(nvme_ctrl_t c,
|
||||
errno = EAGAIN;
|
||||
} else if (numrec != le64_to_cpu(log->numrec)) {
|
||||
nvme_msg(r, LOG_INFO,
|
||||
- "%s: could only fetch %" PRIu64 " of %" PRIu64 " records\n",
|
||||
+ "%s: numrec changed unexpectedly "
|
||||
+ "from %" PRIu64 " to %" PRIu64 "\n",
|
||||
name, numrec, le64_to_cpu(log->numrec));
|
||||
errno = EBADSLT;
|
||||
} else {
|
||||
--
|
||||
2.39.3
|
||||
|
||||
@ -0,0 +1,49 @@
|
||||
From 777b52152f8137048b72edc12ad2ae998df4c30a Mon Sep 17 00:00:00 2001
|
||||
From: Caleb Sander <csander@purestorage.com>
|
||||
Date: Fri, 12 May 2023 09:43:22 -0600
|
||||
Subject: [PATCH] ioctl: fix RAE bit on last Get Log Page command
|
||||
Content-type: text/plain
|
||||
|
||||
If nvme_get_log_page() requires multiple Get Log Page commands
|
||||
because the total log length exceeds the transfer length,
|
||||
args->rae is overwritten, causing the RAE bit to be set in all commands.
|
||||
Retrieve the value of args->rae before overwriting it
|
||||
so the RAE bit is set as requested in the last command.
|
||||
|
||||
Fixes: c23dbd4 ("linux: Change nvme_get_log_page to use nvme_get_log_args parm")
|
||||
Signed-off-by: Caleb Sander <csander@purestorage.com>
|
||||
---
|
||||
src/nvme/ioctl.c | 7 ++-----
|
||||
1 file changed, 2 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/nvme/ioctl.c b/src/nvme/ioctl.c
|
||||
index 6f9d724..b9710b3 100644
|
||||
--- a/src/nvme/ioctl.c
|
||||
+++ b/src/nvme/ioctl.c
|
||||
@@ -434,7 +434,7 @@ int nvme_get_log_page(int fd, __u32 xfer_len, struct nvme_get_log_args *args)
|
||||
{
|
||||
__u64 offset = 0, xfer, data_len = args->len;
|
||||
__u64 start = args->lpo;
|
||||
- bool retain = true;
|
||||
+ bool retain = args->rae;
|
||||
void *ptr = args->log;
|
||||
int ret;
|
||||
|
||||
@@ -454,13 +454,10 @@ int nvme_get_log_page(int fd, __u32 xfer_len, struct nvme_get_log_args *args)
|
||||
* last portion of this log page so the data remains latched
|
||||
* during the fetch sequence.
|
||||
*/
|
||||
- if (offset + xfer == data_len)
|
||||
- retain = args->rae;
|
||||
-
|
||||
args->lpo = start + offset;
|
||||
args->len = xfer;
|
||||
args->log = ptr;
|
||||
- args->rae = retain;
|
||||
+ args->rae = offset + xfer < data_len || retain;
|
||||
ret = nvme_get_log(args);
|
||||
if (ret)
|
||||
return ret;
|
||||
--
|
||||
2.39.3
|
||||
|
||||
Loading…
Reference in new issue