d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/sfc: make flow list engine-agnostic

Browse Source 
A backend which a driver employs to handle flow rules of a given
type depends on the underlying NIC flow engine. The driver in
question in its current state is tailored to support the only
flow engine, VNIC filtering. As the need arises to add support
for transfer rules, the driver has to be reworked so that it
becomes possible to introduce yet another backend.

As a preparation step, make the flow list shared
between different engines.

Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
This commit is contained in:
Ivan Malov 2020-03-05 10:47:48 +00:00 committed by Ferruh Yigit
parent 7571c08d9f
commit 1962171292
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/sfc/sfc.h
View File

@ -242,6 +242,8 @@ struct sfc_adapter {
struct sfc_port port;
struct sfc_filter filter;
struct sfc_flow_list flow_list;
unsigned int rxq_max;
unsigned int txq_max;

2
drivers/net/sfc/sfc_filter.h
View File

@ -23,8 +23,6 @@ struct sfc_filter {
size_t supported_match_num;
/** Driver cache of supported filter match masks */
uint32_t *supported_match;
/** List of flow rules */
struct sfc_flow_list flow_list;
/**
* Supports any of ip_proto, remote host or local host
* filters. This flag is used for filter match exceptions

20
drivers/net/sfc/sfc_flow.c
View File

@ -2317,7 +2317,7 @@ sfc_flow_create(struct rte_eth_dev *dev,
sfc_adapter_lock(sa);
TAILQ_INSERT_TAIL(&sa->filter.flow_list, flow, entries);
TAILQ_INSERT_TAIL(&sa->flow_list, flow, entries);
if (sa->state == SFC_ADAPTER_STARTED) {
rc = sfc_flow_filter_insert(sa, flow);
@ -2334,7 +2334,7 @@ sfc_flow_create(struct rte_eth_dev *dev,
return flow;
fail_filter_insert:
TAILQ_REMOVE(&sa->filter.flow_list, flow, entries);
TAILQ_REMOVE(&sa->flow_list, flow, entries);
fail_bad_value:
rte_free(flow);
@ -2361,7 +2361,7 @@ sfc_flow_remove(struct sfc_adapter *sa,
"Failed to destroy flow rule");
}
TAILQ_REMOVE(&sa->filter.flow_list, flow, entries);
TAILQ_REMOVE(&sa->flow_list, flow, entries);
rte_free(flow);
return rc;
@ -2378,7 +2378,7 @@ sfc_flow_destroy(struct rte_eth_dev *dev,
sfc_adapter_lock(sa);
TAILQ_FOREACH(flow_ptr, &sa->filter.flow_list, entries) {
TAILQ_FOREACH(flow_ptr, &sa->flow_list, entries) {
if (flow_ptr == flow)
rc = 0;
}
@ -2408,7 +2408,7 @@ sfc_flow_flush(struct rte_eth_dev *dev,
sfc_adapter_lock(sa);
while ((flow = TAILQ_FIRST(&sa->filter.flow_list)) != NULL) {
while ((flow = TAILQ_FIRST(&sa->flow_list)) != NULL) {
rc = sfc_flow_remove(sa, flow, error);
if (rc != 0)
ret = rc;
@ -2454,7 +2454,7 @@ sfc_flow_init(struct sfc_adapter *sa)
{
SFC_ASSERT(sfc_adapter_is_locked(sa));
TAILQ_INIT(&sa->filter.flow_list);
TAILQ_INIT(&sa->flow_list);
}
void
@ -2464,8 +2464,8 @@ sfc_flow_fini(struct sfc_adapter *sa)
SFC_ASSERT(sfc_adapter_is_locked(sa));
while ((flow = TAILQ_FIRST(&sa->filter.flow_list)) != NULL) {
TAILQ_REMOVE(&sa->filter.flow_list, flow, entries);
while ((flow = TAILQ_FIRST(&sa->flow_list)) != NULL) {
TAILQ_REMOVE(&sa->flow_list, flow, entries);
rte_free(flow);
}
}
@ -2477,7 +2477,7 @@ sfc_flow_stop(struct sfc_adapter *sa)
SFC_ASSERT(sfc_adapter_is_locked(sa));
TAILQ_FOREACH(flow, &sa->filter.flow_list, entries)
TAILQ_FOREACH(flow, &sa->flow_list, entries)
sfc_flow_filter_remove(sa, flow);
}
@ -2491,7 +2491,7 @@ sfc_flow_start(struct sfc_adapter *sa)
SFC_ASSERT(sfc_adapter_is_locked(sa));
TAILQ_FOREACH(flow, &sa->filter.flow_list, entries) {
TAILQ_FOREACH(flow, &sa->flow_list, entries) {
rc = sfc_flow_filter_insert(sa, flow);
if (rc != 0)
goto fail_bad_flow;