f587197d21
Currently cpumask cannot be specified for each portal when it is created by JSON-RPC and portal group creation is not unified between iSCSI.conf and JSON-RPC. This patch does the following: - cpumask string is decoded in spdk_iscsi_portal_create() which is common between iSCSI.conf and JSON-RPC. - parsing configline of portal is difficult to understand and hence it is refactored. - UT code is added. JSON-RPC will be added by the next patch. Change-Id: I13b9989263fae5facff260de32a55ec99f5d5a06 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/392447 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
75 lines
2.8 KiB
C
75 lines
2.8 KiB
C
/*-
|
|
* 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_PORTAL_GRP_H
|
|
#define SPDK_PORTAL_GRP_H
|
|
|
|
#include "spdk/conf.h"
|
|
|
|
struct spdk_iscsi_portal {
|
|
struct spdk_iscsi_portal_grp *group;
|
|
char *host;
|
|
char *port;
|
|
int sock;
|
|
uint64_t cpumask;
|
|
struct spdk_poller *acceptor_poller;
|
|
TAILQ_ENTRY(spdk_iscsi_portal) per_pg_tailq;
|
|
TAILQ_ENTRY(spdk_iscsi_portal) g_tailq;
|
|
};
|
|
|
|
struct spdk_iscsi_portal_grp {
|
|
int ref;
|
|
int tag;
|
|
TAILQ_ENTRY(spdk_iscsi_portal_grp) tailq;
|
|
TAILQ_HEAD(, spdk_iscsi_portal) head;
|
|
};
|
|
|
|
/* SPDK iSCSI Portal Group management API */
|
|
|
|
struct spdk_iscsi_portal *spdk_iscsi_portal_create(const char *host, const char *port,
|
|
const char *cpumask);
|
|
void spdk_iscsi_portal_destroy(struct spdk_iscsi_portal *p);
|
|
|
|
int spdk_iscsi_portal_grp_create_from_portal_list(int tag,
|
|
struct spdk_iscsi_portal **portal_list,
|
|
int num_portals);
|
|
void spdk_iscsi_portal_grp_release(struct spdk_iscsi_portal_grp *pg);
|
|
int spdk_iscsi_portal_grp_array_create(void);
|
|
void spdk_iscsi_portal_grp_array_destroy(void);
|
|
struct spdk_iscsi_portal_grp *spdk_iscsi_portal_grp_find_by_tag(int tag);
|
|
|
|
int spdk_iscsi_portal_grp_open_all(void);
|
|
void spdk_iscsi_portal_grp_close_all(void);
|
|
#endif // SPDK_PORTAL_GRP_H
|