From: Florin Coras <fcoras@cisco.com>
Date: Tue, 1 Sep 2020 22:25:50 +0000 (-0700)
Subject: session: fix non-blocking msg enqueue to vpp mq
X-Git-Tag: v21.01-rc0~42
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=8ccea00339a550902f76a5ec24c1dda5a5975eaf;p=vpp.git

session: fix non-blocking msg enqueue to vpp mq

Type: fix

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I7228a01d38e61cc00358419b2512ca0da4f76ff5
---

diff --git a/src/vnet/session/application_interface.h b/src/vnet/session/application_interface.h
index cddc031ec0d..d7869312d49 100644
--- a/src/vnet/session/application_interface.h
+++ b/src/vnet/session/application_interface.h
@@ -581,7 +581,8 @@ app_send_io_evt_to_vpp (svm_msg_q_t * mq, u32 session_index, u8 evt_type,
     {
       if (svm_msg_q_try_lock (mq))
 	return -1;
-      if (PREDICT_FALSE (svm_msg_q_ring_is_full (mq, SESSION_MQ_IO_EVT_RING)))
+      if (PREDICT_FALSE (svm_msg_q_ring_is_full (mq, SESSION_MQ_IO_EVT_RING)
+			 || svm_msg_q_is_full (mq)))
 	{
 	  svm_msg_q_unlock (mq);
 	  return -2;