From c661605b520fa64b6fc042a642027c14ae9a62f9 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Tue, 21 May 2019 23:30:35 +0000 Subject: [PATCH] tests: robustify bpf-obj_get_info_by_fd test against future kernels * tests/bpf-obj_get_info_by_fd.c (print_prog_load, main): Change log_level from 42 to 7, to placate Linux kernels containing commit v5.2-rc1~133^2~193^2~18^2~9. --- tests/bpf-obj_get_info_by_fd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: strace-4.24/tests/bpf-obj_get_info_by_fd.c =================================================================== --- strace-4.24.orig/tests/bpf-obj_get_info_by_fd.c 2020-01-28 00:16:43.589035258 +0100 +++ strace-4.24/tests/bpf-obj_get_info_by_fd.c 2020-01-28 01:49:32.228432719 +0100 @@ -180,7 +180,7 @@ if (size > offsetof(struct BPF_PROG_LOAD_struct, license)) printf(", license=\"BSD\""); if (size > offsetof(struct BPF_PROG_LOAD_struct, log_buf)) - printf(", log_level=42, log_size=%zu, log_buf=\"\"", + printf(", log_level=7, log_size=%zu, log_buf=\"\"", sizeof(log_buf)); if (size > offsetof(struct BPF_PROG_LOAD_struct, kern_version)) printf(", kern_version=KERNEL_VERSION(57005, 192, 222)"); @@ -239,7 +239,7 @@ .insn_cnt = ARRAY_SIZE(socket_prog), .insns = (uintptr_t) socket_prog, .license = (uintptr_t) license, - .log_level = 42, + .log_level = 7, .log_size = sizeof(log_buf), .log_buf = (uintptr_t) log_buf, .kern_version = 0xdeadc0de, Index: strace-4.24/tests-m32/bpf-obj_get_info_by_fd.c =================================================================== --- strace-4.24.orig/tests-m32/bpf-obj_get_info_by_fd.c 2020-01-28 00:16:49.360980900 +0100 +++ strace-4.24/tests-m32/bpf-obj_get_info_by_fd.c 2020-01-28 01:53:08.192398852 +0100 @@ -180,7 +180,7 @@ if (size > offsetof(struct BPF_PROG_LOAD_struct, license)) printf(", license=\"BSD\""); if (size > offsetof(struct BPF_PROG_LOAD_struct, log_buf)) - printf(", log_level=42, log_size=%zu, log_buf=\"\"", + printf(", log_level=7, log_size=%zu, log_buf=\"\"", sizeof(log_buf)); if (size > offsetof(struct BPF_PROG_LOAD_struct, kern_version)) printf(", kern_version=KERNEL_VERSION(57005, 192, 222)"); @@ -239,7 +239,7 @@ .insn_cnt = ARRAY_SIZE(socket_prog), .insns = (uintptr_t) socket_prog, .license = (uintptr_t) license, - .log_level = 42, + .log_level = 7, .log_size = sizeof(log_buf), .log_buf = (uintptr_t) log_buf, .kern_version = 0xdeadc0de, Index: strace-4.24/tests-mx32/bpf-obj_get_info_by_fd.c =================================================================== --- strace-4.24.orig/tests-mx32/bpf-obj_get_info_by_fd.c 2020-01-28 00:16:51.902956961 +0100 +++ strace-4.24/tests-mx32/bpf-obj_get_info_by_fd.c 2020-01-28 01:53:10.772374555 +0100 @@ -180,7 +180,7 @@ if (size > offsetof(struct BPF_PROG_LOAD_struct, license)) printf(", license=\"BSD\""); if (size > offsetof(struct BPF_PROG_LOAD_struct, log_buf)) - printf(", log_level=42, log_size=%zu, log_buf=\"\"", + printf(", log_level=7, log_size=%zu, log_buf=\"\"", sizeof(log_buf)); if (size > offsetof(struct BPF_PROG_LOAD_struct, kern_version)) printf(", kern_version=KERNEL_VERSION(57005, 192, 222)"); @@ -239,7 +239,7 @@ .insn_cnt = ARRAY_SIZE(socket_prog), .insns = (uintptr_t) socket_prog, .license = (uintptr_t) license, - .log_level = 42, + .log_level = 7, .log_size = sizeof(log_buf), .log_buf = (uintptr_t) log_buf, .kern_version = 0xdeadc0de,