X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_acl.c;h=316bf4d065ad237d57c428b03e84b3bbfe22c493;hb=27fb5dd2850c60b46660b93c2fe14da6841b142c;hp=c55ac38aaf87d7e47ab4b0423ea37d3a6aa92311;hpb=e9d48c0072d36eb6423b45fba4ec49d0def6c36f;p=dpdk.git

diff --git a/app/test/test_acl.c b/app/test/test_acl.c
index c55ac38aaf..316bf4d065 100644
--- a/app/test/test_acl.c
+++ b/app/test/test_acl.c
@@ -1,60 +1,31 @@
-/*-
- *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   All rights reserved.
- * 
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- * 
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- * 
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <string.h>
 #include <errno.h>
 
-#include <cmdline_parse.h>
+#include "test.h"
 
 #include <rte_string_fns.h>
 #include <rte_mbuf.h>
-
-#include "test.h"
-
-#ifdef RTE_LIBRTE_ACL
-
 #include <rte_byteorder.h>
 #include <rte_ip.h>
 #include <rte_acl.h>
+#include <rte_common.h>
 
 #include "test_acl.h"
 
+#define	BIT_SIZEOF(x) (sizeof(x) * CHAR_BIT)
+
 #define LEN RTE_ACL_MAX_CATEGORIES
 
+RTE_ACL_RULE_DEF(acl_ipv4vlan_rule, RTE_ACL_IPV4VLAN_NUM_FIELDS);
+
 struct rte_acl_param acl_param = {
 	.name = "acl_ctx",
 	.socket_id = SOCKET_ID_ANY,
-	.rule_size = sizeof(struct rte_acl_ipv4vlan_rule),
+	.rule_size = RTE_ACL_IPV4VLAN_RULE_SZ,
 	.max_rule_num = 0x30000,
 };
 
@@ -66,9 +37,18 @@ struct rte_acl_ipv4vlan_rule acl_rule = {
 		.dst_port_high = UINT16_MAX,
 };
 
+const uint32_t ipv4_7tuple_layout[RTE_ACL_IPV4VLAN_NUM] = {
+	offsetof(struct ipv4_7tuple, proto),
+	offsetof(struct ipv4_7tuple, vlan),
+	offsetof(struct ipv4_7tuple, ip_src),
+	offsetof(struct ipv4_7tuple, ip_dst),
+	offsetof(struct ipv4_7tuple, port_src),
+};
+
+
 /* byteswap to cpu or network order */
 static void
-bswap_test_data(struct ipv4_7tuple * data, int len, int to_be)
+bswap_test_data(struct ipv4_7tuple *data, int len, int to_be)
 {
 	int i;
 
@@ -82,8 +62,7 @@ bswap_test_data(struct ipv4_7tuple * data, int len, int to_be)
 			data[i].port_src = rte_cpu_to_be_16(data[i].port_src);
 			data[i].vlan = rte_cpu_to_be_16(data[i].vlan);
 			data[i].domain = rte_cpu_to_be_16(data[i].domain);
-		}
-		else {
+		} else {
 			data[i].ip_dst = rte_be_to_cpu_32(data[i].ip_dst);
 			data[i].ip_src = rte_be_to_cpu_32(data[i].ip_src);
 			data[i].port_dst = rte_be_to_cpu_16(data[i].port_dst);
@@ -94,63 +73,221 @@ bswap_test_data(struct ipv4_7tuple * data, int len, int to_be)
 	}
 }
 
+static int
+acl_ipv4vlan_check_rule(const struct rte_acl_ipv4vlan_rule *rule)
+{
+	if (rule->src_port_low > rule->src_port_high ||
+			rule->dst_port_low > rule->dst_port_high ||
+			rule->src_mask_len > BIT_SIZEOF(rule->src_addr) ||
+			rule->dst_mask_len > BIT_SIZEOF(rule->dst_addr))
+		return -EINVAL;
+	return 0;
+}
+
+static void
+acl_ipv4vlan_convert_rule(const struct rte_acl_ipv4vlan_rule *ri,
+	struct acl_ipv4vlan_rule *ro)
+{
+	ro->data = ri->data;
+
+	ro->field[RTE_ACL_IPV4VLAN_PROTO_FIELD].value.u8 = ri->proto;
+	ro->field[RTE_ACL_IPV4VLAN_VLAN1_FIELD].value.u16 = ri->vlan;
+	ro->field[RTE_ACL_IPV4VLAN_VLAN2_FIELD].value.u16 = ri->domain;
+	ro->field[RTE_ACL_IPV4VLAN_SRC_FIELD].value.u32 = ri->src_addr;
+	ro->field[RTE_ACL_IPV4VLAN_DST_FIELD].value.u32 = ri->dst_addr;
+	ro->field[RTE_ACL_IPV4VLAN_SRCP_FIELD].value.u16 = ri->src_port_low;
+	ro->field[RTE_ACL_IPV4VLAN_DSTP_FIELD].value.u16 = ri->dst_port_low;
+
+	ro->field[RTE_ACL_IPV4VLAN_PROTO_FIELD].mask_range.u8 = ri->proto_mask;
+	ro->field[RTE_ACL_IPV4VLAN_VLAN1_FIELD].mask_range.u16 = ri->vlan_mask;
+	ro->field[RTE_ACL_IPV4VLAN_VLAN2_FIELD].mask_range.u16 =
+		ri->domain_mask;
+	ro->field[RTE_ACL_IPV4VLAN_SRC_FIELD].mask_range.u32 =
+		ri->src_mask_len;
+	ro->field[RTE_ACL_IPV4VLAN_DST_FIELD].mask_range.u32 = ri->dst_mask_len;
+	ro->field[RTE_ACL_IPV4VLAN_SRCP_FIELD].mask_range.u16 =
+		ri->src_port_high;
+	ro->field[RTE_ACL_IPV4VLAN_DSTP_FIELD].mask_range.u16 =
+		ri->dst_port_high;
+}
+
 /*
- * Test scalar and SSE ACL lookup.
+ * Add ipv4vlan rules to an existing ACL context.
+ * This function is not multi-thread safe.
+ *
+ * @param ctx
+ *   ACL context to add patterns to.
+ * @param rules
+ *   Array of rules to add to the ACL context.
+ *   Note that all fields in rte_acl_ipv4vlan_rule structures are expected
+ *   to be in host byte order.
+ * @param num
+ *   Number of elements in the input array of rules.
+ * @return
+ *   - -ENOMEM if there is no space in the ACL context for these rules.
+ *   - -EINVAL if the parameters are invalid.
+ *   - Zero if operation completed successfully.
  */
 static int
-test_classify(void)
+rte_acl_ipv4vlan_add_rules(struct rte_acl_ctx *ctx,
+	const struct rte_acl_ipv4vlan_rule *rules,
+	uint32_t num)
 {
-	struct rte_acl_ctx * acx;
-	int ret, i;
-	uint32_t result, count;
+	int32_t rc;
+	uint32_t i;
+	struct acl_ipv4vlan_rule rv;
+
+	if (ctx == NULL || rules == NULL)
+		return -EINVAL;
+
+	/* check input rules. */
+	for (i = 0; i != num; i++) {
+		rc = acl_ipv4vlan_check_rule(rules + i);
+		if (rc != 0) {
+			RTE_LOG(ERR, ACL, "%s: rule #%u is invalid\n",
+				__func__, i + 1);
+			return rc;
+		}
+	}
 
-	uint32_t results[DIM(acl_test_data) * RTE_ACL_MAX_CATEGORIES];
+	/* perform conversion to the internal format and add to the context. */
+	for (i = 0, rc = 0; i != num && rc == 0; i++) {
+		acl_ipv4vlan_convert_rule(rules + i, &rv);
+		rc = rte_acl_add_rules(ctx, (struct rte_acl_rule *)&rv, 1);
+	}
 
-	const uint8_t * data[DIM(acl_test_data)];
+	return rc;
+}
 
-	const uint32_t layout[RTE_ACL_IPV4VLAN_NUM] = {
-			offsetof(struct ipv4_7tuple, proto),
-			offsetof(struct ipv4_7tuple, vlan),
-			offsetof(struct ipv4_7tuple, ip_src),
-			offsetof(struct ipv4_7tuple, ip_dst),
-			offsetof(struct ipv4_7tuple, port_src),
+static void
+acl_ipv4vlan_config(struct rte_acl_config *cfg,
+	const uint32_t layout[RTE_ACL_IPV4VLAN_NUM],
+	uint32_t num_categories)
+{
+	static const struct rte_acl_field_def
+		ipv4_defs[RTE_ACL_IPV4VLAN_NUM_FIELDS] = {
+		{
+			.type = RTE_ACL_FIELD_TYPE_BITMASK,
+			.size = sizeof(uint8_t),
+			.field_index = RTE_ACL_IPV4VLAN_PROTO_FIELD,
+			.input_index = RTE_ACL_IPV4VLAN_PROTO,
+		},
+		{
+			.type = RTE_ACL_FIELD_TYPE_BITMASK,
+			.size = sizeof(uint16_t),
+			.field_index = RTE_ACL_IPV4VLAN_VLAN1_FIELD,
+			.input_index = RTE_ACL_IPV4VLAN_VLAN,
+		},
+		{
+			.type = RTE_ACL_FIELD_TYPE_BITMASK,
+			.size = sizeof(uint16_t),
+			.field_index = RTE_ACL_IPV4VLAN_VLAN2_FIELD,
+			.input_index = RTE_ACL_IPV4VLAN_VLAN,
+		},
+		{
+			.type = RTE_ACL_FIELD_TYPE_MASK,
+			.size = sizeof(uint32_t),
+			.field_index = RTE_ACL_IPV4VLAN_SRC_FIELD,
+			.input_index = RTE_ACL_IPV4VLAN_SRC,
+		},
+		{
+			.type = RTE_ACL_FIELD_TYPE_MASK,
+			.size = sizeof(uint32_t),
+			.field_index = RTE_ACL_IPV4VLAN_DST_FIELD,
+			.input_index = RTE_ACL_IPV4VLAN_DST,
+		},
+		{
+			.type = RTE_ACL_FIELD_TYPE_RANGE,
+			.size = sizeof(uint16_t),
+			.field_index = RTE_ACL_IPV4VLAN_SRCP_FIELD,
+			.input_index = RTE_ACL_IPV4VLAN_PORTS,
+		},
+		{
+			.type = RTE_ACL_FIELD_TYPE_RANGE,
+			.size = sizeof(uint16_t),
+			.field_index = RTE_ACL_IPV4VLAN_DSTP_FIELD,
+			.input_index = RTE_ACL_IPV4VLAN_PORTS,
+		},
 	};
 
-	acx = rte_acl_create(&acl_param);
-	if (acx == NULL) {
-		printf("Line %i: Error creating ACL context!\n", __LINE__);
-		return -1;
-	}
+	memcpy(&cfg->defs, ipv4_defs, sizeof(ipv4_defs));
+	cfg->num_fields = RTE_DIM(ipv4_defs);
+
+	cfg->defs[RTE_ACL_IPV4VLAN_PROTO_FIELD].offset =
+		layout[RTE_ACL_IPV4VLAN_PROTO];
+	cfg->defs[RTE_ACL_IPV4VLAN_VLAN1_FIELD].offset =
+		layout[RTE_ACL_IPV4VLAN_VLAN];
+	cfg->defs[RTE_ACL_IPV4VLAN_VLAN2_FIELD].offset =
+		layout[RTE_ACL_IPV4VLAN_VLAN] +
+		cfg->defs[RTE_ACL_IPV4VLAN_VLAN1_FIELD].size;
+	cfg->defs[RTE_ACL_IPV4VLAN_SRC_FIELD].offset =
+		layout[RTE_ACL_IPV4VLAN_SRC];
+	cfg->defs[RTE_ACL_IPV4VLAN_DST_FIELD].offset =
+		layout[RTE_ACL_IPV4VLAN_DST];
+	cfg->defs[RTE_ACL_IPV4VLAN_SRCP_FIELD].offset =
+		layout[RTE_ACL_IPV4VLAN_PORTS];
+	cfg->defs[RTE_ACL_IPV4VLAN_DSTP_FIELD].offset =
+		layout[RTE_ACL_IPV4VLAN_PORTS] +
+		cfg->defs[RTE_ACL_IPV4VLAN_SRCP_FIELD].size;
+
+	cfg->num_categories = num_categories;
+}
 
-	/* add rules to the context */
-	ret = rte_acl_ipv4vlan_add_rules(acx, acl_test_rules,
-			DIM(acl_test_rules));
-	if (ret != 0) {
-		printf("Line %i: Adding rules to ACL context failed!\n", __LINE__);
-		rte_acl_free(acx);
-		return -1;
-	}
+/*
+ * Analyze set of ipv4vlan rules and build required internal
+ * run-time structures.
+ * This function is not multi-thread safe.
+ *
+ * @param ctx
+ *   ACL context to build.
+ * @param layout
+ *   Layout of input data to search through.
+ * @param num_categories
+ *   Maximum number of categories to use in that build.
+ * @return
+ *   - -ENOMEM if couldn't allocate enough memory.
+ *   - -EINVAL if the parameters are invalid.
+ *   - Negative error code if operation failed.
+ *   - Zero if operation completed successfully.
+ */
+static int
+rte_acl_ipv4vlan_build(struct rte_acl_ctx *ctx,
+	const uint32_t layout[RTE_ACL_IPV4VLAN_NUM],
+	uint32_t num_categories)
+{
+	struct rte_acl_config cfg;
 
-	/* try building the context */
-	ret = rte_acl_ipv4vlan_build(acx, layout, RTE_ACL_MAX_CATEGORIES);
-	if (ret != 0) {
-		printf("Line %i: Building ACL context failed!\n", __LINE__);
-		rte_acl_free(acx);
-		return -1;
-	}
+	if (ctx == NULL || layout == NULL)
+		return -EINVAL;
 
+	memset(&cfg, 0, sizeof(cfg));
+	acl_ipv4vlan_config(&cfg, layout, num_categories);
+	return rte_acl_build(ctx, &cfg);
+}
+
+/*
+ * Test scalar and SSE ACL lookup.
+ */
+static int
+test_classify_run(struct rte_acl_ctx *acx, struct ipv4_7tuple test_data[],
+	size_t dim)
+{
+	int ret, i;
+	uint32_t result, count;
+	uint32_t results[dim * RTE_ACL_MAX_CATEGORIES];
+	const uint8_t *data[dim];
 	/* swap all bytes in the data to network order */
-	bswap_test_data(acl_test_data, DIM(acl_test_data), 1);
+	bswap_test_data(test_data, dim, 1);
 
 	/* store pointers to test data */
-	for (i = 0; i < (int) DIM(acl_test_data); i++)
-		data[i] = (uint8_t *)&acl_test_data[i];
+	for (i = 0; i < (int) dim; i++)
+		data[i] = (uint8_t *)&test_data[i];
 
 	/**
 	 * these will run quite a few times, it's necessary to test code paths
 	 * from num=0 to num>8
 	 */
-	for (count = 0; count < DIM(acl_test_data); count++) {
+	for (count = 0; count <= dim; count++) {
 		ret = rte_acl_classify(acx, data, results,
 				count, RTE_ACL_MAX_CATEGORIES);
 		if (ret != 0) {
@@ -160,12 +297,14 @@ test_classify(void)
 
 		/* check if we allow everything we should allow */
 		for (i = 0; i < (int) count; i++) {
-			result = results[i * RTE_ACL_MAX_CATEGORIES + ACL_ALLOW];
-			if (result != acl_test_data[i].allow) {
+			result =
+				results[i * RTE_ACL_MAX_CATEGORIES + ACL_ALLOW];
+			if (result != test_data[i].allow) {
 				printf("Line %i: Error in allow results at %i "
-						"(expected %"PRIu32" got %"PRIu32")!\n",
-						__LINE__, i, acl_test_data[i].allow,
-						result);
+					"(expected %"PRIu32" got %"PRIu32")!\n",
+					__LINE__, i, test_data[i].allow,
+					result);
+				ret = -EINVAL;
 				goto err;
 			}
 		}
@@ -173,63 +312,685 @@ test_classify(void)
 		/* check if we deny everything we should deny */
 		for (i = 0; i < (int) count; i++) {
 			result = results[i * RTE_ACL_MAX_CATEGORIES + ACL_DENY];
-			if (result != acl_test_data[i].deny) {
+			if (result != test_data[i].deny) {
 				printf("Line %i: Error in deny results at %i "
-						"(expected %"PRIu32" got %"PRIu32")!\n",
-						__LINE__, i, acl_test_data[i].deny,
-						result);
+					"(expected %"PRIu32" got %"PRIu32")!\n",
+					__LINE__, i, test_data[i].deny,
+					result);
+				ret = -EINVAL;
 				goto err;
 			}
 		}
 	}
 
 	/* make a quick check for scalar */
-	ret = rte_acl_classify_scalar(acx, data, results,
-					DIM(acl_test_data), RTE_ACL_MAX_CATEGORIES);
+	ret = rte_acl_classify_alg(acx, data, results,
+			dim, RTE_ACL_MAX_CATEGORIES,
+			RTE_ACL_CLASSIFY_SCALAR);
 	if (ret != 0) {
-		printf("Line %i: SSE classify failed!\n", __LINE__);
+		printf("Line %i: scalar classify failed!\n", __LINE__);
 		goto err;
 	}
 
 	/* check if we allow everything we should allow */
-	for (i = 0; i < (int) DIM(acl_test_data); i++) {
+	for (i = 0; i < (int) dim; i++) {
 		result = results[i * RTE_ACL_MAX_CATEGORIES + ACL_ALLOW];
-		if (result != acl_test_data[i].allow) {
+		if (result != test_data[i].allow) {
 			printf("Line %i: Error in allow results at %i "
 					"(expected %"PRIu32" got %"PRIu32")!\n",
-					__LINE__, i, acl_test_data[i].allow,
+					__LINE__, i, test_data[i].allow,
 					result);
+			ret = -EINVAL;
 			goto err;
 		}
 	}
 
 	/* check if we deny everything we should deny */
-	for (i = 0; i < (int) DIM(acl_test_data); i++) {
+	for (i = 0; i < (int) dim; i++) {
 		result = results[i * RTE_ACL_MAX_CATEGORIES + ACL_DENY];
-		if (result != acl_test_data[i].deny) {
+		if (result != test_data[i].deny) {
 			printf("Line %i: Error in deny results at %i "
 					"(expected %"PRIu32" got %"PRIu32")!\n",
-					__LINE__, i, acl_test_data[i].deny,
+					__LINE__, i, test_data[i].deny,
 					result);
+			ret = -EINVAL;
 			goto err;
 		}
 	}
 
-	/* free ACL context */
-	rte_acl_free(acx);
+	ret = 0;
 
+err:
 	/* swap data back to cpu order so that next time tests don't fail */
-	bswap_test_data(acl_test_data, DIM(acl_test_data), 0);
+	bswap_test_data(test_data, dim, 0);
+	return ret;
+}
+
+static int
+test_classify_buid(struct rte_acl_ctx *acx,
+	const struct rte_acl_ipv4vlan_rule *rules, uint32_t num)
+{
+	int ret;
+
+	/* add rules to the context */
+	ret = rte_acl_ipv4vlan_add_rules(acx, rules, num);
+	if (ret != 0) {
+		printf("Line %i: Adding rules to ACL context failed!\n",
+			__LINE__);
+		return ret;
+	}
+
+	/* try building the context */
+	ret = rte_acl_ipv4vlan_build(acx, ipv4_7tuple_layout,
+		RTE_ACL_MAX_CATEGORIES);
+	if (ret != 0) {
+		printf("Line %i: Building ACL context failed!\n", __LINE__);
+		return ret;
+	}
 
 	return 0;
-err:
+}
 
-	/* swap data back to cpu order so that next time tests don't fail */
-	bswap_test_data(acl_test_data, DIM(acl_test_data), 0);
+#define	TEST_CLASSIFY_ITER	4
+
+/*
+ * Test scalar and SSE ACL lookup.
+ */
+static int
+test_classify(void)
+{
+	struct rte_acl_ctx *acx;
+	int i, ret;
+
+	acx = rte_acl_create(&acl_param);
+	if (acx == NULL) {
+		printf("Line %i: Error creating ACL context!\n", __LINE__);
+		return -1;
+	}
+
+	ret = 0;
+	for (i = 0; i != TEST_CLASSIFY_ITER; i++) {
+
+		if ((i & 1) == 0)
+			rte_acl_reset(acx);
+		else
+			rte_acl_reset_rules(acx);
+
+		ret = test_classify_buid(acx, acl_test_rules,
+			RTE_DIM(acl_test_rules));
+		if (ret != 0) {
+			printf("Line %i, iter: %d: "
+				"Adding rules to ACL context failed!\n",
+				__LINE__, i);
+			break;
+		}
+
+		ret = test_classify_run(acx, acl_test_data,
+			RTE_DIM(acl_test_data));
+		if (ret != 0) {
+			printf("Line %i, iter: %d: %s failed!\n",
+				__LINE__, i, __func__);
+			break;
+		}
+
+		/* reset rules and make sure that classify still works ok. */
+		rte_acl_reset_rules(acx);
+		ret = test_classify_run(acx, acl_test_data,
+			RTE_DIM(acl_test_data));
+		if (ret != 0) {
+			printf("Line %i, iter: %d: %s failed!\n",
+				__LINE__, i, __func__);
+			break;
+		}
+	}
 
 	rte_acl_free(acx);
+	return ret;
+}
 
-	return -1;
+static int
+test_build_ports_range(void)
+{
+	static const struct rte_acl_ipv4vlan_rule test_rules[] = {
+		{
+			/* match all packets. */
+			.data = {
+				.userdata = 1,
+				.category_mask = ACL_ALLOW_MASK,
+				.priority = 101,
+			},
+			.src_port_low = 0,
+			.src_port_high = UINT16_MAX,
+			.dst_port_low = 0,
+			.dst_port_high = UINT16_MAX,
+		},
+		{
+			/* match all packets with dst ports [54-65280]. */
+			.data = {
+				.userdata = 2,
+				.category_mask = ACL_ALLOW_MASK,
+				.priority = 102,
+			},
+			.src_port_low = 0,
+			.src_port_high = UINT16_MAX,
+			.dst_port_low = 54,
+			.dst_port_high = 65280,
+		},
+		{
+			/* match all packets with dst ports [0-52]. */
+			.data = {
+				.userdata = 3,
+				.category_mask = ACL_ALLOW_MASK,
+				.priority = 103,
+			},
+			.src_port_low = 0,
+			.src_port_high = UINT16_MAX,
+			.dst_port_low = 0,
+			.dst_port_high = 52,
+		},
+		{
+			/* match all packets with dst ports [53]. */
+			.data = {
+				.userdata = 4,
+				.category_mask = ACL_ALLOW_MASK,
+				.priority = 99,
+			},
+			.src_port_low = 0,
+			.src_port_high = UINT16_MAX,
+			.dst_port_low = 53,
+			.dst_port_high = 53,
+		},
+		{
+			/* match all packets with dst ports [65279-65535]. */
+			.data = {
+				.userdata = 5,
+				.category_mask = ACL_ALLOW_MASK,
+				.priority = 98,
+			},
+			.src_port_low = 0,
+			.src_port_high = UINT16_MAX,
+			.dst_port_low = 65279,
+			.dst_port_high = UINT16_MAX,
+		},
+	};
+
+	static struct ipv4_7tuple test_data[] = {
+		{
+			.proto = 6,
+			.ip_src = RTE_IPV4(10, 1, 1, 1),
+			.ip_dst = RTE_IPV4(192, 168, 0, 33),
+			.port_dst = 53,
+			.allow = 1,
+		},
+		{
+			.proto = 6,
+			.ip_src = RTE_IPV4(127, 84, 33, 1),
+			.ip_dst = RTE_IPV4(1, 2, 3, 4),
+			.port_dst = 65281,
+			.allow = 1,
+		},
+	};
+
+	struct rte_acl_ctx *acx;
+	int32_t ret, i, j;
+	uint32_t results[RTE_DIM(test_data)];
+	const uint8_t *data[RTE_DIM(test_data)];
+
+	acx = rte_acl_create(&acl_param);
+	if (acx == NULL) {
+		printf("Line %i: Error creating ACL context!\n", __LINE__);
+		return -1;
+	}
+
+	/* swap all bytes in the data to network order */
+	bswap_test_data(test_data, RTE_DIM(test_data), 1);
+
+	/* store pointers to test data */
+	for (i = 0; i != RTE_DIM(test_data); i++)
+		data[i] = (uint8_t *)&test_data[i];
+
+	for (i = 0; i != RTE_DIM(test_rules); i++) {
+		rte_acl_reset(acx);
+		ret = test_classify_buid(acx, test_rules, i + 1);
+		if (ret != 0) {
+			printf("Line %i, iter: %d: "
+				"Adding rules to ACL context failed!\n",
+				__LINE__, i);
+			break;
+		}
+		ret = rte_acl_classify(acx, data, results,
+			RTE_DIM(data), 1);
+		if (ret != 0) {
+			printf("Line %i, iter: %d: classify failed!\n",
+				__LINE__, i);
+			break;
+		}
+
+		/* check results */
+		for (j = 0; j != RTE_DIM(results); j++) {
+			if (results[j] != test_data[j].allow) {
+				printf("Line %i: Error in allow results at %i "
+					"(expected %"PRIu32" got %"PRIu32")!\n",
+					__LINE__, j, test_data[j].allow,
+					results[j]);
+				ret = -EINVAL;
+			}
+		}
+	}
+
+	bswap_test_data(test_data, RTE_DIM(test_data), 0);
+
+	rte_acl_free(acx);
+	return ret;
+}
+
+static void
+convert_rule(const struct rte_acl_ipv4vlan_rule *ri,
+	struct acl_ipv4vlan_rule *ro)
+{
+	ro->data = ri->data;
+
+	ro->field[RTE_ACL_IPV4VLAN_PROTO_FIELD].value.u8 = ri->proto;
+	ro->field[RTE_ACL_IPV4VLAN_VLAN1_FIELD].value.u16 = ri->vlan;
+	ro->field[RTE_ACL_IPV4VLAN_VLAN2_FIELD].value.u16 = ri->domain;
+	ro->field[RTE_ACL_IPV4VLAN_SRC_FIELD].value.u32 = ri->src_addr;
+	ro->field[RTE_ACL_IPV4VLAN_DST_FIELD].value.u32 = ri->dst_addr;
+	ro->field[RTE_ACL_IPV4VLAN_SRCP_FIELD].value.u16 = ri->src_port_low;
+	ro->field[RTE_ACL_IPV4VLAN_DSTP_FIELD].value.u16 = ri->dst_port_low;
+
+	ro->field[RTE_ACL_IPV4VLAN_PROTO_FIELD].mask_range.u8 = ri->proto_mask;
+	ro->field[RTE_ACL_IPV4VLAN_VLAN1_FIELD].mask_range.u16 = ri->vlan_mask;
+	ro->field[RTE_ACL_IPV4VLAN_VLAN2_FIELD].mask_range.u16 =
+		ri->domain_mask;
+	ro->field[RTE_ACL_IPV4VLAN_SRC_FIELD].mask_range.u32 =
+		ri->src_mask_len;
+	ro->field[RTE_ACL_IPV4VLAN_DST_FIELD].mask_range.u32 = ri->dst_mask_len;
+	ro->field[RTE_ACL_IPV4VLAN_SRCP_FIELD].mask_range.u16 =
+		ri->src_port_high;
+	ro->field[RTE_ACL_IPV4VLAN_DSTP_FIELD].mask_range.u16 =
+		ri->dst_port_high;
+}
+
+/*
+ * Convert IPV4 source and destination from RTE_ACL_FIELD_TYPE_MASK to
+ * RTE_ACL_FIELD_TYPE_BITMASK.
+ */
+static void
+convert_rule_1(const struct rte_acl_ipv4vlan_rule *ri,
+	struct acl_ipv4vlan_rule *ro)
+{
+	uint32_t v;
+
+	convert_rule(ri, ro);
+	v = ro->field[RTE_ACL_IPV4VLAN_SRC_FIELD].mask_range.u32;
+	ro->field[RTE_ACL_IPV4VLAN_SRC_FIELD].mask_range.u32 =
+		RTE_ACL_MASKLEN_TO_BITMASK(v, sizeof(v));
+	v = ro->field[RTE_ACL_IPV4VLAN_DST_FIELD].mask_range.u32;
+	ro->field[RTE_ACL_IPV4VLAN_DST_FIELD].mask_range.u32 =
+		RTE_ACL_MASKLEN_TO_BITMASK(v, sizeof(v));
+}
+
+/*
+ * Convert IPV4 source and destination from RTE_ACL_FIELD_TYPE_MASK to
+ * RTE_ACL_FIELD_TYPE_RANGE.
+ */
+static void
+convert_rule_2(const struct rte_acl_ipv4vlan_rule *ri,
+	struct acl_ipv4vlan_rule *ro)
+{
+	uint32_t hi, lo, mask;
+
+	convert_rule(ri, ro);
+
+	mask = ro->field[RTE_ACL_IPV4VLAN_SRC_FIELD].mask_range.u32;
+	mask = RTE_ACL_MASKLEN_TO_BITMASK(mask, sizeof(mask));
+	lo = ro->field[RTE_ACL_IPV4VLAN_SRC_FIELD].value.u32 & mask;
+	hi = lo + ~mask;
+	ro->field[RTE_ACL_IPV4VLAN_SRC_FIELD].value.u32 = lo;
+	ro->field[RTE_ACL_IPV4VLAN_SRC_FIELD].mask_range.u32 = hi;
+
+	mask = ro->field[RTE_ACL_IPV4VLAN_DST_FIELD].mask_range.u32;
+	mask = RTE_ACL_MASKLEN_TO_BITMASK(mask, sizeof(mask));
+	lo = ro->field[RTE_ACL_IPV4VLAN_DST_FIELD].value.u32 & mask;
+	hi = lo + ~mask;
+	ro->field[RTE_ACL_IPV4VLAN_DST_FIELD].value.u32 = lo;
+	ro->field[RTE_ACL_IPV4VLAN_DST_FIELD].mask_range.u32 = hi;
+}
+
+/*
+ * Convert rte_acl_ipv4vlan_rule: swap VLAN and PORTS rule fields.
+ */
+static void
+convert_rule_3(const struct rte_acl_ipv4vlan_rule *ri,
+	struct acl_ipv4vlan_rule *ro)
+{
+	struct rte_acl_field t1, t2;
+
+	convert_rule(ri, ro);
+
+	t1 = ro->field[RTE_ACL_IPV4VLAN_VLAN1_FIELD];
+	t2 = ro->field[RTE_ACL_IPV4VLAN_VLAN2_FIELD];
+
+	ro->field[RTE_ACL_IPV4VLAN_VLAN1_FIELD] =
+		ro->field[RTE_ACL_IPV4VLAN_SRCP_FIELD];
+	ro->field[RTE_ACL_IPV4VLAN_VLAN2_FIELD] =
+		ro->field[RTE_ACL_IPV4VLAN_DSTP_FIELD];
+
+	ro->field[RTE_ACL_IPV4VLAN_SRCP_FIELD] = t1;
+	ro->field[RTE_ACL_IPV4VLAN_DSTP_FIELD] = t2;
+}
+
+/*
+ * Convert rte_acl_ipv4vlan_rule: swap SRC and DST IPv4 address rules.
+ */
+static void
+convert_rule_4(const struct rte_acl_ipv4vlan_rule *ri,
+	struct acl_ipv4vlan_rule *ro)
+{
+	struct rte_acl_field t;
+
+	convert_rule(ri, ro);
+
+	t = ro->field[RTE_ACL_IPV4VLAN_SRC_FIELD];
+	ro->field[RTE_ACL_IPV4VLAN_SRC_FIELD] =
+		ro->field[RTE_ACL_IPV4VLAN_DST_FIELD];
+
+	ro->field[RTE_ACL_IPV4VLAN_DST_FIELD] = t;
+}
+
+static void
+ipv4vlan_config(struct rte_acl_config *cfg,
+	const uint32_t layout[RTE_ACL_IPV4VLAN_NUM],
+	uint32_t num_categories)
+{
+	static const struct rte_acl_field_def
+		ipv4_defs[RTE_ACL_IPV4VLAN_NUM_FIELDS] = {
+		{
+			.type = RTE_ACL_FIELD_TYPE_BITMASK,
+			.size = sizeof(uint8_t),
+			.field_index = RTE_ACL_IPV4VLAN_PROTO_FIELD,
+			.input_index = RTE_ACL_IPV4VLAN_PROTO,
+		},
+		{
+			.type = RTE_ACL_FIELD_TYPE_BITMASK,
+			.size = sizeof(uint16_t),
+			.field_index = RTE_ACL_IPV4VLAN_VLAN1_FIELD,
+			.input_index = RTE_ACL_IPV4VLAN_VLAN,
+		},
+		{
+			.type = RTE_ACL_FIELD_TYPE_BITMASK,
+			.size = sizeof(uint16_t),
+			.field_index = RTE_ACL_IPV4VLAN_VLAN2_FIELD,
+			.input_index = RTE_ACL_IPV4VLAN_VLAN,
+		},
+		{
+			.type = RTE_ACL_FIELD_TYPE_MASK,
+			.size = sizeof(uint32_t),
+			.field_index = RTE_ACL_IPV4VLAN_SRC_FIELD,
+			.input_index = RTE_ACL_IPV4VLAN_SRC,
+		},
+		{
+			.type = RTE_ACL_FIELD_TYPE_MASK,
+			.size = sizeof(uint32_t),
+			.field_index = RTE_ACL_IPV4VLAN_DST_FIELD,
+			.input_index = RTE_ACL_IPV4VLAN_DST,
+		},
+		{
+			.type = RTE_ACL_FIELD_TYPE_RANGE,
+			.size = sizeof(uint16_t),
+			.field_index = RTE_ACL_IPV4VLAN_SRCP_FIELD,
+			.input_index = RTE_ACL_IPV4VLAN_PORTS,
+		},
+		{
+			.type = RTE_ACL_FIELD_TYPE_RANGE,
+			.size = sizeof(uint16_t),
+			.field_index = RTE_ACL_IPV4VLAN_DSTP_FIELD,
+			.input_index = RTE_ACL_IPV4VLAN_PORTS,
+		},
+	};
+
+	memcpy(&cfg->defs, ipv4_defs, sizeof(ipv4_defs));
+	cfg->num_fields = RTE_DIM(ipv4_defs);
+
+	cfg->defs[RTE_ACL_IPV4VLAN_PROTO_FIELD].offset =
+		layout[RTE_ACL_IPV4VLAN_PROTO];
+	cfg->defs[RTE_ACL_IPV4VLAN_VLAN1_FIELD].offset =
+		layout[RTE_ACL_IPV4VLAN_VLAN];
+	cfg->defs[RTE_ACL_IPV4VLAN_VLAN2_FIELD].offset =
+		layout[RTE_ACL_IPV4VLAN_VLAN] +
+		cfg->defs[RTE_ACL_IPV4VLAN_VLAN1_FIELD].size;
+	cfg->defs[RTE_ACL_IPV4VLAN_SRC_FIELD].offset =
+		layout[RTE_ACL_IPV4VLAN_SRC];
+	cfg->defs[RTE_ACL_IPV4VLAN_DST_FIELD].offset =
+		layout[RTE_ACL_IPV4VLAN_DST];
+	cfg->defs[RTE_ACL_IPV4VLAN_SRCP_FIELD].offset =
+		layout[RTE_ACL_IPV4VLAN_PORTS];
+	cfg->defs[RTE_ACL_IPV4VLAN_DSTP_FIELD].offset =
+		layout[RTE_ACL_IPV4VLAN_PORTS] +
+		cfg->defs[RTE_ACL_IPV4VLAN_SRCP_FIELD].size;
+
+	cfg->num_categories = num_categories;
+}
+
+static int
+convert_rules(struct rte_acl_ctx *acx,
+	void (*convert)(const struct rte_acl_ipv4vlan_rule *,
+	struct acl_ipv4vlan_rule *),
+	const struct rte_acl_ipv4vlan_rule *rules, uint32_t num)
+{
+	int32_t rc;
+	uint32_t i;
+	struct acl_ipv4vlan_rule r;
+
+	for (i = 0; i != num; i++) {
+		convert(rules + i, &r);
+		rc = rte_acl_add_rules(acx, (struct rte_acl_rule *)&r, 1);
+		if (rc != 0) {
+			printf("Line %i: Adding rule %u to ACL context "
+				"failed with error code: %d\n",
+			__LINE__, i, rc);
+			return rc;
+		}
+	}
+
+	return 0;
+}
+
+static void
+convert_config(struct rte_acl_config *cfg)
+{
+	ipv4vlan_config(cfg, ipv4_7tuple_layout, RTE_ACL_MAX_CATEGORIES);
+}
+
+/*
+ * Convert rte_acl_ipv4vlan_rule to use RTE_ACL_FIELD_TYPE_BITMASK.
+ */
+static void
+convert_config_1(struct rte_acl_config *cfg)
+{
+	ipv4vlan_config(cfg, ipv4_7tuple_layout, RTE_ACL_MAX_CATEGORIES);
+	cfg->defs[RTE_ACL_IPV4VLAN_SRC_FIELD].type = RTE_ACL_FIELD_TYPE_BITMASK;
+	cfg->defs[RTE_ACL_IPV4VLAN_DST_FIELD].type = RTE_ACL_FIELD_TYPE_BITMASK;
+}
+
+/*
+ * Convert rte_acl_ipv4vlan_rule to use RTE_ACL_FIELD_TYPE_RANGE.
+ */
+static void
+convert_config_2(struct rte_acl_config *cfg)
+{
+	ipv4vlan_config(cfg, ipv4_7tuple_layout, RTE_ACL_MAX_CATEGORIES);
+	cfg->defs[RTE_ACL_IPV4VLAN_SRC_FIELD].type = RTE_ACL_FIELD_TYPE_RANGE;
+	cfg->defs[RTE_ACL_IPV4VLAN_DST_FIELD].type = RTE_ACL_FIELD_TYPE_RANGE;
+}
+
+/*
+ * Convert rte_acl_ipv4vlan_rule: swap VLAN and PORTS rule definitions.
+ */
+static void
+convert_config_3(struct rte_acl_config *cfg)
+{
+	struct rte_acl_field_def t1, t2;
+
+	ipv4vlan_config(cfg, ipv4_7tuple_layout, RTE_ACL_MAX_CATEGORIES);
+
+	t1 = cfg->defs[RTE_ACL_IPV4VLAN_VLAN1_FIELD];
+	t2 = cfg->defs[RTE_ACL_IPV4VLAN_VLAN2_FIELD];
+
+	/* swap VLAN1 and SRCP rule definition. */
+	cfg->defs[RTE_ACL_IPV4VLAN_VLAN1_FIELD] =
+		cfg->defs[RTE_ACL_IPV4VLAN_SRCP_FIELD];
+	cfg->defs[RTE_ACL_IPV4VLAN_VLAN1_FIELD].field_index = t1.field_index;
+	cfg->defs[RTE_ACL_IPV4VLAN_VLAN1_FIELD].input_index = t1.input_index;
+
+	/* swap VLAN2 and DSTP rule definition. */
+	cfg->defs[RTE_ACL_IPV4VLAN_VLAN2_FIELD] =
+		cfg->defs[RTE_ACL_IPV4VLAN_DSTP_FIELD];
+	cfg->defs[RTE_ACL_IPV4VLAN_VLAN2_FIELD].field_index = t2.field_index;
+	cfg->defs[RTE_ACL_IPV4VLAN_VLAN2_FIELD].input_index = t2.input_index;
+
+	cfg->defs[RTE_ACL_IPV4VLAN_SRCP_FIELD].type = t1.type;
+	cfg->defs[RTE_ACL_IPV4VLAN_SRCP_FIELD].size = t1.size;
+	cfg->defs[RTE_ACL_IPV4VLAN_SRCP_FIELD].offset = t1.offset;
+
+	cfg->defs[RTE_ACL_IPV4VLAN_DSTP_FIELD].type = t2.type;
+	cfg->defs[RTE_ACL_IPV4VLAN_DSTP_FIELD].size = t2.size;
+	cfg->defs[RTE_ACL_IPV4VLAN_DSTP_FIELD].offset = t2.offset;
+}
+
+/*
+ * Convert rte_acl_ipv4vlan_rule: swap SRC and DST ip address rule definitions.
+ */
+static void
+convert_config_4(struct rte_acl_config *cfg)
+{
+	struct rte_acl_field_def t;
+
+	ipv4vlan_config(cfg, ipv4_7tuple_layout, RTE_ACL_MAX_CATEGORIES);
+
+	t = cfg->defs[RTE_ACL_IPV4VLAN_SRC_FIELD];
+
+	cfg->defs[RTE_ACL_IPV4VLAN_SRC_FIELD] =
+		cfg->defs[RTE_ACL_IPV4VLAN_DST_FIELD];
+	cfg->defs[RTE_ACL_IPV4VLAN_SRC_FIELD].field_index = t.field_index;
+	cfg->defs[RTE_ACL_IPV4VLAN_SRC_FIELD].input_index = t.input_index;
+
+	cfg->defs[RTE_ACL_IPV4VLAN_DST_FIELD].type = t.type;
+	cfg->defs[RTE_ACL_IPV4VLAN_DST_FIELD].size = t.size;
+	cfg->defs[RTE_ACL_IPV4VLAN_DST_FIELD].offset = t.offset;
+}
+
+
+static int
+build_convert_rules(struct rte_acl_ctx *acx,
+	void (*config)(struct rte_acl_config *),
+	size_t max_size)
+{
+	struct rte_acl_config cfg;
+
+	memset(&cfg, 0, sizeof(cfg));
+	config(&cfg);
+	cfg.max_size = max_size;
+	return rte_acl_build(acx, &cfg);
+}
+
+static int
+test_convert_rules(const char *desc,
+	void (*config)(struct rte_acl_config *),
+	void (*convert)(const struct rte_acl_ipv4vlan_rule *,
+	struct acl_ipv4vlan_rule *))
+{
+	struct rte_acl_ctx *acx;
+	int32_t rc;
+	uint32_t i;
+	static const size_t mem_sizes[] = {0, -1};
+
+	printf("running %s(%s)\n", __func__, desc);
+
+	acx = rte_acl_create(&acl_param);
+	if (acx == NULL) {
+		printf("Line %i: Error creating ACL context!\n", __LINE__);
+		return -1;
+	}
+
+	rc = convert_rules(acx, convert, acl_test_rules,
+		RTE_DIM(acl_test_rules));
+	if (rc != 0)
+		printf("Line %i: Error converting ACL rules!\n", __LINE__);
+
+	for (i = 0; rc == 0 && i != RTE_DIM(mem_sizes); i++) {
+
+		rc = build_convert_rules(acx, config, mem_sizes[i]);
+		if (rc != 0) {
+			printf("Line %i: Error @ build_convert_rules(%zu)!\n",
+				__LINE__, mem_sizes[i]);
+			break;
+		}
+
+		rc = test_classify_run(acx, acl_test_data,
+			RTE_DIM(acl_test_data));
+		if (rc != 0)
+			printf("%s failed at line %i, max_size=%zu\n",
+				__func__, __LINE__, mem_sizes[i]);
+	}
+
+	rte_acl_free(acx);
+	return rc;
+}
+
+static int
+test_convert(void)
+{
+	static const struct {
+		const char *desc;
+		void (*config)(struct rte_acl_config *);
+		void (*convert)(const struct rte_acl_ipv4vlan_rule *,
+			struct acl_ipv4vlan_rule *);
+	} convert_param[] = {
+		{
+			"acl_ipv4vlan_tuple",
+			convert_config,
+			convert_rule,
+		},
+		{
+			"acl_ipv4vlan_tuple, RTE_ACL_FIELD_TYPE_BITMASK type "
+			"for IPv4",
+			convert_config_1,
+			convert_rule_1,
+		},
+		{
+			"acl_ipv4vlan_tuple, RTE_ACL_FIELD_TYPE_RANGE type "
+			"for IPv4",
+			convert_config_2,
+			convert_rule_2,
+		},
+		{
+			"acl_ipv4vlan_tuple: swap VLAN and PORTs order",
+			convert_config_3,
+			convert_rule_3,
+		},
+		{
+			"acl_ipv4vlan_tuple: swap SRC and DST IPv4 order",
+			convert_config_4,
+			convert_rule_4,
+		},
+	};
+
+	uint32_t i;
+	int32_t rc;
+
+	for (i = 0; i != RTE_DIM(convert_param); i++) {
+		rc = test_convert_rules(convert_param[i].desc,
+			convert_param[i].config,
+			convert_param[i].convert);
+		if (rc != 0) {
+			printf("%s for test-case: %s failed, error code: %d;\n",
+				__func__, convert_param[i].desc, rc);
+			return rc;
+		}
+	}
+
+	return 0;
 }
 
 /*
@@ -243,11 +1004,11 @@ err:
 static int
 test_invalid_layout(void)
 {
-	struct rte_acl_ctx * acx;
+	struct rte_acl_ctx *acx;
 	int ret, i;
 
-	uint32_t results[DIM(invalid_layout_data)];
-	const uint8_t * data[DIM(invalid_layout_data)];
+	uint32_t results[RTE_DIM(invalid_layout_data)];
+	const uint8_t *data[RTE_DIM(invalid_layout_data)];
 
 	const uint32_t layout[RTE_ACL_IPV4VLAN_NUM] = {
 			/* proto points to destination port's first byte */
@@ -259,7 +1020,10 @@ test_invalid_layout(void)
 			offsetof(struct ipv4_7tuple, ip_dst),
 			offsetof(struct ipv4_7tuple, ip_src),
 
-			/* we can't swap ports here, so we will swap them in the data */
+			/*
+			 * we can't swap ports here, so we will swap
+			 * them in the data
+			 */
 			offsetof(struct ipv4_7tuple, port_src),
 	};
 
@@ -274,9 +1038,10 @@ test_invalid_layout(void)
 	for (i = 0; i < 1000; i++) {
 		/* add rules to the context */
 		ret = rte_acl_ipv4vlan_add_rules(acx, invalid_layout_rules,
-				DIM(invalid_layout_rules));
+				RTE_DIM(invalid_layout_rules));
 		if (ret != 0) {
-			printf("Line %i: Adding rules to ACL context failed!\n", __LINE__);
+			printf("Line %i: Adding rules to ACL context failed!\n",
+				__LINE__);
 			rte_acl_free(acx);
 			return -1;
 		}
@@ -291,43 +1056,48 @@ test_invalid_layout(void)
 	}
 
 	/* swap all bytes in the data to network order */
-	bswap_test_data(invalid_layout_data, DIM(invalid_layout_data), 1);
+	bswap_test_data(invalid_layout_data, RTE_DIM(invalid_layout_data), 1);
 
 	/* prepare data */
-	for (i = 0; i < (int) DIM(invalid_layout_data); i++) {
+	for (i = 0; i < (int) RTE_DIM(invalid_layout_data); i++) {
 		data[i] = (uint8_t *)&invalid_layout_data[i];
 	}
 
 	/* classify tuples */
-	ret = rte_acl_classify(acx, data, results,
-			DIM(results), 1);
+	ret = rte_acl_classify_alg(acx, data, results,
+			RTE_DIM(results), 1, RTE_ACL_CLASSIFY_SCALAR);
 	if (ret != 0) {
 		printf("Line %i: SSE classify failed!\n", __LINE__);
 		rte_acl_free(acx);
 		return -1;
 	}
 
-	for (i = 0; i < (int) DIM(results); i++) {
+	for (i = 0; i < (int) RTE_DIM(results); i++) {
 		if (results[i] != invalid_layout_data[i].allow) {
-			printf("Line %i: Wrong results at %i (result=%u, should be %u)!\n",
-					__LINE__, i, results[i], invalid_layout_data[i].allow);
+			printf("Line %i: Wrong results at %i "
+				"(result=%u, should be %u)!\n",
+				__LINE__, i, results[i],
+				invalid_layout_data[i].allow);
 			goto err;
 		}
 	}
 
 	/* classify tuples (scalar) */
-	ret = rte_acl_classify_scalar(acx, data, results,
-			DIM(results), 1);
+	ret = rte_acl_classify_alg(acx, data, results, RTE_DIM(results), 1,
+		RTE_ACL_CLASSIFY_SCALAR);
+
 	if (ret != 0) {
 		printf("Line %i: Scalar classify failed!\n", __LINE__);
 		rte_acl_free(acx);
 		return -1;
 	}
 
-	for (i = 0; i < (int) DIM(results); i++) {
+	for (i = 0; i < (int) RTE_DIM(results); i++) {
 		if (results[i] != invalid_layout_data[i].allow) {
-			printf("Line %i: Wrong results at %i (result=%u, should be %u)!\n",
-					__LINE__, i, results[i], invalid_layout_data[i].allow);
+			printf("Line %i: Wrong results at %i "
+				"(result=%u, should be %u)!\n",
+				__LINE__, i, results[i],
+				invalid_layout_data[i].allow);
 			goto err;
 		}
 	}
@@ -335,13 +1105,13 @@ test_invalid_layout(void)
 	rte_acl_free(acx);
 
 	/* swap data back to cpu order so that next time tests don't fail */
-	bswap_test_data(invalid_layout_data, DIM(invalid_layout_data), 0);
+	bswap_test_data(invalid_layout_data, RTE_DIM(invalid_layout_data), 0);
 
 	return 0;
 err:
 
 	/* swap data back to cpu order so that next time tests don't fail */
-	bswap_test_data(invalid_layout_data, DIM(invalid_layout_data), 0);
+	bswap_test_data(invalid_layout_data, RTE_DIM(invalid_layout_data), 0);
 
 	rte_acl_free(acx);
 
@@ -355,13 +1125,13 @@ static int
 test_create_find_add(void)
 {
 	struct rte_acl_param param;
-	struct rte_acl_ctx * acx, *acx2, *tmp;
+	struct rte_acl_ctx *acx, *acx2, *tmp;
 	struct rte_acl_ipv4vlan_rule rules[LEN];
 
 	const uint32_t layout[RTE_ACL_IPV4VLAN_NUM] = {0};
 
-	const char * acx_name = "acx";
-	const char * acx2_name = "acx2";
+	const char *acx_name = "acx";
+	const char *acx2_name = "acx2";
 	int i, ret;
 
 	/* create two contexts */
@@ -387,8 +1157,9 @@ test_create_find_add(void)
 	param.name = acx_name;
 	tmp = rte_acl_create(&param);
 	if (tmp != acx) {
-		printf("Line %i: Creating context with existing name test failed!\n",
-				__LINE__);
+		printf("Line %i: Creating context with existing name "
+			"test failed!\n",
+			__LINE__);
 		if (tmp)
 			rte_acl_free(tmp);
 		goto err;
@@ -397,8 +1168,9 @@ test_create_find_add(void)
 	param.name = acx2_name;
 	tmp = rte_acl_create(&param);
 	if (tmp != acx2) {
-		printf("Line %i: Creating context with existing name test 2 failed!\n",
-				__LINE__);
+		printf("Line %i: Creating context with existing "
+			"name test 2 failed!\n",
+			__LINE__);
 		if (tmp)
 			rte_acl_free(tmp);
 		goto err;
@@ -444,9 +1216,12 @@ test_create_find_add(void)
 
 	/* create dummy acl */
 	for (i = 0; i < LEN; i++) {
-		memcpy(&rules[i], &acl_rule, sizeof(struct rte_acl_ipv4vlan_rule));
-		rules[i].data.userdata = i + 1;       /* skip zero */
-		rules[i].data.category_mask = 1 << i; /* one rule per category */
+		memcpy(&rules[i], &acl_rule,
+			sizeof(struct rte_acl_ipv4vlan_rule));
+		/* skip zero */
+		rules[i].data.userdata = i + 1;
+		/* one rule per category */
+		rules[i].data.category_mask = 1 << i;
 	}
 
 	/* try filling up the context */
@@ -488,7 +1263,7 @@ err:
 static int
 test_invalid_rules(void)
 {
-	struct rte_acl_ctx * acx;
+	struct rte_acl_ctx *acx;
 	int ret;
 
 	struct rte_acl_ipv4vlan_rule rule;
@@ -556,19 +1331,6 @@ test_invalid_rules(void)
 		goto err;
 	}
 
-	rule.dst_mask_len = 0;
-	rule.src_mask_len = 0;
-	rule.data.userdata = 0;
-
-	/* try adding this rule (it should fail because userdata is invalid) */
-	ret = rte_acl_ipv4vlan_add_rules(acx, &rule, 1);
-	if (ret == 0) {
-		printf("Line %i: Adding a rule with invalid user data "
-				"should have failed!\n", __LINE__);
-		rte_acl_free(acx);
-		return -1;
-	}
-
 	rte_acl_free(acx);
 
 	return 0;
@@ -591,7 +1353,7 @@ static int
 test_invalid_parameters(void)
 {
 	struct rte_acl_param param;
-	struct rte_acl_ctx * acx;
+	struct rte_acl_ctx *acx;
 	struct rte_acl_ipv4vlan_rule rule;
 	int result;
 
@@ -620,8 +1382,7 @@ test_invalid_parameters(void)
 		printf("Line %i: ACL context creation with zero rule len "
 				"failed!\n", __LINE__);
 		return -1;
-	}
-	else
+	} else
 		rte_acl_free(acx);
 
 	/* zero max rule num */
@@ -633,20 +1394,21 @@ test_invalid_parameters(void)
 		printf("Line %i: ACL context creation with zero rule num "
 				"failed!\n", __LINE__);
 		return -1;
-	}
-	else
+	} else
 		rte_acl_free(acx);
 
-	/* invalid NUMA node */
-	memcpy(&param, &acl_param, sizeof(param));
-	param.socket_id = RTE_MAX_NUMA_NODES + 1;
+	if (rte_eal_has_hugepages()) {
+		/* invalid NUMA node */
+		memcpy(&param, &acl_param, sizeof(param));
+		param.socket_id = RTE_MAX_NUMA_NODES + 1;
 
-	acx = rte_acl_create(&param);
-	if (acx != NULL) {
-		printf("Line %i: ACL context creation with invalid NUMA "
-				"should have failed!\n", __LINE__);
-		rte_acl_free(acx);
-		return -1;
+		acx = rte_acl_create(&param);
+		if (acx != NULL) {
+			printf("Line %i: ACL context creation with invalid "
+					"NUMA should have failed!\n", __LINE__);
+			rte_acl_free(acx);
+			return -1;
+		}
 	}
 
 	/* NULL name */
@@ -707,27 +1469,8 @@ test_invalid_parameters(void)
 	/* zero count (should succeed) */
 	result = rte_acl_ipv4vlan_add_rules(acx, &rule, 0);
 	if (result != 0) {
-		printf("Line %i: Adding 0 rules to ACL context failed!\n", __LINE__);
-		rte_acl_free(acx);
-		return -1;
-	}
-
-	/* free ACL context */
-	rte_acl_free(acx);
-
-	/* set wrong rule_size so that adding any rules would fail */
-	param.rule_size = sizeof(struct rte_acl_ipv4vlan_rule) + 4;
-	acx = rte_acl_create(&param);
-	if (acx == NULL) {
-		printf("Line %i: ACL context creation failed!\n", __LINE__);
-		return -1;
-	}
-
-	/* try adding a rule with size different from context rule_size */
-	result = rte_acl_ipv4vlan_add_rules(acx, &rule, 1);
-	if (result == 0) {
-		printf("Line %i: Adding an invalid sized rule "
-				"should have failed!\n", __LINE__);
+		printf("Line %i: Adding 0 rules to ACL context failed!\n",
+			__LINE__);
 		rte_acl_free(acx);
 		return -1;
 	}
@@ -768,8 +1511,9 @@ test_invalid_parameters(void)
 
 	/* zero categories (should not fail) */
 	result = rte_acl_ipv4vlan_build(acx, layout, 0);
-	if (result != 0) {
-		printf("Line %i: Building with 0 categories failed!\n", __LINE__);
+	if (result == 0) {
+		printf("Line %i: Building with 0 categories should fail!\n",
+			__LINE__);
 		rte_acl_free(acx);
 		return -1;
 	}
@@ -797,7 +1541,8 @@ test_invalid_parameters(void)
 	/* scalar classify test */
 
 	/* cover zero categories in classify (should not fail) */
-	result = rte_acl_classify_scalar(acx, NULL, NULL, 0, 0);
+	result = rte_acl_classify_alg(acx, NULL, NULL, 0, 0,
+		RTE_ACL_CLASSIFY_SCALAR);
 	if (result != 0) {
 		printf("Line %i: Scalar classify with zero categories "
 				"failed!\n", __LINE__);
@@ -806,7 +1551,7 @@ test_invalid_parameters(void)
 	}
 
 	/* cover invalid but positive categories in classify */
-	result = rte_acl_classify_scalar(acx, NULL, NULL, 0, 3);
+	result = rte_acl_classify(acx, NULL, NULL, 0, 3);
 	if (result == 0) {
 		printf("Line %i: Scalar classify with 3 categories "
 				"should have failed!\n", __LINE__);
@@ -836,7 +1581,7 @@ static int
 test_misc(void)
 {
 	struct rte_acl_param param;
-	struct rte_acl_ctx * acx;
+	struct rte_acl_ctx *acx;
 
 	/* create context */
 	memcpy(&param, &acl_param, sizeof(param));
@@ -857,7 +1602,120 @@ test_misc(void)
 	return 0;
 }
 
-int
+static uint32_t
+get_u32_range_max(void)
+{
+	uint32_t i, max;
+
+	max = 0;
+	for (i = 0; i != RTE_DIM(acl_u32_range_test_rules); i++)
+		max = RTE_MAX(max, acl_u32_range_test_rules[i].src_mask_len);
+	return max;
+}
+
+static uint32_t
+get_u32_range_min(void)
+{
+	uint32_t i, min;
+
+	min = UINT32_MAX;
+	for (i = 0; i != RTE_DIM(acl_u32_range_test_rules); i++)
+		min = RTE_MIN(min, acl_u32_range_test_rules[i].src_addr);
+	return min;
+}
+
+static const struct rte_acl_ipv4vlan_rule *
+find_u32_range_rule(uint32_t val)
+{
+	uint32_t i;
+
+	for (i = 0; i != RTE_DIM(acl_u32_range_test_rules); i++) {
+		if (val >= acl_u32_range_test_rules[i].src_addr &&
+				val <= acl_u32_range_test_rules[i].src_mask_len)
+			return acl_u32_range_test_rules + i;
+	}
+	return NULL;
+}
+
+static void
+fill_u32_range_data(struct ipv4_7tuple tdata[], uint32_t start, uint32_t num)
+{
+	uint32_t i;
+	const struct rte_acl_ipv4vlan_rule *r;
+
+	for (i = 0; i != num; i++) {
+		tdata[i].ip_src = start + i;
+		r = find_u32_range_rule(start + i);
+		if (r != NULL)
+			tdata[i].allow = r->data.userdata;
+	}
+}
+
+static int
+test_u32_range(void)
+{
+	int32_t rc;
+	uint32_t i, k, max, min;
+	struct rte_acl_ctx *acx;
+	struct acl_ipv4vlan_rule r;
+	struct ipv4_7tuple test_data[64];
+
+	acx = rte_acl_create(&acl_param);
+	if (acx == NULL) {
+		printf("%s#%i: Error creating ACL context!\n",
+			__func__, __LINE__);
+		return -1;
+	}
+
+	for (i = 0; i != RTE_DIM(acl_u32_range_test_rules); i++) {
+		convert_rule(&acl_u32_range_test_rules[i], &r);
+		rc = rte_acl_add_rules(acx, (struct rte_acl_rule *)&r, 1);
+		if (rc != 0) {
+			printf("%s#%i: Adding rule to ACL context "
+				"failed with error code: %d\n",
+				__func__, __LINE__, rc);
+			rte_acl_free(acx);
+			return rc;
+		}
+	}
+
+	rc = build_convert_rules(acx, convert_config_2, 0);
+	if (rc != 0) {
+		printf("%s#%i Error @ build_convert_rules!\n",
+			__func__, __LINE__);
+		rte_acl_free(acx);
+		return rc;
+	}
+
+	max = get_u32_range_max();
+	min = get_u32_range_min();
+
+	max = RTE_MAX(max, max + 1);
+	min = RTE_MIN(min, min - 1);
+
+	printf("%s#%d starting range test from %u to %u\n",
+		__func__, __LINE__, min, max);
+
+	for (i = min; i <= max; i += k) {
+
+		k = RTE_MIN(max - i + 1, RTE_DIM(test_data));
+
+		memset(test_data, 0, sizeof(test_data));
+		fill_u32_range_data(test_data, i, k);
+
+		rc = test_classify_run(acx, test_data, k);
+		if (rc != 0) {
+			printf("%s#%d failed at [%u, %u) interval\n",
+				__func__, __LINE__, i, i + k);
+			break;
+		}
+	}
+
+	rte_acl_free(acx);
+	return rc;
+}
+
+static int
 test_acl(void)
 {
 	if (test_invalid_parameters() < 0)
@@ -872,16 +1730,14 @@ test_acl(void)
 		return -1;
 	if (test_classify() < 0)
 		return -1;
+	if (test_build_ports_range() < 0)
+		return -1;
+	if (test_convert() < 0)
+		return -1;
+	if (test_u32_range() < 0)
+		return -1;
 
 	return 0;
 }
-#else
-
-int
-test_acl(void)
-{
-	printf("This binary was not compiled with ACL support!\n");
-	return 0;
-}
 
-#endif /* RTE_LIBRTE_ACL */
+REGISTER_TEST_COMMAND(acl_autotest, test_acl);