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

mpm/spm: check for SSSE3 and enable/disable HS

Browse Source 
The new Hyperscan 4.4 API provides a function to check for SSSE3
presence at runtime. This allows us to fall back to non-Hyperscan
matchers on systems without SSSE3 even when the suricata executable
is built with Hyperscan support. Addresses Redmine issue #2010.

Signed-off-by: Sascha Steinbiss <sascha@steinbiss.name>
Tested-by: Arturo Borrero Gonzalez <arturo@debian.org>
pull/2524/head
Sascha Steinbiss 9 years ago committed by Victor Julien
parent a0580d8805
commit e6044aaf1c
15 changed files with 113 additions and 67 deletions
Show Stats Download Patch File Download Diff File

1
configure.ac
Unescape Escape View File

@ -622,6 +622,7 @@
fi
AC_CHECK_LIB(hs,hs_compile,,HYPERSCAN="no")
AC_CHECK_FUNCS(hs_valid_platform)
enable_hyperscan="yes"
if test "$HYPERSCAN" = "no"; then
echo

2
src/app-layer-detect-proto.c
Unescape Escape View File

@ -1550,7 +1550,7 @@ int AppLayerProtoDetectSetup(void)
#ifdef __SC_CUDA_SUPPORT__
/* CUDA won't work here, so fall back to AC */
if (mpm_matcher == MPM_AC_CUDA)
mpm_matcher = DEFAULT_MPM;
mpm_matcher = mpm_default_matcher;
#endif
alpd_ctx.spm_global_thread_ctx = SpmInitGlobalThreadCtx(spm_matcher);

2
src/app-layer-smtp.c
Unescape Escape View File

@ -157,7 +157,7 @@ typedef struct SMTPThreadCtx_ {
PrefilterRuleStore *pmq;
} SMTPThreadCtx;
#define SMTP_MPM DEFAULT_MPM
#define SMTP_MPM mpm_default_matcher
static MpmCtx *smtp_mpm_ctx = NULL;

2
src/detect-csum.c
Unescape Escape View File

@ -1544,7 +1544,7 @@ int DetectCsumICMPV6Test01(void)
printf("DetectEngineCtxInit failure\n");
goto end;
}
de_ctx->mpm_matcher = DEFAULT_MPM;
de_ctx->mpm_matcher = mpm_default_matcher;
de_ctx->flags |= DE_QUIET;
s = de_ctx->sig_list = SigInit(de_ctx, "alert ip any any -> any any "

14
src/detect-dns-query.c
Unescape Escape View File

@ -153,7 +153,7 @@ static int DetectDnsQueryTest01(void)
if (de_ctx == NULL) {
goto end;
}
de_ctx->mpm_matcher = DEFAULT_MPM;
de_ctx->mpm_matcher = mpm_default_matcher;
de_ctx->flags |= DE_QUIET;
s = DetectEngineAppendSig(de_ctx, "alert dns any any -> any any "
@ -286,7 +286,7 @@ static int DetectDnsQueryTest02(void)
if (de_ctx == NULL) {
goto end;
}
de_ctx->mpm_matcher = DEFAULT_MPM;
de_ctx->mpm_matcher = mpm_default_matcher;
de_ctx->flags |= DE_QUIET;
s = DetectEngineAppendSig(de_ctx, "alert dns any any -> any any "
@ -441,7 +441,7 @@ static int DetectDnsQueryTest03(void)
if (de_ctx == NULL) {
goto end;
}
de_ctx->mpm_matcher = DEFAULT_MPM;
de_ctx->mpm_matcher = mpm_default_matcher;
de_ctx->flags |= DE_QUIET;
s = DetectEngineAppendSig(de_ctx, "alert dns any any -> any any "
@ -548,7 +548,7 @@ static int DetectDnsQueryTest04(void)
if (de_ctx == NULL) {
goto end;
}
de_ctx->mpm_matcher = DEFAULT_MPM;
de_ctx->mpm_matcher = mpm_default_matcher;
de_ctx->flags |= DE_QUIET;
s = DetectEngineAppendSig(de_ctx, "alert dns any any -> any any "
@ -714,7 +714,7 @@ static int DetectDnsQueryTest05(void)
if (de_ctx == NULL) {
goto end;
}
de_ctx->mpm_matcher = DEFAULT_MPM;
de_ctx->mpm_matcher = mpm_default_matcher;
de_ctx->flags |= DE_QUIET;
s = DetectEngineAppendSig(de_ctx, "alert dns any any -> any any "
@ -887,7 +887,7 @@ static int DetectDnsQueryTest06(void)
if (de_ctx == NULL) {
goto end;
}
de_ctx->mpm_matcher = DEFAULT_MPM;
de_ctx->mpm_matcher = mpm_default_matcher;
de_ctx->flags |= DE_QUIET;
s = DetectEngineAppendSig(de_ctx, "alert dns any any -> any any "
@ -1034,7 +1034,7 @@ static int DetectDnsQueryTest07(void)
if (de_ctx == NULL) {
goto end;
}
de_ctx->mpm_matcher = DEFAULT_MPM;
de_ctx->mpm_matcher = mpm_default_matcher;
de_ctx->flags |= DE_QUIET;
s = DetectEngineAppendSig(de_ctx, "alert dns any any -> any any "

2
src/detect-engine-mpm.c
Unescape Escape View File

@ -343,7 +343,7 @@ int SignatureHasStreamContent(const Signature *s)
uint16_t PatternMatchDefaultMatcher(void)
{
char *mpm_algo;
uint16_t mpm_algo_val = DEFAULT_MPM;
uint16_t mpm_algo_val = mpm_default_matcher;
/* Get the mpm algo defined in config file by the user */
if ((ConfGet("mpm-algo", &mpm_algo)) == 1) {

68
src/detect-engine-payload.c
Unescape Escape View File

@ -214,7 +214,7 @@ static int PayloadTestSig01 (void)
int result = 0;
char sig[] = "alert tcp any any -> any any (content:\"abc\"; content:\"d\"; distance:0; within:1; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -236,7 +236,7 @@ static int PayloadTestSig02 (void)
int result = 0;
char sig[] = "alert tcp any any -> any any (content:\"abc\"; nocase; content:\"d\"; distance:0; within:1; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -258,7 +258,7 @@ static int PayloadTestSig03 (void)
int result = 0;
char sig[] = "alert tcp any any -> any any (content:\"aBc\"; nocase; content:\"abca\"; distance:-10; within:4; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -283,7 +283,7 @@ static int PayloadTestSig04(void)
char sig[] = "alert tcp any any -> any any (msg:\"dummy\"; "
"content:\"this\"; content:\"is\"; within:6; content:\"big\"; within:8; "
"content:\"string\"; within:8; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -308,7 +308,7 @@ static int PayloadTestSig05(void)
char sig[] = "alert tcp any any -> any any (msg:\"dummy\"; "
"content:\"this\"; content:\"is\"; within:9; content:\"big\"; within:12; "
"content:\"string\"; within:8; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -333,7 +333,7 @@ static int PayloadTestSig06(void)
char sig[] = "alert tcp any any -> any any (msg:\"dummy\"; "
"content:\"now\"; content:\"this\"; content:\"is\"; within:12; content:\"big\"; within:8; "
"content:\"string\"; within:8; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -358,7 +358,7 @@ static int PayloadTestSig07(void)
char sig[] = "alert tcp any any -> any any (msg:\"dummy\"; "
"content:\"thus\"; offset:8; content:\"is\"; within:6; content:\"big\"; within:8; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -384,7 +384,7 @@ static int PayloadTestSig08(void)
char sig[] = "alert tcp any any -> any any (msg:\"dummy\"; "
"content:\"fix\"; content:\"this\"; within:6; content:!\"and\"; distance:0; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) != 1) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) != 1) {
goto end;
}
@ -408,7 +408,7 @@ static int PayloadTestSig09(void)
char sig[] = "alert tcp any any -> any any (msg:\"dummy\"; "
"pcre:/super/; content:\"nova\"; within:7; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -433,7 +433,7 @@ static int PayloadTestSig10(void)
char sig[] = "alert udp any any -> any any (msg:\"crash\"; "
"byte_test:4,>,2,0,relative; sid:11;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 1) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 1) {
result = 0;
goto end;
}
@ -458,7 +458,7 @@ static int PayloadTestSig11(void)
char sig[] = "alert udp any any -> any any (msg:\"crash\"; "
"byte_jump:1,0,relative; sid:11;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 1) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 1) {
result = 0;
goto end;
}
@ -483,7 +483,7 @@ static int PayloadTestSig12(void)
char sig[] = "alert udp any any -> any any (msg:\"crash\"; "
"isdataat:10,relative; sid:11;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 1) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 1) {
result = 0;
goto end;
}
@ -523,7 +523,7 @@ static int PayloadTestSig13(void)
uint16_t buflen = strlen((char *)buf);
Packet *p = UTHBuildPacket( buf, buflen, IPPROTO_TCP);
int result = 0;
uint16_t mpm_type = DEFAULT_MPM;
uint16_t mpm_type = mpm_default_matcher;
char sig[] = "alert tcp any any -> any any (msg:\"dummy\"; "
"content:\"aa\"; content:\"aa\"; distance:0; content:\"aa\"; distance:0; "
@ -605,7 +605,7 @@ static int PayloadTestSig14(void)
//char sig[] = "alert tcp any any -> any any (content:\"User-Agent: Mozilla/5.0 (Macintosh; \"; content:\"Firefox/3.\"; distance:0; content:!\"Firefox/3.6.12\"; distance:-10; content:!\"Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.1b4) Gecko/20090423 Firefox/3.6 GTB5\"; sid:1; rev:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 1) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 1) {
goto end;
}
@ -626,7 +626,7 @@ static int PayloadTestSig15(void)
char sig[] = "alert tcp any any -> any any (msg:\"dummy\"; "
"content:\"nova\"; isdataat:18,relative; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -649,7 +649,7 @@ static int PayloadTestSig16(void)
char sig[] = "alert tcp any any -> any any (msg:\"dummy\"; "
"content:\"nova\"; isdataat:!20,relative; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -673,7 +673,7 @@ static int PayloadTestSig17(void)
"content:\"%\"; depth:4; offset:0; "
"content:\"%\"; within:2; distance:1; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -702,7 +702,7 @@ static int PayloadTestSig18(void)
"byte_extract:1,2,one,string,dec,relative; "
"content:\"|0C 0D 0E 0F|\"; distance:one; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -731,7 +731,7 @@ static int PayloadTestSig19(void)
"byte_extract:1,2,one,string,hex,relative; "
"content:\"|0C 0D 0E 0F|\"; distance:one; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -760,7 +760,7 @@ static int PayloadTestSig20(void)
"byte_extract:1,2,one,string,dec,relative; "
"content:\"|06 35 07 08|\"; offset:one; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -789,7 +789,7 @@ static int PayloadTestSig21(void)
"byte_extract:1,2,one,string,dec,relative; "
"content:\"|03 04 05 06|\"; depth:one; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -818,7 +818,7 @@ static int PayloadTestSig22(void)
"byte_extract:1,2,one,string,dec,relative; "
"content:\"|09 0A 0B 0C|\"; within:one; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -848,7 +848,7 @@ static int PayloadTestSig23(void)
"byte_extract:1,3,two,string,dec,relative; "
"byte_test:1,=,one,two,string,dec,relative; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -878,7 +878,7 @@ static int PayloadTestSig24(void)
"byte_jump:1,one,string,dec,relative; "
"content:\"|0D 0E 0F|\"; distance:0; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -910,7 +910,7 @@ static int PayloadTestSig25(void)
"byte_extract:1,-4,one,string,dec,relative; "
"content:\"|0C 0D 0E 0F|\"; distance:one; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -942,7 +942,7 @@ static int PayloadTestSig26(void)
"byte_extract:1,-3000,one,string,dec,relative; "
"content:\"|0C 0D 0E 0F|\"; distance:one; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) != 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) != 0) {
result = 0;
goto end;
}
@ -970,7 +970,7 @@ static int PayloadTestSig27(void)
"depth:5; sid:1;)";
p->flags |= PKT_STREAM_ADD;
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) != 1)
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) != 1)
goto end;
result = 1;
@ -996,7 +996,7 @@ static int PayloadTestSig28(void)
"offset:4; depth:12; sid:1;)";
p->flags |= PKT_STREAM_ADD;
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) != 1)
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) != 1)
goto end;
result = 1;
@ -1020,7 +1020,7 @@ static int PayloadTestSig29(void)
char sig[] = "alert tcp any any -> any any (msg:\"dummy\"; "
"pcre:/^.{4}/; content:\"nova\"; within:4; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 1) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 1) {
result = 0;
goto end;
}
@ -1041,7 +1041,7 @@ static int PayloadTestSig30(void)
int result = 0;
char sig[] = "alert tcp any any -> any any (content:\"one\"; pcre:\"/^two/R\"; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -1062,7 +1062,7 @@ static int PayloadTestSig31(void)
int result = 0;
char sig[] = "alert tcp any any -> any any (content:\"one\"; pcre:\"/(fiv|^two)/R\"; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0) {
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0) {
result = 0;
goto end;
}
@ -1087,7 +1087,7 @@ static int PayloadTestSig32(void)
char sig[] = "alert tcp any any -> any any (msg:\"crash\"; "
"content:\"message\"; byte_jump:2,-14,string,dec,relative; content:\"card\"; within:4; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0)
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0)
goto end;
result = 1;
@ -1110,7 +1110,7 @@ static int PayloadTestSig33(void)
char sig[] = "alert tcp any any -> any any (msg:\"crash\"; "
"content:\"message\"; byte_test:1,=,2,-14,string,dec,relative; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0)
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0)
goto end;
result = 1;
@ -1133,7 +1133,7 @@ static int PayloadTestSig34(void)
char sig[] = "alert tcp any any -> any any (msg:\"crash\"; "
"content:\"message\"; byte_extract:1,-14,boom,string,dec,relative; sid:1;)";
if (UTHPacketMatchSigMpm(p, sig, DEFAULT_MPM) == 0)
if (UTHPacketMatchSigMpm(p, sig, mpm_default_matcher) == 0)
goto end;
result = 1;

2
src/detect-http-header.c
Unescape Escape View File

@ -724,7 +724,7 @@ static int DetectHttpHeaderTest09(void)
goto end;
de_ctx->flags |= DE_QUIET;
de_ctx->mpm_matcher = DEFAULT_MPM;
de_ctx->mpm_matcher = mpm_default_matcher;
de_ctx->sig_list = SigInit(de_ctx,"alert http any any -> any any "
"(msg:\"http header test\"; "

4
src/detect-ipproto.c
Unescape Escape View File

@ -9281,7 +9281,7 @@ static int DetectIPProtoTestSig2(void)
goto end;
}
de_ctx->mpm_matcher = DEFAULT_MPM;
de_ctx->mpm_matcher = mpm_default_matcher;
de_ctx->flags |= DE_QUIET;
de_ctx->sig_list = SigInit(de_ctx,
@ -9366,7 +9366,7 @@ static int DetectIPProtoTestSig3(void)
goto end;
}
de_ctx->mpm_matcher = DEFAULT_MPM;
de_ctx->mpm_matcher = mpm_default_matcher;
de_ctx->flags |= DE_QUIET;
de_ctx->sig_list = SigInit(de_ctx,

2
src/detect-tls-cert-issuer.c
Unescape Escape View File

@ -387,7 +387,7 @@ static int DetectTlsIssuerTest02(void)
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
FAIL_IF_NULL(de_ctx);
de_ctx->mpm_matcher = DEFAULT_MPM;
de_ctx->mpm_matcher = mpm_default_matcher;
de_ctx->flags |= DE_QUIET;
s = DetectEngineAppendSig(de_ctx, "alert tls any any -> any any "

2
src/detect-tls-cert-subject.c
Unescape Escape View File

@ -387,7 +387,7 @@ static int DetectTlsSubjectTest02(void)
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
FAIL_IF_NULL(de_ctx);
de_ctx->mpm_matcher = DEFAULT_MPM;
de_ctx->mpm_matcher = mpm_default_matcher;
de_ctx->flags |= DE_QUIET;
s = DetectEngineAppendSig(de_ctx, "alert tls any any -> any any "

4
src/detect-tls-sni.c
Unescape Escape View File

@ -156,7 +156,7 @@ static int DetectTlsSniTest01(void)
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
FAIL_IF_NULL(de_ctx);
de_ctx->mpm_matcher = DEFAULT_MPM;
de_ctx->mpm_matcher = mpm_default_matcher;
de_ctx->flags |= DE_QUIET;
s = DetectEngineAppendSig(de_ctx, "alert tls any any -> any any "
@ -248,7 +248,7 @@ static int DetectTlsSniTest02(void)
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
FAIL_IF_NULL(de_ctx);
de_ctx->mpm_matcher = DEFAULT_MPM;
de_ctx->mpm_matcher = mpm_default_matcher;
de_ctx->flags |= DE_QUIET;
s = DetectEngineAppendSig(de_ctx, "alert tls any any -> any any "

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

@ -46,6 +46,9 @@
#include "detect-engine-mpm.h"
#endif
#include "util-memcpy.h"
#ifdef BUILD_HYPERSCAN
#include "hs.h"
#endif
/**
* \brief Register a new Mpm Context.
@ -402,15 +405,46 @@ void MpmInitCtx (MpmCtx *mpm_ctx, uint16_t matcher)
mpm_table[matcher].InitCtx(mpm_ctx);
}
/* MPM matcher to use by default, i.e. when "mpm-algo" is set to "auto".
* If Hyperscan is available, use it. Otherwise, use AC. */
#ifdef BUILD_HYPERSCAN
# define DEFAULT_MPM MPM_HS
# ifdef __tile__
# define DEFAULT_MPM_AC MPM_AC_TILE
# else
# define DEFAULT_MPM_AC MPM_AC
# endif
#else
# ifdef __tile__
# define DEFAULT_MPM MPM_AC_TILE
# else
# define DEFAULT_MPM MPM_AC
# endif
#endif
void MpmTableSetup(void)
{
memset(mpm_table, 0, sizeof(mpm_table));
mpm_default_matcher = DEFAULT_MPM;
MpmACRegister();
MpmACBSRegister();
MpmACTileRegister();
#ifdef BUILD_HYPERSCAN
MpmHSRegister();
#ifdef HAVE_HS_VALID_PLATFORM
/* Enable runtime check for SSSE3. Do not use Hyperscan MPM matcher if
* check is not successful. */
if (hs_valid_platform() != HS_SUCCESS) {
SCLogInfo("SSSE3 support not detected, disabling Hyperscan for "
"MPM");
/* Fall back to best Aho-Corasick variant. */
mpm_default_matcher = DEFAULT_MPM_AC;
} else {
MpmHSRegister();
}
#else
MpmHSRegister();
#endif /* HAVE_HS_VALID_PLATFORM */
#endif /* BUILD_HYPERSCAN */
#ifdef __SC_CUDA_SUPPORT__
MpmACCudaRegister();

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

@ -43,18 +43,6 @@ enum {
MPM_TABLE_SIZE,
};
/* MPM matcher to use by default, i.e. when "mpm-algo" is set to "auto".
* If Hyperscan is available, use it. Otherwise, use AC. */
#ifdef BUILD_HYPERSCAN
# define DEFAULT_MPM MPM_HS
#else
# ifdef __tile__
# define DEFAULT_MPM MPM_AC_TILE
# else
# define DEFAULT_MPM MPM_AC
# endif
#endif
/* Internal Pattern Index: 0 to pattern_cnt-1 */
typedef uint32_t MpmPatternIndex;
@ -171,6 +159,7 @@ typedef struct MpmTableElmt_ {
} MpmTableElmt;
MpmTableElmt mpm_table[MPM_TABLE_SIZE];
int mpm_default_matcher;
/* macros decides if cuda is enabled for the platform or not */
#ifdef __SC_CUDA_SUPPORT__

26
src/util-spm.c
Unescape Escape View File

@ -55,6 +55,9 @@
#include "util-spm-bm.h"
#include "util-spm-hs.h"
#include "util-clock.h"
#ifdef BUILD_HYPERSCAN
#include "hs.h"
#endif
/**
* \brief Returns the single pattern matcher algorithm to be used, based on the
@ -89,7 +92,20 @@ default_matcher:
/* When Suricata is built with Hyperscan support, default to using it for
* SPM. */
#ifdef BUILD_HYPERSCAN
return SPM_HS;
#ifdef HAVE_HS_VALID_PLATFORM
/* Enable runtime check for SSSE3. Do not use Hyperscan SPM matcher if
* check is not successful. */
if (hs_valid_platform() != HS_SUCCESS) {
SCLogInfo("SSSE3 support not detected, disabling Hyperscan for "
"SPM");
/* Use Boyer-Moore as fallback. */
return SPM_BM;
} else {
return SPM_HS;
}
#else
return SPM_HS;
#endif
#else
/* Otherwise, default to Boyer-Moore */
return SPM_BM;
@ -102,7 +118,13 @@ void SpmTableSetup(void)
SpmBMRegister();
#ifdef BUILD_HYPERSCAN
SpmHSRegister();
#ifdef HAVE_HS_VALID_PLATFORM
if (hs_valid_platform() == HS_SUCCESS) {
SpmHSRegister();
}
#else
SpmHSRegister();
#endif
#endif
}

Write Preview
Loading…
Cancel
Save