From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 32D50A10DA for ; Fri, 2 Aug 2019 11:36:43 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2C7161C236; Fri, 2 Aug 2019 11:36:43 +0200 (CEST) Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by dpdk.org (Postfix) with ESMTP id 3F32E1C236 for ; Fri, 2 Aug 2019 11:36:41 +0200 (CEST) Received: by mail-pf1-f193.google.com with SMTP id r1so35737841pfq.12 for ; Fri, 02 Aug 2019 02:36:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=/oZqEBSpFDBhohhwkvj/n1SVLaLgNS5l4bcF0xNiTws=; b=EKEPTtdKkrt+CnIA4IT2uVTskIRU3K0d+5wa5paiUIDVJRLin9ZblcFhmTzLM+AElk SpPh3C7nSbMmctWpCDOcheo3uUA+zcqmOODVaulaaD3Yi8VY0P9Pvv1DIrBMBxNJYLtx +uvPGgwLS5fTc63vpRj6GaOTWCEs5a/WcSkhNI0gsPtC944jAfTHlUAZjqa1alLohIVr 0Bt6K55Bu43mEecRqKKCYEa3jv5QdEkjpd6UaTOyBNvK/cMQcVw9KT9JIjweaRibltGy jeef5y1oDZObdyN7C/we6MBJdXzReJAAUBBVusaeOK2XwsyC6fbp19/qb2KksyABqENl Hrcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=/oZqEBSpFDBhohhwkvj/n1SVLaLgNS5l4bcF0xNiTws=; b=P72mWgFbG9+Ju3+CE7Uo5Pevel8cpaANI+rBf8UOZgqH1IOVypbip/aPCkNXpqe+SQ rjvNzy0d1KlM2MwzqcdsXXkasiY1W1DNN08xM/hLlv6MRjBMDkT2Z3knTukGfAhhsluy jQtrie7GYcDtVPa9vgG8/qnzaNLWucbvc9aHSf7MG2K4A/W9rhUTpLLgyAieT1+YLzMV MCQGQfxwbY1VDAQdDoOcnGdGJVT2e4lEmm4c5AjWq4FWXwPiqgUjRMD7MJtHp5WmUz6A xe/mNfJHL7jSC5KamSiw0CVX6uZpN25c11pJTizzL3MW47afOK11d0tZwLU13H5+Xymb VPRQ== X-Gm-Message-State: APjAAAUH6Cz8WKHqPUF6PYIDihJtNfq1FhcqR/LnneKImuglzjTOxDcE MqU7jIKlmj7Wj4QO2pnfGFO/BUoV X-Google-Smtp-Source: APXvYqwkyqHw3hbgWXZMcGay/YZUTxUpAQ5JvpKHLIukGzn6aNtpFcsZ7qHjNCR/FP3HIXGYQrwoNw== X-Received: by 2002:a63:6a81:: with SMTP id f123mr45195814pgc.348.1564738600132; Fri, 02 Aug 2019 02:36:40 -0700 (PDT) Received: from localhost.localdomain ([2400:4050:c8c2:de00:9c1a:eba9:3129:63d2]) by smtp.gmail.com with ESMTPSA id o129sm51075901pfg.1.2019.08.02.02.36.38 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 02 Aug 2019 02:36:39 -0700 (PDT) From: Yasufumi Ogawa To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com Date: Fri, 2 Aug 2019 18:36:36 +0900 Message-Id: <20190802093636.14223-1-yasufum.o@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [spp] [PATCH] spp_vf: revise functions start with uninit 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: , Errors-To: spp-bounces@dpdk.org Sender: "spp" Functions have prefix `uninit_` are defined to set a structs with 0 to clear, and different meaning to uninitialization. This update is to correct the meaning. This update also is to remove uninit_component_info() from shared lib because it was changed to be called only from `classifier.c`. Signed-off-by: Yasufumi Ogawa --- src/shared/secondary/spp_worker_th/vf_deps.h | 2 -- src/vf/classifier.c | 30 ++++++++++---------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/shared/secondary/spp_worker_th/vf_deps.h b/src/shared/secondary/spp_worker_th/vf_deps.h index 35fb356..a73329b 100644 --- a/src/shared/secondary/spp_worker_th/vf_deps.h +++ b/src/shared/secondary/spp_worker_th/vf_deps.h @@ -85,8 +85,6 @@ int update_forwarder(struct sppwk_comp_info *wk_comp_info); void init_classifier_info(int component_id); -void uninit_component_info(struct cls_comp_info *cmp_info); - /** * Activate temporarily stored component info while flushing. * diff --git a/src/vf/classifier.c b/src/vf/classifier.c index cadd03e..efaecb9 100644 --- a/src/vf/classifier.c +++ b/src/vf/classifier.c @@ -69,16 +69,26 @@ struct cls_mng_info { /* classifier information per lcore */ struct cls_mng_info cls_mng_info_list[RTE_MAX_LCORE]; +/* uninitialize classifier information. */ +static void +clean_component_info(struct cls_comp_info *comp_info) +{ + int i; + for (i = 0; i < NOF_VLAN; ++i) + free_mac_classifier(comp_info->mac_clfs[i]); + memset(comp_info, 0, sizeof(struct cls_comp_info)); +} + /* uninitialize classifier. */ static void -uninit_classifier(struct cls_mng_info *mng_info) +clean_classifier(struct cls_mng_info *mng_info) { int i; mng_info->is_used = 0; for (i = 0; i < TWO_SIDES; ++i) - uninit_component_info(mng_info->cmp_infos + (long)i); + clean_component_info(mng_info->cmp_infos + (long)i); memset(mng_info, 0, sizeof(struct cls_mng_info)); } @@ -90,7 +100,7 @@ init_classifier_info(int comp_id) struct cls_mng_info *mng_info = NULL; mng_info = cls_mng_info_list + comp_id; - uninit_classifier(mng_info); + clean_classifier(mng_info); } /** @@ -429,16 +439,6 @@ init_component_info(struct cls_comp_info *cmp_info, return SPPWK_RET_OK; } -/* uninitialize classifier information. */ -void -uninit_component_info(struct cls_comp_info *comp_info) -{ - int i; - for (i = 0; i < NOF_VLAN; ++i) - free_mac_classifier(comp_info->mac_clfs[i]); - memset(comp_info, 0, sizeof(struct cls_comp_info)); -} - /* transmit packet to one destination. */ static inline void transmit_packets(struct cls_port_info *clsd_data) @@ -722,8 +722,8 @@ update_classifier(struct sppwk_comp_info *wk_comp_info) mng_info->upd_index)) rte_delay_us_block(SPPWK_UPDATE_INTERVAL); - /* uninitialize old */ - uninit_component_info(mng_info->cmp_infos + mng_info->upd_index); + /* Clean old one. */ + clean_component_info(mng_info->cmp_infos + mng_info->upd_index); RTE_LOG(INFO, SPP_CLASSIFIER_MAC, "Done update classifier, id=%u.\n", wk_id); -- 2.17.1