add freebsd specific memory usage tests

Author: ed-silva-eb

src/common/memusage.c

@@ -33,10 +33,7 @@
 #include <stdint.h>
 
 #if defined(OS_FREEBSD)
-#include <fcntl.h>
-#include <kvm.h>
 #include <limits.h>
-#include <paths.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
@@ -262,33 +259,39 @@ static int freebsd_sys_memusage(struct sys_memusage *mu)
 
 static int freebsd_proc_memusage(struct proc_memusage *mu)
 {
-	int count;
-	kvm_t *kd;
 	pid_t mypid;
-	char errbuf[LINE_MAX];
-	struct kinfo_proc *procinfo;
+	struct kinfo_proc procinfo;
+	size_t size;
+	size_t page_size;
+	int mib[4];
 
 	mypid = getpid();
-	kd = kvm_openfiles(NULL, _PATH_DEVNULL, NULL, O_RDONLY, errbuf);
-
-	if (!kd)
+	size = sizeof(procinfo);
+	memset(&procinfo, 0, sizeof(procinfo));
+	mib[0] = CTL_KERN;
+	mib[1] = KERN_PROC;
+	mib[2] = KERN_PROC_PID;
+	mib[3] = mypid;
+
+	if (sysctl(mib, 4, &procinfo, &size, NULL, 0) < 0)
 		return -1;
 
-	procinfo = kvm_getprocs(kd, KERN_PROC_PID, mypid, &count);
-
-	if (!procinfo)
+	if (size == 0) {
+		errno = ESRCH;
 		return -1;
+	}
 
-	mu->mu_rss = procinfo->ki_rssize;
-	mu->mu_text = procinfo->ki_tsize;
-	mu->mu_data = procinfo->ki_dsize;
-	mu->mu_stack = procinfo->ki_ssize;
+	page_size = (size_t)getpagesize();
+	mu->mu_rss = BYTES_TO_KIB((uint64_t)procinfo.ki_rssize * page_size);
+	mu->mu_text = BYTES_TO_KIB((uint64_t)procinfo.ki_tsize * page_size);
+	mu->mu_data = BYTES_TO_KIB((uint64_t)procinfo.ki_dsize * page_size);
+	mu->mu_stack = BYTES_TO_KIB((uint64_t)procinfo.ki_ssize * page_size);
 
 	/* ki_swrss is the resident set size before last swap, this
 	 * is the closest approximation to Linux's "VmHWM" which is the
 	 * peak resident set size of the process.
 	 */
-	mu->mu_hwm = procinfo->ki_swrss;
+	mu->mu_hwm = BYTES_TO_KIB((uint64_t)procinfo.ki_swrss * page_size);
 
 	/* Not exposed on FreeBSD */
 	mu->mu_lib = 0;

tests/API/probes/CMakeLists.txt

@@ -58,3 +58,14 @@ target_include_directories(test_memusage_platform PUBLIC
 	"${CMAKE_SOURCE_DIR}/src/common"
 )
 add_oscap_test("test_memusage_platform.sh" LABELS api probes freebsd macos linux)
+
+add_oscap_test_executable(test_memusage_freebsd_stress
+	"test_memusage_freebsd_stress.c"
+	"${CMAKE_SOURCE_DIR}/src/common/memusage.c"
+	"${CMAKE_SOURCE_DIR}/src/common/bfind.c"
+)
+target_include_directories(test_memusage_freebsd_stress PUBLIC
+	"${CMAKE_SOURCE_DIR}/src/common"
+)
+target_link_libraries(test_memusage_freebsd_stress Threads::Threads)
+add_oscap_test("test_memusage_freebsd_stress.sh" LABELS api probes freebsd)

tests/API/probes/test_memusage_freebsd_stress.c

@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdio.h>
+
+#include "memusage.h"
+
+#define STRESS_THREADS 4
+#define STRESS_ITERATIONS 2000
+
+struct thread_result {
+	int err;
+};
+
+static void *worker(void *arg)
+{
+	struct thread_result *result = arg;
+	int i;
+
+	for (i = 0; i < STRESS_ITERATIONS; ++i) {
+		struct proc_memusage proc_mu = {0};
+
+		if (oscap_proc_memusage(&proc_mu) != 0) {
+			result->err = errno ? errno : -1;
+			return NULL;
+		}
+	}
+
+	result->err = 0;
+	return NULL;
+}
+
+int main(void)
+{
+#if defined(OS_FREEBSD)
+	pthread_t threads[STRESS_THREADS];
+	struct thread_result results[STRESS_THREADS];
+	int i;
+
+	for (i = 0; i < STRESS_THREADS; ++i) {
+		results[i].err = 0;
+		if (pthread_create(&threads[i], NULL, worker, &results[i]) != 0) {
+			perror("pthread_create");
+			return 1;
+		}
+	}
+
+	for (i = 0; i < STRESS_THREADS; ++i) {
+		if (pthread_join(threads[i], NULL) != 0) {
+			perror("pthread_join");
+			return 1;
+		}
+		if (results[i].err != 0) {
+			fprintf(stderr, "oscap_proc_memusage failed in worker %d with errno=%d\n", i, results[i].err);
+			return 1;
+		}
+	}
+#endif
+
+	return 0;
+}

tests/API/probes/test_memusage_freebsd_stress.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+. $builddir/tests/test_common.sh
+
+if [ "$(uname)" != "FreeBSD" ] ; then
+	exit 255
+fi
+
+./test_memusage_freebsd_stress