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 37AE45A6E for ; Wed, 21 Nov 2018 02:41:28 +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 wAL1fSCi002943; Wed, 21 Nov 2018 10:41:28 +0900 Received: (from root@localhost) by gwchk03.silk.ntt-tx.co.jp (unknown) id wAL1fSZj004998; Wed, 21 Nov 2018 10:41:28 +0900 Received: from gwchk.silk.ntt-tx.co.jp [10.107.0.110] by gwchk03.silk.ntt-tx.co.jp with ESMTP id LAA02023; Wed, 21 Nov 2018 10:36:18 +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 wAL1aHD8009762; Wed, 21 Nov 2018 10:36:17 +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 wAL1aHmd009759; Wed, 21 Nov 2018 10:36:17 +0900 Message-Id: <201811210136.wAL1aHmd009759@imss03.silk.ntt-tx.co.jp> Received: from localhost by mgate02.silk.ntt-tx.co.jp (unknown) id wAL1aH1e008431 ; Wed, 21 Nov 2018 10:36:17 +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:36:15 +0900 X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181121013617.8938-1-x-fn-spp@sl.ntt-tx.co.jp> References: <20181121013617.8938-1-x-fn-spp@sl.ntt-tx.co.jp> X-TM-AS-MML: No Subject: [spp] [PATCH 1/3] spp_mirror: add spp_mirror common define and func 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:29 -0000 From: Hideyuki Yamashita Add common defines and functions for spp_mirror. Signed-off-by: Hideyuki Yamashita Signed-off-by: Naoki Takada --- src/vf/common/command_dec.c | 6 ++++++ src/vf/common/command_proc.c | 9 +++++++++ src/vf/common/spp_proc.c | 6 ++++++ src/vf/common/spp_proc.h | 17 ++++++++++------- 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/vf/common/command_dec.c b/src/vf/common/command_dec.c index 84268de..9f56eba 100644 --- a/src/vf/common/command_dec.c +++ b/src/vf/common/command_dec.c @@ -201,6 +201,12 @@ spp_convert_component_type(const char *type_str) return SPP_COMPONENT_FORWARD; } #endif /* SPP_VF_MODULE */ +#ifdef SPP_MIRROR_MODULE + if (strncmp(type_str, SPP_TYPE_MIRROR_STR, + strlen(SPP_TYPE_MIRROR_STR)+1) == 0) + /* Mirror */ + return SPP_COMPONENT_MIRROR; +#endif /* SPP_MIRROR_MODULE */ return SPP_COMPONENT_UNUSE; } diff --git a/src/vf/common/command_proc.c b/src/vf/common/command_proc.c index f274707..e6a9fab 100644 --- a/src/vf/common/command_proc.c +++ b/src/vf/common/command_proc.c @@ -14,6 +14,9 @@ #include "../classifier_mac.h" #include "../spp_forward.h" #endif /* SPP_VF_MODULE */ +#ifdef SPP_MIRROR_MODULE +#include "../../mirror/spp_mirror.h" +#endif /* SPP_MIRROR_MODULE */ #include "command_conn.h" #include "command_dec.h" #include "command_proc.h" @@ -482,6 +485,12 @@ spp_iterate_core_info(struct spp_iterate_core_params *params) params); } #endif /* SPP_VF_MODULE */ +#ifdef SPP_MIRROR_MODULE + ret = spp_mirror_get_component_status( + lcore_id, + core->id[cnt], + params); +#endif /* SPP_MIRROR_MODULE */ if (unlikely(ret != 0)) { RTE_LOG(ERR, APP, "Cannot iterate core " "information. " diff --git a/src/vf/common/spp_proc.c b/src/vf/common/spp_proc.c index 5119612..abbd5d5 100644 --- a/src/vf/common/spp_proc.c +++ b/src/vf/common/spp_proc.c @@ -18,6 +18,9 @@ #include "../spp_forward.h" #include "../classifier_mac.h" #endif /* SPP_VF_MODULE */ +#ifdef SPP_MIRROR_MODULE +#include "../../mirror/spp_mirror.h" +#endif /* SPP_MIRROR_MODULE */ /* Manage data to addoress */ struct manage_data_addr_info { @@ -888,6 +891,9 @@ flush_component(void) else ret = spp_forward_update(component_info); #endif /* SPP_VF_MODULE */ +#ifdef SPP_MIRROR_MODULE + ret = spp_mirror_update(component_info); +#endif /* SPP_MIRROR_MODULE */ if (unlikely(ret < 0)) { RTE_LOG(ERR, APP, "Flush error. " "( component = %s, type = %d)\n", diff --git a/src/vf/common/spp_proc.h b/src/vf/common/spp_proc.h index a6de55c..8bb43ec 100644 --- a/src/vf/common/spp_proc.h +++ b/src/vf/common/spp_proc.h @@ -21,9 +21,10 @@ */ /** Identifier string for each component (status command) */ #define SPP_TYPE_CLASSIFIER_MAC_STR "classifier_mac" -#define SPP_TYPE_MERGE_STR "merge" -#define SPP_TYPE_FORWARD_STR "forward" -#define SPP_TYPE_UNUSE_STR "unuse" +#define SPP_TYPE_MERGE_STR "merge" +#define SPP_TYPE_FORWARD_STR "forward" +#define SPP_TYPE_MIRROR_STR "mirror" +#define SPP_TYPE_UNUSE_STR "unuse" /** Identifier string for each interface */ #define SPP_IFTYPE_NIC_STR "phy" @@ -72,8 +73,9 @@ */ /* Name string for each component */ #define CORE_TYPE_CLASSIFIER_MAC_STR "classifier_mac" -#define CORE_TYPE_MERGE_STR "merge" -#define CORE_TYPE_FORWARD_STR "forward" +#define CORE_TYPE_MERGE_STR "merge" +#define CORE_TYPE_FORWARD_STR "forward" +#define CORE_TYPE_MIRROR_STR "mirror" /* State on component */ enum spp_core_status { @@ -89,8 +91,9 @@ enum spp_core_status { enum spp_component_type { SPP_COMPONENT_UNUSE, /**< Not used */ SPP_COMPONENT_CLASSIFIER_MAC, /**< Classifier_mac */ - SPP_COMPONENT_MERGE, /**< Merger */ - SPP_COMPONENT_FORWARD, /**< Forwarder */ + SPP_COMPONENT_MERGE, /**< Merger */ + SPP_COMPONENT_FORWARD, /**< Forwarder */ + SPP_COMPONENT_MIRROR, /**< Mirror */ }; /* Classifier Type */ -- 2.18.0