summaryrefslogtreecommitdiffstats
path: root/src/vnet/dpo
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2017-02-23 17:11:26 -0500
committerDave Barach <openvpp@barachs.net>2017-02-24 12:17:01 +0000
commit26cd8c129567b48ed0e3610293251ca78fa67103 (patch)
tree627830df91fa440ebbf4635a72848f80d1c85de9 /src/vnet/dpo
parent02767e9f2eaf7ccfc4079f83d467ad2d3faee203 (diff)
VPP-650: handle buffer failure in vlib_buffer_copy(...)
Change-Id: I6aac48d780fcd935818221044eae50067f225175 Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'src/vnet/dpo')
-rw-r--r--src/vnet/dpo/replicate_dpo.c32
1 files changed, 31 insertions, 1 deletions
diff --git a/src/vnet/dpo/replicate_dpo.c b/src/vnet/dpo/replicate_dpo.c
index c779516f..a67b19c8 100644
--- a/src/vnet/dpo/replicate_dpo.c
+++ b/src/vnet/dpo/replicate_dpo.c
@@ -34,6 +34,21 @@
#define REP_DBG(_p, _fmt, _args...)
#endif
+#define foreach_replicate_dpo_error \
+_(BUFFER_ALLOCATION_FAILURE, "Buffer Allocation Failure")
+
+typedef enum {
+#define _(sym,str) REPLICATE_DPO_ERROR_##sym,
+ foreach_replicate_dpo_error
+#undef _
+ REPLICATE_DPO_N_ERROR,
+} replicate_dpo_error_t;
+
+static char * replicate_dpo_error_strings[] = {
+#define _(sym,string) string,
+ foreach_replicate_dpo_error
+#undef _
+};
/**
* Pool of all DPOs. It's not static so the DP can have fast access
@@ -678,8 +693,17 @@ replicate_inline (vlib_main_t * vm,
vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
}
- /* Make a copy */
+ /* Make a copy. This can fail, so deal with it. */
c0 = vlib_buffer_copy(vm, b0);
+ if (PREDICT_FALSE (c0 == 0))
+ {
+ vlib_node_increment_counter
+ (vm, node->node_index,
+ REPLICATE_DPO_ERROR_BUFFER_ALLOCATION_FAILURE,
+ 1);
+ continue;
+ }
+
ci0 = vlib_get_buffer_index(vm, c0);
to_next[0] = ci0;
@@ -738,6 +762,9 @@ VLIB_REGISTER_NODE (ip4_replicate_node) = {
.name = "ip4-replicate",
.vector_size = sizeof (u32),
+ .n_errors = ARRAY_LEN(replicate_dpo_error_strings),
+ .error_strings = replicate_dpo_error_strings,
+
.format_trace = format_replicate_trace,
.n_next_nodes = 1,
.next_nodes = {
@@ -761,6 +788,9 @@ VLIB_REGISTER_NODE (ip6_replicate_node) = {
.name = "ip6-replicate",
.vector_size = sizeof (u32),
+ .n_errors = ARRAY_LEN(replicate_dpo_error_strings),
+ .error_strings = replicate_dpo_error_strings,
+
.format_trace = format_replicate_trace,
.n_next_nodes = 1,
.next_nodes = {