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 BAD91A0487 for ; Mon, 1 Jul 2019 06:11:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AFF264C99; Mon, 1 Jul 2019 06:11:36 +0200 (CEST) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by dpdk.org (Postfix) with ESMTP id 5978E325F for ; Mon, 1 Jul 2019 06:11:35 +0200 (CEST) Received: by mail-pf1-f194.google.com with SMTP id 81so5847966pfy.13 for ; Sun, 30 Jun 2019 21:11:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=wHm9ldDzBqPDP7Nh1fa08r0YcGmkjM36JnBI6wewBto=; b=hAsEVVSVjsL12pMq9VW7KlcTrCV1bIAO+SiuhPUPduLNY5FXV9aO2I/SojftN0H1Bu 1vEKcMOFL6rUN8ywTXalm5Heq9qvn/kpD5I/NNRaRGM4cL4hZzOk16jTUXDwbWNUTVYY b6z/11f0jLYhEmnmeHt66Ugpe74/THmdfWphon+Nwu5gJRGOJAgFT7hHgNki7wjIe+IO DmmWdr/LUFTcCfLIMFKf+r4jAsegEy+0iyVCHwPXY0wIF/1Bt+l6bHUwDRGVAMDLjIUm MdtMaDMMTjq15wiSANnvpCoMBcBhLFljhgFbuj8f1ErRFWfCkIprF9n+zy1MR4E5SQMa UwjQ== 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:in-reply-to :references; bh=wHm9ldDzBqPDP7Nh1fa08r0YcGmkjM36JnBI6wewBto=; b=by3m+1WBvKCPxZF/j4aAfo49eUvCh+vmsVMLEIEIXKSOKlBi5Pn/HvSA8CDoLLl2bl Gd/UMHDuWraOghsqt/xNPdY+icJOiq8KZDCGWlcxKtEN5nNIG63SHONM/7jh/ZEPhERK Z7cYjFnO0+yOnHIahO4S0pyNZhYUxo+uIUc4/c7KuEZfnRa9Up7sMJvIKHsjGmDZiapx 5/IqbAJjoqtaXRFhgGOIHIFi7ip5hlgv2NWXWRx5UZrMB30ipbZLaAijhzPdae0g42YH WTwcO0uApBdzSvJUCdkejxHYPzdcPJNAhPpPQK2fHEgvrfqNCcJjMbK7+ZCS+yKZh+6J x8vQ== X-Gm-Message-State: APjAAAXnbkoBMpW+6b7w50eh2JsBBl+ce3Llpy1br3U5+asJ9r0HJtMU BXdKtCx8aqYk9/S8EjaJFOYCJcvY X-Google-Smtp-Source: APXvYqwRfWuGlZKPYNK4N29ltmxHSDt8TgTPFtMwcRiIVM0NLg+3USAvHWf4Q2dvve3MOiB/eTj91A== X-Received: by 2002:a63:490a:: with SMTP id w10mr22091316pga.6.1561954294370; Sun, 30 Jun 2019 21:11:34 -0700 (PDT) Received: from localhost.localdomain ([192.47.164.146]) by smtp.gmail.com with ESMTPSA id o128sm12190907pfb.42.2019.06.30.21.11.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Jun 2019 21:11:33 -0700 (PDT) From: yasufum.o@gmail.com To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com Date: Mon, 1 Jul 2019 13:11:24 +0900 Message-Id: <20190701041126.33947-3-yasufum.o@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190701041126.33947-1-yasufum.o@gmail.com> References: <20190701041126.33947-1-yasufum.o@gmail.com> Subject: [spp] [PATCH 2/4] spp_vf: change to use burst funcs with VLAN 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" From: Yasufumi Ogawa This update is to change to use RX and TX burst functions which were added in the previous patch. Signed-off-by: Yasufumi Ogawa --- src/vf/Makefile | 2 +- src/vf/classifier_mac.c | 8 ++++---- src/vf/forwarder.c | 5 +++-- src/vf/spp_vf.c | 1 + src/vf/vf_cmd_runner.c | 1 + 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/vf/Makefile b/src/vf/Makefile index 1d6cb7c..35f13e5 100644 --- a/src/vf/Makefile +++ b/src/vf/Makefile @@ -20,7 +20,7 @@ SRCS-y += $(SPP_SEC_DIR)/string_buffer.c SRCS-y += $(SPP_SEC_DIR)/json_helper.c SRCS-y += $(SPP_SEC_DIR)/utils.c $(SPP_SEC_DIR)/add_port.c SRCS-y += $(SPP_WKT_DIR)/ringlatencystats.c -SRCS-y += $(SPP_WKT_DIR)/spp_port.c +SRCS-y += $(SPP_WKT_DIR)/port_capability.c SRCS-y += $(SPP_WKT_DIR)/conn_spp_ctl.c SRCS-y += $(SPP_WKT_DIR)/cmd_parser.c SRCS-y += ../shared/common.c diff --git a/src/vf/classifier_mac.c b/src/vf/classifier_mac.c index a1d6ba4..6850962 100644 --- a/src/vf/classifier_mac.c +++ b/src/vf/classifier_mac.c @@ -28,7 +28,7 @@ #include "shared/secondary/json_helper.h" #include "shared/secondary/spp_worker_th/cmd_res_formatter.h" #include "shared/secondary/spp_worker_th/vf_deps.h" -#include "shared/secondary/spp_worker_th/spp_port.h" +#include "shared/secondary/spp_worker_th/port_capability.h" #define RTE_LOGTYPE_SPP_CLASSIFIER_MAC RTE_LOGTYPE_USER1 @@ -460,7 +460,7 @@ transmit_packet(struct cls_port_info *clsd_data) uint16_t n_tx; /* transmit packets */ - n_tx = spp_eth_tx_burst(clsd_data->ethdev_port_id, 0, + n_tx = sppwk_eth_vlan_tx_burst(clsd_data->ethdev_port_id, 0, clsd_data->pkts, clsd_data->nof_pkts); /* free cannot transmit packets */ @@ -797,8 +797,8 @@ spp_classifier_mac_do(int id) return SPP_RET_OK; /* retrieve packets */ - n_rx = spp_eth_rx_burst(clsd_data_rx->ethdev_port_id, 0, rx_pkts, - MAX_PKT_BURST); + n_rx = sppwk_eth_vlan_rx_burst(clsd_data_rx->ethdev_port_id, 0, + rx_pkts, MAX_PKT_BURST); if (unlikely(n_rx == 0)) return SPP_RET_OK; diff --git a/src/vf/forwarder.c b/src/vf/forwarder.c index e5cc963..77afc4e 100644 --- a/src/vf/forwarder.c +++ b/src/vf/forwarder.c @@ -9,6 +9,7 @@ #include "shared/secondary/return_codes.h" #include "shared/secondary/spp_worker_th/vf_deps.h" #include "shared/secondary/spp_worker_th/spp_port.h" +#include "shared/secondary/spp_worker_th/port_capability.h" #define RTE_LOGTYPE_FORWARD RTE_LOGTYPE_USER1 @@ -212,14 +213,14 @@ forward_packets(int id) tx = &path->ports[cnt].tx; /* Receive packets */ - nb_rx = spp_eth_rx_burst(rx->ethdev_port_id, 0, + nb_rx = sppwk_eth_vlan_rx_burst(rx->ethdev_port_id, 0, bufs, MAX_PKT_BURST); if (unlikely(nb_rx == 0)) continue; /* Send packets */ if (tx->ethdev_port_id >= 0) - nb_tx = spp_eth_tx_burst(tx->ethdev_port_id, + nb_tx = sppwk_eth_vlan_tx_burst(tx->ethdev_port_id, 0, bufs, nb_rx); /* Discard remained packets to release mbuf */ diff --git a/src/vf/spp_vf.c b/src/vf/spp_vf.c index 18a3619..504ee26 100644 --- a/src/vf/spp_vf.c +++ b/src/vf/spp_vf.c @@ -16,6 +16,7 @@ #include "shared/secondary/spp_worker_th/cmd_runner.h" #include "shared/secondary/spp_worker_th/cmd_parser.h" #include "shared/secondary/spp_worker_th/spp_port.h" +#include "shared/secondary/spp_worker_th/port_capability.h" /* Declare global variables */ /* Interface management information */ diff --git a/src/vf/vf_cmd_runner.c b/src/vf/vf_cmd_runner.c index fe37a19..5246af7 100644 --- a/src/vf/vf_cmd_runner.c +++ b/src/vf/vf_cmd_runner.c @@ -6,6 +6,7 @@ #include "forwarder.h" #include "shared/secondary/return_codes.h" #include "shared/secondary/json_helper.h" +#include "shared/secondary/spp_worker_th/port_capability.h" #include "shared/secondary/spp_worker_th/cmd_parser.h" #include "shared/secondary/spp_worker_th/cmd_runner.h" #include "shared/secondary/spp_worker_th/cmd_res_formatter.h" -- 2.17.1