dpdk: rework hugepage hints to use per-numa information v2 #9898
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previous integration of hugepage analysis only fetched data from /proc/meminfo. However this proved to be often deceiving mainly for providing only global information and not taking into account different hugepage sizes (e.g. 1GB hugepages) and different NUMA nodes. Ticket: OISF#6419
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #9898 +/- ##
==========================================
- Coverage 82.45% 82.30% -0.16%
==========================================
Files 972 973 +1
Lines 273057 273213 +156
==========================================
- Hits 225156 224859 -297
- Misses 47901 48354 +453
Flags with carried forward coverage won't be shown. Click here to find out more. |
|
Information: QA ran without warnings. Pipeline 16735 |
victorjulien
requested changes
Dec 1, 2023
There was a problem hiding this comment.
cppcheck
src/util-hugepages.c:120:9: warning: %hd in format string (no. 1) requires 'short' but the argument type is 'unsigned short'. [invalidPrintfArgType_sint]
snprintf(path, sizeof(path),
^
src/util-hugepages.c:129:13: warning: %hd in format string (no. 1) requires 'short *' but the argument type is 'unsigned short *'. [invalidScanfArgType_int]
if (fscanf(f, "%hd", &hugepages[i].allocated) != 1) {
^
src/util-hugepages.c:137:9: warning: %hd in format string (no. 1) requires 'short' but the argument type is 'unsigned short'. [invalidPrintfArgType_sint]
snprintf(path, sizeof(path),
^
src/util-hugepages.c:146:13: warning: %hd in format string (no. 1) requires 'short *' but the argument type is 'unsigned short *'. [invalidScanfArgType_int]
if (fscanf(f, "%hd", &hugepages[i].free) != 1) {
^
src/util-hugepages.c:126:20: warning: Either the condition '!f' is redundant or there is possible null pointer dereference: f. [nullPointerRedundantCheck]
fclose(f);
^
src/util-hugepages.c:124:13: note: Assuming that condition '!f' is not redundant
if (!f) {
^
src/util-hugepages.c:126:20: note: Null pointer dereference
fclose(f);
^
src/util-hugepages.c:143:20: warning: Either the condition '!f' is redundant or there is possible null pointer dereference: f. [nullPointerRedundantCheck]
fclose(f);
^
src/util-hugepages.c:141:13: note: Assuming that condition '!f' is not redundant
if (!f) {
^
src/util-hugepages.c:143:20: note: Null pointer dereference
fclose(f);
^
src/util-hugepages.c:126:20: error: Null pointer dereference [nullPointer]
fclose(f);
^
src/util-hugepages.c:143:20: error: Null pointer dereference [nullPointer]
fclose(f);
^
scan-build about the same
In function 'SystemHugepagePerNodeGetHugepageInfoLinux',
inlined from 'SystemHugepagePerNodeGetHugepageInfo' at util-hugepages.c:178:11,
inlined from 'SystemHugepageSnapshotCreate' at util-hugepages.c:300:23:
util-hugepages.c:126:13: warning: argument 1 null where non-null expected [-Wnonnull]
126 | fclose(f);
| ^~~~~~~~~
In file included from suricata-common.h:64,
from suricata.h:67,
from util-hugepages.c:24:
/usr/include/stdio.h: In function 'SystemHugepageSnapshotCreate':
/usr/include/stdio.h:183:12: note: in a call to function 'fclose' declared 'nonnull'
183 | extern int fclose (FILE *__stream) __nonnull ((1));
| ^~~~~~
In function 'SystemHugepagePerNodeGetHugepageInfoLinux',
inlined from 'SystemHugepagePerNodeGetHugepageInfo' at util-hugepages.c:178:11,
inlined from 'SystemHugepageSnapshotCreate' at util-hugepages.c:300:23:
util-hugepages.c:143:13: warning: argument 1 null where non-null expected [-Wnonnull]
143 | fclose(f);
| ^~~~~~~~~
/usr/include/stdio.h: In function 'SystemHugepageSnapshotCreate':
/usr/include/stdio.h:183:12: note: in a call to function 'fclose' declared 'nonnull'
183 | extern int fclose (FILE *__stream) __nonnull ((1));
| ^~~~~~
util-hugepages.c:126:13: warning: Null pointer passed to 1st parameter expecting 'nonnull' [core.NonNullParamChecker]
fclose(f);
^~~~~~~~~
util-hugepages.c:143:13: warning: Null pointer passed to 1st parameter expecting 'nonnull' [core.NonNullParamChecker]
fclose(f);
^~~~~~~~~
2 warnings generated.
| NodeInfo *nodes = SCCalloc(node_cnt, sizeof(*nodes)); | ||
| if (nodes == NULL) { | ||
| FatalError("failed to allocate memory for NUMA node info"); | ||
| return NULL; |
There was a problem hiding this comment.
unreachable due to FatalError
There was a problem hiding this comment.
return statement removed
| SCFree(s); | ||
| } | ||
|
|
||
| SystemHugepageSnapshot *SystemHugepageSnapshotCreate(void) |
There was a problem hiding this comment.
can you add a comment about the return values?
|
Continues in #10164 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow-up #9735
Previous integration of hugepage analysis only fetched data from /proc/meminfo. However, this proved to be often deceiving mainly for providing only global information and not taking into account different hugepage sizes (e.g. 1GB hugepages) and different NUMA nodes.
Describe changes:
https://redmine.openinfosecfoundation.org/issues/6419