From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail04.ics.ntt-tx.co.jp (mail05.ics.ntt-tx.co.jp [210.232.35.69]) by dpdk.org (Postfix) with ESMTP id 08BC55F21 for ; Wed, 21 Nov 2018 02:41:09 +0100 (CET) Received: from gwchk03.silk.ntt-tx.co.jp (gwchk03.silk.ntt-tx.co.jp [10.107.0.111]) by mail04.ics.ntt-tx.co.jp (unknown) with ESMTP id wAL1f8oY002714; Wed, 21 Nov 2018 10:41:08 +0900 Received: (from root@localhost) by gwchk03.silk.ntt-tx.co.jp (unknown) id wAL1f6tR004509; Wed, 21 Nov 2018 10:41:06 +0900 Received: from gwchk.silk.ntt-tx.co.jp [10.107.0.110] by gwchk03.silk.ntt-tx.co.jp with ESMTP id LAA01808; Wed, 21 Nov 2018 10:36:00 +0900 Received: from imss03.silk.ntt-tx.co.jp (localhost [127.0.0.1]) by imss03.silk.ntt-tx.co.jp (unknown) with ESMTP id wAL1a0tq009639; Wed, 21 Nov 2018 10:36:00 +0900 Received: from mgate02.silk.ntt-tx.co.jp (smtp02.silk.ntt-tx.co.jp [10.107.0.37]) by imss03.silk.ntt-tx.co.jp (unknown) with ESMTP id wAL1a0ZB009636; Wed, 21 Nov 2018 10:36:00 +0900 Message-Id: <201811210136.wAL1a0ZB009636@imss03.silk.ntt-tx.co.jp> Received: from localhost by mgate02.silk.ntt-tx.co.jp (unknown) id wAL1ZwWc008346 ; Wed, 21 Nov 2018 10:36:00 +0900 From: x-fn-spp@sl.ntt-tx.co.jp To: ferruh.yigit@intel.com, ogawa.yasufumi@lab.ntt.co.jp Cc: spp@dpdk.org Date: Wed, 21 Nov 2018 10:35:45 +0900 X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181121013558.8869-1-x-fn-spp@sl.ntt-tx.co.jp> References: <20181121013558.8869-1-x-fn-spp@sl.ntt-tx.co.jp> X-TM-AS-MML: No Subject: [spp] [PATCH 10/23] spp_vf: add management data registration X-BeenThere: spp@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Soft Patch Panel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Nov 2018 01:41:10 -0000 From: Hideyuki Yamashita This patch adds the registration and retrieval functions of management data to 'common/spp_proc.c'. Signed-off-by: Hideyuki Yamashita Signed-off-by: Naoki Takada --- src/vf/common/spp_proc.c | 71 ++++++++++++++++++++++++++++++++++++++++ src/vf/common/spp_proc.h | 58 ++++++++++++++++++++++++++++++++ src/vf/spp_vf.c | 13 ++++++++ 3 files changed, 142 insertions(+) diff --git a/src/vf/common/spp_proc.c b/src/vf/common/spp_proc.c index 7b92e38..5bb8571 100644 --- a/src/vf/common/spp_proc.c +++ b/src/vf/common/spp_proc.c @@ -17,7 +17,21 @@ #include "../vf/spp_forward.h" #include "../vf/classifier_mac.h" +/* Manage data to addoress */ +struct manage_data_addr_info { + struct startup_param *p_startup_param; + struct iface_info *p_iface_info; + struct spp_component_info *p_component_info; + struct core_mng_info *p_core_info; + int *p_change_core; + int *p_change_component; + struct cancel_backup_info *p_backup_info; + unsigned int main_lcore_id; +}; + /* Declare global variables */ +/* Logical core ID for main process */ +static struct manage_data_addr_info g_mng_data_addr; /** * Make a hexdump of an array data in every 4 byte. @@ -930,3 +944,60 @@ spp_change_mac_str_to_int64(const char *mac) mac, ret_mac); return ret_mac; } + +/* Set mange data address */ +int spp_set_mng_data_addr(struct startup_param *startup_param_addr, + struct iface_info *iface_addr, + struct spp_component_info *component_addr, + struct core_mng_info *core_mng_addr, + int *change_core_addr, + int *change_component_addr, + struct cancel_backup_info *backup_info_addr, + unsigned int main_lcore_id) +{ + if (startup_param_addr == NULL || iface_addr == NULL || + component_addr == NULL || core_mng_addr == NULL || + change_core_addr == NULL || + change_component_addr == NULL || + backup_info_addr == NULL || + main_lcore_id == 0xffffffff) + return SPP_RET_NG; + + g_mng_data_addr.p_startup_param = startup_param_addr; + g_mng_data_addr.p_iface_info = iface_addr; + g_mng_data_addr.p_component_info = component_addr; + g_mng_data_addr.p_core_info = core_mng_addr; + g_mng_data_addr.p_change_core = change_core_addr; + g_mng_data_addr.p_change_component = change_component_addr; + g_mng_data_addr.p_backup_info = backup_info_addr; + g_mng_data_addr.main_lcore_id = main_lcore_id; + + return SPP_RET_OK; +} + +/* Get manage data address */ +void spp_get_mng_data_addr(struct startup_param **startup_param_addr, + struct iface_info **iface_addr, + struct spp_component_info **component_addr, + struct core_mng_info **core_mng_addr, + int **change_core_addr, + int **change_component_addr, + struct cancel_backup_info **backup_info_addr) +{ + + if (startup_param_addr != NULL) + *startup_param_addr = g_mng_data_addr.p_startup_param; + if (iface_addr != NULL) + *iface_addr = g_mng_data_addr.p_iface_info; + if (component_addr != NULL) + *component_addr = g_mng_data_addr.p_component_info; + if (core_mng_addr != NULL) + *core_mng_addr = g_mng_data_addr.p_core_info; + if (change_core_addr != NULL) + *change_core_addr = g_mng_data_addr.p_change_core; + if (change_component_addr != NULL) + *change_component_addr = g_mng_data_addr.p_change_component; + if (backup_info_addr != NULL) + *backup_info_addr = g_mng_data_addr.p_backup_info; + +} diff --git a/src/vf/common/spp_proc.h b/src/vf/common/spp_proc.h index f90b2ac..ce205d8 100644 --- a/src/vf/common/spp_proc.h +++ b/src/vf/common/spp_proc.h @@ -666,4 +666,62 @@ spp_format_port_string(char *port, enum port_type iface_type, int iface_no); */ int64_t spp_change_mac_str_to_int64(const char *mac); +/** + * Set mange data address + * + * @param startup_param_addr + * g_startup_param address + * @param iface_addr + * g_iface_info address + * @param component_addr + * g_component_info address + * @param core_mng_addr + * g_core_info address + * @param change_core_addr + * g_change_core address + * @param change_component_addr + * g_change_component address + * @param backup_info_addr + * g_backup_info address + * @param main_lcore_id + * main_lcore_id mask + * + * @retval SPP_RET_OK succeeded. + * @retval SPP_RET_NG failed. + */ +int spp_set_mng_data_addr(struct startup_param *startup_param_addr, + struct iface_info *iface_addr, + struct spp_component_info *component_addr, + struct core_mng_info *core_mng_addr, + int *change_core_addr, + int *change_component_addr, + struct cancel_backup_info *backup_info_addr, + unsigned int main_lcore_id); + +/** + * Get mange data address + * + * @param iface_addr + * g_startup_param write address + * @param iface_addr + * g_iface_info write address + * @param component_addr + * g_component_info write address + * @param core_mng_addr + * g_core_mng_info write address + * @param change_core_addr + * g_change_core write address + * @param change_component_addr + * g_change_component write address + * @param backup_info_addr + * g_backup_info write address + */ +void spp_get_mng_data_addr(struct startup_param **startup_param_addr, + struct iface_info **iface_addr, + struct spp_component_info **component_addr, + struct core_mng_info **core_mng_addr, + int **change_core_addr, + int **change_component_addr, + struct cancel_backup_info **backup_info_addr); + #endif /* _SPP_PROC_H_ */ diff --git a/src/vf/spp_vf.c b/src/vf/spp_vf.c index 9095c73..1433731 100644 --- a/src/vf/spp_vf.c +++ b/src/vf/spp_vf.c @@ -277,6 +277,19 @@ main(int argc, char *argv[]) /* Get lcore id of main thread to set its status after */ g_main_lcore_id = rte_lcore_id(); + /* set manage address */ + if (spp_set_mng_data_addr(&g_startup_param, + &g_iface_info, + g_component_info, + g_core_info, + g_change_core, + g_change_component, + &g_backup_info, + g_main_lcore_id) < 0) { + RTE_LOG(ERR, APP, "manage address set is failed.\n"); + break; + } + int ret_mng = init_mng_data(); if (unlikely(ret_mng != 0)) break; -- 2.18.0