| Message ID | 20171130165242.1581024-1-yhs@fb.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [net-next] tools/bpf: adjust rlimit RLIMIT_MEMLOCK for test_verifier_log | expand |
On 11/30/2017 05:52 PM, Yonghong Song wrote: > The default rlimit RLIMIT_MEMLOCK is 64KB. In certain cases, > e.g. in a test machine mimicking our production system, this test may > fail due to unable to charge the required memory for prog load: > # ./test_verifier_log > Test log_level 0... > ERROR: Program load returned: ret:-1/errno:1, expected ret:-1/errno:22 > > Changing the default rlimit RLIMIT_MEMLOCK to unlimited makes > the test always pass. > > Signed-off-by: Yonghong Song <yhs@fb.com> Given this is a fix, I've applied this to bpf tree, thanks Yonghong!
diff --git a/tools/testing/selftests/bpf/test_verifier_log.c b/tools/testing/selftests/bpf/test_verifier_log.c index 3cc0b56..e9626cf 100644 --- a/tools/testing/selftests/bpf/test_verifier_log.c +++ b/tools/testing/selftests/bpf/test_verifier_log.c @@ -3,6 +3,8 @@ #include <stdio.h> #include <string.h> #include <unistd.h> +#include <sys/time.h> +#include <sys/resource.h> #include <linux/bpf.h> #include <linux/filter.h> @@ -131,11 +133,16 @@ static void test_log_bad(char *log, size_t log_len, int log_level) int main(int argc, char **argv) { + struct rlimit limit = { RLIM_INFINITY, RLIM_INFINITY }; char full_log[LOG_SIZE]; char log[LOG_SIZE]; size_t want_len; int i; + /* allow unlimited locked memory to have more consistent error code */ + if (setrlimit(RLIMIT_MEMLOCK, &limit) < 0) + perror("Unable to lift memlock rlimit"); + memset(log, 1, LOG_SIZE); /* Test incorrect attr */
The default rlimit RLIMIT_MEMLOCK is 64KB. In certain cases, e.g. in a test machine mimicking our production system, this test may fail due to unable to charge the required memory for prog load: # ./test_verifier_log Test log_level 0... ERROR: Program load returned: ret:-1/errno:1, expected ret:-1/errno:22 Changing the default rlimit RLIMIT_MEMLOCK to unlimited makes the test always pass. Signed-off-by: Yonghong Song <yhs@fb.com> --- tools/testing/selftests/bpf/test_verifier_log.c | 7 +++++++ 1 file changed, 7 insertions(+)