ioctl: refactor nvme_get_log_partial uring

Refactore so we maintain nvme_get_log_partial easier.

Signed-off-by: Tokunori Ikegami <[email protected]>

Author: ikegami-t

libnvme/src/nvme/ioctl.c

@@ -304,7 +304,7 @@ static int nvme_uring_cmd_admin_passthru_async(struct nvme_transport_handle *hdl
 
 	memcpy(&sqe->cmd, cmd, sizeof(*cmd));
 
-	sqe->fd = l->fd;
+	sqe->fd = hdl->fd;
 	sqe->opcode = IORING_OP_URING_CMD;
 	sqe->cmd_op = NVME_URING_CMD_ADMIN;
 	sqe->user_data = (__u64)(uintptr_t)result;
@@ -340,7 +340,19 @@ static int nvme_uring_cmd_wait_complete(struct io_uring *ring, int n)
 
 	return ret;
 }
-#endif
+
+static bool nvme_uring_is_usable(struct nvme_transport_handle *hdl)
+{
+	struct stat st;
+
+	if (io_uring_kernel_support != IO_URING_AVAILABLE ||
+	    hdl->type != NVME_TRANSPORT_HANDLE_TYPE_DIRECT ||
+	    fstat(hdl->fd, &st) || !S_ISCHR(st.st_mode))
+		return false;
+
+	return true;
+}
+#endif /* CONFIG_LIBURING */
 
 int nvme_get_log(struct nvme_transport_handle *hdl,
 		struct nvme_passthru_cmd *cmd, bool rae,
@@ -357,26 +369,21 @@ int nvme_get_log(struct nvme_transport_handle *hdl,
 	__u32 cdw10 = cmd->cdw10 & (NVME_VAL(LOG_CDW10_LID) |
 				    NVME_VAL(LOG_CDW10_LSP));
 	__u32 cdw11 = cmd->cdw11 & NVME_VAL(LOG_CDW11_LSI);
-
-	if (force_4k)
-		xfer_len = NVME_LOG_PAGE_PDU_SIZE;
-
 #ifdef CONFIG_LIBURING
-	int n = 0;
+	bool use_uring = nvme_uring_is_usable(hdl);
 	struct io_uring ring;
-	struct stat st;
-	bool use_uring = false;
-
-	if (io_uring_kernel_support == IO_URING_AVAILABLE && l->type == NVME_LINK_TYPE_DIRECT) {
-		if (fstat(l->fd, &st) == 0 && S_ISCHR(st.st_mode)) {
-			use_uring = true;
+	int n = 0;
 
-			ret = nvme_uring_cmd_setup(&ring);
-			if (ret)
-				return ret;
-		}
+	if (use_uring) {
+		ret = nvme_uring_cmd_setup(&ring);
+		if (ret)
+			return ret;
 	}
-#endif
+#endif /* CONFIG_LIBURING */
+
+	if (force_4k)
+		xfer_len = NVME_LOG_PAGE_PDU_SIZE;
+
 	/*
 	 * 4k is the smallest possible transfer unit, so restricting to 4k
 	 * avoids having to check the MDTS value of the controller.
@@ -410,20 +417,27 @@ int nvme_get_log(struct nvme_transport_handle *hdl,
 		cmd->cdw13 = lpo >> 32;
 		cmd->data_len = xfer;
 		cmd->addr = (__u64)(uintptr_t)ptr;
+
 #ifdef CONFIG_LIBURING
-		if (io_uring_kernel_support == IO_URING_AVAILABLE && use_uring) {
+		if (use_uring) {
 			if (n >= NVME_URING_ENTRIES) {
-				ret = nvme_uring_cmd_wait_complete(&ring, n);
+				nvme_uring_cmd_wait_complete(&ring, n);
 				n = 0;
 			}
 			n += 1;
-			ret = nvme_uring_cmd_admin_passthru_async(hdl, &ring, cmd, result);
+			ret = nvme_uring_cmd_admin_passthru_async(hdl, &ring,
+				cmd, result);
 
 			if (ret)
 				nvme_uring_cmd_exit(&ring);
-		} else
-#endif
+		} else {
+			ret = nvme_submit_admin_passthru(hdl, cmd, result);
+			if (ret)
+				return ret;
+		}
+#else /* CONFIG_LIBURING */
 		ret = nvme_submit_admin_passthru(hdl, cmd, result);
+#endif /* CONFIG_LIBURING */
 		if (ret)
 			return ret;
 
@@ -432,13 +446,14 @@ int nvme_get_log(struct nvme_transport_handle *hdl,
 	} while (offset < data_len);
 
 #ifdef CONFIG_LIBURING
-	if (io_uring_kernel_support == IO_URING_AVAILABLE && use_uring) {
-		ret = nvme_uring_cmd_wait_complete(&ring, n);
+	if (use_uring) {
+		nvme_uring_cmd_wait_complete(&ring, n);
 		nvme_uring_cmd_exit(&ring);
 		if (ret)
 			return ret;
 	}
-#endif
+#endif /* CONFIG_LIBURING */
+
 	return 0;
 }