@@ -93,6 +93,7 @@ enum index {
TUNNEL,
FLEX,
QUEUE,
+ DEQUEUE,
DRAIN,
/* Flex arguments */
@@ -132,6 +133,9 @@ enum index {
QUEUE_DESTROY_ID,
QUEUE_DESTROY_DRAIN,
+ /* Dequeue arguments. */
+ DEQUEUE_QUEUE,
+
/* Drain arguments. */
DRAIN_QUEUE,
@@ -2159,6 +2163,9 @@ static int parse_qo(struct context *, const struct token *,
static int parse_qo_destroy(struct context *, const struct token *,
const char *, unsigned int,
void *, unsigned int);
+static int parse_dequeue(struct context *, const struct token *,
+ const char *, unsigned int,
+ void *, unsigned int);
static int parse_drain(struct context *, const struct token *,
const char *, unsigned int,
void *, unsigned int);
@@ -2440,6 +2447,7 @@ static const struct token token_list[] = {
TUNNEL,
FLEX,
QUEUE,
+ DEQUEUE,
DRAIN)),
.call = parse_init,
},
@@ -2775,6 +2783,21 @@ static const struct token token_list[] = {
.call = parse_qo_destroy,
},
/* Top-level command. */
+ [DEQUEUE] = {
+ .name = "dequeue",
+ .help = "dequeue flow operations",
+ .next = NEXT(NEXT_ENTRY(DEQUEUE_QUEUE), NEXT_ENTRY(COMMON_PORT_ID)),
+ .args = ARGS(ARGS_ENTRY(struct buffer, port)),
+ .call = parse_dequeue,
+ },
+ /* Sub-level commands. */
+ [DEQUEUE_QUEUE] = {
+ .name = "queue",
+ .help = "specify queue id",
+ .next = NEXT(NEXT_ENTRY(END), NEXT_ENTRY(COMMON_QUEUE_ID)),
+ .args = ARGS(ARGS_ENTRY(struct buffer, queue)),
+ },
+ /* Top-level command. */
[DRAIN] = {
.name = "drain",
.help = "drain a flow queue",
@@ -8408,6 +8431,34 @@ parse_qo_destroy(struct context *ctx, const struct token *token,
}
}
+/** Parse tokens for dequeue command. */
+static int
+parse_dequeue(struct context *ctx, const struct token *token,
+ const char *str, unsigned int len,
+ void *buf, unsigned int size)
+{
+ struct buffer *out = buf;
+
+ /* Token name must match. */
+ if (parse_default(ctx, token, str, len, NULL, 0) < 0)
+ return -1;
+ /* Nothing else to do if there is no buffer. */
+ if (!out)
+ return len;
+ if (!out->command) {
+ if (ctx->curr != DEQUEUE)
+ return -1;
+ if (sizeof(*out) > size)
+ return -1;
+ out->command = ctx->curr;
+ ctx->objdata = 0;
+ ctx->object = out;
+ ctx->objmask = NULL;
+ out->args.vc.data = (uint8_t *)out + size;
+ }
+ return len;
+}
+
/** Parse tokens for drain queue command. */
static int
parse_drain(struct context *ctx, const struct token *token,
@@ -9800,6 +9851,9 @@ cmd_flow_parsed(const struct buffer *in)
in->args.destroy.rule_n,
in->args.destroy.rule);
break;
+ case DEQUEUE:
+ port_queue_flow_dequeue(in->port, in->queue);
+ break;
case DRAIN:
port_queue_flow_drain(in->port, in->queue);
break;
@@ -2420,14 +2420,12 @@ port_queue_flow_create(portid_t port_id, queueid_t queue_id,
const struct rte_flow_action *actions)
{
struct rte_flow_q_ops_attr ops_attr = { .drain = drain };
- struct rte_flow_q_op_res comp = { 0 };
struct rte_flow *flow;
struct rte_port *port;
struct port_flow *pf;
struct port_table *pt;
uint32_t id = 0;
bool found;
- int ret = 0;
struct rte_flow_error error;
struct rte_flow_action_age *age = age_action_get(actions);
@@ -2477,16 +2475,6 @@ port_queue_flow_create(portid_t port_id, queueid_t queue_id,
return port_flow_complain(&error);
}
- while (ret == 0) {
- /* Poisoning to make sure PMDs update it in case of error. */
- memset(&error, 0x22, sizeof(error));
- ret = rte_flow_q_dequeue(port_id, queue_id, &comp, 1, &error);
- if (ret < 0) {
- printf("Failed to poll queue\n");
- return -EINVAL;
- }
- }
-
pf->next = port->flow_list;
pf->id = id;
pf->flow = flow;
@@ -2501,7 +2489,6 @@ port_queue_flow_destroy(portid_t port_id, queueid_t queue_id,
bool drain, uint32_t n, const uint32_t *rule)
{
struct rte_flow_q_ops_attr op_attr = { .drain = drain };
- struct rte_flow_q_op_res comp = { 0 };
struct rte_port *port;
struct port_flow **tmp;
uint32_t c = 0;
@@ -2537,21 +2524,6 @@ port_queue_flow_destroy(portid_t port_id, queueid_t queue_id,
ret = port_flow_complain(&error);
continue;
}
-
- while (ret == 0) {
- /*
- * Poisoning to make sure PMD
- * update it in case of error.
- */
- memset(&error, 0x44, sizeof(error));
- ret = rte_flow_q_dequeue(port_id, queue_id,
- &comp, 1, &error);
- if (ret < 0) {
- printf("Failed to poll queue\n");
- return -EINVAL;
- }
- }
-
printf("Flow rule #%u destruction enqueued\n", pf->id);
*tmp = pf->next;
free(pf);
@@ -2592,6 +2564,52 @@ port_queue_flow_drain(portid_t port_id, queueid_t queue_id)
return ret;
}
+/** Dequeue a queue operation from the queue. */
+int
+port_queue_flow_dequeue(portid_t port_id, queueid_t queue_id)
+{
+ struct rte_port *port;
+ struct rte_flow_q_op_res *res;
+ struct rte_flow_error error;
+ int ret = 0;
+ int success = 0;
+ int i;
+
+ if (port_id_is_invalid(port_id, ENABLED_WARN) ||
+ port_id == (portid_t)RTE_PORT_ALL)
+ return -EINVAL;
+ port = &ports[port_id];
+
+ if (queue_id >= port->queue_nb) {
+ printf("Queue #%u is invalid\n", queue_id);
+ return -EINVAL;
+ }
+
+ res = malloc(sizeof(struct rte_flow_q_op_res) * port->queue_sz);
+ if (!res) {
+ printf("Failed to allocate memory for dequeue results\n");
+ return -ENOMEM;
+ }
+
+ memset(&error, 0x66, sizeof(error));
+ ret = rte_flow_q_dequeue(port_id, queue_id, res,
+ port->queue_sz, &error);
+ if (ret < 0) {
+ printf("Failed to dequeue a queue\n");
+ free(res);
+ return -EINVAL;
+ }
+
+ for (i = 0; i < ret; i++) {
+ if (res[i].status == RTE_FLOW_Q_OP_SUCCESS)
+ success++;
+ }
+ printf("Queue #%u dequeued %u operations (%u failed, %u succeeded)\n",
+ queue_id, ret, ret - success, success);
+ free(res);
+ return ret;
+}
+
/** Create flow rule. */
int
port_flow_create(portid_t port_id,
@@ -935,6 +935,7 @@ int port_queue_flow_create(portid_t port_id, queueid_t queue_id,
int port_queue_flow_destroy(portid_t port_id, queueid_t queue_id,
bool drain, uint32_t n, const uint32_t *rule);
int port_queue_flow_drain(portid_t port_id, queueid_t queue_id);
+int port_queue_flow_dequeue(portid_t port_id, queueid_t queue_id);
int port_flow_validate(portid_t port_id,
const struct rte_flow_attr *attr,
const struct rte_flow_item *pattern,
@@ -3372,6 +3372,10 @@ following sections.
flow drain {port_id} queue {queue_id}
+- Dequeue all operations from a queue::
+
+ flow dequeue {port_id} queue {queue_id}
+
- Create a flow rule::
flow create {port_id}
@@ -3582,6 +3586,23 @@ The usual error message is shown when a queue cannot be drained::
Caught error type [...] ([...]): [...]
+Dequeueing flow operations
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``flow dequeue`` asks the underlying device about flow queue operations
+results and return all the processed (successfully or not) operations.
+It is bound to ``rte_flow_q_dequeue()``::
+
+ flow dequeue {port_id} queue {queue_id}
+
+If successful, it will show::
+
+ Queue #[...] dequeued #[...] operations (#[...] failed, #[...] succeeded)
+
+The usual error message is shown when a queue cannot be drained::
+
+ Caught error type [...] ([...]): [...]
+
Creating a tunnel stub for offload
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -3711,6 +3732,8 @@ Otherwise it will show an error message of the form::
This command uses the same pattern items and actions as ``flow create``,
their format is described in `Creating flow rules`_.
+``flow queue dequeue`` must be called to retrieve the operation status.
+
Attributes
^^^^^^^^^^
@@ -4444,6 +4467,8 @@ message is shown when a rule cannot be destroyed::
Caught error type [...] ([...]): [...]
+``flow queue dequeue`` must be called to retrieve the operation status.
+
Querying flow rules
~~~~~~~~~~~~~~~~~~~