aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cuda streams support in b2g-cuda MPM

Browse Source
remotes/origin/master-1.1.x
Martin Beyer 15 years ago committed by Victor Julien
parent 0ce86efe40
commit b1c577f829
5 changed files with 1433 additions and 296 deletions
Show Stats Download Patch File Download Diff File

1667
src/util-mpm-b2g-cuda.c
View File

File diff suppressed because it is too large Load Diff

1
src/util-mpm-b2g-cuda.h
Unescape Escape View File

@ -20,6 +20,7 @@
*
* \author Victor Julien <victor@inliniac.net>
* \author Anoop Saldanha <poonaatsoc@gmail.com>
* \author Martin Beyer <martin.beyer@marasystems.de>
*/
#ifndef __UTIL_MPM_B2G_CUDA_H__

55
src/util-mpm.c
Unescape Escape View File

@ -477,6 +477,7 @@ MpmCudaConf *MpmCudaConfParse(void)
const char *batching_timeout = NULL;
const char *page_locked = NULL;
const char *device_id = NULL;
const char *cuda_streams = NULL;
if ((profile = malloc(sizeof(MpmCudaConf))) == NULL) {
SCLogError(SC_ERR_MEM_ALLOC, "Error allocating memory");
@ -489,6 +490,7 @@ MpmCudaConf *MpmCudaConfParse(void)
profile->batching_timeout = MPM_BATCHING_TIMEOUT;
profile->page_locked = MPM_PAGE_LOCKED;
profile->device_id = SC_CUDA_DEFAULT_DEVICE;
profile->cuda_streams = MPM_CUDA_STREAMS;
cuda_node = ConfGetNode("cuda");
if (cuda_node == NULL) {
@ -510,6 +512,8 @@ MpmCudaConf *MpmCudaConfParse(void)
(seq_node->head.tqh_first, "page_locked");
device_id = ConfNodeLookupChildValue
(seq_node->head.tqh_first, "device_id");
cuda_streams = ConfNodeLookupChildValue
(seq_node->head.tqh_first, "cuda_streams");
/* packet_buffer_size */
if (packet_buffer_limit == NULL || strcasecmp(packet_buffer_limit, "") == 0) {
@ -593,6 +597,22 @@ MpmCudaConf *MpmCudaConfParse(void)
continue;
}
}
/* cuda_streams */
if (cuda_streams == NULL || strcasecmp(cuda_streams, "") == 0) {
SCLogError(SC_ERR_INVALID_YAML_CONF_ENTRY, "Invalid entry for "
"cuda.mpm.cuda_streams Either NULL or empty");
profile->cuda_streams = MPM_CUDA_STREAMS;
continue;
} else {
profile->cuda_streams = atoi(cuda_streams);
if (profile->cuda_streams < 1) {
SCLogError(SC_ERR_INVALID_YAML_CONF_ENTRY, "Invalid entry for "
"cuda.mpm.cuda_streams - %s", cuda_streams);
profile->cuda_streams = MPM_CUDA_STREAMS;
continue;
}
}
} /* if (strcasecmp(seq_node->val, "mpm") == 0) */
} /* TAILQ_FOREACH(seq_node, &cuda_node->head, next) */
@ -653,7 +673,8 @@ static int MpmTest01(void)
" packet_buffers: 10\n"
" batching_timeout: 1\n"
" page_locked: enabled\n"
" device_id: 0\n";
" device_id: 0\n"
" cuda_streams: 2\n";
DetectEngineCtx *de_ctx = NULL;
int result = 0;
@ -679,6 +700,7 @@ static int MpmTest01(void)
result &= (profile->batching_timeout == 1);
result &= (profile->page_locked == 1);
result &= (profile->device_id == 0);
result &= (profile->cuda_streams == 2);
end:
SCCudaHlCleanProfiles();
@ -703,7 +725,8 @@ static int MpmTest02(void)
" packet_buffers: 12\n"
" batching_timeout: 10\n"
" page_locked: disabled\n"
" device_id: 5\n";
" device_id: 5\n"
" cuda_streams: 4\n";
DetectEngineCtx *de_ctx = NULL;
int result = 0;
@ -729,6 +752,7 @@ static int MpmTest02(void)
result &= (profile->batching_timeout == 10);
result &= (profile->page_locked == 0);
result &= (profile->device_id == 5);
result &= (profile->cuda_streams == 4);
end:
SCCudaHlCleanProfiles();
@ -753,7 +777,8 @@ static int MpmTest03(void)
" packet_buffers: 0\n"
" batching_timeout: 0\n"
" page_locked: enbled\n"
" device_id: -1\n";
" device_id: -1\n"
" cuda_streams: -1\n";
DetectEngineCtx *de_ctx = NULL;
int result = 0;
@ -779,6 +804,7 @@ static int MpmTest03(void)
result &= (profile->batching_timeout == MPM_BATCHING_TIMEOUT);
result &= (profile->page_locked == MPM_PAGE_LOCKED);
result &= (profile->device_id == SC_CUDA_DEFAULT_DEVICE);
result &= (profile->cuda_streams == MPM_CUDA_STREAMS);
end:
SCCudaHlCleanProfiles();
@ -803,7 +829,8 @@ static int MpmTest04(void)
" packet_buffers: -1\n"
" batching_timeout: -1\n"
" page_locked: enbled\n"
" device_id: -1\n";
" device_id: -1\n"
" cuda_streams: -1\n";
DetectEngineCtx *de_ctx = NULL;
int result = 0;
@ -829,6 +856,7 @@ static int MpmTest04(void)
result &= (profile->batching_timeout == MPM_BATCHING_TIMEOUT);
result &= (profile->page_locked == MPM_PAGE_LOCKED);
result &= (profile->device_id == SC_CUDA_DEFAULT_DEVICE);
result &= (profile->cuda_streams == MPM_CUDA_STREAMS);
end:
SCCudaHlCleanProfiles();
@ -853,7 +881,8 @@ static int MpmTest05(void)
" packet_buffers:\n"
" batching_timeout: 2\n"
" page_locked: enabled\n"
" device_id: 1\n";
" device_id: 1\n"
" cuda_streams: 0\n";
DetectEngineCtx *de_ctx = NULL;
int result = 0;
@ -879,6 +908,7 @@ static int MpmTest05(void)
result &= (profile->batching_timeout == 2);
result &= (profile->page_locked == 1);
result &= (profile->device_id == 1);
result &= (profile->cuda_streams == 0);
end:
SCCudaHlCleanProfiles();
@ -903,7 +933,8 @@ static int MpmTest06(void)
" packet_buffers: \n"
" batching_timeout: \n"
" page_locked: \n"
" device_id: \n";
" device_id: \n"
" cuda_streams: \n";
DetectEngineCtx *de_ctx = NULL;
int result = 0;
@ -929,6 +960,7 @@ static int MpmTest06(void)
result &= (profile->batching_timeout == MPM_BATCHING_TIMEOUT);
result &= (profile->page_locked == MPM_PAGE_LOCKED);
result &= (profile->device_id == SC_CUDA_DEFAULT_DEVICE);
result &= (profile->cuda_streams == MPM_CUDA_STREAMS);
end:
SCCudaHlCleanProfiles();
@ -953,7 +985,8 @@ static int MpmTest07(void)
" packet_buffers:\n"
" batching_timeout:\n"
" page_locked:\n"
" device_id:\n";
" device_id:\n"
" cuda_streams:\n";
DetectEngineCtx *de_ctx = NULL;
int result = 0;
@ -979,6 +1012,7 @@ static int MpmTest07(void)
result &= (profile->batching_timeout == MPM_BATCHING_TIMEOUT);
result &= (profile->page_locked == MPM_PAGE_LOCKED);
result &= (profile->device_id == SC_CUDA_DEFAULT_DEVICE);
result &= (profile->cuda_streams == MPM_CUDA_STREAMS);
end:
SCCudaHlCleanProfiles();
@ -1000,7 +1034,8 @@ static int MpmTest08(void)
" - mpm:\n"
" packet_size_limit: 2000\n"
" page_locked: disabled\n"
" device_id: 4\n";
" device_id: 4\n"
" cuda_streams: 8\n";
DetectEngineCtx *de_ctx = NULL;
int result = 0;
@ -1026,6 +1061,7 @@ static int MpmTest08(void)
result &= (profile->batching_timeout == MPM_BATCHING_TIMEOUT);
result &= (profile->page_locked == !MPM_PAGE_LOCKED);
result &= (profile->device_id == 4);
result &= (profile->cuda_streams == 8);
end:
SCCudaHlCleanProfiles();
@ -1070,6 +1106,7 @@ static int MpmTest09(void)
result &= (profile->batching_timeout == MPM_BATCHING_TIMEOUT);
result &= (profile->page_locked == MPM_PAGE_LOCKED);
result &= (profile->device_id == SC_CUDA_DEFAULT_DEVICE);
result &= (profile->cuda_streams == MPM_CUDA_STREAMS);
end:
SCCudaHlCleanProfiles();
@ -1113,6 +1150,7 @@ static int MpmTest10(void)
result &= (profile->batching_timeout == MPM_BATCHING_TIMEOUT);
result &= (profile->page_locked == MPM_PAGE_LOCKED);
result &= (profile->device_id == SC_CUDA_DEFAULT_DEVICE);
result &= (profile->cuda_streams == MPM_CUDA_STREAMS);
end:
SCCudaHlCleanProfiles();
@ -1155,6 +1193,7 @@ static int MpmTest11(void)
result &= (profile->batching_timeout == MPM_BATCHING_TIMEOUT);
result &= (profile->page_locked == MPM_PAGE_LOCKED);
result &= (profile->device_id == SC_CUDA_DEFAULT_DEVICE);
result &= (profile->cuda_streams == MPM_CUDA_STREAMS);
end:
SCCudaHlCleanProfiles();

2
src/util-mpm.h
Unescape Escape View File

@ -56,6 +56,7 @@
#define MPM_PACKET_BUFFERS 10
#define MPM_BATCHING_TIMEOUT 1
#define MPM_PAGE_LOCKED 1
#define MPM_CUDA_STREAMS 2
enum {
MPM_NOTSET = 0,
@ -199,6 +200,7 @@ typedef struct MpmCudaConf_ {
double batching_timeout;
int8_t page_locked;
int8_t device_id;
int8_t cuda_streams;
} MpmCudaConf;
#endif /* __SC_CUDA_SUPPORT__ */

4
suricata.yaml
Unescape Escape View File

@ -178,6 +178,10 @@ cuda:
# specify the first device cuda sees. To find out device_id associated with
# the card(s) on the system run "suricata --list-cuda-cards".
device_id: 0
# No of Cuda streams used for asynchronous processing. All values > 0 are valid.
# For this option you need a device with Compute Capability > 1.0 and
# page_locked enabled to have any effect.
cuda_streams: 2
# Select the multi pattern algorithm you want to run for scan/search the
# in the engine. The supported algorithms are b2g, b2gc, b2gm, b3g, wumanber,

Write Preview
Loading…
Cancel
Save