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

snort: fix snort hang issue when interrupted

Browse Source 
fix vpp daq to break out-of-loop when interrupted.

Type: fix

Signed-off-by: Sivaprasad Tummala <Sivaprasad.Tummala@intel.com>
Change-Id: I04594a0b872d16f803d7d7c3b7d9bb60e94bc707
This commit is contained in:
Sivaprasad Tummala
2021-08-11 01:54:15 +05:30
committed by Damjan Marion
parent ce5075823f
commit a13100f3aa
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/snort/daq_vpp.c
View File

@@ -113,6 +113,7 @@ typedef struct _vpp_context
daq_vpp_input_mode_t input_mode;
const char *socket_name;
volatile bool interrupted;
} VPP_Context_t;
static VPP_Context_t *global_vpp_ctx = 0;
@@ -479,6 +480,16 @@ vpp_daq_start (void *handle)
return DAQ_SUCCESS;
}
static int
vpp_daq_interrupt (void *handle)
{
VPP_Context_t *vc = (VPP_Context_t *) handle;
vc->interrupted = true;
return DAQ_SUCCESS;
}
static int
vpp_daq_get_stats (void *handle, DAQ_Stats_t *stats)
{
@@ -552,6 +563,14 @@ vpp_daq_msg_receive (void *handle, const unsigned max_recv,
uint32_t n_qpairs_left = vc->num_qpairs;
uint32_t n, n_events, n_recv = 0;
/* If the receive has been interrupted, break out of loop and return. */
if (vc->interrupted)
{
vc->interrupted = false;
*rstat = DAQ_RSTAT_INTERRUPTED;
return 0;
}
/* first, we visit all qpairs. If we find any work there then we can give
* it back immediatelly. To avoid bias towards qpair 0 we remeber what
* next qpair */
@@ -676,7 +695,7 @@ const DAQ_ModuleAPI_t DAQ_MODULE_DATA = {
/* .start = */ vpp_daq_start,
/* .inject = */ NULL,
/* .inject_relative = */ NULL,
/* .interrupt = */ NULL,
/* .interrupt = */ vpp_daq_interrupt,
/* .stop = */ NULL,
/* .ioctl = */ NULL,
/* .get_stats = */ vpp_daq_get_stats,