/* PMD headers. */
#include "mlx4.h"
#include "mlx4_flow.h"
+#include "mlx4_rxtx.h"
+#include "mlx4_utils.h"
/** Static initializer for items. */
#define ITEMS(...) \
struct rte_flow_error *error)
{
struct priv *priv = dev->data->dev_private;
- int ret;
struct mlx4_flow flow = { .offset = sizeof(struct ibv_flow_attr) };
- priv_lock(priv);
- ret = priv_flow_validate(priv, attr, items, actions, error, &flow);
- priv_unlock(priv);
- return ret;
+ return priv_flow_validate(priv, attr, items, actions, error, &flow);
}
/**
goto error;
}
return rte_flow;
-
error:
rte_free(rte_flow);
return NULL;
}
/**
- * Convert a flow.
- *
- * @param priv
- * Pointer to private structure.
- * @param[in] attr
- * Flow rule attributes.
- * @param[in] items
- * Pattern specification (list terminated by the END pattern item).
- * @param[in] actions
- * Associated actions (list terminated by the END action).
- * @param[out] error
- * Perform verbose error reporting if not NULL.
+ * Create a flow.
*
- * @return
- * A flow on success, NULL otherwise.
+ * @see rte_flow_create()
+ * @see rte_flow_ops
*/
-static struct rte_flow *
-priv_flow_create(struct priv *priv,
+struct rte_flow *
+mlx4_flow_create(struct rte_eth_dev *dev,
const struct rte_flow_attr *attr,
const struct rte_flow_item items[],
const struct rte_flow_action actions[],
struct rte_flow_error *error)
{
+ struct priv *priv = dev->data->dev_private;
struct rte_flow *rte_flow;
struct mlx4_flow_action action;
struct mlx4_flow flow = { .offset = sizeof(struct ibv_flow_attr), };
}
rte_flow = priv_flow_create_action_queue(priv, flow.ibv_attr,
&action, error);
- if (rte_flow)
+ if (rte_flow) {
+ LIST_INSERT_HEAD(&priv->flows, rte_flow, next);
+ DEBUG("Flow created %p", (void *)rte_flow);
return rte_flow;
+ }
exit:
rte_free(flow.ibv_attr);
return NULL;
}
-/**
- * Create a flow.
- *
- * @see rte_flow_create()
- * @see rte_flow_ops
- */
-struct rte_flow *
-mlx4_flow_create(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
- const struct rte_flow_item items[],
- const struct rte_flow_action actions[],
- struct rte_flow_error *error)
-{
- struct priv *priv = dev->data->dev_private;
- struct rte_flow *flow;
-
- priv_lock(priv);
- flow = priv_flow_create(priv, attr, items, actions, error);
- if (flow) {
- LIST_INSERT_HEAD(&priv->flows, flow, next);
- DEBUG("Flow created %p", (void *)flow);
- }
- priv_unlock(priv);
- return flow;
-}
-
/**
* @see rte_flow_isolate()
*
{
struct priv *priv = dev->data->dev_private;
- priv_lock(priv);
if (priv->rxqs) {
rte_flow_error_set(error, ENOTSUP,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
NULL, "isolated mode must be set"
" before configuring the device");
- priv_unlock(priv);
return -rte_errno;
}
priv->isolated = !!enable;
- priv_unlock(priv);
return 0;
}
-/**
- * Destroy a flow.
- *
- * @param priv
- * Pointer to private structure.
- * @param[in] flow
- * Flow to destroy.
- */
-static void
-priv_flow_destroy(struct priv *priv, struct rte_flow *flow)
-{
- (void)priv;
- LIST_REMOVE(flow, next);
- if (flow->ibv_flow)
- claim_zero(ibv_destroy_flow(flow->ibv_flow));
- rte_free(flow->ibv_attr);
- DEBUG("Flow destroyed %p", (void *)flow);
- rte_free(flow);
-}
-
/**
* Destroy a flow.
*
struct rte_flow *flow,
struct rte_flow_error *error)
{
- struct priv *priv = dev->data->dev_private;
-
+ (void)dev;
(void)error;
- priv_lock(priv);
- priv_flow_destroy(priv, flow);
- priv_unlock(priv);
+ LIST_REMOVE(flow, next);
+ if (flow->ibv_flow)
+ claim_zero(ibv_destroy_flow(flow->ibv_flow));
+ rte_free(flow->ibv_attr);
+ DEBUG("Flow destroyed %p", (void *)flow);
+ rte_free(flow);
return 0;
}
-/**
- * Destroy all flows.
- *
- * @param priv
- * Pointer to private structure.
- */
-static void
-priv_flow_flush(struct priv *priv)
-{
- while (!LIST_EMPTY(&priv->flows)) {
- struct rte_flow *flow;
-
- flow = LIST_FIRST(&priv->flows);
- priv_flow_destroy(priv, flow);
- }
-}
-
/**
* Destroy all flows.
*
{
struct priv *priv = dev->data->dev_private;
- (void)error;
- priv_lock(priv);
- priv_flow_flush(priv);
- priv_unlock(priv);
+ while (!LIST_EMPTY(&priv->flows)) {
+ struct rte_flow *flow;
+
+ flow = LIST_FIRST(&priv->flows);
+ mlx4_flow_destroy(dev, flow, error);
+ }
return 0;
}