hugepages: run hugepage check only on DPDK runmode and on Linux v2 #10385
Conversation
Previous implementation allowed FreeBSD to enter into the hugepage analysis. It then failed with an error message because hugepage/ NUMA node paths that are used in the codebase to retrieve info about the system are not the same with the structure in Linux. Additionally, the messages were logged on error level. It has been demoted to info level because the whole hugepage analysis checkup is only for informational purposes and does not affect Suricata operation. The hugepage analysis and the hugepage snapshots are now limited to only run in the DPDK runmode. Ticket: OISF#6760 Ticket: OISF#6762
|
Information: ERROR: QA failed on SURI_TLPW2_autofp_suri_time.
Pipeline 18394 |
| @@ -38,15 +38,15 @@ static void SystemHugepageSnapshotDump(SystemHugepageSnapshot *s); | |||
|
|
|||
| static bool SystemHugepageSupported(void) | |||
| { | |||
| #if !defined __CYGWIN__ && !defined OS_WIN32 && !defined __OpenBSD__ && !defined sun | |||
| #if defined __linux__ | |||
There was a problem hiding this comment.
what was the reason to make this use ifdefs instead of just checking at runtime if hugepage support is enabled?
There was a problem hiding this comment.
the function seems wrong, because it doesnt seem to be true that linux means hugepages are enabled
There was a problem hiding this comment.
The guards were there to avoid Windows compilation errors:
https://github.com/lukashino/suricata/actions/runs/7004361732/job/19052076585
extracted from: #9898
There was a problem hiding this comment.
that seems like a pretty small issue that can be addressed by refactoring things a bit, and/or investigating how to do this properly on windows
There was a problem hiding this comment.
also, it seems it should work, so perhaps it's an include issue? https://github.com/luzexi/MinGW/blob/master/x86/include/dirent.h#L26
| @@ -57,7 +57,7 @@ static uint16_t SystemNodeCountGetLinux(void) | |||
| char dir_path[] = "/sys/devices/system/node/"; | |||
There was a problem hiding this comment.
For example, my Raspberry PI (more or less default) does not have /sys/devices/system/node. So would a Linux specific check to see if huge pages are enabled be "if linux and /sys/devices/system/node exists"?
There was a problem hiding this comment.
which for all intends and purposes can just be the path check. this will save us messy ifdefs
There was a problem hiding this comment.
ok, thanks, that's a good catch, I forgot that the path might not be present on every Linux, I'll redo the path check.
|
continues in #10448 |
Follow-up of #10358
The previous implementation allowed FreeBSD to enter into the hugepage analysis. It then failed with an error message because hugepage/ NUMA node paths that are used in the codebase to retrieve info about the system are not the same as the structure in Linux.
Additionally, the messages were logged on an error level. It has been demoted to the info level because the whole hugepage analysis checkup is only for informational purposes and does not affect Suricata operation.
The hugepage analysis and the hugepage snapshots are now limited to only run in the DPDK runmode.
Ticket: #6760
https://redmine.openinfosecfoundation.org/issues/6760
Ticket: #6762
https://redmine.openinfosecfoundation.org/issues/6762