d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6bcd3588d1
numam-spdk/lib/iscsi/init_grp.h

82 lines
3.4 KiB
C
Raw Normal View History

iscsi: Add an iscsi library. Change-Id: I28f3f4723a66f845eb478a6873d7aedb8f5409b8 Signed-off-by: Ben Walker <benjamin.walker@intel.com>
2016-08-02 16:34:45 +00:00
/*-
* BSD LICENSE
*
* Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
* Copyright (c) Intel Corporation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Intel Corporation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef SPDK_INIT_GRP_H
#define SPDK_INIT_GRP_H
#include "spdk/conf.h"
iscsi: Use not malloc'ed but fixed size for initiator name Using malloc'ed string for string in iSCSI target has caused scan-build error. Maximum size of initiator name is already defined to be MAX_INITIATOR_NAME, and hence use fixed size string whose size is MAX_INITIATOR_NAME + 1 for spdk_iscsi_initiator_name::name. This will also reduce the potential malloc failure. Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Change-Id: Ic6bc172125fc6c9c0896499704d2a9b522106da0 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459705 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
2019-06-27 23:49:28 +00:00
#include "iscsi/iscsi.h"
iscsi: Use not malloc'ed but fixed size string for initiator address Using malloc'ed string for string in iSCSI target has caused scan-build error. Maximum size of initiator address is already defined to be MAX_INITIATOR_ADDR, and hence use fixed size string whose size is MAX_INITIATOR_ADDR + 1 for spdk_iscsi_initiator_mask::mask. This change will reduce the potential malloc failure. Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Change-Id: Ic39e08986c9377800ce58a1cb5b8401c6b71cf96 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459706 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
2019-06-28 00:24:49 +00:00
#include "iscsi/conn.h"
iscsi: Add an iscsi library. Change-Id: I28f3f4723a66f845eb478a6873d7aedb8f5409b8 Signed-off-by: Ben Walker <benjamin.walker@intel.com>
2016-08-02 16:34:45 +00:00
iscsi: manage IG's name and mask by linked list To add initiators to an existing target, manage name and netmask of initiator group by linked list. It is not easy for array to detect duplication and change configuration. Change-Id: Id9e77740e24ac309a33d8de1be37663681160d94 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/379932 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ziye Yang <optimistyzy@gmail.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2017-11-15 00:14:27 +00:00
struct spdk_iscsi_initiator_name {
iscsi: Use not malloc'ed but fixed size for initiator name Using malloc'ed string for string in iSCSI target has caused scan-build error. Maximum size of initiator name is already defined to be MAX_INITIATOR_NAME, and hence use fixed size string whose size is MAX_INITIATOR_NAME + 1 for spdk_iscsi_initiator_name::name. This will also reduce the potential malloc failure. Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Change-Id: Ic6bc172125fc6c9c0896499704d2a9b522106da0 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459705 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
2019-06-27 23:49:28 +00:00
char name[MAX_INITIATOR_NAME + 1];
iscsi: manage IG's name and mask by linked list To add initiators to an existing target, manage name and netmask of initiator group by linked list. It is not easy for array to detect duplication and change configuration. Change-Id: Id9e77740e24ac309a33d8de1be37663681160d94 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/379932 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ziye Yang <optimistyzy@gmail.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2017-11-15 00:14:27 +00:00
TAILQ_ENTRY(spdk_iscsi_initiator_name) tailq;
};
struct spdk_iscsi_initiator_netmask {
iscsi: Use not malloc'ed but fixed size string for initiator address Using malloc'ed string for string in iSCSI target has caused scan-build error. Maximum size of initiator address is already defined to be MAX_INITIATOR_ADDR, and hence use fixed size string whose size is MAX_INITIATOR_ADDR + 1 for spdk_iscsi_initiator_mask::mask. This change will reduce the potential malloc failure. Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Change-Id: Ic39e08986c9377800ce58a1cb5b8401c6b71cf96 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459706 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
2019-06-28 00:24:49 +00:00
char mask[MAX_INITIATOR_ADDR + 1];
iscsi: manage IG's name and mask by linked list To add initiators to an existing target, manage name and netmask of initiator group by linked list. It is not easy for array to detect duplication and change configuration. Change-Id: Id9e77740e24ac309a33d8de1be37663681160d94 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/379932 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ziye Yang <optimistyzy@gmail.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2017-11-15 00:14:27 +00:00
TAILQ_ENTRY(spdk_iscsi_initiator_netmask) tailq;
};
iscsi: Add an iscsi library. Change-Id: I28f3f4723a66f845eb478a6873d7aedb8f5409b8 Signed-off-by: Ben Walker <benjamin.walker@intel.com>
2016-08-02 16:34:45 +00:00
struct spdk_iscsi_init_grp {
int ninitiators;
iscsi: manage IG's name and mask by linked list To add initiators to an existing target, manage name and netmask of initiator group by linked list. It is not easy for array to detect duplication and change configuration. Change-Id: Id9e77740e24ac309a33d8de1be37663681160d94 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/379932 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ziye Yang <optimistyzy@gmail.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2017-11-15 00:14:27 +00:00
TAILQ_HEAD(, spdk_iscsi_initiator_name) initiator_head;
iscsi: Add an iscsi library. Change-Id: I28f3f4723a66f845eb478a6873d7aedb8f5409b8 Signed-off-by: Ben Walker <benjamin.walker@intel.com>
2016-08-02 16:34:45 +00:00
int nnetmasks;
iscsi: manage IG's name and mask by linked list To add initiators to an existing target, manage name and netmask of initiator group by linked list. It is not easy for array to detect duplication and change configuration. Change-Id: Id9e77740e24ac309a33d8de1be37663681160d94 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/379932 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ziye Yang <optimistyzy@gmail.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2017-11-15 00:14:27 +00:00
TAILQ_HEAD(, spdk_iscsi_initiator_netmask) netmask_head;
iscsi: Add an iscsi library. Change-Id: I28f3f4723a66f845eb478a6873d7aedb8f5409b8 Signed-off-by: Ben Walker <benjamin.walker@intel.com>
2016-08-02 16:34:45 +00:00
int ref;
int tag;
TAILQ_ENTRY(spdk_iscsi_init_grp) tailq;
};
/* SPDK iSCSI Initiator Group management API */
int spdk_iscsi_init_grp_create_from_initiator_list(int tag,
int num_initiator_names, char **initiator_names,
int num_initiator_masks, char **initiator_masks);
iscsi&rpc: Add new initiator information to an existing initiator group Adding new initiator to an existing initiator group to allow login will be usual. This patch support the following JSON-RPC commands: - add_initiators_to_initiator_group - delete_initiators_from_initiator_group Both initiator's name and netmask are optional but already added name or netmask cannot be added. Test code is added too. Change-Id: Ic101210b9d00c2b36e37ece23fcba8cfe8e44eb8 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/398361 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-02-06 23:22:00 +00:00
int spdk_iscsi_init_grp_add_initiators_from_initiator_list(int tag,
int num_initiator_names, char **initiator_names,
int num_initiator_masks, char **initiator_masks);
int spdk_iscsi_init_grp_delete_initiators_from_initiator_list(int tag,
int num_initiator_names, char **initiator_names,
int num_initiator_masks, char **initiator_masks);
iscsi: Consolidating checking uniqueness of IG into register/unregister Checking uniqueness of initiator group is done without mutex and before register/unregister. This is not thread-safe. This patch is a preparation to dynamic addition of initiator information to existing initiator groups. Change-Id: I44f48c857210522eee70d14bc3735ec73b0c5c6f Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/397032 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-02-05 04:02:25 +00:00
int spdk_iscsi_init_grp_register(struct spdk_iscsi_init_grp *ig);
struct spdk_iscsi_init_grp *spdk_iscsi_init_grp_unregister(int tag);
iscsi: Add an iscsi library. Change-Id: I28f3f4723a66f845eb478a6873d7aedb8f5409b8 Signed-off-by: Ben Walker <benjamin.walker@intel.com>
2016-08-02 16:34:45 +00:00
struct spdk_iscsi_init_grp *spdk_iscsi_init_grp_find_by_tag(int tag);
iscsi: Consolidating checking uniqueness of IG into register/unregister Checking uniqueness of initiator group is done without mutex and before register/unregister. This is not thread-safe. This patch is a preparation to dynamic addition of initiator information to existing initiator groups. Change-Id: I44f48c857210522eee70d14bc3735ec73b0c5c6f Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/397032 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-02-05 04:02:25 +00:00
void spdk_iscsi_init_grp_destroy(struct spdk_iscsi_init_grp *ig);
iscsi: Change function names of iSCSI subsystem configuration Portal, portal group, initiator group, and target node don't use fixed size array anymore. To use the same naming rule in iSCSI subsystem and in SPDK is helpful to understand and maintain. Current naming rule is not bad but to use unified and compact name is prioritized at this time. This patch changes function names as follows: - spdk_iscsi_init_tgt_nodes() -> spdk_iscsi_parse_tgt_nodes() - spdk_cf_add_iscsi_tgt_node() -> spdk_iscsi_parse_tgt_node() - spdk_iscsi_portal_grp_array_create() -> spdk_iscsi_parse_portal_grps() - spdk_iscsi_portal_grp_create_from_configfile() -> spdk_iscsi_parse_portal_grp() - spdk_iscsi_portal_create_from_configline() -> spdk_iscsi_parse_portal() - spdk_iscsi_portal_grp_array_destroy() -> spdk_iscsi_portal_grps_destroy() - spdk_iscsi_init_grp_array_create() -> spdk_iscsi_parse_init_grps() - spdk_iscsi_init_grp_create_from_configfile() -> spdk_iscsi_parse_init_grp() - spdk_iscsi_init_grp_array_destroy() -> spdk_iscsi_init_grps_destroy() For example "parse" is already used to explain the operation in portal_grp.c. Hence using "parse" is familiar and not strange in iSCSI. Change-Id: Ieff952069d39bd96b7afa1586bfff927968accc2 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/403149 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-03-08 23:25:34 +00:00
int spdk_iscsi_parse_init_grps(void);
void spdk_iscsi_init_grps_destroy(void);
iscsi: Add JSON config/info dump for initiator group. Support JSON config/info dump for initiator group. These are added to init_grp.c. Text config dump is moved to init_grp.c too. Add accesses to g_spdk_iscsi.ig_head are consolidated into init_grp.c to extract ig_head from g_spdk_iscsi. Change-Id: I88131d248ed13e42e4da56aed8ae0edc01a65715 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/407849 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Pawel Wodkowski <pawelx.wodkowski@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-05-09 22:55:12 +00:00
void spdk_iscsi_init_grps_config_text(FILE *fp);
void spdk_iscsi_init_grps_info_json(struct spdk_json_write_ctx *w);
void spdk_iscsi_init_grps_config_json(struct spdk_json_write_ctx *w);
iscsi: Use not C++ style comments // but C-style comments /* */ Change-Id: Ia81209e1dd7c0892bb14ae8b2a5850130fcbf199 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/431078 Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
2018-10-29 02:20:47 +00:00
#endif /* SPDK_INIT_GRP_H */
Reference in New Issue Copy Permalink