libnvme: propagate the error to the caller if nvme_get_log_page() fails

The nvme_get_log_page() function may return an NVMe status code on failure,
leaving the errno number set to zero.
The nvme_discovery_log() function wasn't
propagating this error information to its caller; it would just return
NULL without setting a meaningful errno value.

the NULL pointer is interpreted as an error by nvme-cli, it then tries
to print the string associated to the errno value, resulting
in a funny output:

failed to get discovery log: Success

Fix this by capturing the status code returned by
nvme_get_log_page(), converting it to an errno value using
nvme_status_to_errno(), and setting errno before returning.

Additionally, the error message has been improved to include the
NVMe status code and the log level has been raised from
LOG_INFO to LOG_ERR.

Signed-off-by: Maurizio Lombardi <[email protected]>

Author: maurizio-lombardi

src/nvme/fabrics.c

@@ -1134,6 +1134,7 @@ static struct nvmf_discovery_log *nvme_discovery_log(
 	nvme_root_t r = root_from_ctrl(args->c);
 	struct nvmf_discovery_log *log;
 	int retries = 0;
+	uint32_t status = 0;
 	const char *name = nvme_ctrl_get_name(args->c);
 	uint64_t genctr, numrec;
 	int fd = nvme_ctrl_get_fd(args->c);
@@ -1161,10 +1162,10 @@ static struct nvmf_discovery_log *nvme_discovery_log(
 		 name, retries, args->max_retries);
 	log_args.log = log;
 	log_args.len = DISCOVERY_HEADER_LEN;
-	if (nvme_get_log_page(fd, NVME_LOG_PAGE_PDU_SIZE, &log_args)) {
-		nvme_msg(r, LOG_INFO,
-			 "%s: discover try %d/%d failed, error %d\n",
-			 name, retries, args->max_retries, errno);
+	if ((status = nvme_get_log_page(fd, NVME_LOG_PAGE_PDU_SIZE, &log_args))) {
+		nvme_msg(r, LOG_ERR,
+			 "%s: discover try %d/%d failed, errno %d status 0x%x\n",
+			 name, retries, args->max_retries, errno, status);
 		goto out_free_log;
 	}
 
@@ -1194,10 +1195,10 @@ static struct nvmf_discovery_log *nvme_discovery_log(
 		log_args.lpo = sizeof(*log);
 		log_args.log = log->entries;
 		log_args.len = entries_size;
-		if (nvme_get_log_page(fd, NVME_LOG_PAGE_PDU_SIZE, &log_args)) {
-			nvme_msg(r, LOG_INFO,
-				 "%s: discover try %d/%d failed, error %d\n",
-				 name, retries, args->max_retries, errno);
+		if ((status = nvme_get_log_page(fd, NVME_LOG_PAGE_PDU_SIZE, &log_args))) {
+			nvme_msg(r, LOG_ERR,
+				 "%s: discover try %d/%d failed, errno %d status 0x%x\n",
+				 name, retries, args->max_retries, errno, status);
 			goto out_free_log;
 		}
 
@@ -1210,10 +1211,10 @@ static struct nvmf_discovery_log *nvme_discovery_log(
 		log_args.lpo = 0;
 		log_args.log = log;
 		log_args.len = DISCOVERY_HEADER_LEN;
-		if (nvme_get_log_page(fd, NVME_LOG_PAGE_PDU_SIZE, &log_args)) {
-			nvme_msg(r, LOG_INFO,
-				 "%s: discover try %d/%d failed, error %d\n",
-				 name, retries, args->max_retries, errno);
+		if ((status = nvme_get_log_page(fd, NVME_LOG_PAGE_PDU_SIZE, &log_args))) {
+			nvme_msg(r, LOG_ERR,
+				 "%s: discover try %d/%d failed, errno %d status 0x%x\n",
+				 name, retries, args->max_retries, errno, status);
 			goto out_free_log;
 		}
 	} while (genctr != le64_to_cpu(log->genctr) &&
@@ -1234,6 +1235,8 @@ static struct nvmf_discovery_log *nvme_discovery_log(
 
 out_free_log:
 	free(log);
+	if (!errno)
+		errno = nvme_status_to_errno(status, true);
 	return NULL;
 }