Merge pull request #1 from mwilck/fix-num-hfis

nbft: avoid duplicate entries in ssns->hfis
linux-nvme · Jan 12, 2024 · b251b26 · b251b26
2 parents 8d89f03 + cf6c8b2
commit b251b26
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 18 deletions.
diff --git a/src/nvme/nbft.c b/src/nvme/nbft.c
@@ -276,6 +276,27 @@ static int read_ssns(struct nbft_info *nbft,
 	}
 	ssns->num_hfis = 1;
 	for (i = 0; i < le16_to_cpu(raw_ssns->secondary_hfi_assoc_obj.length); i++) {
+		bool duplicate = false;
+		int j;
+
+		for (j = 0; j < i; j++) {
+			if (ss_hfi_indexes[i] == ss_hfi_indexes[j]) {
+				duplicate = true;
+				break;
+			}
+		}
+
+		if (!duplicate &&
+		    ss_hfi_indexes[i] == raw_ssns->primary_hfi_desc_index)
+			duplicate = true;
+
+		if (duplicate) {
+			nvme_msg(NULL, LOG_DEBUG,
+				 "file %s: SSNS %d skipping duplicate HFI index %d\n",
+				 nbft->filename, ssns->index, ss_hfi_indexes[i]);
+			continue;
+		}
+
 		ssns->hfis[i + 1] = hfi_from_index(nbft, ss_hfi_indexes[i]);
 		if (ss_hfi_indexes[i] && !ssns->hfis[i + 1])
 			nvme_msg(NULL, LOG_DEBUG,

diff --git a/test/nbft/diffs/NBFT-Dell.PowerEdge.R760 b/test/nbft/diffs/NBFT-Dell.PowerEdge.R760
@@ -26,9 +26,8 @@ discovery_list[0]->uri=nvme+tcp://100.71.103.50:8009/
 discovery_list[0]->nqn=nqn.2014-08.org.nvmexpress.discovery
 subsystem_ns_list[0]->index=1
 subsystem_ns_list[0]->discovery->index=1
-subsystem_ns_list[0]->num_hfis=2
+subsystem_ns_list[0]->num_hfis=1
 subsystem_ns_list[0]->hfis[0]->index=1
-subsystem_ns_list[0]->hfis[1]->index=1
 subsystem_ns_list[0]->transport=tcp
 subsystem_ns_list[0]->traddr=100.71.103.48
 subsystem_ns_list[0]->trsvcid=4420
@@ -44,9 +43,8 @@ subsystem_ns_list[0]->asqsz=0
 subsystem_ns_list[0]->dhcp_root_path_string=(null)
 subsystem_ns_list[1]->index=2
 subsystem_ns_list[1]->discovery->index=1
-subsystem_ns_list[1]->num_hfis=2
+subsystem_ns_list[1]->num_hfis=1
 subsystem_ns_list[1]->hfis[0]->index=1
-subsystem_ns_list[1]->hfis[1]->index=1
 subsystem_ns_list[1]->transport=tcp
 subsystem_ns_list[1]->traddr=100.71.103.49
 subsystem_ns_list[1]->trsvcid=4420

diff --git a/test/nbft/diffs/NBFT-auto-ipv6 b/test/nbft/diffs/NBFT-auto-ipv6
@@ -21,9 +21,8 @@ hfi_list[0]->tcp_info.host_name=nvmepoc-sles15-sp5
 hfi_list[0]->tcp_info.this_hfi_is_default_route=1
 hfi_list[0]->tcp_info.dhcp_override=0
 subsystem_ns_list[0]->index=1
-subsystem_ns_list[0]->num_hfis=2
+subsystem_ns_list[0]->num_hfis=1
 subsystem_ns_list[0]->hfis[0]->index=1
-subsystem_ns_list[0]->hfis[1]->index=1
 subsystem_ns_list[0]->transport=tcp
 subsystem_ns_list[0]->traddr=fd09:9a46:b5c1:1ff:5054:ff:fefd:9e66
 subsystem_ns_list[0]->trsvcid=4420

diff --git a/test/nbft/diffs/NBFT-dhcp-ipv4 b/test/nbft/diffs/NBFT-dhcp-ipv4
@@ -26,9 +26,8 @@ discovery_list[0]->uri=nvme+tcp://192.168.49.10:4420/
 discovery_list[0]->nqn=nqn.2014-08.org.nvmexpress.discovery
 subsystem_ns_list[0]->index=1
 subsystem_ns_list[0]->discovery->index=1
-subsystem_ns_list[0]->num_hfis=2
+subsystem_ns_list[0]->num_hfis=1
 subsystem_ns_list[0]->hfis[0]->index=1
-subsystem_ns_list[0]->hfis[1]->index=1
 subsystem_ns_list[0]->transport=tcp
 subsystem_ns_list[0]->traddr=192.168.49.10
 subsystem_ns_list[0]->trsvcid=4420

diff --git a/test/nbft/diffs/NBFT-dhcp-ipv6 b/test/nbft/diffs/NBFT-dhcp-ipv6
@@ -21,9 +21,8 @@ hfi_list[0]->tcp_info.host_name=nvmeof-sles
 hfi_list[0]->tcp_info.this_hfi_is_default_route=1
 hfi_list[0]->tcp_info.dhcp_override=1
 subsystem_ns_list[0]->index=1
-subsystem_ns_list[0]->num_hfis=2
+subsystem_ns_list[0]->num_hfis=1
 subsystem_ns_list[0]->hfis[0]->index=1
-subsystem_ns_list[0]->hfis[1]->index=1
 subsystem_ns_list[0]->transport=tcp
 subsystem_ns_list[0]->traddr=fddf:d:f:49::10
 subsystem_ns_list[0]->trsvcid=4420

diff --git a/test/nbft/diffs/NBFT-rhpoc b/test/nbft/diffs/NBFT-rhpoc
@@ -21,9 +21,8 @@ hfi_list[0]->tcp_info.host_name=host-vm
 hfi_list[0]->tcp_info.this_hfi_is_default_route=1
 hfi_list[0]->tcp_info.dhcp_override=0
 subsystem_ns_list[0]->index=1
-subsystem_ns_list[0]->num_hfis=2
+subsystem_ns_list[0]->num_hfis=1
 subsystem_ns_list[0]->hfis[0]->index=1
-subsystem_ns_list[0]->hfis[1]->index=1
 subsystem_ns_list[0]->transport=tcp
 subsystem_ns_list[0]->traddr=192.168.101.20
 subsystem_ns_list[0]->trsvcid=4420

diff --git a/test/nbft/diffs/NBFT-static-ipv4 b/test/nbft/diffs/NBFT-static-ipv4
@@ -21,9 +21,8 @@ hfi_list[0]->tcp_info.host_name=nvmeof-sles
 hfi_list[0]->tcp_info.this_hfi_is_default_route=1
 hfi_list[0]->tcp_info.dhcp_override=0
 subsystem_ns_list[0]->index=1
-subsystem_ns_list[0]->num_hfis=2
+subsystem_ns_list[0]->num_hfis=1
 subsystem_ns_list[0]->hfis[0]->index=1
-subsystem_ns_list[0]->hfis[1]->index=1
 subsystem_ns_list[0]->transport=tcp
 subsystem_ns_list[0]->traddr=192.168.49.10
 subsystem_ns_list[0]->trsvcid=4420

diff --git a/test/nbft/diffs/NBFT-static-ipv4-discovery b/test/nbft/diffs/NBFT-static-ipv4-discovery
@@ -26,9 +26,8 @@ discovery_list[0]->uri=nvme+tcp://192.168.49.10:4420/
 discovery_list[0]->nqn=nqn.2014-08.org.nvmexpress.discovery
 subsystem_ns_list[0]->index=1
 subsystem_ns_list[0]->discovery->index=1
-subsystem_ns_list[0]->num_hfis=2
+subsystem_ns_list[0]->num_hfis=1
 subsystem_ns_list[0]->hfis[0]->index=1
-subsystem_ns_list[0]->hfis[1]->index=1
 subsystem_ns_list[0]->transport=tcp
 subsystem_ns_list[0]->traddr=192.168.49.10
 subsystem_ns_list[0]->trsvcid=4420

diff --git a/test/nbft/diffs/NBFT-static-ipv6 b/test/nbft/diffs/NBFT-static-ipv6
@@ -21,9 +21,8 @@ hfi_list[0]->tcp_info.host_name=nvmepoc-sles15-sp5
 hfi_list[0]->tcp_info.this_hfi_is_default_route=1
 hfi_list[0]->tcp_info.dhcp_override=0
 subsystem_ns_list[0]->index=1
-subsystem_ns_list[0]->num_hfis=2
+subsystem_ns_list[0]->num_hfis=1
 subsystem_ns_list[0]->hfis[0]->index=1
-subsystem_ns_list[0]->hfis[1]->index=1
 subsystem_ns_list[0]->transport=tcp
 subsystem_ns_list[0]->traddr=fd09:9a46:b5c1:1fe::13f
 subsystem_ns_list[0]->trsvcid=4420