d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

acl: make data indexes long enough to survive idle transitions

Browse Source 
Make data_indexes long enough to survive idle transitions.
That allows to simplify match processing code.
Also fix incorrect size calculations for data indexes.

Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
This commit is contained in:
Konstantin Ananyev 2015-01-20 18:40:52 +00:00 committed by Thomas Monjalon
parent 589758eb1c
commit efb2529385
2 changed files with 3 additions and 6 deletions
lib/librte_acl
acl_bld.cacl_run.h

5
lib/librte_acl/acl_bld.c

@ -1948,7 +1948,7 @@ acl_set_data_indexes(struct rte_acl_ctx *ctx)
memcpy(ctx->data_indexes + ofs, ctx->trie[i].data_index,
n * sizeof(ctx->data_indexes[0]));
ctx->trie[i].data_index = ctx->data_indexes + ofs;
ofs += n;
ofs += RTE_ACL_MAX_FIELDS;
}
}
@ -1988,7 +1988,8 @@ rte_acl_build(struct rte_acl_ctx *ctx, const struct rte_acl_config *cfg)
/* allocate and fill run-time structures. */
rc = rte_acl_gen(ctx, bcx.tries, bcx.bld_tries,
bcx.num_tries, bcx.cfg.num_categories,
RTE_ACL_IPV4VLAN_NUM * RTE_DIM(bcx.tries),
RTE_ACL_MAX_FIELDS * RTE_DIM(bcx.tries) *
sizeof(ctx->data_indexes[0]),
bcx.num_build_rules);
if (rc == 0) {

4
lib/librte_acl/acl_run.h

@ -256,10 +256,6 @@ acl_match_check(uint64_t transition, int slot,
/* Fill the slot with the next trie or idle trie */
transition = acl_start_next_trie(flows, parms, slot, ctx);
} else if (transition == ctx->idle) {
/* reset indirection table for idle slots */
parms[slot].data_index = idle;
}
return transition;