From: yasufum.o@gmail.com
To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com
Subject: [spp] [PATCH 04/11] shared/sec: rename struct classified_data
Date: Mon, 24 Jun 2019 11:24:57 +0900 [thread overview]
Message-ID: <20190624022504.18752-5-yasufum.o@gmail.com> (raw)
In-Reply-To: <20190624022504.18752-1-yasufum.o@gmail.com>
From: Yasufumi Ogawa <yasufum.o@gmail.com>
This update is to rename struct `classified_data` to `cls_port_info`
because it is a set of attributes of a port and not classified data
actually.
Signed-off-by: Yasufumi Ogawa <yasufum.o@gmail.com>
---
src/shared/secondary/spp_worker_th/vf_deps.h | 13 +++--
src/vf/classifier_mac.c | 50 ++++++++++----------
2 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/src/shared/secondary/spp_worker_th/vf_deps.h b/src/shared/secondary/spp_worker_th/vf_deps.h
index 3e8fc01..8085357 100644
--- a/src/shared/secondary/spp_worker_th/vf_deps.h
+++ b/src/shared/secondary/spp_worker_th/vf_deps.h
@@ -20,14 +20,13 @@ struct mac_classifier {
int default_cls_idx; /* Default index for classification. */
};
-/* classified data (destination port, target packets, etc) */
-/* TODO(yasufum) rename `classified_data`. */
-/* TODO(yasufum) confirm what `iface_no_global` does mean? */
-struct classified_data {
+/* Set of attirbutes of port for classification. */
+/* TODO(yasufum) confirm what is `iface_no_global`. */
+struct cls_port_info {
enum port_type iface_type;
int iface_no; /* Index of ports handled by classifier. */
int iface_no_global; /* ID for interface generated by spp_vf */
- uint16_t port; /* Ethdev port ID. */
+ uint16_t ethdev_port_id; /* Ethdev port ID. */
uint16_t nof_pkts; /* Number of packets in pkts[]. */
struct rte_mbuf *pkts[MAX_PKT_BURST]; /* packets to be classified. */
};
@@ -41,9 +40,9 @@ struct component_info {
struct mac_classifier *mac_classifications[NOF_VLAN];
int n_classified_data_tx; /* number of transmission ports */
- struct classified_data classified_data_rx; /* RX handled by cls */
+ struct cls_port_info classified_data_rx; /* RX handled by cls */
/* transmission ports handled by classifier */
- struct classified_data classified_data_tx[RTE_MAX_ETHPORTS];
+ struct cls_port_info classified_data_tx[RTE_MAX_ETHPORTS];
};
/* free mac classification instance. */
diff --git a/src/vf/classifier_mac.c b/src/vf/classifier_mac.c
index cd0c546..b2388af 100644
--- a/src/vf/classifier_mac.c
+++ b/src/vf/classifier_mac.c
@@ -183,7 +183,7 @@ log_classification(
long clsd_idx,
struct rte_mbuf *pkt,
struct component_info *cmp_info,
- struct classified_data *clsd_data,
+ struct cls_port_info *clsd_data,
const char *func_name,
int line_num)
{
@@ -203,8 +203,7 @@ log_classification(
if (clsd_idx < 0)
snprintf(iface_str, sizeof(iface_str), "%ld", clsd_idx);
else
- spp_format_port_string(
- iface_str,
+ spp_format_port_string(iface_str,
clsd_data[clsd_idx].iface_type,
clsd_data[clsd_idx].iface_no_global);
@@ -231,7 +230,7 @@ log_entry(
uint16_t vid,
const char *mac_addr_str,
struct component_info *cmp_info,
- struct classified_data *clsd_data,
+ struct cls_port_info *clsd_data,
const char *func_name,
int line_num)
{
@@ -331,8 +330,8 @@ init_component_info(struct component_info *cmp_info,
struct mac_classifier *mac_cls;
struct ether_addr eth_addr;
char mac_addr_str[ETHER_ADDR_STR_BUF_SZ];
- struct classified_data *clsd_data_rx = &cmp_info->classified_data_rx;
- struct classified_data *clsd_data_tx = cmp_info->classified_data_tx;
+ struct cls_port_info *clsd_data_rx = &cmp_info->classified_data_rx;
+ struct cls_port_info *clsd_data_tx = cmp_info->classified_data_tx;
struct sppwk_port_info *tx_port = NULL;
uint16_t vid;
@@ -341,7 +340,7 @@ init_component_info(struct component_info *cmp_info,
clsd_data_rx->iface_type = UNDEF;
clsd_data_rx->iface_no = 0;
clsd_data_rx->iface_no_global = 0;
- clsd_data_rx->port = 0;
+ clsd_data_rx->ethdev_port_id = 0;
clsd_data_rx->nof_pkts = 0;
} else {
clsd_data_rx->iface_type =
@@ -349,7 +348,7 @@ init_component_info(struct component_info *cmp_info,
clsd_data_rx->iface_no = 0;
clsd_data_rx->iface_no_global =
component_info->rx_ports[0]->iface_no;
- clsd_data_rx->port =
+ clsd_data_rx->ethdev_port_id =
component_info->rx_ports[0]->ethdev_port_id;
clsd_data_rx->nof_pkts = 0;
}
@@ -362,10 +361,10 @@ init_component_info(struct component_info *cmp_info,
vid = tx_port->cls_attrs.vlantag.vid;
/* store ports information */
- clsd_data_tx[i].iface_type = tx_port->iface_type;
- clsd_data_tx[i].iface_no = i;
+ clsd_data_tx[i].iface_type = tx_port->iface_type;
+ clsd_data_tx[i].iface_no = i;
clsd_data_tx[i].iface_no_global = tx_port->iface_no;
- clsd_data_tx[i].port = tx_port->ethdev_port_id;
+ clsd_data_tx[i].ethdev_port_id = tx_port->ethdev_port_id;
clsd_data_tx[i].nof_pkts = 0;
if (tx_port->cls_attrs.mac_addr == 0)
@@ -450,13 +449,13 @@ uninit_component_info(struct component_info *cmp_info)
/* transmit packet to one destination. */
static inline void
-transmit_packet(struct classified_data *clsd_data)
+transmit_packet(struct cls_port_info *clsd_data)
{
int i;
uint16_t n_tx;
/* transmit packets */
- n_tx = spp_eth_tx_burst(clsd_data->port, 0,
+ n_tx = spp_eth_tx_burst(clsd_data->ethdev_port_id, 0,
clsd_data->pkts, clsd_data->nof_pkts);
/* free cannot transmit packets */
@@ -466,7 +465,7 @@ transmit_packet(struct classified_data *clsd_data)
RTE_LOG(DEBUG, SPP_CLASSIFIER_MAC,
"drop packets(tx). num=%hu, ethdev_port_id=%hu\n",
(uint16_t)(clsd_data->nof_pkts - n_tx),
- clsd_data->port);
+ clsd_data->ethdev_port_id);
}
clsd_data->nof_pkts = 0;
@@ -477,7 +476,7 @@ static inline void
transmit_all_packet(struct component_info *cmp_info)
{
int i;
- struct classified_data *clsd_data_tx = cmp_info->classified_data_tx;
+ struct cls_port_info *clsd_data_tx = cmp_info->classified_data_tx;
for (i = 0; i < cmp_info->n_classified_data_tx; i++) {
if (unlikely(clsd_data_tx[i].nof_pkts != 0)) {
@@ -494,7 +493,7 @@ transmit_all_packet(struct component_info *cmp_info)
/* set mbuf pointer to tx buffer and transmit packet, if buffer is filled */
static inline void
-push_packet(struct rte_mbuf *pkt, struct classified_data *clsd_data)
+push_packet(struct rte_mbuf *pkt, struct cls_port_info *clsd_data)
{
clsd_data->pkts[clsd_data->nof_pkts++] = pkt;
@@ -507,7 +506,7 @@ push_packet(struct rte_mbuf *pkt, struct classified_data *clsd_data)
clsd_data->iface_type,
clsd_data->iface_no_global,
clsd_data->iface_no,
- clsd_data->port,
+ clsd_data->ethdev_port_id,
clsd_data->nof_pkts);
transmit_packet(clsd_data);
}
@@ -533,7 +532,7 @@ get_general_default_classified_index(struct component_info *cmp_info)
static inline void
handle_l2multicast_packet(struct rte_mbuf *pkt,
struct component_info *cmp_info,
- struct classified_data *clsd_data)
+ struct cls_port_info *clsd_data)
{
int i;
struct mac_classifier *mac_cls;
@@ -640,7 +639,7 @@ select_classified_index(const struct rte_mbuf *pkt,
static inline void
classify_packet(struct rte_mbuf **rx_pkts, uint16_t n_rx,
struct component_info *cmp_info,
- struct classified_data *clsd_data)
+ struct cls_port_info *clsd_data)
{
int i;
long clsd_idx;
@@ -747,8 +746,8 @@ spp_classifier_mac_do(int id)
struct component_info *cmp_info = NULL;
struct rte_mbuf *rx_pkts[MAX_PKT_BURST];
- struct classified_data *clsd_data_rx = NULL;
- struct classified_data *clsd_data_tx = NULL;
+ struct cls_port_info *clsd_data_rx = NULL;
+ struct cls_port_info *clsd_data_tx = NULL;
uint64_t cur_tsc, prev_tsc = 0;
const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) /
@@ -792,7 +791,8 @@ spp_classifier_mac_do(int id)
return SPP_RET_OK;
/* retrieve packets */
- n_rx = spp_eth_rx_burst(clsd_data_rx->port, 0, rx_pkts, MAX_PKT_BURST);
+ n_rx = spp_eth_rx_burst(clsd_data_rx->ethdev_port_id, 0, rx_pkts,
+ MAX_PKT_BURST);
if (unlikely(n_rx == 0))
return SPP_RET_OK;
@@ -812,7 +812,7 @@ spp_classifier_get_component_status(
int i, nof_tx, nof_rx = 0; /* Num of RX and TX ports. */
struct management_info *mng_info;
struct component_info *cmp_info;
- struct classified_data *clsd_data;
+ struct cls_port_info *clsd_data;
struct sppwk_port_idx rx_ports[RTE_MAX_ETHPORTS];
struct sppwk_port_idx tx_ports[RTE_MAX_ETHPORTS];
@@ -861,7 +861,7 @@ mac_classification_iterate_table(
uint16_t vid,
struct mac_classifier *mac_cls,
__rte_unused struct component_info *cmp_info,
- struct classified_data *clsd_data)
+ struct cls_port_info *clsd_data)
{
int ret;
const void *key;
@@ -918,7 +918,7 @@ spp_classifier_mac_iterate_table(
int i, n;
struct management_info *mng_info;
struct component_info *cmp_info;
- struct classified_data *clsd_data;
+ struct cls_port_info *clsd_data;
for (i = 0; i < RTE_MAX_LCORE; i++) {
mng_info = g_mng_infos + i;
--
2.17.1
next prev parent reply other threads:[~2019-06-24 2:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-24 2:24 [spp] [PATCH 00/11] Refactor libs for classifier in spp_vf yasufum.o
2019-06-24 2:24 ` [spp] [PATCH 01/11] shared/sec: refactor defines of VLAN " yasufum.o
2019-06-24 2:24 ` [spp] [PATCH 02/11] shared/sec: rename struct mac_classification yasufum.o
2019-06-24 2:24 ` [spp] [PATCH 03/11] shared/sec: refactor comments in vf_deps.h yasufum.o
2019-06-24 2:24 ` yasufum.o [this message]
2019-06-24 2:24 ` [spp] [PATCH 05/11] shared/sec: revise usage of term component_info yasufum.o
2019-06-24 2:24 ` [spp] [PATCH 06/11] shared/sec: revise members of struct cls_port_info yasufum.o
2019-06-24 2:25 ` [spp] [PATCH 07/11] shared/sec: rename func free_mac_classification yasufum.o
2019-06-24 2:25 ` [spp] [PATCH 08/11] shared/sec: refactor updating classifier info yasufum.o
2019-06-24 2:25 ` [spp] [PATCH 09/11] shared/sec: refactor updating forwarder yasufum.o
2019-06-24 2:25 ` [spp] [PATCH 10/11] shared/sec: refactor getting classifier status yasufum.o
2019-06-24 2:25 ` [spp] [PATCH 11/11] shared/sec: refactor setup cls table stat in JSON yasufum.o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190624022504.18752-5-yasufum.o@gmail.com \
--to=yasufum.o@gmail.com \
--cc=ferruh.yigit@intel.com \
--cc=spp@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).