typedef struct
{
- u32 status;
+ /* dev id of this cryptodev */
+ u16 dev_id;
+ u16 next_index;
} dpdk_crypto_input_trace_t;
-#define foreach_cryptodev_status \
- _(SUCCESS, "success") \
- _(NOT_PROCESSED, "not processed") \
- _(AUTH_FAILED, "auth failed") \
- _(INVALID_SESSION, "invalid session") \
- _(INVALID_ARGS, "invalid arguments") \
- _(ERROR, "error")
-
-static u8 *
-format_cryptodev_status (u8 * s, va_list * args)
-{
- u32 status = va_arg (*args, u32);
- char *str = 0;
-
- switch (status)
- {
-#define _(x, z) case RTE_CRYPTO_OP_STATUS_##x: str = z; break;
- foreach_cryptodev_status
-#undef _
- }
- s = format (s, "%s", str);
-
- return s;
-}
-
static u8 *
format_dpdk_crypto_input_trace (u8 * s, va_list * args)
{
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
dpdk_crypto_input_trace_t *t = va_arg (*args, dpdk_crypto_input_trace_t *);
- s = format (s, "status: %U", format_cryptodev_status, t->status);
+ s = format (s, "cryptodev-id %d next-index %d", t->dev_id, t->next_index);
return s;
}
always_inline void
dpdk_crypto_input_trace (vlib_main_t * vm, vlib_node_runtime_t * node,
- struct rte_crypto_op **ops, u32 n_deq)
+ u8 dev_id, u32 * bis, u16 * nexts, u32 n_deq)
{
u32 n_left, n_trace;
+
if (PREDICT_FALSE ((n_trace = vlib_get_trace_count (vm, node))))
{
n_left = n_deq;
while (n_trace && n_left)
{
vlib_buffer_t *b0;
- struct rte_crypto_op *op0;
u16 next;
+ u32 bi;
- op0 = ops[0];
+ bi = bis[0];
+ next = nexts[0];
- next = crypto_op_get_priv (op0)->next;
+ b0 = vlib_get_buffer (vm, bi);
- b0 = vlib_buffer_from_rte_mbuf (op0->sym[0].m_src);
+ if (PREDICT_TRUE
+ (vlib_trace_buffer (vm, node, next, b0, /* follow_chain */ 0)))
+ {
+ dpdk_crypto_input_trace_t *tr =
+ vlib_add_trace (vm, node, b0, sizeof (*tr));
+ tr->dev_id = dev_id;
+ tr->next_index = next;
+ n_trace--;
+ }
- vlib_trace_buffer (vm, node, next, b0, /* follow_chain */ 0);
-
- dpdk_crypto_input_trace_t *tr =
- vlib_add_trace (vm, node, b0, sizeof (*tr));
- tr->status = op0->status;
-
- n_trace--;
n_left--;
- ops++;
+ nexts++;
+ bis++;
}
vlib_set_trace_count (vm, node, n_trace);
}
}
static_always_inline u32
-dpdk_crypto_dequeue (vlib_main_t * vm, vlib_node_runtime_t * node,
- crypto_resource_t * res)
+dpdk_crypto_dequeue (vlib_main_t * vm, crypto_worker_main_t * cwm,
+ vlib_node_runtime_t * node, crypto_resource_t * res)
{
- u32 thread_idx = vlib_get_thread_index ();
u8 numa = rte_socket_id ();
-
- dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
- crypto_worker_main_t *cwm =
- vec_elt_at_index (dcm->workers_main, thread_idx);
-
- u32 n_ops, n_deq;
+ u32 n_ops, total_n_deq, n_deq[2];
u32 bis[VLIB_FRAME_SIZE], *bi;
u16 nexts[VLIB_FRAME_SIZE], *next;
struct rte_crypto_op **ops;
+ n_deq[0] = 0;
+ n_deq[1] = 0;
bi = bis;
next = nexts;
ops = cwm->ops;
- n_ops = n_deq = rte_cryptodev_dequeue_burst (res->dev_id,
- res->qp_id,
- ops, VLIB_FRAME_SIZE);
-
+ n_ops = total_n_deq = rte_cryptodev_dequeue_burst (res->dev_id,
+ res->qp_id,
+ ops, VLIB_FRAME_SIZE);
/* no op dequeued, do not proceed */
- if (n_deq == 0)
+ if (n_ops == 0)
return 0;
- res->inflights -= n_ops;
-
- dpdk_crypto_input_trace (vm, node, ops, n_deq);
-
while (n_ops >= 4)
{
struct rte_crypto_op *op0, *op1, *op2, *op3;
- vlib_buffer_t *b0, *b1, *b2, *b3;
/* Prefetch next iteration. */
if (n_ops >= 8)
next[2] = crypto_op_get_priv (op2)->next;
next[3] = crypto_op_get_priv (op3)->next;
+ bi[0] = crypto_op_get_priv (op0)->bi;
+ bi[1] = crypto_op_get_priv (op1)->bi;
+ bi[2] = crypto_op_get_priv (op2)->bi;
+ bi[3] = crypto_op_get_priv (op3)->bi;
+
+ n_deq[crypto_op_get_priv (op0)->encrypt] += 1;
+ n_deq[crypto_op_get_priv (op1)->encrypt] += 1;
+ n_deq[crypto_op_get_priv (op2)->encrypt] += 1;
+ n_deq[crypto_op_get_priv (op3)->encrypt] += 1;
+
dpdk_crypto_input_check_op (vm, node, op0, next + 0);
dpdk_crypto_input_check_op (vm, node, op1, next + 1);
dpdk_crypto_input_check_op (vm, node, op2, next + 2);
dpdk_crypto_input_check_op (vm, node, op3, next + 3);
- b0 = vlib_buffer_from_rte_mbuf (op0->sym[0].m_src);
- b1 = vlib_buffer_from_rte_mbuf (op1->sym[0].m_src);
- b2 = vlib_buffer_from_rte_mbuf (op2->sym[0].m_src);
- b3 = vlib_buffer_from_rte_mbuf (op3->sym[0].m_src);
-
- bi[0] = vlib_get_buffer_index (vm, b0);
- bi[1] = vlib_get_buffer_index (vm, b1);
- bi[2] = vlib_get_buffer_index (vm, b2);
- bi[3] = vlib_get_buffer_index (vm, b3);
-
op0->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
op1->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
op2->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
while (n_ops > 0)
{
struct rte_crypto_op *op0;
- vlib_buffer_t *b0;
op0 = ops[0];
next[0] = crypto_op_get_priv (op0)->next;
+ bi[0] = crypto_op_get_priv (op0)->bi;
- dpdk_crypto_input_check_op (vm, node, op0, next + 0);
+ n_deq[crypto_op_get_priv (op0)->encrypt] += 1;
- /* XXX store bi0 and next0 in op0 private? */
- b0 = vlib_buffer_from_rte_mbuf (op0->sym[0].m_src);
- bi[0] = vlib_get_buffer_index (vm, b0);
+ dpdk_crypto_input_check_op (vm, node, op0, next + 0);
op0->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
}
vlib_node_increment_counter (vm, node->node_index,
- DPDK_CRYPTO_INPUT_ERROR_DQ_COPS, n_deq);
+ DPDK_CRYPTO_INPUT_ERROR_DQ_COPS, total_n_deq);
- vlib_buffer_enqueue_to_next (vm, node, bis, nexts, n_deq);
+ res->inflights[0] -= n_deq[0];
+ res->inflights[1] -= n_deq[1];
- crypto_free_ops (numa, cwm->ops, n_deq);
+ vlib_buffer_enqueue_to_next (vm, node, bis, nexts, total_n_deq);
- return n_deq;
+ dpdk_crypto_input_trace (vm, node, res->dev_id, bis, nexts, total_n_deq);
+
+ crypto_free_ops (numa, cwm->ops, total_n_deq);
+
+ return total_n_deq;
}
static_always_inline uword
dpdk_crypto_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
- u32 thread_index = vlib_get_thread_index ();
dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
- crypto_worker_main_t *cwm = &dcm->workers_main[thread_index];
+ crypto_worker_main_t *cwm = &dcm->workers_main[vm->thread_index];
crypto_resource_t *res;
u32 n_deq = 0;
u16 *remove = NULL, *res_idx;
vec_foreach (res_idx, cwm->resource_idx)
{
res = vec_elt_at_index (dcm->resource, res_idx[0]);
+ u32 inflights = res->inflights[0] + res->inflights[1];
- if (res->inflights)
- n_deq += dpdk_crypto_dequeue (vm, node, res);
+ if (inflights)
+ n_deq += dpdk_crypto_dequeue (vm, cwm, node, res);
- if (PREDICT_FALSE (res->remove && !(res->inflights)))
+ inflights = res->inflights[0] + res->inflights[1];
+ if (PREDICT_FALSE (res->remove && !(inflights)))
vec_add1 (remove, res_idx[0]);
}
/* *INDENT-ON* */
VLIB_REGISTER_NODE (dpdk_crypto_input_node) =
{
.name = "dpdk-crypto-input",
+ .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED,
.format_trace = format_dpdk_crypto_input_trace,
.type = VLIB_NODE_TYPE_INPUT,
.state = VLIB_NODE_STATE_DISABLED,
Code Review / vpp.git / blobdiff