apps: use helper to create mbuf pools

[dpdk.git] / examples / l3fwd-acl / main.c

diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c
index 4487c95..1a04004 100644 (file)
--- a/examples/l3fwd-acl/main.c
+++ b/examples/l3fwd-acl/main.c
@@ -48,7 +48,6 @@
 #include <rte_memory.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_launch.h>
@@ -81,7 +80,7 @@
 
 #define MEMPOOL_CACHE_SIZE 256
 
-#define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
+#define MBUF_DATA_SIZE (2048 + RTE_PKTMBUF_HEADROOM)
 
 /*
  * This expression is used to calculate the number of mbufs needed
@@ -174,11 +173,8 @@ static struct rte_eth_conf port_conf = {
        .rx_adv_conf = {
                .rss_conf = {
                        .rss_key = NULL,
-                       .rss_hf = ETH_RSS_IPV4 | ETH_RSS_IPV4_TCP
-                               | ETH_RSS_IPV4_UDP
-                               | ETH_RSS_IPV6 | ETH_RSS_IPV6_EX
-                               | ETH_RSS_IPV6_TCP | ETH_RSS_IPV6_TCP_EX
-                               | ETH_RSS_IPV6_UDP | ETH_RSS_IPV6_UDP_EX,
+                       .rss_hf = ETH_RSS_IP | ETH_RSS_UDP |
+                               ETH_RSS_TCP | ETH_RSS_SCTP,
                },
        },
        .txmode = {
@@ -1047,13 +1043,13 @@ add_rules(const char *rule_path,
 
        fseek(fh, 0, SEEK_SET);
 
-       acl_rules = (uint8_t *)calloc(acl_num, rule_size);
+       acl_rules = calloc(acl_num, rule_size);
 
        if (NULL == acl_rules)
                rte_exit(EXIT_FAILURE, "%s: failed to malloc memory\n",
                        __func__);
 
-       route_rules = (uint8_t *)calloc(route_num, rule_size);
+       route_rules = calloc(route_num, rule_size);
 
        if (NULL == route_rules)
                rte_exit(EXIT_FAILURE, "%s: failed to malloc memory\n",
@@ -1178,8 +1174,9 @@ setup_acl(struct rte_acl_rule *route_base,
                        rte_exit(EXIT_FAILURE, "add rules failed\n");
 
        /* Perform builds */
-       acl_build_param.num_categories = DEFAULT_MAX_CATEGORIES;
+       memset(&acl_build_param, 0, sizeof(acl_build_param));
 
+       acl_build_param.num_categories = DEFAULT_MAX_CATEGORIES;
        acl_build_param.num_fields = dim;
        memcpy(&acl_build_param.defs, ipv6 ? ipv6_defs : ipv4_defs,
                ipv6 ? sizeof(ipv6_defs) : sizeof(ipv4_defs));
@@ -1247,6 +1244,10 @@ app_acl_init(void)
                                acl_log("Socket %d of lcore %u is out "
                                        "of range %d\n",
                                        socketid, lcore_id, NB_SOCKETS);
+                               free(route_base_ipv4);
+                               free(route_base_ipv6);
+                               free(acl_base_ipv4);
+                               free(acl_base_ipv6);
                                return -1;
                        }
 
@@ -1847,12 +1848,9 @@ init_mem(unsigned nb_mbuf)
                if (pktmbuf_pool[socketid] == NULL) {
                        snprintf(s, sizeof(s), "mbuf_pool_%d", socketid);
                        pktmbuf_pool[socketid] =
-                               rte_mempool_create(s, nb_mbuf, MBUF_SIZE,
-                                       MEMPOOL_CACHE_SIZE,
-                                       sizeof(struct rte_pktmbuf_pool_private),
-                                       rte_pktmbuf_pool_init, NULL,
-                                       rte_pktmbuf_init, NULL,
-                                       socketid, 0);
+                               rte_pktmbuf_pool_create(s, nb_mbuf,
+                                       MEMPOOL_CACHE_SIZE, 0, MBUF_DATA_SIZE,
+                                       socketid);
                        if (pktmbuf_pool[socketid] == NULL)
                                rte_exit(EXIT_FAILURE,
                                        "Cannot init mbuf pool on socket %d\n",