Commit e87c3434 authored by Yucong Sun's avatar Yucong Sun Committed by Andrii Nakryiko

selftests/bpf: Add per worker cgroup suffix

This patch make each worker use a unique cgroup base directory, thus
allowing tests that uses cgroups to run concurrently.
Signed-off-by: default avatarYucong Sun <sunyucong@gmail.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20211006185619.364369-5-fallentree@fb.com
parent 6587ff58
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <ftw.h> #include <ftw.h>
#include <unistd.h>
#include "cgroup_helpers.h" #include "cgroup_helpers.h"
...@@ -33,10 +34,9 @@ ...@@ -33,10 +34,9 @@
#define CGROUP_MOUNT_DFLT "/sys/fs/cgroup" #define CGROUP_MOUNT_DFLT "/sys/fs/cgroup"
#define NETCLS_MOUNT_PATH CGROUP_MOUNT_DFLT "/net_cls" #define NETCLS_MOUNT_PATH CGROUP_MOUNT_DFLT "/net_cls"
#define CGROUP_WORK_DIR "/cgroup-test-work-dir" #define CGROUP_WORK_DIR "/cgroup-test-work-dir"
#define format_cgroup_path(buf, path) \ #define format_cgroup_path(buf, path) \
snprintf(buf, sizeof(buf), "%s%s%s", CGROUP_MOUNT_PATH, \ snprintf(buf, sizeof(buf), "%s%s%d%s", CGROUP_MOUNT_PATH, \
CGROUP_WORK_DIR, path) CGROUP_WORK_DIR, getpid(), path)
#define format_classid_path(buf) \ #define format_classid_path(buf) \
snprintf(buf, sizeof(buf), "%s%s", NETCLS_MOUNT_PATH, \ snprintf(buf, sizeof(buf), "%s%s", NETCLS_MOUNT_PATH, \
......
...@@ -26,4 +26,4 @@ int join_classid(void); ...@@ -26,4 +26,4 @@ int join_classid(void);
int setup_classid_environment(void); int setup_classid_environment(void);
void cleanup_classid_environment(void); void cleanup_classid_environment(void);
#endif /* __CGROUP_HELPERS_H */ #endif /* __CGROUP_HELPERS_H */
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment