vpp.git
6 years agoIP4/IP6 FIB: fix crash during interface delete 39/7139/4
Pavel Kotucek [Wed, 14 Jun 2017 11:56:55 +0000 (13:56 +0200)]
IP4/IP6 FIB: fix crash during interface delete

after deleting a sub interface with IP4/IP6 address vpp crash

Change-Id: Ie768ca845b9e2394f61e2a8e9722a80a788746e7
Signed-off-by: Pavel Kotucek <pkotucek@cisco.com>
6 years agoUpdate master revision to 17.10 86/7286/1
Neale Ranns [Thu, 22 Jun 2017 21:43:55 +0000 (14:43 -0700)]
Update master revision to 17.10

Change-Id: I0b74cad60be4edace5c3636922cfb9c26cfde9ff
Signed-off-by: Neale Ranns <nranns@cisco.com>
6 years agoUpdate lisp map record default ttl to 24h 60/7260/2 v17.10-rc0
Florin Coras [Wed, 21 Jun 2017 23:27:01 +0000 (16:27 -0700)]
Update lisp map record default ttl to 24h

Change-Id: Ib8c72f8e08e89357b64f2f69ab70d60d3a7ec506
Signed-off-by: Florin Coras <fcoras@cisco.com>
6 years agoImprove svm fifo and tcp tx path performance (VPP-846) 93/7193/9
Florin Coras [Mon, 19 Jun 2017 16:26:09 +0000 (12:26 -0400)]
Improve svm fifo and tcp tx path performance (VPP-846)

- multiarch on svm fifo
- avoid ip lookup on tx

Change-Id: Iab0d85204a710979417bca1d692cc47877131203
Signed-off-by: Florin Coras <fcoras@cisco.com>
Signed-off-by: Dave Barach <dbarach@cisco.com>
6 years agoExport and Install GTP-U API file 97/7197/5
Hongjun Ni [Tue, 20 Jun 2017 15:09:32 +0000 (23:09 +0800)]
Export and Install GTP-U API file

Change-Id: I064d22277a0334c63f3d5072b1584b93e327b331
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
6 years agoacl-plugin: clean up the code enabling/disabling acl-plugin processing on interface 77/7277/2
Andrew Yourtchenko [Thu, 22 Jun 2017 12:51:06 +0000 (14:51 +0200)]
acl-plugin: clean up the code enabling/disabling acl-plugin processing on interface

Multiple subsequent calls to vnet_feature_enable_disable() to enable the feature
cause the feature to be inserted into the processing graph multiple times in a row.
This might be argued to be a bug in that function, but enabling already enabled feature
is suboptimal anyway, so avoid that. The existing tests already catch this issue whenever
the ASSERT() part of this patch was added.

Change-Id: Ia2c06f7dc87bbe05795c2c7b7d19ea06270ce150
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
6 years agoUpdate CSIT tests 170612 -> 170622 62/7262/2
Jan Gelety [Thu, 22 Jun 2017 06:06:53 +0000 (08:06 +0200)]
Update CSIT tests 170612 -> 170622

- update of CSIT operational branch to be used for VPP-patch test

Change-Id: I5645ebfaa32599797e4edf83b2281270ea4a8376
Signed-off-by: Jan Gelety <jgelety@cisco.com>
6 years agoNAT64: documentation 70/7270/1
Matus Fabian [Thu, 22 Jun 2017 10:03:53 +0000 (03:03 -0700)]
NAT64: documentation

added CLI command documentation
added NAT64 user documentation page

Change-Id: I3df400013800fe16351e02db7762ee3f92b195ff
Signed-off-by: Matus Fabian <matfabia@cisco.com>
6 years agoVNET:explicitly pad l2_classify 52/7252/3
Eyal Bari [Wed, 21 Jun 2017 12:32:13 +0000 (15:32 +0300)]
VNET:explicitly pad l2_classify

Change-Id: I77412aa8c17b45b1533604e7bfe8fe052ed0f80a
Signed-off-by: Eyal Bari <ebari@cisco.com>
6 years agoIntroduce default rx mode for device drivers 49/7249/5
Damjan Marion [Wed, 21 Jun 2017 12:29:44 +0000 (14:29 +0200)]
Introduce default rx mode for device drivers

If interface is down and queues are not configured then we are not able
to change rx-mode. This change introducess default mode which is stored
per interface and applied if driver wants.

Change-Id: I70149c21c1530eafc148d5e4aa03fbee53dec62f
Signed-off-by: Damjan Marion <damarion@cisco.com>
6 years agoacl-plugin: the second and subsequent ACEs incorrect endianness when custom-dump... 25/7225/2
Andrew Yourtchenko [Tue, 20 Jun 2017 11:54:57 +0000 (13:54 +0200)]
acl-plugin: the second and subsequent ACEs incorrect endianness when custom-dump and in VAT (VPP-885)

Add the missing function to convert the entire array of rules in the respective _endian functions,
rather than just the first rule.

Change-Id: Ic057f27ff7ec20150595efca1a48b74e5850f52b
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
6 years agoacl-plugin: CLI to clear all sessions 42/7242/3
Andrew Yourtchenko [Wed, 21 Jun 2017 09:24:25 +0000 (11:24 +0200)]
acl-plugin: CLI to clear all sessions

It is useful to have the CLI to clear the existing sessions.
There was a work-in-progress CLI but it did not work properly.
Fix it and split into a separate "clear acl-plugin sessions",
and add a unit test into the extended connection-oriented tests.

Change-Id: I55889165ebcee139841fdac88747390903a05394
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
6 years agoacl-plugin: use ethernet_buffer_header_size() to determine the size of the ethernet... 45/7245/2
Andrew Yourtchenko [Wed, 21 Jun 2017 10:20:39 +0000 (12:20 +0200)]
acl-plugin: use ethernet_buffer_header_size() to determine the size of the ethernet header

When extracting the 5-tuple, use the ethernet_buffer_header_size() so we can correctly
handle the case of subinterfaces, etc.

Change-Id: Ied73fde98d6b313e9eeab2aff4f22daa50a6cbbf
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
6 years agoacl-plugin: fix coverity issue 170476 59/7259/2
Andrew Yourtchenko [Wed, 21 Jun 2017 17:34:02 +0000 (19:34 +0200)]
acl-plugin: fix coverity issue 170476

Remove the unnecessary variable assignment which coverity detected.

Change-Id: I66ac20a8495400ac59192ddb72f16c95f6b4d03c
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
6 years agoacl-plugin: fix coverity issue 166801 58/7258/1
Andrew Yourtchenko [Wed, 21 Jun 2017 17:26:59 +0000 (19:26 +0200)]
acl-plugin: fix coverity issue 166801

A typo resulted in a value being overwritten and flagged as unused, fix the typo.

Change-Id: I512ba94321afb80d12c71ebbb0eec42d9fa6f299
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
6 years agoNAT64: custom prefix 55/7255/2
Matus Fabian [Wed, 21 Jun 2017 13:15:18 +0000 (06:15 -0700)]
NAT64: custom prefix

Change-Id: If397b49861468eed29b964fa64b186f80eb0eceb
Signed-off-by: Matus Fabian <matfabia@cisco.com>
6 years agomemif: minor changes in memif.h 53/7253/3
Damjan Marion [Wed, 21 Jun 2017 12:54:52 +0000 (14:54 +0200)]
memif: minor changes in memif.h

Change-Id: Iff550fd65f6e559b9fdfbbd53ef92d287c18166c
Signed-off-by: Damjan Marion <damarion@cisco.com>
6 years agoAdd option to create clib_socket with group write permissions 44/7244/2
Damjan Marion [Wed, 21 Jun 2017 10:01:37 +0000 (12:01 +0200)]
Add option to create clib_socket with group write permissions

Also allow group write as default for CLI socket connections.

Change-Id: I6af1f277f70581358cd9241bf0f5cb0752fe250f
Signed-off-by: Damjan Marion <damarion@cisco.com>
6 years agoAdd knob to specify effective group id (gid) for VPP process 43/7243/2
Damjan Marion [Wed, 21 Jun 2017 09:57:07 +0000 (11:57 +0200)]
Add knob to specify effective group id (gid) for VPP process

Change-Id: Icf9bd4abda058fb380f1a25d5fe3917ffb38b1c4
Signed-off-by: Damjan Marion <damarion@cisco.com>
6 years agoARP: ignore non-connected routes and non-interface sources when determing if source... 44/7144/5
Neale Ranns [Wed, 14 Jun 2017 13:50:08 +0000 (06:50 -0700)]
ARP: ignore non-connected routes and non-interface sources when determing if source is connected

Change-Id: I39fb0ec44cc322eaa12c0ff0700fc405d3982bfc
Signed-off-by: Neale Ranns <nranns@cisco.com>
6 years agoacl-plugin: fix coverity error 171135 29/7229/2
Andrew Yourtchenko [Tue, 20 Jun 2017 13:13:12 +0000 (15:13 +0200)]
acl-plugin: fix coverity error 171135

The code path which sets the sw_if_index aimed to restrict the output
did not set the flag to trigger that output.

Change-Id: I0a1a3977fdddbce9a276960df43fed745d099ca0
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
6 years agoacl-plugin: vat: acl_interface_list_dump confusing/incorrect output in case n_input... 27/7227/2
Andrew Yourtchenko [Tue, 20 Jun 2017 12:40:44 +0000 (14:40 +0200)]
acl-plugin: vat: acl_interface_list_dump confusing/incorrect output in case n_input == 0

The logic to print the line " output " is wrong for the case of n_input == 0,
and the applied ACLs are printed as if they were applied on input.
One may still figure out the truth by looking at the n_input value above,
but it is confusing.

Change-Id: I7b4a4d548e569994678dd1e139eb829456548b88
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
6 years agoL2-VTR: add vtr tests 23/7023/6
Eyal Bari [Tue, 6 Jun 2017 11:18:55 +0000 (14:18 +0300)]
L2-VTR: add vtr tests

re-enable l2 fib flush tests
reorder l2bd multi instance tests - move flags test as last
enabling of uu-flood will now flood when entry is stale

Change-Id: I052663ec3eb4acee5f296fb7525dd535924e0003
Signed-off-by: Eyal Bari <ebari@cisco.com>
6 years agovlib: make runtime_data handling thread-local 71/7171/7
Igor Mikhailov (imichail) [Fri, 16 Jun 2017 03:47:48 +0000 (20:47 -0700)]
vlib: make runtime_data handling thread-local

Change-Id: Ic2f2dc234199a5f882846880cbacff20fc8d477b
Signed-off-by: Igor Mikhailov (imichail) <imichail@cisco.com>
6 years agoParenthesize the usage of the macro argument within vec_search() macro definition 17/7217/2
Andrew Yourtchenko [Tue, 20 Jun 2017 10:26:23 +0000 (12:26 +0200)]
Parenthesize the usage of the macro argument within vec_search() macro definition

Change-Id: I488d7c2b864c0e3661c8abf0363e4b97984d4974
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
6 years agoSNAT: unknow protocol hairpinning fix 00/7200/2
Matus Fabian [Tue, 20 Jun 2017 08:45:49 +0000 (01:45 -0700)]
SNAT: unknow protocol hairpinning fix

Change-Id: I15813167e7c8529f229143de4a8f64f0fb530951
Signed-off-by: Matus Fabian <matfabia@cisco.com>
6 years agoVPP-879 MAP: s/u32 is_add/u8 is_add in map.api 38/7138/3
Ole Troan [Wed, 14 Jun 2017 11:12:33 +0000 (13:12 +0200)]
VPP-879 MAP: s/u32 is_add/u8 is_add in map.api

Change-Id: If35171005e409f77bed4cc16eccb66a85aae5dfb
Signed-off-by: Ole Troan <ot@cisco.com>
6 years agoL2FWD:fix seq_num overwritten + validate l2fib entries when forwarding 36/7136/6
Eyal Bari [Wed, 14 Jun 2017 10:11:20 +0000 (13:11 +0300)]
L2FWD:fix seq_num overwritten + validate l2fib entries when forwarding

l2_classify memeber table_index was overlaid over l2.l2fib_seq_num
which over written when table_index gets initialized in l2_input_classify

solved by overlaying both table_index and opaque_index as only one is used

seperated l2fib seq num from l2_input configs
for better handling of theoretical ABA issue where an entry for a deleted
interface is considered valid by the ager because a different interface with
same sw_if_index and seq_num was created before the ager got a chance to delete

Change-Id: I7b0eeded971627406f1c80834d7e02c0ebe62136
Signed-off-by: Eyal Bari <ebari@cisco.com>
6 years agoNAT64: change not supported multi threading behaviour 88/7188/2
Matus Fabian [Mon, 19 Jun 2017 12:28:27 +0000 (05:28 -0700)]
NAT64: change not supported multi threading behaviour

Disable CLI/API commands instead of error message on startup.

Change-Id: I313ed6e2ea009f573afb5e08b0e85ed1f9091dc3
Signed-off-by: Matus Fabian <matfabia@cisco.com>
6 years agomemif: add ip mode 29/7129/7
Damjan Marion [Fri, 16 Jun 2017 20:06:00 +0000 (22:06 +0200)]
memif: add ip mode

In IP mode memif interface is L3 point-to-point interfaces and
we don't pass l2 header. There is no l2 header rewrite operation and
received packets are sent straight to ip4-input / ip6-input nodes.

Change-Id: I4177f3fce3004da7ecf14d235006ae053fcf3f09
Signed-off-by: Damjan Marion <damarion@cisco.com>
6 years agoOverall tcp performance improvements (VPP-846) 93/7093/19
Florin Coras [Sat, 10 Jun 2017 04:07:32 +0000 (21:07 -0700)]
Overall tcp performance improvements (VPP-846)

- limit minimum rto per connection
- cleanup sack scoreboard
- switched svm fifo out-of-order data handling from absolute offsets to
  relative offsets.
- improve cwnd handling when using sacks
- add cc event debug stats
- improved uri tcp test client/server:  bugfixes and added half-duplex mode
- expanded builtin client/server
- updated uri socket client/server code to work in half-duplex
- ensure session node unsets fifo event for empty fifo
- fix session detach

Change-Id: Ia446972340e32a65e0694ee2844355167d0c170d
Signed-off-by: Florin Coras <fcoras@cisco.com>
6 years agoSNAT: NAT packet with unknown L4 protocol if match 1:1 NAT 87/7187/2
Matus Fabian [Mon, 19 Jun 2017 11:28:04 +0000 (04:28 -0700)]
SNAT: NAT packet with unknown L4 protocol if match 1:1 NAT

Change-Id: Ic81c6098d615fdb6a874e532921efd833fed872c
Signed-off-by: Matus Fabian <matfabia@cisco.com>
6 years agoacl-plugin: bihash-based ACL lookup 58/6858/18
Andrew Yourtchenko [Wed, 24 May 2017 11:20:47 +0000 (13:20 +0200)]
acl-plugin: bihash-based ACL lookup

Add a bihash-based ACL lookup mechanism and make it a new default.
This changes the time required to lookup a 5-tuple match
from O(total_N_entries) to O(total_N_mask_types), where
"mask type" is an overall mask on the 5-tuple required
to represent an ACE.

For testing/comparison there is a temporary debug CLI
"set acl-plugin use-hash-acl-matching {0|1}", which,
when set to 0, makes the plugin use the "old" linear lookup,
and when set to 1, makes it use the hash-based lookup.

Based on the discussions on vpp-dev mailing list,
prevent assigning the ACL index to an interface,
when the ACL with that index is not defined,
also prevent deleting an ACL if that ACL is applied.

Also, for the easier debugging of the state, there are
new debug CLI commands to see the ACL plugin state at
several layers:

"show acl-plugin acl [index N]" - show a high-level
ACL representation, used for the linear lookup and
as a base for building the hashtable-based lookup.
Also shows if a given ACL is applied somewhere.

"show acl-plugin interface [sw_if_index N]" - show
which interfaces have which ACL(s) applied.

"show acl-plugin tables" - a lower-level debug command
used to see the state of all of the related data structures
at once. There are specifiers possible, which make
for a more focused and maybe augmented output:

"show acl-plugin tables acl [index N]"
show the "bitmask-ready" representations of the ACLs,
we well as the mask types and their associated indices.

"show acl-plutin tables mask"
show the derived mask types and their indices only.

"show acl-plugin tables applied [sw_if_index N]"
show the table of all of the ACEs applied for a given
sw_if_index or all interfaces.

"show acl-plugin tables hash [verbose N]"
show the 48x8 bihash used for the ACL lookup.

Change-Id: I89fff051424cb44bcb189e3cee04c1b8f76efc28
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
6 years agoNAT64: Hairpinning (VPP-699) 62/7162/3
Matus Fabian [Thu, 15 Jun 2017 09:28:50 +0000 (02:28 -0700)]
NAT64: Hairpinning (VPP-699)

Change-Id: I83a6c277fa211ac2c2ca2d603650c992886af0a7
Signed-off-by: Matus Fabian <matfabia@cisco.com>
6 years agoFix map-notify processing with multiple workers 67/7167/2
Florin Coras [Thu, 15 Jun 2017 21:33:48 +0000 (14:33 -0700)]
Fix map-notify processing with multiple workers

Change-Id: Id160346ebf533ee5f55bd735803624a75ed997b9
Signed-off-by: Florin Coras <fcoras@cisco.com>
6 years agomemif: show memif CLI enhancement 69/7169/5
Steven [Thu, 15 Jun 2017 22:32:24 +0000 (15:32 -0700)]
memif: show memif CLI enhancement

Add optional keywords to show memif to allow display a particular
interface and option to display the descriptor tables. The new syntax for
the show memif command is now
  show memif [<interface>] [descriptors]

Change-Id: I20696bbea1142bdc152b6e351c6ece24b1cf5500
Signed-off-by: Steven <sluong@cisco.com>
6 years agomemif: jumbo frames support 71/7071/6
Steven [Thu, 8 Jun 2017 19:52:29 +0000 (12:52 -0700)]
memif: jumbo frames support

Current memif interface supports frame size up to 2048. This patch is to
enhance memif to support jumbo frames.

On tx (writing buffers to the ring), keep reading the next buffer in vlib
when the flag VLIB_BUFFER_NEXT_PRESENT and merge it to the same ring entry.
Use descriptor chaining if the buffer is not big enough.

On rx (reading buffers from the ring), if the packet is greater than 2048,
create multiple vlib buffers, chained with the VLIB_BUFFER_NEXT_PRESENT.

Testing:
Because the ping command provided by VPP does not support jumbo frames,
I have to use linux ping. Here is the set up that I use for testing.

VM1 --- vhost ---- VPP1 --- memif --- VPP2 --- vhost --- VM2

Create vhost-user interfaces between VM1 and VPP1 and between VPP2 and VM2

VM configuration:
Set the interface mtu on the VM, e.g 9216 to support jumbo frames.
create static route and static arp on VM1 to VM2 and vice versa.
Use iperf3 or ping -s 8000 from VM1 to VM2 or vice versa.

Sample run
sluong@ubuntu:~$ ping 131.1.1.1 -c1 -s 8000
ping 131.1.1.1 -c1 -s 8000
PING 131.1.1.1 (131.1.1.1) 8000(8028) bytes of data.
8008 bytes from 131.1.1.1: icmp_seq=1 ttl=62 time=0.835 ms

--- 131.1.1.1 ping statistics ---
1 packets transmitted, 1 received, 0% packet loss, time 0ms
rtt min/avg/max/mdev = 0.835/0.835/0.835/0.000 ms
sluong@ubuntu:~$

DBGvpp# sh interface memif0
              Name               Idx       State          Counter          Count
memif0                            1         up       rx packets                     1
                                                     rx bytes                    8042
                                                     tx packets                     1
                                                     tx bytes                    8042
                                                     ip4                            1
DBGvpp#

Change-Id: I469bece3d45a790dceaee1d6a8e976bd018feee2
Signed-off-by: Steven <sluong@cisco.com>
6 years agoLISP-GPE: add test CLI for NSH 17/7117/4
Filip Tehlar [Mon, 12 Jun 2017 11:36:02 +0000 (13:36 +0200)]
LISP-GPE: add test CLI for NSH

Change-Id: I9999474c1a4b744f5d5880ee99a0293c576f2819
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
6 years agoAdd missing barrier sync to rx placement infra code 66/7166/2
Damjan Marion [Thu, 15 Jun 2017 17:01:31 +0000 (19:01 +0200)]
Add missing barrier sync to rx placement infra code

Change-Id: I25ccf8260dbe7e1550aee3904a688fc135ce1f03
Signed-off-by: Damjan Marion <damarion@cisco.com>
6 years agoFix vni/dp_table endianness for gpe iface addition (VPP-882) 68/7168/4
Florin Coras [Thu, 15 Jun 2017 22:07:32 +0000 (15:07 -0700)]
Fix vni/dp_table endianness for gpe iface addition (VPP-882)

Change-Id: I2b78dad740b67fc05b0e2cf9c180809bc0962cd5
Signed-off-by: Florin Coras <fcoras@cisco.com>
6 years agoFix gpe_native_fwd_rpaths_get (VPP-883) 70/7170/2
Florin Coras [Thu, 15 Jun 2017 22:44:14 +0000 (15:44 -0700)]
Fix gpe_native_fwd_rpaths_get (VPP-883)

Change-Id: Iab2aa5fd92b9e95049f55fce4177e236a482723c
Signed-off-by: Florin Coras <fcoras@cisco.com>
6 years agoAdd maintainer for GTPU Plugin 33/7133/6
Hongjun Ni [Wed, 14 Jun 2017 10:38:26 +0000 (18:38 +0800)]
Add maintainer for GTPU Plugin

Change-Id: Ic8cecdee7ae74a6b816e0a02985c456fd3ec8d8f
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
6 years agoAdd VAT handlers for LISP-GPE API 42/7142/4
Filip Tehlar [Wed, 14 Jun 2017 12:39:42 +0000 (14:39 +0200)]
Add VAT handlers for LISP-GPE API

Change-Id: Id1139533c41cabef48394b5d79750608e0b74179
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
6 years agoacl-plugin: store sessions in a single hash table instead of a per-interface 70/7070/3
Andrew Yourtchenko [Thu, 8 Jun 2017 18:03:35 +0000 (20:03 +0200)]
acl-plugin: store sessions in a single hash table instead of a per-interface

A bihash-per-interface is convenient, but turns out tricky difficult from
the maintenance standpoint with the large number of interfaces.
This patch makes the sessions reside in a single hash table for all the interfaces,
adding the lower 16 bit of sw_if_index as part of the key into the previously
unused space.

There is a tradeoff, that a session with an identical 5-tuple and the same
sw_if_index modulo 65536 will match on either of the interfaces.
The probability of that is deemed sufficiently small to not worry about it.
In case it still happens before the heat death of the universe,
there is a clib_warning and the colliding packet will be dropped,
at which point we will need to bump the hash key size by another u64,
but rather not pay the cost of doing that right now.

Change-Id: I2747839cfcceda73e597cbcafbe1e377fb8f1889
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
6 years agoFix session api connect sock handler. 47/7147/2
Dave Wallace [Wed, 14 Jun 2017 16:38:28 +0000 (12:38 -0400)]
Fix session api connect sock handler.

Change-Id: I034efb9fc3ebb846c0aef07b18c1f110b8cbf3e3
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
6 years agoacl-plugin: shrink the L2 classifier tables used for traffic redirect 64/7064/2
Andrew Yourtchenko [Thu, 8 Jun 2017 16:59:24 +0000 (18:59 +0200)]
acl-plugin: shrink the L2 classifier tables used for traffic redirect

The previous iteration of the code used the L2 classifier tables for session storage,
as a result, the table allocations were pretty big. The new ACL plugin
datapath uses the tables just as a redirection mechanism, without adding any
entries. Thus, the tables can be much smaller.

Change-Id: Ieec4a5abf0abda6e513ab4e675f912f14d47e671
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
6 years agoVPP-874: fix coverity warnings in tw_timer_template.c 31/7131/2
Dave Barach [Tue, 13 Jun 2017 21:04:28 +0000 (17:04 -0400)]
VPP-874: fix coverity warnings in tw_timer_template.c

Best guess, tested carefully, should do no harm. Clang doesn't
complain either way; it's not certain that this patch will make the
coverity warnings in tw_timer_template.c disappear.

Change-Id: I75aa0cfd8970751e823a1165df2a755e947c4cf9
Signed-off-by: Dave Barach <dave@barachs.net>
6 years agoETH:fix l2_len/vlan count mismatch for > 2 tags 20/7120/2
Eyal Bari [Tue, 13 Jun 2017 09:09:37 +0000 (12:09 +0300)]
ETH:fix l2_len/vlan count mismatch for > 2 tags

l2_len was not updated for the third tag
as the ethernet node retracts by the vlan count after parse_header (using
ethernet_buffer_header_size) it ends up pointing before the ethernet header

+ some minor cleanups

Change-Id: I4ccaedd33928912e5d837376f146503b27071741
Signed-off-by: Eyal Bari <ebari@cisco.com>
6 years agoFlowprobe - tests speed-up 19/7119/2
Pavel Kotucek [Mon, 12 Jun 2017 06:26:13 +0000 (08:26 +0200)]
Flowprobe - tests speed-up

Updated test to reduce tests runtime.

Change-Id: I7904628fc19d349d6c26502e49d4c990cb8816ff
Signed-off-by: Pavel Kotucek <pkotucek@cisco.com>
6 years agoFIB walk process - wake-up rate unnecessarily high 94/7094/4
Neale Ranns [Sat, 10 Jun 2017 08:43:44 +0000 (01:43 -0700)]
FIB walk process - wake-up rate unnecessarily high

Change-Id: I7dedf283c83c7f0e0b7642f095b68bc0b40898cf
Signed-off-by: Neale Ranns <nranns@cisco.com>
6 years agoSNAT: fix 1:1 NAT without port hairpinning TCP checksum update 77/7077/4
Matus Fabian [Fri, 9 Jun 2017 09:33:30 +0000 (02:33 -0700)]
SNAT: fix 1:1 NAT without port hairpinning TCP checksum update

Change-Id: I5077fcf3671a6116b475f87e43120efc10ecaa08
Signed-off-by: Matus Fabian <matfabia@cisco.com>
6 years agomemif: fix crash during interface delete 14/7114/2
Damjan Marion [Mon, 12 Jun 2017 19:38:35 +0000 (21:38 +0200)]
memif: fix crash during interface delete

Change-Id: Ide6d26d6fcc81be6f26ac0abe2cd0d6a0838cfe6
Signed-off-by: Damjan Marion <damarion@cisco.com>
6 years agoL2FIB:fix crash in show with deleted subif entries 09/7109/3
Eyal Bari [Mon, 12 Jun 2017 14:07:22 +0000 (17:07 +0300)]
L2FIB:fix crash in show with deleted subif entries

after deleting a sub interface it's l2fib entries are left with a dangling
sw_if_index (while waiting for the ager to delete them).
changed "show l2fib" to reflect that state with "Deleted" as the interface name.

added sleep in test_l2_fib as a workaround for packets still passing after flush
will investigate...

Change-Id: Id998d7d3c6a073ef5005c5f3009e1cfb7febf7db
Signed-off-by: Eyal Bari <ebari@cisco.com>
6 years agothree-level timer wheel implementation w/ overflow vector 46/7046/10
Dave Barach [Wed, 7 Jun 2017 19:18:23 +0000 (15:18 -0400)]
three-level timer wheel implementation w/ overflow vector

prep work for s/timing_wheel/tw_timer/ in the vlib process model

Change-Id: I763f4968a8fce1764a3778b12def0afbd30086b1
Signed-off-by: Dave Barach <dave@barachs.net>
6 years agomemif: complete refactor of socket handling code 65/6965/16
Damjan Marion [Mon, 5 Jun 2017 13:37:58 +0000 (15:37 +0200)]
memif: complete refactor of socket handling code

Change-Id: I4d41def83a23f13701f1ddcea722d481e4c85cbc
Signed-off-by: Damjan Marion <damarion@cisco.com>
6 years agoFix build breakge post 6956 99/7099/1
Neale Ranns [Mon, 12 Jun 2017 13:12:26 +0000 (06:12 -0700)]
Fix build breakge post 6956

Change-Id: I0ab0e3e40b00ed5c2a34f5c23d04b596c1e9aa5f
Signed-off-by: Neale Ranns <nranns@cisco.com>
6 years agoNAT64: bug fix 97/7097/3
Matus Fabian [Mon, 12 Jun 2017 09:29:39 +0000 (02:29 -0700)]
NAT64: bug fix

ICMP to ICMPv6 error message inner UDP packet translation
delete ST entries when deleting static BIB entry

Change-Id: I2a28631ac040e20827a692331506cd8254f70916
Signed-off-by: Matus Fabian <matfabia@cisco.com>
6 years agoUpdate CSIT tests 170605 -> 170612 98/7098/2
Jan Gelety [Mon, 12 Jun 2017 10:06:51 +0000 (12:06 +0200)]
Update CSIT tests 170605 -> 170612

- update of CSIT operational branch to be used for VPP-patch test

Change-Id: I0e19f085153ca00ddb46e016cff742b42eca15a0
Signed-off-by: Jan Gelety <jgelety@cisco.com>
6 years agoRemove calls to crc_u32 and add clib_crc32c for armv8+crc 56/6956/8
Christophe Fontaine [Wed, 31 May 2017 09:27:19 +0000 (11:27 +0200)]
Remove calls to crc_u32 and add clib_crc32c for armv8+crc

crc_u32 was not defined for non x86_64 with SSE4.2 processors.

Calls to "crc_u32" are removed and replaced by either a call to
clib_crc32c or a call to clib_xxhash, as the result is not used
as a check value but as a hash.

Change-Id: I3af4d68e2e5ebd0c9b0a6090f848d043cb0f20a2
Signed-off-by: Christophe Fontaine <christophe.fontaine@enea.com>
6 years agoNAT64: coverity fix 84/7084/3
Matus Fabian [Fri, 9 Jun 2017 11:55:54 +0000 (04:55 -0700)]
NAT64: coverity fix

Change-Id: I08544b2f06f993c8a6435901232a0616d0548b94
Signed-off-by: Matus Fabian <matfabia@cisco.com>
6 years agoFix coverity issue 88/7088/2
Filip Tehlar [Fri, 9 Jun 2017 13:25:57 +0000 (15:25 +0200)]
Fix coverity issue

Change-Id: Ib62ee0eacd6c91dc4cd95835efe901079754ef42
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
6 years agoMPLS: cannot delete a path from the CLI 91/7091/3
Neale Ranns [Fri, 9 Jun 2017 19:41:00 +0000 (12:41 -0700)]
MPLS: cannot delete a path from the CLI

Change-Id: I7f85870ef99405727312a5de6839c8875c9fa1c5
Signed-off-by: Neale Ranns <nranns@cisco.com>
6 years agoFix gpe coverity issue (VPP-874) 90/7090/1
Florin Coras [Fri, 9 Jun 2017 17:22:22 +0000 (10:22 -0700)]
Fix gpe coverity issue (VPP-874)

Change-Id: I70fb60619a0a02d891276ea6c7ac277ba2b26fa3
Signed-off-by: Florin Coras <fcoras@cisco.com>
6 years agoImplement sack based tcp loss recovery (RFC 6675) 87/6887/21
Florin Coras [Thu, 25 May 2017 01:03:56 +0000 (18:03 -0700)]
Implement sack based tcp loss recovery (RFC 6675)

- refactor existing congestion control code (RFC 6582/5681). Handling of ack
  feedback now consists of: ack parsing, cc event detection, event handling,
  congestion control update
- extend sack scoreboard to support sack based retransmissions
- basic implementation of Eifel detection algorithm (RFC 3522) for
  detecting spurious retransmissions
- actually initialize the per-thread frame freelist hash tables
- increase worker stack size to 2mb
- fix session queue node out-of-buffer handling
  - ensure that the local buffer cache vec_len matches reality
  - avoid 2x spurious event requeues when short of buffers
  - count out-of-buffer events
- make the builtin server thread-safe
- fix bihash template threading issue: need to paint -1 across uninitialized
  working_copy_length vector elements (via rebase from master)

Change-Id: I646cb9f1add9a67d08f4a87badbcb117980ebfc4
Signed-off-by: Florin Coras <fcoras@cisco.com>
Signed-off-by: Dave Barach <dbarach@cisco.com>
6 years agoSample plugin: Add sample plugin documentation 87/7087/3
Ray Kinsella [Thu, 8 Jun 2017 14:54:19 +0000 (15:54 +0100)]
Sample plugin: Add sample plugin documentation

Added some user documentation to sample plugin.

Change-Id: I518910f80499307e8fcac8dcef7baaeab5ea8e35
Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
6 years agoacl-plugin: wrap a verbose debug message in the appropriate conditional 76/7076/2
Andrew Yourtchenko [Fri, 9 Jun 2017 09:06:11 +0000 (11:06 +0200)]
acl-plugin: wrap a verbose debug message in the appropriate conditional

Change-Id: Ibd57cb617642e42d4c4d64f186479702b8a81900
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
6 years agodpdk: fix ipsec coverity warning 60/7060/3
Sergio Gonzalez Monroy [Thu, 8 Jun 2017 12:04:47 +0000 (13:04 +0100)]
dpdk: fix ipsec coverity warning

CID 170475

Change-Id: I9748dd56bdcb62e68d8f672e5b1619a3be400b8f
Signed-off-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
6 years agoNAT64: ICMP error support 53/7053/2
Matus Fabian [Thu, 8 Jun 2017 12:24:28 +0000 (05:24 -0700)]
NAT64: ICMP error support

Added ICMP error messages translation.
Added check for multi thread (not supported yet, so init failed).
Added API definition for custom NAT64 refix.

Change-Id: Ice2f04631af63e594aecc09087a1cf59f3b676fb
Signed-off-by: Matus Fabian <matfabia@cisco.com>
6 years agoLISP: add NSH support 58/7058/2
Filip Tehlar [Tue, 30 May 2017 05:14:46 +0000 (07:14 +0200)]
LISP: add NSH support

Change-Id: I971c110ed126f1a24a963f9d3b88cf8f8c308816
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
6 years agoacl-plugin: remove clib_warnings on plugin init 63/7063/2
Andrew Yourtchenko [Thu, 8 Jun 2017 16:42:02 +0000 (18:42 +0200)]
acl-plugin: remove clib_warnings on plugin init

Change-Id: Ic3c9a914a588824b8abd6668961f731432083c4f
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
6 years agoAdd gpe native-forward static route support 48/7048/3
Florin Coras [Thu, 8 Jun 2017 04:50:57 +0000 (21:50 -0700)]
Add gpe native-forward static route support

Change-Id: I744e7d64d94dbb302f2c1246663480f720672ee2
Signed-off-by: Florin Coras <fcoras@cisco.com>
6 years agoP2P Ethernet - API 49/7049/3
Pavel Kotucek [Thu, 8 Jun 2017 06:46:10 +0000 (08:46 +0200)]
P2P Ethernet - API

API for P2P Ethernet feature

Change-Id: Id0280f42b9ce2428262e79c4dc309595037cd10e
Signed-off-by: Pavel Kotucek <pkotucek@cisco.com>
6 years agoNAT64: Add NAT64 support for snat plugin (VPP-699) 20/7020/7
Matus Fabian [Tue, 6 Jun 2017 11:53:28 +0000 (04:53 -0700)]
NAT64: Add NAT64 support for snat plugin (VPP-699)

Basic NAT64 feature (no hairpinning, no multi-thread).

Change-Id: I392fccbce93e70c117f4a9a7ec7cf08d6c537f2d
Signed-off-by: Matus Fabian <matfabia@cisco.com>
6 years agoSmall update to session API 47/7047/1
Florin Coras [Wed, 7 Jun 2017 21:18:48 +0000 (14:18 -0700)]
Small update to session API

Change-Id: I6a566d1dc9531b790bdcb00edc73516f86daeb72
Signed-off-by: Florin Coras <fcoras@cisco.com>
6 years agomake test: improve debugability 43/7043/2
Klement Sekera [Wed, 7 Jun 2017 06:19:47 +0000 (08:19 +0200)]
make test: improve debugability

Introduce faulthandler to print stack trace to stderr on python crash.
Don't disable automatic garbage collection to decrease the chances of
running out of memory.

Change-Id: I6927a5f6ea9569735d084d4ed3d258950a400d74
Signed-off-by: Klement Sekera <ksekera@cisco.com>
6 years agoVPP-874: fix coverity warning in vnet_classify.c 41/7041/2
Dave Barach [Wed, 7 Jun 2017 12:32:51 +0000 (08:32 -0400)]
VPP-874: fix coverity warning in vnet_classify.c

Change-Id: Icffd2862eadbe9ddfb3ee34f3cb19c9324b3d9b4
Signed-off-by: Dave Barach <dave@barachs.net>
6 years agoacl-plugin: add a plugin-specific control-ping message api and make the test code... 38/6838/3
Andrew Yourtchenko [Tue, 6 Jun 2017 12:50:03 +0000 (14:50 +0200)]
acl-plugin: add a plugin-specific control-ping message api and make the test code use it

This fixes the undesirable pause in the dump commands in case there is nothing to dump.

Change-Id: I0554556c9e442038aa2a1ed8c88234f21f7fe9b9
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
6 years agoacl-plugin: make the ACL plugin multicore-capable 71/6771/9
Andrew Yourtchenko [Wed, 17 May 2017 19:27:03 +0000 (21:27 +0200)]
acl-plugin: make the ACL plugin multicore-capable

Add the logic to be able to use stateful ACLs in a multithreaded setup.

Change-Id: I3b0cfa6ca4ea8f46f61648611c3e97b00c3376b6
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
6 years agoVPP-873: fix vector expansion bug in dispatch_pending_node 39/7039/2
Dave Barach [Wed, 7 Jun 2017 12:18:49 +0000 (08:18 -0400)]
VPP-873: fix vector expansion bug in dispatch_pending_node

The main interior graph-node dispatch loop had a longstanding dangling
vector element reference:

for (i = 0; i < _vec_len (nm->pending_frames); i++)
   cpu_time_now = dispatch_pending_node (vm, nm->pending_frames + i,
                               cpu_time_now);

Passing a pointer to a vector element (nm->pending_frames + i) has
considerable comedic potential if there's any chance that the vector
could expand.

dispatch_pending_node() calls dispatch_node(), and indirectly any
interior graph node dispatch function. If that node happens to expand
nm->pending_frames by filling in a new frame, nm->pending_frames can
expand.

After calling the node dispatch function, dispatch_node() does the
following:

  nf = vec_elt_at_index (nm->next_frames, p->next_frame_index);

If nm->pending_frames expands during dispatch function execution, p is
a dangling reference to freed memory.

By luck, the TCP stack managed to allocate a fresh frame which
included "old-p," which caused p->next_frame_index to be filled with
the new-frame poison pattern 0xfefefefe.

This has been broken from day 1, summer 2007, first use of the
third-generation vector processing library.

Change-Id: Ideb6363bb060c4e8bf9b901882c318bd83853121
Signed-off-by: Dave Barach <dave@barachs.net>
6 years agoVPP-872 and End.T function for SRv6 25/7025/2
Pablo Camarillo [Tue, 6 Jun 2017 13:18:12 +0000 (15:18 +0200)]
VPP-872 and End.T function for SRv6

Fixes VPP-872 and adds support for End.T

Change-Id: I3c32cb6e412f37babe1abd293c0b6b49367fc2a9
Signed-off-by: Pablo Camarillo <pcamaril@cisco.com>
6 years agoacl-plugin: fix coverity error in acl_test.c 37/7037/2
Andrew Yourtchenko [Wed, 7 Jun 2017 10:30:48 +0000 (12:30 +0200)]
acl-plugin: fix coverity error in acl_test.c

Attempting to supply within a VAT CLI to add the ACLs a rule count
override with no rules to add would result in null pointer dereference
as we attempt to copy those rules to the message.
Add the check to avoid copy if the source pointer is null
(i.e. if there are no rules to copy from).
This commit fixes coverity errors 166797 and 166792.

Change-Id: Icabe060d961ba07dc41f63b8e17fca12ff82aa29
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
6 years agodpdk: ipsec fixes 36/7036/2
Sergio Gonzalez Monroy [Wed, 17 May 2017 10:43:41 +0000 (11:43 +0100)]
dpdk: ipsec fixes

- Fix buffer trace from esp_decrypt node
- Fix VLIB_REGISTER_NODE macro format
- Remove unnecessary code since we do not reconfigure graph
  unless requirements are met

Change-Id: Ic1c2afffb8265e40a6ced0c8a58775c05fadc9e2
Signed-off-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
6 years agodpdk: fix ipsec coverity warnings 33/7033/3
Sergio Gonzalez Monroy [Wed, 7 Jun 2017 08:13:06 +0000 (09:13 +0100)]
dpdk: fix ipsec coverity warnings

CID 161044 and 161045

Change-Id: I50a450e231e387f05e354e3b07dc777ab864d018
Signed-off-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
6 years agoAdd support for memif API to VAT. 17/7017/2
Milan Lenco [Fri, 31 Mar 2017 08:16:31 +0000 (10:16 +0200)]
Add support for memif API to VAT.

Change-Id: I01dc439fc84f9213e55ba56982eff34474637115
Signed-off-by: Milan Lenco <milan.lenco@pantheon.tech>
6 years agoFix coverity error in IP4 Mtrie. 27/7027/2
Neale Ranns [Tue, 6 Jun 2017 13:52:14 +0000 (06:52 -0700)]
Fix coverity error in IP4 Mtrie.

Change-Id: I586a758a8b4b0ea5ca030b2df2796f5acb49e154
Signed-off-by: Neale Ranns <nranns@cisco.com>
6 years agoPackets recieved on VLAN-0 map to the main interface 36/6936/7
Neale Ranns [Tue, 30 May 2017 14:30:04 +0000 (07:30 -0700)]
Packets recieved on VLAN-0 map to the main interface

Change-Id: I21b1ad39275495d4d006023b58f630a213445854
Signed-off-by: Neale Ranns <nranns@cisco.com>
6 years agoFix coverity issue 26/7026/1
Filip Tehlar [Tue, 6 Jun 2017 13:32:52 +0000 (15:32 +0200)]
Fix coverity issue

Change-Id: I5f7dc38beb96b600be67599049f951d8a17ff8da
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
6 years agoUpdate CSIT tests 170529 -> 170605 15/7015/1
Jan Gelety [Tue, 6 Jun 2017 07:41:06 +0000 (09:41 +0200)]
Update CSIT tests 170529 -> 170605

- update of CSIT operational branch to be used for VPP-patch test

Change-Id: I49396105470609422f28a49211012fcd9f252587
Signed-off-by: Jan Gelety <jgelety@cisco.com>
6 years agoRework vxlan-gpe to support FIB 2.0 and bypass mode 89/6889/10
Hongjun Ni [Sat, 27 May 2017 12:23:09 +0000 (20:23 +0800)]
Rework vxlan-gpe to support FIB 2.0 and bypass mode

Change-Id: I0324f945bdb4dd3b19151be6f3ce24a47a000104
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
6 years agoFix lisp map-notify parsing 11/7011/2
Florin Coras [Mon, 5 Jun 2017 22:38:50 +0000 (15:38 -0700)]
Fix lisp map-notify parsing

Change-Id: Ib22ffee3d8ac63af171d032c2ffcb44a2e42400c
Signed-off-by: Florin Coras <fcoras@cisco.com>
6 years agovlib: add screen-256color CLI terminal type 10/7010/2
Damjan Marion [Mon, 5 Jun 2017 19:56:12 +0000 (21:56 +0200)]
vlib: add screen-256color CLI terminal type

Change-Id: Ia78e69e5e8ed18020314aef321b94ac37037799b
Signed-off-by: Damjan Marion <damarion@cisco.com>
6 years agovlib: add unix_file_del_by_index function 09/7009/2
Damjan Marion [Mon, 5 Jun 2017 19:54:46 +0000 (21:54 +0200)]
vlib: add unix_file_del_by_index function

Change-Id: I9eca5f9d1c1ae62d5ba5fb36f2f97434dbaf334e
Signed-off-by: Damjan Marion <damarion@cisco.com>
6 years agovppinfra: fix vec_validate_init_empty_aligned macro 08/7008/2
Damjan Marion [Mon, 5 Jun 2017 19:53:39 +0000 (21:53 +0200)]
vppinfra: fix vec_validate_init_empty_aligned macro

Change-Id: Ieafd00c7d03fe5c090808c7af4aa2f86974a092e
Signed-off-by: Damjan Marion <damarion@cisco.com>
6 years agoSNAT: fix ICMP hairpinning 00/7000/2
Matus Fabian [Mon, 5 Jun 2017 12:55:48 +0000 (05:55 -0700)]
SNAT: fix ICMP hairpinning

Change-Id: I9d63133bd1db72917571ade868040c4597c896a1
Signed-off-by: Matus Fabian <matfabia@cisco.com>
6 years agoMore GCC-7 errors 05/7005/2
Marco Varlese [Mon, 5 Jun 2017 15:59:24 +0000 (17:59 +0200)]
More GCC-7 errors

The Wmaybe-uninitialized is the new error included with Wall.
This patch addresses the warning and fixes it.

Change-Id: I8fdf9ff2d236c46b717024a14874fbbbad8af303
Signed-off-by: Marco Varlese <marco.varlese@suse.com>
6 years agoLISP-GPE: return index of newly created fwd entry, VPP-868 99/6999/2
Filip Tehlar [Mon, 5 Jun 2017 11:40:13 +0000 (13:40 +0200)]
LISP-GPE: return index of newly created fwd entry, VPP-868

Change-Id: I4fc45097cb994ab6a59503d9fcfb693d1c7ec442
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
6 years agoLISP: fix GPE entry dump, VPP-871 95/6995/1
Filip Tehlar [Mon, 5 Jun 2017 07:50:38 +0000 (09:50 +0200)]
LISP: fix GPE entry dump, VPP-871

Change-Id: Ifcd6d2caecce29c8b4605d06b9df82b36a403e74
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
6 years agoFix typo for specifying table_id on ping. 92/6992/2
wenxian li [Sun, 4 Jun 2017 13:52:07 +0000 (13:52 +0000)]
Fix typo for specifying table_id on ping.

Change-Id: I76d399915c76ec68d8a401e11c14dc15c55291e4
Signed-off-by: wenxian li <wofanli@gmail.com>
6 years agoFix for gcc7 55/6955/4
Marco Varlese [Wed, 31 May 2017 12:00:37 +0000 (14:00 +0200)]
Fix for gcc7

When building VPP code with gcc7 a warning (threated as error) is encountered and the build fails.
This patch addressed the compilation issue.

Change-Id: I49af9288a84d91ec8145da07c00aefb5333ec418
Signed-off-by: Marco Varlese <marco.varlese@suse.com>
6 years agoFix mac_age process crash in multi-threaded environment 88/6988/2
Steve Shin [Fri, 2 Jun 2017 17:09:02 +0000 (10:09 -0700)]
Fix mac_age process crash in multi-threaded environment

VPP crash is observed when MAC aging is enabled with multi-threaded mode.
If a thread other-than-zero expands the working_copies vector,
working_copy_lengths should be initialized with vec_validate_init_empty(..., -1)
to fill -1 across lower-numbered working_copy_lengths vector element.

Change-Id: I60959fc6511306b33acae323df9c6898fc6c50ce
Signed-off-by: Steve Shin <jonshin@cisco.com>