f1f6ebc0ea
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>
256 lines
5.9 KiB
C
256 lines
5.9 KiB
C
/* SPDX-License-Identifier: BSD-3-Clause
|
|
* Copyright 2017 6WIND S.A.
|
|
* Copyright 2017 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 <rte_flow_driver.h>
|
|
|
|
#include "failsafe_private.h"
|
|
|
|
static struct rte_flow *
|
|
fs_flow_allocate(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) {
|
|
ERROR("Unable to process flow rule (%s): %s",
|
|
error.message ? error.message : "unspecified",
|
|
strerror(rte_errno));
|
|
return NULL;
|
|
}
|
|
flow = rte_zmalloc(NULL, offsetof(struct rte_flow, rule) + ret,
|
|
RTE_CACHE_LINE_SIZE);
|
|
if (flow == NULL) {
|
|
ERROR("Could not allocate new flow");
|
|
return NULL;
|
|
}
|
|
ret = rte_flow_conv(RTE_FLOW_CONV_OP_RULE, &flow->rule, ret, &rule,
|
|
&error);
|
|
if (ret < 0) {
|
|
ERROR("Failed to copy flow rule (%s): %s",
|
|
error.message ? error.message : "unspecified",
|
|
strerror(rte_errno));
|
|
rte_free(flow);
|
|
return NULL;
|
|
}
|
|
return flow;
|
|
}
|
|
|
|
static void
|
|
fs_flow_release(struct rte_flow **flow)
|
|
{
|
|
rte_free(*flow);
|
|
*flow = NULL;
|
|
}
|
|
|
|
static int
|
|
fs_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 *error)
|
|
{
|
|
struct sub_device *sdev;
|
|
uint8_t i;
|
|
int ret;
|
|
|
|
fs_lock(dev, 0);
|
|
FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
|
|
DEBUG("Calling rte_flow_validate on sub_device %d", i);
|
|
ret = rte_flow_validate(PORT_ID(sdev),
|
|
attr, patterns, actions, error);
|
|
if ((ret = fs_err(sdev, ret))) {
|
|
ERROR("Operation rte_flow_validate failed for sub_device %d"
|
|
" with error %d", i, ret);
|
|
fs_unlock(dev, 0);
|
|
return ret;
|
|
}
|
|
}
|
|
fs_unlock(dev, 0);
|
|
return 0;
|
|
}
|
|
|
|
static struct rte_flow *
|
|
fs_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 *error)
|
|
{
|
|
struct sub_device *sdev;
|
|
struct rte_flow *flow;
|
|
uint8_t i;
|
|
|
|
fs_lock(dev, 0);
|
|
flow = fs_flow_allocate(attr, patterns, actions);
|
|
FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
|
|
flow->flows[i] = rte_flow_create(PORT_ID(sdev),
|
|
attr, patterns, actions, error);
|
|
if (flow->flows[i] == NULL && fs_err(sdev, -rte_errno)) {
|
|
ERROR("Failed to create flow on sub_device %d",
|
|
i);
|
|
goto err;
|
|
}
|
|
}
|
|
TAILQ_INSERT_TAIL(&PRIV(dev)->flow_list, flow, next);
|
|
fs_unlock(dev, 0);
|
|
return flow;
|
|
err:
|
|
FOREACH_SUBDEV(sdev, i, dev) {
|
|
if (flow->flows[i] != NULL)
|
|
rte_flow_destroy(PORT_ID(sdev),
|
|
flow->flows[i], error);
|
|
}
|
|
fs_flow_release(&flow);
|
|
fs_unlock(dev, 0);
|
|
return NULL;
|
|
}
|
|
|
|
static int
|
|
fs_flow_destroy(struct rte_eth_dev *dev,
|
|
struct rte_flow *flow,
|
|
struct rte_flow_error *error)
|
|
{
|
|
struct sub_device *sdev;
|
|
uint8_t i;
|
|
int ret;
|
|
|
|
if (flow == NULL) {
|
|
ERROR("Invalid flow");
|
|
return -EINVAL;
|
|
}
|
|
ret = 0;
|
|
fs_lock(dev, 0);
|
|
FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
|
|
int local_ret;
|
|
|
|
if (flow->flows[i] == NULL)
|
|
continue;
|
|
local_ret = rte_flow_destroy(PORT_ID(sdev),
|
|
flow->flows[i], error);
|
|
if ((local_ret = fs_err(sdev, local_ret))) {
|
|
ERROR("Failed to destroy flow on sub_device %d: %d",
|
|
i, local_ret);
|
|
if (ret == 0)
|
|
ret = local_ret;
|
|
}
|
|
}
|
|
TAILQ_REMOVE(&PRIV(dev)->flow_list, flow, next);
|
|
fs_flow_release(&flow);
|
|
fs_unlock(dev, 0);
|
|
return ret;
|
|
}
|
|
|
|
static int
|
|
fs_flow_flush(struct rte_eth_dev *dev,
|
|
struct rte_flow_error *error)
|
|
{
|
|
struct sub_device *sdev;
|
|
struct rte_flow *flow;
|
|
void *tmp;
|
|
uint8_t i;
|
|
int ret;
|
|
|
|
fs_lock(dev, 0);
|
|
FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
|
|
DEBUG("Calling rte_flow_flush on sub_device %d", i);
|
|
ret = rte_flow_flush(PORT_ID(sdev), error);
|
|
if ((ret = fs_err(sdev, ret))) {
|
|
ERROR("Operation rte_flow_flush failed for sub_device %d"
|
|
" with error %d", i, ret);
|
|
fs_unlock(dev, 0);
|
|
return ret;
|
|
}
|
|
}
|
|
RTE_TAILQ_FOREACH_SAFE(flow, &PRIV(dev)->flow_list, next, tmp) {
|
|
TAILQ_REMOVE(&PRIV(dev)->flow_list, flow, next);
|
|
fs_flow_release(&flow);
|
|
}
|
|
fs_unlock(dev, 0);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
fs_flow_query(struct rte_eth_dev *dev,
|
|
struct rte_flow *flow,
|
|
const struct rte_flow_action *action,
|
|
void *arg,
|
|
struct rte_flow_error *error)
|
|
{
|
|
struct sub_device *sdev;
|
|
|
|
fs_lock(dev, 0);
|
|
sdev = TX_SUBDEV(dev);
|
|
if (sdev != NULL) {
|
|
int ret = rte_flow_query(PORT_ID(sdev),
|
|
flow->flows[SUB_ID(sdev)],
|
|
action, arg, error);
|
|
|
|
if ((ret = fs_err(sdev, ret))) {
|
|
fs_unlock(dev, 0);
|
|
return ret;
|
|
}
|
|
}
|
|
fs_unlock(dev, 0);
|
|
WARN("No active sub_device to query about its flow");
|
|
return -1;
|
|
}
|
|
|
|
static int
|
|
fs_flow_isolate(struct rte_eth_dev *dev,
|
|
int set,
|
|
struct rte_flow_error *error)
|
|
{
|
|
struct sub_device *sdev;
|
|
uint8_t i;
|
|
int ret;
|
|
|
|
fs_lock(dev, 0);
|
|
FOREACH_SUBDEV(sdev, i, dev) {
|
|
if (sdev->state < DEV_PROBED)
|
|
continue;
|
|
DEBUG("Calling rte_flow_isolate on sub_device %d", i);
|
|
if (PRIV(dev)->flow_isolated != sdev->flow_isolated)
|
|
WARN("flow isolation mode of sub_device %d in incoherent state.",
|
|
i);
|
|
ret = rte_flow_isolate(PORT_ID(sdev), set, error);
|
|
if ((ret = fs_err(sdev, ret))) {
|
|
ERROR("Operation rte_flow_isolate failed for sub_device %d"
|
|
" with error %d", i, ret);
|
|
fs_unlock(dev, 0);
|
|
return ret;
|
|
}
|
|
sdev->flow_isolated = set;
|
|
}
|
|
PRIV(dev)->flow_isolated = set;
|
|
fs_unlock(dev, 0);
|
|
return 0;
|
|
}
|
|
|
|
const struct rte_flow_ops fs_flow_ops = {
|
|
.validate = fs_flow_validate,
|
|
.create = fs_flow_create,
|
|
.destroy = fs_flow_destroy,
|
|
.flush = fs_flow_flush,
|
|
.query = fs_flow_query,
|
|
.isolate = fs_flow_isolate,
|
|
};
|