ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

session: propagate delayed rx evts after connect/accept

Browse Source 
Type: fix

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I4a2e8f864df7269ec5a3c4fd4d8785a67b687d58
This commit is contained in:
Florin Coras
2023-10-07 14:22:52 -07:00
parent 9ffec14a22
commit 431b489c5a
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/vnet/session/session_input.c
View File

@ -112,16 +112,18 @@ app_worker_flush_events_inline (app_worker_t *app_wrk, u32 thread_index,
{ {
case SESSION_IO_EVT_RX: case SESSION_IO_EVT_RX:
s = session_get (evt->session_index, thread_index); s = session_get (evt->session_index, thread_index);
s->flags &= ~SESSION_F_RX_EVT;
/* Application didn't confirm accept yet */ /* Application didn't confirm accept yet */
if (PREDICT_FALSE (s->session_state == SESSION_STATE_ACCEPTING)) if (PREDICT_FALSE (s->session_state == SESSION_STATE_ACCEPTING ||
s->session_state == SESSION_STATE_CONNECTING))
break; break;
s->flags &= ~SESSION_F_RX_EVT;
app->cb_fns.builtin_app_rx_callback (s); app->cb_fns.builtin_app_rx_callback (s);
break; break;
/* Handle sessions that might not be on current thread */ /* Handle sessions that might not be on current thread */
case SESSION_IO_EVT_BUILTIN_RX: case SESSION_IO_EVT_BUILTIN_RX:
s = session_get_from_handle_if_valid (evt->session_handle); s = session_get_from_handle_if_valid (evt->session_handle);
if (!s || s->session_state == SESSION_STATE_ACCEPTING) if (!s || s->session_state == SESSION_STATE_ACCEPTING ||
s->session_state == SESSION_STATE_CONNECTING)
break; break;
s->flags &= ~SESSION_F_RX_EVT; s->flags &= ~SESSION_F_RX_EVT;
app->cb_fns.builtin_app_rx_callback (s); app->cb_fns.builtin_app_rx_callback (s);
@ -153,8 +155,16 @@ app_worker_flush_events_inline (app_worker_t *app_wrk, u32 thread_index,
s->app_wrk_index = SESSION_INVALID_INDEX; s->app_wrk_index = SESSION_INVALID_INDEX;
break; break;
} }
if (is_builtin && was_closed) if (is_builtin)
app_worker_close_notify (app_wrk, s); {
if (s->flags & SESSION_F_RX_EVT)
{
s->flags &= ~SESSION_F_RX_EVT;
app->cb_fns.builtin_app_rx_callback (s);
}
if (was_closed)
app_worker_close_notify (app_wrk, s);
}
break; break;
case SESSION_CTRL_EVT_CONNECTED: case SESSION_CTRL_EVT_CONNECTED:
if (!(evt->as_u64[1] & 0xffffffff)) if (!(evt->as_u64[1] & 0xffffffff))
@ -177,6 +187,11 @@ app_worker_flush_events_inline (app_worker_t *app_wrk, u32 thread_index,
} }
if (was_closed) if (was_closed)
app_worker_close_notify (app_wrk, s); app_worker_close_notify (app_wrk, s);
if (s->flags & SESSION_F_RX_EVT)
{
s->flags &= ~SESSION_F_RX_EVT;
app->cb_fns.builtin_app_rx_callback (s);
}
break; break;
case SESSION_CTRL_EVT_DISCONNECTED: case SESSION_CTRL_EVT_DISCONNECTED:
s = session_get (evt->session_index, thread_index); s = session_get (evt->session_index, thread_index);