numam-dpdk/drivers/net/bonding/rte_eth_bond_flow.c
William Tu f1f6ebc0ea eal: remove sys/queue.h from public headers
Currently there are some public headers that include 'sys/queue.h', which
is not POSIX, but usually provided by the Linux/BSD system library.
(Not in POSIX.1, POSIX.1-2001, or POSIX.1-2008. Present on the BSDs.)
The file is missing on Windows. During the Windows build, DPDK uses a
bundled copy, so building a DPDK library works fine.  But when OVS or other
applications use DPDK as a library, because some DPDK public headers
include 'sys/queue.h', on Windows, it triggers an error due to no such
file.

One solution is to install the 'lib/eal/windows/include/sys/queue.h' into
Windows environment, such as [1]. However, this means DPDK exports the
functionalities of 'sys/queue.h' into the environment, which might cause
symbols, macros, headers clashing with other applications.

The patch fixes it by removing the "#include <sys/queue.h>" from
DPDK public headers, so programs including DPDK headers don't depend
on the system to provide 'sys/queue.h'. When these public headers use
macros such as TAILQ_xxx, we replace it by the ones with RTE_ prefix.
For Windows, we copy the definitions from <sys/queue.h> to rte_os.h
in Windows EAL. Note that these RTE_ macros are compatible with
<sys/queue.h>, both at the level of API (to use with <sys/queue.h>
macros in C files) and ABI (to avoid breaking it).

Additionally, the TAILQ_FOREACH_SAFE is not part of <sys/queue.h>,
the patch replaces it with RTE_TAILQ_FOREACH_SAFE.

[1] http://mails.dpdk.org/archives/dev/2021-August/216304.html

Suggested-by: Nick Connolly <nick.connolly@mayadata.io>
Suggested-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
Signed-off-by: William Tu <u9012063@gmail.com>
Acked-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
Acked-by: Narcisa Vasile <navasile@linux.microsoft.com>
2021-10-01 13:09:43 +02:00

246 lines
6.3 KiB
C

/* SPDX-License-Identifier: BSD-3-Clause
* Copyright 2018 Mellanox Technologies, Ltd
*/
#include <stddef.h>
#include <string.h>
#include <sys/queue.h>
#include <rte_errno.h>
#include <rte_malloc.h>
#include <rte_tailq.h>
#include <rte_flow.h>
#include "eth_bond_private.h"
static struct rte_flow *
bond_flow_alloc(int numa_node, const struct rte_flow_attr *attr,
const struct rte_flow_item *items,
const struct rte_flow_action *actions)
{
struct rte_flow *flow;
const struct rte_flow_conv_rule rule = {
.attr_ro = attr,
.pattern_ro = items,
.actions_ro = actions,
};
struct rte_flow_error error;
int ret;
ret = rte_flow_conv(RTE_FLOW_CONV_OP_RULE, NULL, 0, &rule, &error);
if (ret < 0) {
RTE_BOND_LOG(ERR, "Unable to process flow rule (%s): %s",
error.message ? error.message : "unspecified",
strerror(rte_errno));
return NULL;
}
flow = rte_zmalloc_socket(NULL, offsetof(struct rte_flow, rule) + ret,
RTE_CACHE_LINE_SIZE, numa_node);
if (unlikely(flow == NULL)) {
RTE_BOND_LOG(ERR, "Could not allocate new flow");
return NULL;
}
ret = rte_flow_conv(RTE_FLOW_CONV_OP_RULE, &flow->rule, ret, &rule,
&error);
if (ret < 0) {
RTE_BOND_LOG(ERR, "Failed to copy flow rule (%s): %s",
error.message ? error.message : "unspecified",
strerror(rte_errno));
rte_free(flow);
return NULL;
}
return flow;
}
static void
bond_flow_release(struct rte_flow **flow)
{
rte_free(*flow);
*flow = NULL;
}
static int
bond_flow_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
const struct rte_flow_item patterns[],
const struct rte_flow_action actions[],
struct rte_flow_error *err)
{
struct bond_dev_private *internals = dev->data->dev_private;
int i;
int ret;
for (i = 0; i < internals->slave_count; i++) {
ret = rte_flow_validate(internals->slaves[i].port_id, attr,
patterns, actions, err);
if (ret) {
RTE_BOND_LOG(ERR, "Operation rte_flow_validate failed"
" for slave %d with error %d", i, ret);
return ret;
}
}
return 0;
}
static struct rte_flow *
bond_flow_create(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
const struct rte_flow_item patterns[],
const struct rte_flow_action actions[],
struct rte_flow_error *err)
{
struct bond_dev_private *internals = dev->data->dev_private;
struct rte_flow *flow;
int i;
flow = bond_flow_alloc(dev->data->numa_node, attr, patterns, actions);
if (unlikely(flow == NULL)) {
rte_flow_error_set(err, ENOMEM, RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
NULL, rte_strerror(ENOMEM));
return NULL;
}
for (i = 0; i < internals->slave_count; i++) {
flow->flows[i] = rte_flow_create(internals->slaves[i].port_id,
attr, patterns, actions, err);
if (unlikely(flow->flows[i] == NULL)) {
RTE_BOND_LOG(ERR, "Failed to create flow on slave %d",
i);
goto err;
}
}
TAILQ_INSERT_TAIL(&internals->flow_list, flow, next);
return flow;
err:
/* Destroy all slaves flows. */
for (i = 0; i < internals->slave_count; i++) {
if (flow->flows[i] != NULL)
rte_flow_destroy(internals->slaves[i].port_id,
flow->flows[i], err);
}
bond_flow_release(&flow);
return NULL;
}
static int
bond_flow_destroy(struct rte_eth_dev *dev, struct rte_flow *flow,
struct rte_flow_error *err)
{
struct bond_dev_private *internals = dev->data->dev_private;
int i;
int ret = 0;
for (i = 0; i < internals->slave_count; i++) {
int lret;
if (unlikely(flow->flows[i] == NULL))
continue;
lret = rte_flow_destroy(internals->slaves[i].port_id,
flow->flows[i], err);
if (unlikely(lret != 0)) {
RTE_BOND_LOG(ERR, "Failed to destroy flow on slave %d:"
" %d", i, lret);
ret = lret;
}
}
TAILQ_REMOVE(&internals->flow_list, flow, next);
bond_flow_release(&flow);
return ret;
}
static int
bond_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *err)
{
struct bond_dev_private *internals = dev->data->dev_private;
struct rte_flow *flow;
void *tmp;
int ret = 0;
int lret;
/* Destroy all bond flows from its slaves instead of flushing them to
* keep the LACP flow or any other external flows.
*/
RTE_TAILQ_FOREACH_SAFE(flow, &internals->flow_list, next, tmp) {
lret = bond_flow_destroy(dev, flow, err);
if (unlikely(lret != 0))
ret = lret;
}
if (unlikely(ret != 0))
RTE_BOND_LOG(ERR, "Failed to flush flow in all slaves");
return ret;
}
static int
bond_flow_query_count(struct rte_eth_dev *dev, struct rte_flow *flow,
const struct rte_flow_action *action,
struct rte_flow_query_count *count,
struct rte_flow_error *err)
{
struct bond_dev_private *internals = dev->data->dev_private;
struct rte_flow_query_count slave_count;
int i;
int ret;
count->bytes = 0;
count->hits = 0;
rte_memcpy(&slave_count, count, sizeof(slave_count));
for (i = 0; i < internals->slave_count; i++) {
ret = rte_flow_query(internals->slaves[i].port_id,
flow->flows[i], action,
&slave_count, err);
if (unlikely(ret != 0)) {
RTE_BOND_LOG(ERR, "Failed to query flow on"
" slave %d: %d", i, ret);
return ret;
}
count->bytes += slave_count.bytes;
count->hits += slave_count.hits;
slave_count.bytes = 0;
slave_count.hits = 0;
}
return 0;
}
static int
bond_flow_query(struct rte_eth_dev *dev, struct rte_flow *flow,
const struct rte_flow_action *action, void *arg,
struct rte_flow_error *err)
{
switch (action->type) {
case RTE_FLOW_ACTION_TYPE_COUNT:
return bond_flow_query_count(dev, flow, action, arg, err);
default:
return rte_flow_error_set(err, ENOTSUP,
RTE_FLOW_ERROR_TYPE_ACTION, arg,
rte_strerror(ENOTSUP));
}
}
static int
bond_flow_isolate(struct rte_eth_dev *dev, int set,
struct rte_flow_error *err)
{
struct bond_dev_private *internals = dev->data->dev_private;
int i;
int ret;
for (i = 0; i < internals->slave_count; i++) {
ret = rte_flow_isolate(internals->slaves[i].port_id, set, err);
if (unlikely(ret != 0)) {
RTE_BOND_LOG(ERR, "Operation rte_flow_isolate failed"
" for slave %d with error %d", i, ret);
internals->flow_isolated_valid = 0;
return ret;
}
}
internals->flow_isolated = set;
internals->flow_isolated_valid = 1;
return 0;
}
const struct rte_flow_ops bond_flow_ops = {
.validate = bond_flow_validate,
.create = bond_flow_create,
.destroy = bond_flow_destroy,
.flush = bond_flow_flush,
.query = bond_flow_query,
.isolate = bond_flow_isolate,
};