From patchwork Thu Mar 17 08:47:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Jastrzebski X-Patchwork-Id: 11552 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 4C662569A; Thu, 17 Mar 2016 09:48:03 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 54F505693 for ; Thu, 17 Mar 2016 09:48:01 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 17 Mar 2016 01:48:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,349,1455004800"; d="scan'208";a="912810977" Received: from unknown (HELO Sent) ([10.217.248.54]) by orsmga001.jf.intel.com with SMTP; 17 Mar 2016 01:47:58 -0700 Received: by Sent (sSMTP sendmail emulation); Thu, 17 Mar 2016 09:47:35 +0100 From: Michal Jastrzebski To: dev@dpdk.org Cc: Michal Kobylinski Date: Thu, 17 Mar 2016 09:47:25 +0100 Message-Id: <1458204445-7480-1-git-send-email-michalx.k.jastrzebski@intel.com> X-Mailer: git-send-email 2.7.0 Subject: [dpdk-dev] [PATCH] app: fix for lpm in ip_pipeline X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Michal Kobylinski Updated ip_pipeline app is using new changes from LPM library (Increased number of next hops and added new config structure for LPM IPv4). Fixes: 7164439d017d ("lpm: add a new config structure for IPv4") Signed-off-by: Michal Kobylinski Acked-by: Cristian Dumitrescu --- app/test-pipeline/pipeline_lpm.c | 6 ++++++ examples/ip_pipeline/pipeline/pipeline_routing_be.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/app/test-pipeline/pipeline_lpm.c b/app/test-pipeline/pipeline_lpm.c index 916abd4..ecea6b3 100644 --- a/app/test-pipeline/pipeline_lpm.c +++ b/app/test-pipeline/pipeline_lpm.c @@ -47,6 +47,10 @@ #include "main.h" +#ifndef PIPELINE_LPM_TABLE_NUMBER_TABLE8s +#define PIPELINE_LPM_TABLE_NUMBER_TABLE8s 256 +#endif + void app_main_loop_worker_pipeline_lpm(void) { struct rte_pipeline_params pipeline_params = { @@ -113,6 +117,8 @@ app_main_loop_worker_pipeline_lpm(void) { struct rte_table_lpm_params table_lpm_params = { .name = "LPM", .n_rules = 1 << 24, + .number_tbl8s = PIPELINE_LPM_TABLE_NUMBER_TABLE8s, + .flags = 0, .entry_unique_size = sizeof(struct rte_pipeline_table_entry), .offset = APP_METADATA_OFFSET(32), diff --git a/examples/ip_pipeline/pipeline/pipeline_routing_be.c b/examples/ip_pipeline/pipeline/pipeline_routing_be.c index 8342b7b..431c636 100644 --- a/examples/ip_pipeline/pipeline/pipeline_routing_be.c +++ b/examples/ip_pipeline/pipeline/pipeline_routing_be.c @@ -67,6 +67,10 @@ #define MAC_SRC_DEFAULT 0x112233445566 +#ifndef PIPELINE_ROUTING_LPM_TABLE_NUMBER_TABLE8s +#define PIPELINE_ROUTING_LPM_TABLE_NUMBER_TABLE8s 256 +#endif + struct pipeline_routing { struct pipeline p; struct pipeline_routing_params params; @@ -1284,6 +1288,8 @@ pipeline_routing_init(struct pipeline_params *params, struct rte_table_lpm_params table_lpm_params = { .name = p->name, .n_rules = p_rt->params.n_routes, + .number_tbl8s = PIPELINE_ROUTING_LPM_TABLE_NUMBER_TABLE8s, + .flags = 0, .entry_unique_size = sizeof(struct routing_table_entry), .offset = p_rt->params.ip_hdr_offset + __builtin_offsetof(struct ipv4_hdr, dst_addr),