From 4b5723a43e980328bca039dbc1e5785c23cbf378 Mon Sep 17 00:00:00 2001 From: Nathan Skrzypczak Date: Tue, 19 Nov 2019 16:48:58 +0100 Subject: session: Fix out of order mq Type: fix Change-Id: I522db62db50fc0fa46a6dd7cddd32e2f09b5e5a6 Signed-off-by: Nathan Skrzypczak (cherry picked from commit 989bc47d68187dd5db608d2b32abbbbc392b03ca) --- src/vnet/session/session.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/vnet/session') diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c index c0863007a51..258a15898b6 100644 --- a/src/vnet/session/session.c +++ b/src/vnet/session/session.c @@ -36,7 +36,8 @@ session_send_evt_to_thread (void *data, void *args, u32 thread_index, mq = session_main_get_vpp_event_queue (thread_index); if (PREDICT_FALSE (svm_msg_q_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_is_full (mq) + || svm_msg_q_ring_is_full (mq, SESSION_MQ_IO_EVT_RING))) { svm_msg_q_unlock (mq); return -2; -- cgit 1.2.3-korg