nvme-cmds: move nvme_ns_detach/attach_ctrl to nvme-cli

Move these trivial functions to nvme-cli. Since they had to be modified
recently due to the I/O Submission Handling (ISH) bit, it is better to
move them out of the library to simplify maintaining a stable API.

Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

libnvme/src/nvme/cmds.c

@@ -303,36 +303,6 @@ int nvme_get_lba_status_log(struct nvme_transport_handle *hdl, bool rae,
 	return 0;
 }
 
-static int nvme_ns_attachment(struct nvme_transport_handle *hdl, bool ish,
-		__u32 nsid, __u16 num_ctrls, __u16 *ctrlist, bool attach)
-{
-	struct nvme_ctrl_list cntlist = { 0 };
-	struct nvme_passthru_cmd cmd;
-
-	nvme_init_ctrl_list(&cntlist, num_ctrls, ctrlist);
-	if (ish && nvme_transport_handle_is_mi(hdl))
-		nvme_init_mi_cmd_flags(&cmd, ish);
-
-	if (attach)
-		nvme_init_ns_attach_ctrls(&cmd, nsid, &cntlist);
-	else
-		nvme_init_ns_detach_ctrls(&cmd, nsid, &cntlist);
-
-	return nvme_submit_admin_passthru(hdl, &cmd);
-}
-
-int nvme_namespace_attach_ctrls(struct nvme_transport_handle *hdl, bool ish,
-		__u32 nsid, __u16 num_ctrls, __u16 *ctrlist)
-{
-	return nvme_ns_attachment(hdl, ish, nsid, num_ctrls, ctrlist, true);
-}
-
-int nvme_namespace_detach_ctrls(struct nvme_transport_handle *hdl, bool ish,
-		__u32 nsid, __u16 num_ctrls, __u16 *ctrlist)
-{
-	return nvme_ns_attachment(hdl, ish, nsid, num_ctrls, ctrlist, false);
-}
-
 size_t nvme_get_ana_log_len_from_id_ctrl(const struct nvme_id_ctrl *id_ctrl,
 					 bool rgo)
 {

libnvme/src/nvme/cmds.h

@@ -5568,34 +5568,6 @@ int nvme_get_logical_block_size(struct nvme_transport_handle *hdl, __u32 nsid,
 int nvme_get_lba_status_log(struct nvme_transport_handle *hdl, bool rae,
 		struct nvme_lba_status_log **log);
 
-/**
- * nvme_namespace_attach_ctrls() - Attach namespace to controller(s)
- * @hdl:	Transport handle
- * @ish:	Ignore Shutdown (for NVMe-MI command)
- * @nsid:	Namespace ID to attach
- * @num_ctrls:	Number of controllers in ctrlist
- * @ctrlist:	List of controller IDs to perform the attach action
- *
- * Return: 0 on success, the nvme command status if a response was
- * received (see &enum nvme_status_field) or a negative error otherwise.
- */
-int nvme_namespace_attach_ctrls(struct nvme_transport_handle *hdl, bool ish,
-				__u32 nsid, __u16 num_ctrls, __u16 *ctrlist);
-
-/**
- * nvme_namespace_detach_ctrls() - Detach namespace from controller(s)
- * @hdl:	Transport handle
- * @ish:	Ignore Shutdown (for NVMe-MI command)
- * @nsid:	Namespace ID to detach
- * @num_ctrls:	Number of controllers in ctrlist
- * @ctrlist:	List of controller IDs to perform the detach action
- *
- * Return: 0 on success, the nvme command status if a response was
- * received (see &enum nvme_status_field) or a negative error otherwise.
- */
-int nvme_namespace_detach_ctrls(struct nvme_transport_handle *hdl, bool ish,
-			__u32 nsid, __u16 num_ctrls, __u16 *ctrlist);
-
 /**
  * nvme_get_feature_length() - Retrieve the command payload length for a
  *			       specific feature identifier

meson.build

@@ -472,15 +472,16 @@ if want_nvme
     subdir('util')      # declares: util_sources
 
     sources = [
-        'nvme.c',
+        'libnvme-wrap.c',
+        'logging.c',
+        'nvme-cmds.c',
         'nvme-models.c',
-        'nvme-print.c',
-        'nvme-print-stdout.c',
         'nvme-print-binary.c',
+        'nvme-print-stdout.c',
+        'nvme-print.c',
         'nvme-rpmb.c',
+        'nvme.c',
         'plugin.c',
-        'libnvme-wrap.c',
-        'logging.c',
     ]
     if want_fabrics
         sources += 'fabrics.c'

nvme-cmds.c

@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
+/*
+ * This file is part of libnvme.
+ * Copyright (c) 2020 Western Digital Corporation or its affiliates.
+ *
+ * Authors: Keith Busch <[email protected]>
+ *	    Chaitanya Kulkarni <[email protected]>
+ */
+
+#include <libnvme.h>
+
+#include "nvme-cmds.h"
+
+static int nvme_ns_attachment(struct nvme_transport_handle *hdl, bool ish,
+		__u32 nsid, __u16 num_ctrls, __u16 *ctrlist, bool attach)
+{
+	struct nvme_ctrl_list cntlist = { 0 };
+	struct nvme_passthru_cmd cmd;
+
+	nvme_init_ctrl_list(&cntlist, num_ctrls, ctrlist);
+	if (ish && nvme_transport_handle_is_mi(hdl))
+		nvme_init_mi_cmd_flags(&cmd, ish);
+
+	if (attach)
+		nvme_init_ns_attach_ctrls(&cmd, nsid, &cntlist);
+	else
+		nvme_init_ns_detach_ctrls(&cmd, nsid, &cntlist);
+
+	return nvme_submit_admin_passthru(hdl, &cmd);
+}
+
+int nvme_namespace_attach_ctrls(struct nvme_transport_handle *hdl, bool ish,
+		__u32 nsid, __u16 num_ctrls, __u16 *ctrlist)
+{
+	return nvme_ns_attachment(hdl, ish, nsid, num_ctrls, ctrlist, true);
+}
+
+int nvme_namespace_detach_ctrls(struct nvme_transport_handle *hdl, bool ish,
+		__u32 nsid, __u16 num_ctrls, __u16 *ctrlist)
+{
+	return nvme_ns_attachment(hdl, ish, nsid, num_ctrls, ctrlist, false);
+}
+
+

nvme-cmds.h

@@ -1717,5 +1717,33 @@ nvme_get_features_simple(struct nvme_transport_handle *hdl, __u8 fid,
 	return err;
 }
 
+/**
+ * nvme_namespace_attach_ctrls() - Attach namespace to controller(s)
+ * @hdl:	Transport handle
+ * @ish:	Ignore Shutdown (for NVMe-MI command)
+ * @nsid:	Namespace ID to attach
+ * @num_ctrls:	Number of controllers in ctrlist
+ * @ctrlist:	List of controller IDs to perform the attach action
+ *
+ * Return: 0 on success, the nvme command status if a response was
+ * received (see &enum nvme_status_field) or a negative error otherwise.
+ */
+int nvme_namespace_attach_ctrls(struct nvme_transport_handle *hdl, bool ish,
+				__u32 nsid, __u16 num_ctrls, __u16 *ctrlist);
+
+/**
+ * nvme_namespace_detach_ctrls() - Detach namespace from controller(s)
+ * @hdl:	Transport handle
+ * @ish:	Ignore Shutdown (for NVMe-MI command)
+ * @nsid:	Namespace ID to detach
+ * @num_ctrls:	Number of controllers in ctrlist
+ * @ctrlist:	List of controller IDs to perform the detach action
+ *
+ * Return: 0 on success, the nvme command status if a response was
+ * received (see &enum nvme_status_field) or a negative error otherwise.
+ */
+int nvme_namespace_detach_ctrls(struct nvme_transport_handle *hdl, bool ish,
+			__u32 nsid, __u16 num_ctrls, __u16 *ctrlist);
+
 
 #endif /* NVME_CMDS */