diff -u linux-5.3.0/debian.master/changelog linux-5.3.0/debian.master/changelog --- linux-5.3.0/debian.master/changelog +++ linux-5.3.0/debian.master/changelog @@ -1,6 +1,6 @@ -linux (5.3.0-43.35) eoan; urgency=medium +linux (5.3.0-43.36) eoan; urgency=medium - * eoan/linux: 5.3.0-43.35 -proposed tracker (LP: #1867301) + * eoan/linux: 5.3.0-43.36 -proposed tracker (LP: #1867301) * Packaging resync (LP: #1786013) - [Packaging] resync getabis @@ -254,11 +254,9 @@ - btrfs: fix improper setting of scanned for range cyclic write cache pages - btrfs: Handle another split brain scenario with metadata uuid feature - riscv, bpf: Fix broken BPF tail calls - - selftests/bpf: Fix perf_buffer test on systems w/ offline CPUs - tc-testing: fix eBPF tests failure on linux fresh clones - samples/bpf: Xdp_redirect_cpu fix missing tracepoint attach - selftests/bpf: Fix test_attach_probe - - selftests/bpf: Skip perf hw events test if the setup disabled it - selftests: bpf: Use a temporary file in test_sockmap - selftests: bpf: Ignore FIN packets for reuseport tests - crypto: api - fix unexpectedly getting generic implementation @@ -859,7 +857,7 @@ - phy/rockchip: inno-hdmi: round clock rate down to closest 1000 Hz - optee: Fix multi page dynamic shm pool alloc - -- Khalid Elmously Sun, 15 Mar 2020 23:17:30 -0400 + -- Kleber Sacilotto de Souza Mon, 16 Mar 2020 12:50:28 +0100 linux (5.3.0-42.34) eoan; urgency=medium diff -u linux-5.3.0/debian/changelog linux-5.3.0/debian/changelog --- linux-5.3.0/debian/changelog +++ linux-5.3.0/debian/changelog @@ -1,6 +1,6 @@ -linux (5.3.0-43.35) eoan; urgency=medium +linux (5.3.0-43.36) eoan; urgency=medium - * eoan/linux: 5.3.0-43.35 -proposed tracker (LP: #1867301) + * eoan/linux: 5.3.0-43.36 -proposed tracker (LP: #1867301) * Packaging resync (LP: #1786013) - [Packaging] resync getabis @@ -254,11 +254,9 @@ - btrfs: fix improper setting of scanned for range cyclic write cache pages - btrfs: Handle another split brain scenario with metadata uuid feature - riscv, bpf: Fix broken BPF tail calls - - selftests/bpf: Fix perf_buffer test on systems w/ offline CPUs - tc-testing: fix eBPF tests failure on linux fresh clones - samples/bpf: Xdp_redirect_cpu fix missing tracepoint attach - selftests/bpf: Fix test_attach_probe - - selftests/bpf: Skip perf hw events test if the setup disabled it - selftests: bpf: Use a temporary file in test_sockmap - selftests: bpf: Ignore FIN packets for reuseport tests - crypto: api - fix unexpectedly getting generic implementation @@ -859,7 +857,7 @@ - phy/rockchip: inno-hdmi: round clock rate down to closest 1000 Hz - optee: Fix multi page dynamic shm pool alloc - -- Khalid Elmously Sun, 15 Mar 2020 23:17:30 -0400 + -- Kleber Sacilotto de Souza Mon, 16 Mar 2020 12:50:28 +0100 linux (5.3.0-42.34) eoan; urgency=medium reverted: --- linux-5.3.0/tools/testing/selftests/bpf/prog_tests/perf_buffer.c +++ linux-5.3.0.orig/tools/testing/selftests/bpf/prog_tests/perf_buffer.c @@ -4,7 +4,6 @@ #include #include #include -#include "libbpf_internal.h" static void on_sample(void *ctx, int cpu, void *data, __u32 size) { @@ -20,7 +19,7 @@ void test_perf_buffer(void) { + int err, prog_fd, nr_cpus, i, duration = 0; - int err, prog_fd, on_len, nr_on_cpus = 0, nr_cpus, i, duration = 0; const char *prog_name = "kprobe/sys_nanosleep"; const char *file = "./test_perf_buffer.o"; struct perf_buffer_opts pb_opts = {}; @@ -30,27 +29,15 @@ struct bpf_object *obj; struct perf_buffer *pb; struct bpf_link *link; - bool *online; nr_cpus = libbpf_num_possible_cpus(); if (CHECK(nr_cpus < 0, "nr_cpus", "err %d\n", nr_cpus)) return; - err = parse_cpu_mask_file("/sys/devices/system/cpu/online", - &online, &on_len); - if (CHECK(err, "nr_on_cpus", "err %d\n", err)) - return; - - for (i = 0; i < on_len; i++) - if (online[i]) - nr_on_cpus++; - /* load program */ err = bpf_prog_load(file, BPF_PROG_TYPE_KPROBE, &obj, &prog_fd); + if (CHECK(err, "obj_load", "err %d errno %d\n", err, errno)) + return; - if (CHECK(err, "obj_load", "err %d errno %d\n", err, errno)) { - obj = NULL; - goto out_close; - } prog = bpf_object__find_program_by_title(obj, prog_name); if (CHECK(!prog, "find_probe", "prog '%s' not found\n", prog_name)) @@ -77,11 +64,6 @@ /* trigger kprobe on every CPU */ CPU_ZERO(&cpu_seen); for (i = 0; i < nr_cpus; i++) { - if (i >= on_len || !online[i]) { - printf("skipping offline CPU #%d\n", i); - continue; - } - CPU_ZERO(&cpu_set); CPU_SET(i, &cpu_set); @@ -99,8 +81,8 @@ if (CHECK(err < 0, "perf_buffer__poll", "err %d\n", err)) goto out_free_pb; + if (CHECK(CPU_COUNT(&cpu_seen) != nr_cpus, "seen_cpu_cnt", + "expect %d, seen %d\n", nr_cpus, CPU_COUNT(&cpu_seen))) - if (CHECK(CPU_COUNT(&cpu_seen) != nr_on_cpus, "seen_cpu_cnt", - "expect %d, seen %d\n", nr_on_cpus, CPU_COUNT(&cpu_seen))) goto out_free_pb; out_free_pb: @@ -109,5 +91,4 @@ bpf_link__destroy(link); out_close: bpf_object__close(obj); - free(online); } reverted: --- linux-5.3.0/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c +++ linux-5.3.0.orig/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c @@ -49,12 +49,8 @@ pmu_fd = syscall(__NR_perf_event_open, &attr, -1 /* pid */, 0 /* cpu 0 */, -1 /* group id */, 0 /* flags */); + if (CHECK(pmu_fd < 0, "perf_event_open", + "err %d errno %d. Does the test host support PERF_COUNT_HW_CPU_CYCLES?\n", - if (pmu_fd < 0 && errno == ENOENT) { - printf("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n", __func__); - test__skip(); - goto cleanup; - } - if (CHECK(pmu_fd < 0, "perf_event_open", "err %d errno %d\n", pmu_fd, errno)) goto close_prog;