* [dpdk-dev] [PATCH 1/2] ip_pipleine: fix load balance table action
@ 2018-03-30 14:15 Jasvinder Singh
2018-03-30 14:15 ` [dpdk-dev] [PATCH 2/2] ip_pipeline: add ecmp route example Jasvinder Singh
2018-03-30 14:31 ` [dpdk-dev] [PATCH v2 1/2] ip_pipleine: fix load balance table action Jasvinder Singh
0 siblings, 2 replies; 6+ messages in thread
From: Jasvinder Singh @ 2018-03-30 14:15 UTC (permalink / raw)
To: dev; +Cc: cristian.dumitrescu
Fix bug in load balance action for pipeline table.
Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
---
examples/ip_pipeline/action.c | 42 ++++++++++++++++++++++++++++++++++++++++++
examples/ip_pipeline/cli.c | 9 ++++-----
2 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/examples/ip_pipeline/action.c b/examples/ip_pipeline/action.c
index 2cedb24..77a04fe 100644
--- a/examples/ip_pipeline/action.c
+++ b/examples/ip_pipeline/action.c
@@ -186,6 +186,48 @@ table_action_profile_create(const char *name,
((params->action_mask & (1LLU << RTE_TABLE_ACTION_FWD)) == 0))
return NULL;
+ if ((params->action_mask & (1LLU << RTE_TABLE_ACTION_LB)) &&
+ (params->lb.f_hash == NULL)) {
+ switch (params->lb.key_size) {
+ case 8:
+ params->lb.f_hash = hash_default_key8;
+ break;
+
+ case 16:
+ params->lb.f_hash = hash_default_key16;
+ break;
+
+ case 24:
+ params->lb.f_hash = hash_default_key24;
+ break;
+
+ case 32:
+ params->lb.f_hash = hash_default_key32;
+ break;
+
+ case 40:
+ params->lb.f_hash = hash_default_key40;
+ break;
+
+ case 48:
+ params->lb.f_hash = hash_default_key48;
+ break;
+
+ case 56:
+ params->lb.f_hash = hash_default_key56;
+ break;
+
+ case 64:
+ params->lb.f_hash = hash_default_key64;
+ break;
+
+ default:
+ return NULL;
+ }
+
+ params->lb.seed = 0;
+ }
+
/* Resource */
ap = rte_table_action_profile_create(¶ms->common);
if (ap == NULL)
diff --git a/examples/ip_pipeline/cli.c b/examples/ip_pipeline/cli.c
index 433f644..357d0ae 100644
--- a/examples/ip_pipeline/cli.c
+++ b/examples/ip_pipeline/cli.c
@@ -2314,8 +2314,7 @@ cmd_pipeline_table_stats(char **tokens,
* priority <priority>
* ipv4 | ipv6 <sa> <sa_depth> <da> <da_depth>
* <sp0> <sp1> <dp0> <dp1> <proto>
- * | array
- * pos
+ * | array <pos>
* | hash
* raw <key>
* | ipv4_5tuple <sa> <da> <sp> <dp> <proto>
@@ -2845,15 +2844,15 @@ parse_table_action_balance(char **tokens,
tokens++;
n_tokens--;
- if (n_tokens < RTE_TABLE_ACTION_LB_KEY_SIZE_MAX)
+ if (n_tokens < RTE_TABLE_ACTION_LB_TABLE_SIZE)
return 0;
- for (i = 0; i < RTE_TABLE_ACTION_LB_KEY_SIZE_MAX; i++)
+ for (i = 0; i < RTE_TABLE_ACTION_LB_TABLE_SIZE; i++)
if (parser_read_uint32(&a->lb.out[i], tokens[i]) != 0)
return 0;
a->action_mask |= 1 << RTE_TABLE_ACTION_LB;
- return 1 + RTE_TABLE_ACTION_LB_KEY_SIZE_MAX;
+ return 1 + RTE_TABLE_ACTION_LB_TABLE_SIZE;
}
--
2.9.3
^ permalink raw reply [flat|nested] 6+ messages in thread
* [dpdk-dev] [PATCH 2/2] ip_pipeline: add ecmp route example
2018-03-30 14:15 [dpdk-dev] [PATCH 1/2] ip_pipleine: fix load balance table action Jasvinder Singh
@ 2018-03-30 14:15 ` Jasvinder Singh
2018-03-30 14:31 ` [dpdk-dev] [PATCH v2 1/2] ip_pipleine: fix load balance table action Jasvinder Singh
1 sibling, 0 replies; 6+ messages in thread
From: Jasvinder Singh @ 2018-03-30 14:15 UTC (permalink / raw)
To: dev; +Cc: cristian.dumitrescu
From: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Add example to build pipeline to demonstrate equal-cost multi-path
routing example.
Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
---
examples/ip_pipeline_new/examples/route_ecmp.cli | 57 ++++++++++++++++++++++++
1 file changed, 57 insertions(+)
create mode 100755 examples/ip_pipeline_new/examples/route_ecmp.cli
diff --git a/examples/ip_pipeline_new/examples/route_ecmp.cli b/examples/ip_pipeline_new/examples/route_ecmp.cli
new file mode 100755
index 0000000..06434a2
--- /dev/null
+++ b/examples/ip_pipeline_new/examples/route_ecmp.cli
@@ -0,0 +1,57 @@
+; SPDX-License-Identifier: BSD-3-Clause
+; Copyright(c) 2010-2018 Intel Corporation
+
+; Equal Cost Multi-Path (ECMP) Routing
+;
+; Input packet: Ethernet/IPv4
+;
+; Packet buffer layout:
+; # Field Name Offset (Bytes) Size (Bytes)
+; 0 Mbuf 0 128
+; 1 Headroom 128 128
+; 2 Ethernet header 256 14
+; 3 IPv4 header 270 20
+
+mempool MEMPOOL0 buffer 2304 pool 32K cache 256 cpu 0
+
+link LINK0 dev 0000:02:00.0 rxq 1 128 MEMPOOL0 txq 1 512 promiscuous on
+link LINK1 dev 0000:02:00.1 rxq 1 128 MEMPOOL0 txq 1 512 promiscuous on
+link LINK2 dev 0000:06:00.0 rxq 1 128 MEMPOOL0 txq 1 512 promiscuous on
+link LINK3 dev 0000:06:00.1 rxq 1 128 MEMPOOL0 txq 1 512 promiscuous on
+
+table action profile APRT ipv4 offset 270 fwd balance offset 278 mask 00FF0000FFFFFFFFFFFFFFFFFFFFFFFF outoffset 256
+table action profile APNH ipv4 offset 270 fwd encap ether
+
+pipeline PIPELINE0 period 10 offset_port_id 0 cpu 0
+
+pipeline PIPELINE0 port in bsz 32 link LINK0 rxq 0
+pipeline PIPELINE0 port in bsz 32 link LINK1 rxq 0
+pipeline PIPELINE0 port in bsz 32 link LINK2 rxq 0
+pipeline PIPELINE0 port in bsz 32 link LINK3 rxq 0
+
+pipeline PIPELINE0 port out bsz 32 link LINK0 txq 0
+pipeline PIPELINE0 port out bsz 32 link LINK1 txq 0
+pipeline PIPELINE0 port out bsz 32 link LINK2 txq 0
+pipeline PIPELINE0 port out bsz 32 link LINK3 txq 0
+pipeline PIPELINE0 port out bsz 32 sink
+
+pipeline PIPELINE0 table match lpm ipv4 offset 286 size 4K action APRT
+pipeline PIPELINE0 table match array offset 256 size 64K action APNH
+
+pipeline PIPELINE0 port in 0 table 0
+pipeline PIPELINE0 port in 1 table 0
+pipeline PIPELINE0 port in 2 table 0
+pipeline PIPELINE0 port in 3 table 0
+
+thread 1 pipeline PIPELINE0 enable
+
+pipeline PIPELINE0 table 0 rule add match default action fwd port 4
+pipeline PIPELINE0 table 0 rule add match lpm ipv4 100.0.0.0 10 action fwd table 1 balance 0 0 0 0 1 1 2 2
+pipeline PIPELINE0 table 0 rule add match lpm ipv4 100.64.0.0 10 action fwd table 1 balance 1 1 1 1 2 2 3 3
+pipeline PIPELINE0 table 0 rule add match lpm ipv4 100.128.0.0 10 action fwd table 1 balance 2 2 2 2 3 3 0 0
+pipeline PIPELINE0 table 0 rule add match lpm ipv4 100.192.0.0 10 action fwd table 1 balance 3 3 3 3 0 0 1 1
+
+pipeline PIPELINE0 table 1 rule add match array 0 action fwd port 0 encap ether a0:a1:a2:a3:a4:a5 00:01:02:03:04:05
+pipeline PIPELINE0 table 1 rule add match array 1 action fwd port 1 encap ether b0:b1:b2:b3:b4:b5 10:11:12:13:14:15
+pipeline PIPELINE0 table 1 rule add match array 2 action fwd port 2 encap ether c0:c1:c2:c3:c4:c5 20:21:22:23:24:25
+pipeline PIPELINE0 table 1 rule add match array 3 action fwd port 3 encap ether d0:d1:d2:d3:d4:d5 30:31:32:33:34:35
--
2.9.3
^ permalink raw reply [flat|nested] 6+ messages in thread
* [dpdk-dev] [PATCH v2 1/2] ip_pipleine: fix load balance table action
2018-03-30 14:15 [dpdk-dev] [PATCH 1/2] ip_pipleine: fix load balance table action Jasvinder Singh
2018-03-30 14:15 ` [dpdk-dev] [PATCH 2/2] ip_pipeline: add ecmp route example Jasvinder Singh
@ 2018-03-30 14:31 ` Jasvinder Singh
2018-03-30 14:31 ` [dpdk-dev] [PATCH v2 2/2] ip_pipeline: add ecmp route example Jasvinder Singh
2018-03-30 15:38 ` [dpdk-dev] [PATCH v2 1/2] ip_pipleine: fix load balance table action Dumitrescu, Cristian
1 sibling, 2 replies; 6+ messages in thread
From: Jasvinder Singh @ 2018-03-30 14:31 UTC (permalink / raw)
To: dev; +Cc: cristian.dumitrescu
Fix bug in load balance action for pipeline table.
Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
---
examples/ip_pipeline/action.c | 42 ++++++++++++++++++++++++++++++++++++++++++
examples/ip_pipeline/cli.c | 9 ++++-----
2 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/examples/ip_pipeline/action.c b/examples/ip_pipeline/action.c
index 2cedb24..77a04fe 100644
--- a/examples/ip_pipeline/action.c
+++ b/examples/ip_pipeline/action.c
@@ -186,6 +186,48 @@ table_action_profile_create(const char *name,
((params->action_mask & (1LLU << RTE_TABLE_ACTION_FWD)) == 0))
return NULL;
+ if ((params->action_mask & (1LLU << RTE_TABLE_ACTION_LB)) &&
+ (params->lb.f_hash == NULL)) {
+ switch (params->lb.key_size) {
+ case 8:
+ params->lb.f_hash = hash_default_key8;
+ break;
+
+ case 16:
+ params->lb.f_hash = hash_default_key16;
+ break;
+
+ case 24:
+ params->lb.f_hash = hash_default_key24;
+ break;
+
+ case 32:
+ params->lb.f_hash = hash_default_key32;
+ break;
+
+ case 40:
+ params->lb.f_hash = hash_default_key40;
+ break;
+
+ case 48:
+ params->lb.f_hash = hash_default_key48;
+ break;
+
+ case 56:
+ params->lb.f_hash = hash_default_key56;
+ break;
+
+ case 64:
+ params->lb.f_hash = hash_default_key64;
+ break;
+
+ default:
+ return NULL;
+ }
+
+ params->lb.seed = 0;
+ }
+
/* Resource */
ap = rte_table_action_profile_create(¶ms->common);
if (ap == NULL)
diff --git a/examples/ip_pipeline/cli.c b/examples/ip_pipeline/cli.c
index 433f644..357d0ae 100644
--- a/examples/ip_pipeline/cli.c
+++ b/examples/ip_pipeline/cli.c
@@ -2314,8 +2314,7 @@ cmd_pipeline_table_stats(char **tokens,
* priority <priority>
* ipv4 | ipv6 <sa> <sa_depth> <da> <da_depth>
* <sp0> <sp1> <dp0> <dp1> <proto>
- * | array
- * pos
+ * | array <pos>
* | hash
* raw <key>
* | ipv4_5tuple <sa> <da> <sp> <dp> <proto>
@@ -2845,15 +2844,15 @@ parse_table_action_balance(char **tokens,
tokens++;
n_tokens--;
- if (n_tokens < RTE_TABLE_ACTION_LB_KEY_SIZE_MAX)
+ if (n_tokens < RTE_TABLE_ACTION_LB_TABLE_SIZE)
return 0;
- for (i = 0; i < RTE_TABLE_ACTION_LB_KEY_SIZE_MAX; i++)
+ for (i = 0; i < RTE_TABLE_ACTION_LB_TABLE_SIZE; i++)
if (parser_read_uint32(&a->lb.out[i], tokens[i]) != 0)
return 0;
a->action_mask |= 1 << RTE_TABLE_ACTION_LB;
- return 1 + RTE_TABLE_ACTION_LB_KEY_SIZE_MAX;
+ return 1 + RTE_TABLE_ACTION_LB_TABLE_SIZE;
}
--
2.9.3
^ permalink raw reply [flat|nested] 6+ messages in thread
* [dpdk-dev] [PATCH v2 2/2] ip_pipeline: add ecmp route example
2018-03-30 14:31 ` [dpdk-dev] [PATCH v2 1/2] ip_pipleine: fix load balance table action Jasvinder Singh
@ 2018-03-30 14:31 ` Jasvinder Singh
2018-03-30 15:38 ` Dumitrescu, Cristian
2018-03-30 15:38 ` [dpdk-dev] [PATCH v2 1/2] ip_pipleine: fix load balance table action Dumitrescu, Cristian
1 sibling, 1 reply; 6+ messages in thread
From: Jasvinder Singh @ 2018-03-30 14:31 UTC (permalink / raw)
To: dev; +Cc: cristian.dumitrescu
Add example to build pipeline to demonstrate equal-cost multi-path
routing example.
Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
---
v2:
- fix checkpatch warnings on file permission.
examples/ip_pipeline/examples/route_ecmp.cli | 57 ++++++++++++++++++++++++++++
1 file changed, 57 insertions(+)
create mode 100644 examples/ip_pipeline/examples/route_ecmp.cli
diff --git a/examples/ip_pipeline/examples/route_ecmp.cli b/examples/ip_pipeline/examples/route_ecmp.cli
new file mode 100644
index 0000000..06434a2
--- /dev/null
+++ b/examples/ip_pipeline/examples/route_ecmp.cli
@@ -0,0 +1,57 @@
+; SPDX-License-Identifier: BSD-3-Clause
+; Copyright(c) 2010-2018 Intel Corporation
+
+; Equal Cost Multi-Path (ECMP) Routing
+;
+; Input packet: Ethernet/IPv4
+;
+; Packet buffer layout:
+; # Field Name Offset (Bytes) Size (Bytes)
+; 0 Mbuf 0 128
+; 1 Headroom 128 128
+; 2 Ethernet header 256 14
+; 3 IPv4 header 270 20
+
+mempool MEMPOOL0 buffer 2304 pool 32K cache 256 cpu 0
+
+link LINK0 dev 0000:02:00.0 rxq 1 128 MEMPOOL0 txq 1 512 promiscuous on
+link LINK1 dev 0000:02:00.1 rxq 1 128 MEMPOOL0 txq 1 512 promiscuous on
+link LINK2 dev 0000:06:00.0 rxq 1 128 MEMPOOL0 txq 1 512 promiscuous on
+link LINK3 dev 0000:06:00.1 rxq 1 128 MEMPOOL0 txq 1 512 promiscuous on
+
+table action profile APRT ipv4 offset 270 fwd balance offset 278 mask 00FF0000FFFFFFFFFFFFFFFFFFFFFFFF outoffset 256
+table action profile APNH ipv4 offset 270 fwd encap ether
+
+pipeline PIPELINE0 period 10 offset_port_id 0 cpu 0
+
+pipeline PIPELINE0 port in bsz 32 link LINK0 rxq 0
+pipeline PIPELINE0 port in bsz 32 link LINK1 rxq 0
+pipeline PIPELINE0 port in bsz 32 link LINK2 rxq 0
+pipeline PIPELINE0 port in bsz 32 link LINK3 rxq 0
+
+pipeline PIPELINE0 port out bsz 32 link LINK0 txq 0
+pipeline PIPELINE0 port out bsz 32 link LINK1 txq 0
+pipeline PIPELINE0 port out bsz 32 link LINK2 txq 0
+pipeline PIPELINE0 port out bsz 32 link LINK3 txq 0
+pipeline PIPELINE0 port out bsz 32 sink
+
+pipeline PIPELINE0 table match lpm ipv4 offset 286 size 4K action APRT
+pipeline PIPELINE0 table match array offset 256 size 64K action APNH
+
+pipeline PIPELINE0 port in 0 table 0
+pipeline PIPELINE0 port in 1 table 0
+pipeline PIPELINE0 port in 2 table 0
+pipeline PIPELINE0 port in 3 table 0
+
+thread 1 pipeline PIPELINE0 enable
+
+pipeline PIPELINE0 table 0 rule add match default action fwd port 4
+pipeline PIPELINE0 table 0 rule add match lpm ipv4 100.0.0.0 10 action fwd table 1 balance 0 0 0 0 1 1 2 2
+pipeline PIPELINE0 table 0 rule add match lpm ipv4 100.64.0.0 10 action fwd table 1 balance 1 1 1 1 2 2 3 3
+pipeline PIPELINE0 table 0 rule add match lpm ipv4 100.128.0.0 10 action fwd table 1 balance 2 2 2 2 3 3 0 0
+pipeline PIPELINE0 table 0 rule add match lpm ipv4 100.192.0.0 10 action fwd table 1 balance 3 3 3 3 0 0 1 1
+
+pipeline PIPELINE0 table 1 rule add match array 0 action fwd port 0 encap ether a0:a1:a2:a3:a4:a5 00:01:02:03:04:05
+pipeline PIPELINE0 table 1 rule add match array 1 action fwd port 1 encap ether b0:b1:b2:b3:b4:b5 10:11:12:13:14:15
+pipeline PIPELINE0 table 1 rule add match array 2 action fwd port 2 encap ether c0:c1:c2:c3:c4:c5 20:21:22:23:24:25
+pipeline PIPELINE0 table 1 rule add match array 3 action fwd port 3 encap ether d0:d1:d2:d3:d4:d5 30:31:32:33:34:35
--
2.9.3
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [PATCH v2 1/2] ip_pipleine: fix load balance table action
2018-03-30 14:31 ` [dpdk-dev] [PATCH v2 1/2] ip_pipleine: fix load balance table action Jasvinder Singh
2018-03-30 14:31 ` [dpdk-dev] [PATCH v2 2/2] ip_pipeline: add ecmp route example Jasvinder Singh
@ 2018-03-30 15:38 ` Dumitrescu, Cristian
1 sibling, 0 replies; 6+ messages in thread
From: Dumitrescu, Cristian @ 2018-03-30 15:38 UTC (permalink / raw)
To: Singh, Jasvinder, dev
> -----Original Message-----
> From: Singh, Jasvinder
> Sent: Friday, March 30, 2018 3:31 PM
> To: dev@dpdk.org
> Cc: Dumitrescu, Cristian <cristian.dumitrescu@intel.com>
> Subject: [PATCH v2 1/2] ip_pipleine: fix load balance table action
>
> Fix bug in load balance action for pipeline table.
>
> Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
> Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
> ---
Fix applied to next-pipeline tree, thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [PATCH v2 2/2] ip_pipeline: add ecmp route example
2018-03-30 14:31 ` [dpdk-dev] [PATCH v2 2/2] ip_pipeline: add ecmp route example Jasvinder Singh
@ 2018-03-30 15:38 ` Dumitrescu, Cristian
0 siblings, 0 replies; 6+ messages in thread
From: Dumitrescu, Cristian @ 2018-03-30 15:38 UTC (permalink / raw)
To: Singh, Jasvinder, dev
> -----Original Message-----
> From: Singh, Jasvinder
> Sent: Friday, March 30, 2018 3:31 PM
> To: dev@dpdk.org
> Cc: Dumitrescu, Cristian <cristian.dumitrescu@intel.com>
> Subject: [PATCH v2 2/2] ip_pipeline: add ecmp route example
>
> Add example to build pipeline to demonstrate equal-cost multi-path
> routing example.
>
> Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
> Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
> ---
> v2:
> - fix checkpatch warnings on file permission.
>
Applied to next-pipeline tree, thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-03-30 15:38 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-30 14:15 [dpdk-dev] [PATCH 1/2] ip_pipleine: fix load balance table action Jasvinder Singh
2018-03-30 14:15 ` [dpdk-dev] [PATCH 2/2] ip_pipeline: add ecmp route example Jasvinder Singh
2018-03-30 14:31 ` [dpdk-dev] [PATCH v2 1/2] ip_pipleine: fix load balance table action Jasvinder Singh
2018-03-30 14:31 ` [dpdk-dev] [PATCH v2 2/2] ip_pipeline: add ecmp route example Jasvinder Singh
2018-03-30 15:38 ` Dumitrescu, Cristian
2018-03-30 15:38 ` [dpdk-dev] [PATCH v2 1/2] ip_pipleine: fix load balance table action Dumitrescu, Cristian
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).