Merged in develop-117 (pull request ofiwg#2)

Develop 117 * lpp: update getinfo function None of the serivce, node, flags params are used so ignore them because service is not zero in 1.17. Update libfabric version to 'LATEST' in provider structure. Signed-off-by: Tadeusz Struk <tstruk@gigaio.com> * fabtest: update lpp tests Update the lpp type test names. Signed-off-by: Tadeusz Struk <tstruk@gigaio.com>
tstruk · Feb 27, 2023 · 67f47e5 · 67f47e5
1 parent a8f9617
commit 67f47e5
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 40 deletions.
diff --git a/fabtests/scripts/runfabtests.sh b/fabtests/scripts/runfabtests.sh
@@ -92,42 +92,42 @@ fi
 declare -ri FI_ENOSYS=$($python -c 'import errno; print(errno.ENOSYS)')
 
 lpp_unit_tests=(
-	"getinfo_test -s SERVER_ADDR GOOD_ADDR"
-	"dom_test -n 2"
-	"cq_test"
-	"mr_test"
-	"cntr_test"
+	"fi_getinfo_test -s SERVER_ADDR GOOD_ADDR"
+	"fi_dom_test -n 2"
+	"fi_cq_test"
+	"fi_mr_test"
+	"fi_cntr_test"
 )
 
 lpp_neg_unit_tests=(
-	"dgram g00n13s"
+	"fi_dgram g00n13s"
 	# (EXIT_FAILURE instead of FI_ENODATA) "rdm g00n13s"
-	"msg g00n13s"
+	"fi_msg g00n13s"
 )
 
 lpp_tests=(
-	"rdm -b"
-	"rdm_rma_simple -b"
-	"rdm_tagged_peek -b"
-	"unexpected_msg -e rdm -i 10 -b"
-	"rma_bw -e rdm -o write -I 5 -b"
-	"rdm_cntr_pingpong -I 5 -b"
-	"rdm_multi_recv -I 5 -b"
-	"rdm_pingpong -I 5 -b"
-	"rdm_pingpong -I 5 -v -b"
-	"rdm_tagged_pingpong -I 5 -b"
-	"rdm_tagged_pingpong -I 5 -v -b"
-	"rdm_tagged_bw -I 5 -b -t counter"
-	"rdm_tagged_bw -I 5 -v -b -t counter"
-	"rma_bw -e rdm -o write -b"
-	"rdm_cntr_pingpong -b"
-	"rdm_multi_recv -b"
-	"rdm_pingpong -b"
-	"rdm_pingpong -v -b"
-	"rdm_tagged_pingpong -b"
-	"rdm_tagged_pingpong -v -b"
-	"rdm_tagged_bw -t counter -b"
-	"rdm_tagged_bw -t counter -v -b"
+	"fi_rdm -b"
+	"fi_rdm_rma_simple -b"
+	"fi_rdm_tagged_peek -b"
+	"fi_unexpected_msg -e rdm -i 10 -b"
+	"fi_rma_bw -e rdm -o write -I 5 -b"
+	"fi_rdm_cntr_pingpong -I 5 -b"
+	"fi_rdm_multi_recv -I 5 -b"
+	"fi_rdm_pingpong -I 5 -b"
+	"fi_rdm_pingpong -I 5 -v -b"
+	"fi_rdm_tagged_pingpong -I 5 -b"
+	"fi_rdm_tagged_pingpong -I 5 -v -b"
+	"fi_rdm_tagged_bw -I 5 -b -t counter"
+	"fi_rdm_tagged_bw -I 5 -v -b -t counter"
+	"fi_rma_bw -e rdm -o write -b"
+	"fi_rdm_cntr_pingpong -b"
+	"fi_rdm_multi_recv -b"
+	"fi_rdm_pingpong -b"
+	"fi_rdm_pingpong -v -b"
+	"fi_rdm_tagged_pingpong -b"
+	"fi_rdm_tagged_pingpong -v -b"
+	"fi_rdm_tagged_bw -t counter -b"
+	"fi_rdm_tagged_bw -t counter -v -b"
 )
 
 neg_unit_tests=(

diff --git a/prov/lpp/src/lpp_getinfo.c b/prov/lpp/src/lpp_getinfo.c
@@ -194,27 +194,19 @@ int lpp_fi_getinfo(uint32_t version, const char *node, const char *service,
 		return -FI_ENODATA;
 	}
 
-	//
-	// MPICH doesn't use node, service or flags.
-	//
-	if ((node != NULL) || (service != NULL) || (flags != 0)) {
-		FI_INFO(&lpp_prov, FI_LOG_FABRIC, "'node', 'service', 'flags' parameters are not supported\n");
-		return -FI_ENODATA;
-	}
-
 	//
 	// We only support FI_EP_RDM.
 	//
 	if ((hints != NULL) && (hints->ep_attr != NULL)) {
 		if ((hints->ep_attr->type != FI_EP_UNSPEC) && (hints->ep_attr->type != FI_EP_RDM)) {
-			FI_INFO(&lpp_prov, FI_LOG_FABRIC, "only RDM msg type is supported\n");
+			FI_WARN(&lpp_prov, FI_LOG_FABRIC, "only RDM msg type is supported\n");
 			return -FI_ENODATA;
 		}
 	}
 
 	ret = glob("/dev/klpp[0-9]", GLOB_ERR, NULL, &globmatch);
 	if (ret == GLOB_NOMATCH) {
-		FI_INFO(&lpp_prov, FI_LOG_FABRIC, "no KLPP devices found\n");
+		FI_WARN(&lpp_prov, FI_LOG_FABRIC, "no KLPP devices found\n");
 		return -FI_ENODATA;
 	} else if (ret != 0) {
 		FI_WARN(&lpp_prov, FI_LOG_FABRIC, "failed to enumerate KLPP devices (%d)\n",

diff --git a/prov/lpp/src/lpp_util.c b/prov/lpp/src/lpp_util.c
@@ -172,7 +172,7 @@ __attribute__((visibility("default")))
 struct fi_provider lpp_prov = {
 	.name       = lpp_prov_name,
 	.version    = LPP_VERSION,
-	.fi_version = FI_VERSION(1, 7),
+	.fi_version = OFI_VERSION_LATEST,
 	.getinfo    = lpp_fi_getinfo,
 	.fabric     = lpp_fi_fabric,
 	.cleanup    = lpp_fi_fini