update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / lib / iscsi / tgt_node.h

diff --git a/ceph/src/spdk/lib/iscsi/tgt_node.h b/ceph/src/spdk/lib/iscsi/tgt_node.h
index 1d54922a8cabef47a1e9faa4af3013d4848be82d..2787fac91f229e33710cdd9a03302802e2804606 100644 (file)
--- a/ceph/src/spdk/lib/iscsi/tgt_node.h
+++ b/ceph/src/spdk/lib/iscsi/tgt_node.h
@@ -37,7 +37,7 @@
 
 #include "spdk/stdinc.h"
 
-#include "spdk/scsi.h"
+#include "iscsi/iscsi.h"
 
 struct spdk_iscsi_conn;
 struct spdk_iscsi_init_grp;
@@ -48,6 +48,8 @@ struct spdk_json_write_ctx;
 #define MAX_TARGET_MAP                 256
 #define SPDK_TN_TAG_MAX                        0x0000ffff
 
+typedef void (*iscsi_tgt_node_destruct_cb)(void *cb_arg, int rc);
+
 struct spdk_iscsi_ig_map {
        struct spdk_iscsi_init_grp *ig;
        TAILQ_ENTRY(spdk_iscsi_ig_map) tailq;
@@ -62,8 +64,8 @@ struct spdk_iscsi_pg_map {
 
 struct spdk_iscsi_tgt_node {
        int num;
-       char *name;
-       char *alias;
+       char name[MAX_TARGET_NAME + 1];
+       char alias[MAX_TARGET_NAME + 1];
 
        pthread_mutex_t mutex;
 
@@ -81,25 +83,27 @@ struct spdk_iscsi_tgt_node {
         *  target node.
         */
        uint32_t num_active_conns;
-       int lcore;
+       struct spdk_iscsi_poll_group *pg;
 
        int num_pg_maps;
        TAILQ_HEAD(, spdk_iscsi_pg_map) pg_map_head;
        TAILQ_ENTRY(spdk_iscsi_tgt_node) tailq;
-};
 
-int spdk_iscsi_parse_tgt_nodes(void);
+       bool destructed;
+       struct spdk_poller *destruct_poller;
+       iscsi_tgt_node_destruct_cb destruct_cb_fn;
+       void *destruct_cb_arg;
+};
 
-void spdk_iscsi_shutdown_tgt_nodes(void);
-int spdk_iscsi_shutdown_tgt_node_by_name(const char *target_name);
-int spdk_iscsi_send_tgts(struct spdk_iscsi_conn *conn, const char *iiqn,
-                        const char *iaddr, const char *tiqn, uint8_t *data, int alloc_len,
-                        int data_len);
+int iscsi_parse_tgt_nodes(void);
 
-/* This typedef exists to work around an astyle 2.05 bug.
- * Remove it when astyle is fixed.
- */
-typedef struct spdk_iscsi_tgt_node _spdk_iscsi_tgt_node;
+void iscsi_shutdown_tgt_nodes(void);
+void iscsi_shutdown_tgt_node_by_name(const char *target_name,
+                                    iscsi_tgt_node_destruct_cb cb_fn, void *cb_arg);
+bool iscsi_tgt_node_is_destructed(struct spdk_iscsi_tgt_node *target);
+int iscsi_send_tgts(struct spdk_iscsi_conn *conn, const char *iiqn,
+                   const char *iaddr, const char *tiqn, uint8_t *data, int alloc_len,
+                   int data_len);
 
 /*
  * bdev_name_list and lun_id_list are equal sized arrays of size num_luns.
@@ -107,40 +111,37 @@ typedef struct spdk_iscsi_tgt_node _spdk_iscsi_tgt_node;
  *  new target node.
  * lun_id_list refers to the LUN IDs that will be used for the LUNs on the target node.
  */
-_spdk_iscsi_tgt_node *
-spdk_iscsi_tgt_node_construct(int target_index,
-                             const char *name, const char *alias,
-                             int *pg_tag_list, int *ig_tag_list, uint16_t num_maps,
-                             const char *bdev_name_list[], int *lun_id_list, int num_luns,
-                             int queue_depth,
-                             bool disable_chap, bool require_chap, bool mutual_chap, int chap_group,
-                             bool header_digest, bool data_digest);
-
-bool spdk_iscsi_check_chap_params(bool disable, bool require, bool mutual, int group);
-
-int spdk_iscsi_tgt_node_add_pg_ig_maps(struct spdk_iscsi_tgt_node *target,
-                                      int *pg_tag_list, int *ig_tag_list,
-                                      uint16_t num_maps);
-int spdk_iscsi_tgt_node_delete_pg_ig_maps(struct spdk_iscsi_tgt_node *target,
-               int *pg_tag_list, int *ig_tag_list,
-               uint16_t num_maps);
-
-bool spdk_iscsi_tgt_node_access(struct spdk_iscsi_conn *conn,
-                               struct spdk_iscsi_tgt_node *target, const char *iqn,
-                               const char *addr);
-struct spdk_iscsi_tgt_node *spdk_iscsi_find_tgt_node(const char *target_name);
-int spdk_iscsi_tgt_node_reset(struct spdk_iscsi_tgt_node *target,
-                             uint64_t lun);
-int spdk_iscsi_tgt_node_cleanup_luns(struct spdk_iscsi_conn *conn,
-                                    struct spdk_iscsi_tgt_node *target);
-void spdk_iscsi_tgt_node_delete_map(struct spdk_iscsi_portal_grp *portal_group,
-                                   struct spdk_iscsi_init_grp *initiator_group);
-int spdk_iscsi_tgt_node_add_lun(struct spdk_iscsi_tgt_node *target,
-                               const char *bdev_name, int lun_id);
-int spdk_iscsi_tgt_node_set_chap_params(struct spdk_iscsi_tgt_node *target,
-                                       bool disable_chap, bool require_chap,
-                                       bool mutual_chap, int32_t chap_group);
-void spdk_iscsi_tgt_nodes_config_text(FILE *fp);
-void spdk_iscsi_tgt_nodes_info_json(struct spdk_json_write_ctx *w);
-void spdk_iscsi_tgt_nodes_config_json(struct spdk_json_write_ctx *w);
+struct spdk_iscsi_tgt_node *iscsi_tgt_node_construct(int target_index,
+               const char *name, const char *alias,
+               int *pg_tag_list, int *ig_tag_list, uint16_t num_maps,
+               const char *bdev_name_list[], int *lun_id_list, int num_luns,
+               int queue_depth,
+               bool disable_chap, bool require_chap, bool mutual_chap, int chap_group,
+               bool header_digest, bool data_digest);
+
+bool iscsi_check_chap_params(bool disable, bool require, bool mutual, int group);
+
+int iscsi_target_node_add_pg_ig_maps(struct spdk_iscsi_tgt_node *target,
+                                    int *pg_tag_list, int *ig_tag_list,
+                                    uint16_t num_maps);
+int iscsi_target_node_remove_pg_ig_maps(struct spdk_iscsi_tgt_node *target,
+                                       int *pg_tag_list, int *ig_tag_list,
+                                       uint16_t num_maps);
+
+bool iscsi_tgt_node_access(struct spdk_iscsi_conn *conn,
+                          struct spdk_iscsi_tgt_node *target, const char *iqn,
+                          const char *addr);
+struct spdk_iscsi_tgt_node *iscsi_find_tgt_node(const char *target_name);
+int iscsi_tgt_node_cleanup_luns(struct spdk_iscsi_conn *conn,
+                               struct spdk_iscsi_tgt_node *target);
+void iscsi_tgt_node_delete_map(struct spdk_iscsi_portal_grp *portal_group,
+                              struct spdk_iscsi_init_grp *initiator_group);
+int iscsi_tgt_node_add_lun(struct spdk_iscsi_tgt_node *target,
+                          const char *bdev_name, int lun_id);
+int iscsi_tgt_node_set_chap_params(struct spdk_iscsi_tgt_node *target,
+                                  bool disable_chap, bool require_chap,
+                                  bool mutual_chap, int32_t chap_group);
+void iscsi_tgt_nodes_config_text(FILE *fp);
+void iscsi_tgt_nodes_info_json(struct spdk_json_write_ctx *w);
+void iscsi_tgt_nodes_config_json(struct spdk_json_write_ctx *w);
 #endif /* SPDK_ISCSI_TGT_NODE_H_ */