From 30adf5f6eb1b64b8d687241b120552939d30e6f8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 14 Jul 2020 16:14:06 +0200 Subject: [PATCH] 5.4-stable patches added patches: arc-elf-use-right-elf_arch.patch arc-entry-fix-potential-efa-clobber-when-tif_syscall_trace.patch arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch blk-mq-consider-non-idle-request-as-inflight-in-blk_mq_rq_inflight.patch btrfs-fix-double-put-of-block-group-with-nocow.patch btrfs-fix-fatal-extent_buffer-readahead-vs-releasepage-race.patch dm-use-noio-when-sending-kobject-event.patch dm-writecache-reject-asynchronous-pmem-devices.patch drm-amdgpu-don-t-do-soft-recovery-if-gpu_recovery-0.patch drm-radeon-fix-double-free.patch mmc-meson-gx-limit-segments-to-1-when-dram-access-quirk-is-needed.patch perf-scripts-python-export-to-postgresql.py-fix-struct.pack-int-argument.patch perf-scripts-python-exported-sql-viewer.py-fix-unexpanded-find-result.patch perf-scripts-python-exported-sql-viewer.py-fix-zero-id-in-call-graph-find-result.patch perf-scripts-python-exported-sql-viewer.py-fix-zero-id-in-call-tree-find-result.patch s390-mm-fix-huge-pte-soft-dirty-copying.patch s390-setup-init-jump-labels-before-command-line-parsing.patch --- queue-5.4/arc-elf-use-right-elf_arch.patch | 28 +++ ...l-efa-clobber-when-tif_syscall_trace.patch | 81 +++++++ ...affected-by-arm64_workaround_1418040.patch | 44 ++++ ...st-as-inflight-in-blk_mq_rq_inflight.patch | 52 +++++ ...double-put-of-block-group-with-nocow.patch | 68 ++++++ ...buffer-readahead-vs-releasepage-race.patch | 206 ++++++++++++++++++ ...-use-noio-when-sending-kobject-event.patch | 67 ++++++ ...che-reject-asynchronous-pmem-devices.patch | 39 ++++ ...t-do-soft-recovery-if-gpu_recovery-0.patch | 37 ++++ queue-5.4/drm-radeon-fix-double-free.patch | 81 +++++++ ...o-1-when-dram-access-quirk-is-needed.patch | 51 +++++ ...esql.py-fix-struct.pack-int-argument.patch | 68 ++++++ ...viewer.py-fix-unexpanded-find-result.patch | 57 +++++ ...ix-zero-id-in-call-graph-find-result.patch | 58 +++++ ...fix-zero-id-in-call-tree-find-result.patch | 58 +++++ ...0-mm-fix-huge-pte-soft-dirty-copying.patch | 35 +++ ...p-labels-before-command-line-parsing.patch | 42 ++++ queue-5.4/series | 17 ++ 18 files changed, 1089 insertions(+) create mode 100644 queue-5.4/arc-elf-use-right-elf_arch.patch create mode 100644 queue-5.4/arc-entry-fix-potential-efa-clobber-when-tif_syscall_trace.patch create mode 100644 queue-5.4/arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch create mode 100644 queue-5.4/blk-mq-consider-non-idle-request-as-inflight-in-blk_mq_rq_inflight.patch create mode 100644 queue-5.4/btrfs-fix-double-put-of-block-group-with-nocow.patch create mode 100644 queue-5.4/btrfs-fix-fatal-extent_buffer-readahead-vs-releasepage-race.patch create mode 100644 queue-5.4/dm-use-noio-when-sending-kobject-event.patch create mode 100644 queue-5.4/dm-writecache-reject-asynchronous-pmem-devices.patch create mode 100644 queue-5.4/drm-amdgpu-don-t-do-soft-recovery-if-gpu_recovery-0.patch create mode 100644 queue-5.4/drm-radeon-fix-double-free.patch create mode 100644 queue-5.4/mmc-meson-gx-limit-segments-to-1-when-dram-access-quirk-is-needed.patch create mode 100644 queue-5.4/perf-scripts-python-export-to-postgresql.py-fix-struct.pack-int-argument.patch create mode 100644 queue-5.4/perf-scripts-python-exported-sql-viewer.py-fix-unexpanded-find-result.patch create mode 100644 queue-5.4/perf-scripts-python-exported-sql-viewer.py-fix-zero-id-in-call-graph-find-result.patch create mode 100644 queue-5.4/perf-scripts-python-exported-sql-viewer.py-fix-zero-id-in-call-tree-find-result.patch create mode 100644 queue-5.4/s390-mm-fix-huge-pte-soft-dirty-copying.patch create mode 100644 queue-5.4/s390-setup-init-jump-labels-before-command-line-parsing.patch diff --git a/queue-5.4/arc-elf-use-right-elf_arch.patch b/queue-5.4/arc-elf-use-right-elf_arch.patch new file mode 100644 index 00000000000..302286ee2e3 --- /dev/null +++ b/queue-5.4/arc-elf-use-right-elf_arch.patch @@ -0,0 +1,28 @@ +From b7faf971081a4e56147f082234bfff55135305cb Mon Sep 17 00:00:00 2001 +From: Vineet Gupta +Date: Wed, 27 May 2020 14:18:45 -0700 +Subject: ARC: elf: use right ELF_ARCH + +From: Vineet Gupta + +commit b7faf971081a4e56147f082234bfff55135305cb upstream. + +Cc: +Signed-off-by: Vineet Gupta +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arc/include/asm/elf.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arc/include/asm/elf.h ++++ b/arch/arc/include/asm/elf.h +@@ -19,7 +19,7 @@ + #define R_ARC_32_PCREL 0x31 + + /*to set parameters in the core dumps */ +-#define ELF_ARCH EM_ARCOMPACT ++#define ELF_ARCH EM_ARC_INUSE + #define ELF_CLASS ELFCLASS32 + + #ifdef CONFIG_CPU_BIG_ENDIAN diff --git a/queue-5.4/arc-entry-fix-potential-efa-clobber-when-tif_syscall_trace.patch b/queue-5.4/arc-entry-fix-potential-efa-clobber-when-tif_syscall_trace.patch new file mode 100644 index 00000000000..d82ff7c452d --- /dev/null +++ b/queue-5.4/arc-entry-fix-potential-efa-clobber-when-tif_syscall_trace.patch @@ -0,0 +1,81 @@ +From 00fdec98d9881bf5173af09aebd353ab3b9ac729 Mon Sep 17 00:00:00 2001 +From: Vineet Gupta +Date: Tue, 19 May 2020 22:28:32 -0700 +Subject: ARC: entry: fix potential EFA clobber when TIF_SYSCALL_TRACE + +From: Vineet Gupta + +commit 00fdec98d9881bf5173af09aebd353ab3b9ac729 upstream. + +Trap handler for syscall tracing reads EFA (Exception Fault Address), +in case strace wants PC of trap instruction (EFA is not part of pt_regs +as of current code). + +However this EFA read is racy as it happens after dropping to pure +kernel mode (re-enabling interrupts). A taken interrupt could +context-switch, trigger a different task's trap, clobbering EFA for this +execution context. + +Fix this by reading EFA early, before re-enabling interrupts. A slight +side benefit is de-duplication of FAKE_RET_FROM_EXCPN in trap handler. +The trap handler is common to both ARCompact and ARCv2 builds too. + +This just came out of code rework/review and no real problem was reported +but is clearly a potential problem specially for strace. + +Cc: +Signed-off-by: Vineet Gupta +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arc/kernel/entry.S | 16 +++++----------- + 1 file changed, 5 insertions(+), 11 deletions(-) + +--- a/arch/arc/kernel/entry.S ++++ b/arch/arc/kernel/entry.S +@@ -153,7 +153,6 @@ END(EV_Extension) + tracesys: + ; save EFA in case tracer wants the PC of traced task + ; using ERET won't work since next-PC has already committed +- lr r12, [efa] + GET_CURR_TASK_FIELD_PTR TASK_THREAD, r11 + st r12, [r11, THREAD_FAULT_ADDR] ; thread.fault_address + +@@ -196,15 +195,9 @@ tracesys_exit: + ; Breakpoint TRAP + ; --------------------------------------------- + trap_with_param: +- +- ; stop_pc info by gdb needs this info +- lr r0, [efa] ++ mov r0, r12 ; EFA in case ptracer/gdb wants stop_pc + mov r1, sp + +- ; Now that we have read EFA, it is safe to do "fake" rtie +- ; and get out of CPU exception mode +- FAKE_RET_FROM_EXCPN +- + ; Save callee regs in case gdb wants to have a look + ; SP will grow up by size of CALLEE Reg-File + ; NOTE: clobbers r12 +@@ -231,6 +224,10 @@ ENTRY(EV_Trap) + + EXCEPTION_PROLOGUE + ++ lr r12, [efa] ++ ++ FAKE_RET_FROM_EXCPN ++ + ;============ TRAP 1 :breakpoints + ; Check ECR for trap with arg (PROLOGUE ensures r10 has ECR) + bmsk.f 0, r10, 7 +@@ -238,9 +235,6 @@ ENTRY(EV_Trap) + + ;============ TRAP (no param): syscall top level + +- ; First return from Exception to pure K mode (Exception/IRQs renabled) +- FAKE_RET_FROM_EXCPN +- + ; If syscall tracing ongoing, invoke pre-post-hooks + GET_CURR_THR_INFO_FLAGS r10 + btst r10, TIF_SYSCALL_TRACE diff --git a/queue-5.4/arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch b/queue-5.4/arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch new file mode 100644 index 00000000000..718e006822e --- /dev/null +++ b/queue-5.4/arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch @@ -0,0 +1,44 @@ +From 4b661d6133c5d3a7c9aca0b4ee5a78c7766eff3f Mon Sep 17 00:00:00 2001 +From: Marc Zyngier +Date: Mon, 6 Jul 2020 17:38:01 +0100 +Subject: arm64: arch_timer: Disable the compat vdso for cores affected by ARM64_WORKAROUND_1418040 + +From: Marc Zyngier + +commit 4b661d6133c5d3a7c9aca0b4ee5a78c7766eff3f upstream. + +ARM64_WORKAROUND_1418040 requires that AArch32 EL0 accesses to +the virtual counter register are trapped and emulated by the kernel. +This makes the vdso pretty pointless, and in some cases livelock +prone. + +Provide a workaround entry that limits the vdso to 64bit tasks. + +Signed-off-by: Marc Zyngier +Acked-by: Mark Rutland +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20200706163802.1836732-4-maz@kernel.org +Signed-off-by: Will Deacon +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/clocksource/arm_arch_timer.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/drivers/clocksource/arm_arch_timer.c ++++ b/drivers/clocksource/arm_arch_timer.c +@@ -476,6 +476,14 @@ static const struct arch_timer_erratum_w + .set_next_event_virt = erratum_set_next_event_tval_virt, + }, + #endif ++#ifdef CONFIG_ARM64_ERRATUM_1418040 ++ { ++ .match_type = ate_match_local_cap_id, ++ .id = (void *)ARM64_WORKAROUND_1418040, ++ .desc = "ARM erratum 1418040", ++ .disable_compat_vdso = true, ++ }, ++#endif + }; + + typedef bool (*ate_match_fn_t)(const struct arch_timer_erratum_workaround *, diff --git a/queue-5.4/blk-mq-consider-non-idle-request-as-inflight-in-blk_mq_rq_inflight.patch b/queue-5.4/blk-mq-consider-non-idle-request-as-inflight-in-blk_mq_rq_inflight.patch new file mode 100644 index 00000000000..c2f0319b0b5 --- /dev/null +++ b/queue-5.4/blk-mq-consider-non-idle-request-as-inflight-in-blk_mq_rq_inflight.patch @@ -0,0 +1,52 @@ +From 05a4fed69ff00a8bd83538684cb602a4636b07a7 Mon Sep 17 00:00:00 2001 +From: Ming Lei +Date: Tue, 7 Jul 2020 11:04:33 -0400 +Subject: blk-mq: consider non-idle request as "inflight" in blk_mq_rq_inflight() + +From: Ming Lei + +commit 05a4fed69ff00a8bd83538684cb602a4636b07a7 upstream. + +dm-multipath is the only user of blk_mq_queue_inflight(). When +dm-multipath calls blk_mq_queue_inflight() to check if it has +outstanding IO it can get a false negative. The reason for this is +blk_mq_rq_inflight() doesn't consider requests that are no longer +MQ_RQ_IN_FLIGHT but that are now MQ_RQ_COMPLETE (->complete isn't +called or finished yet) as "inflight". + +This causes request-based dm-multipath's dm_wait_for_completion() to +return before all outstanding dm-multipath requests have actually +completed. This breaks DM multipath's suspend functionality because +blk-mq requests complete after DM's suspend has finished -- which +shouldn't happen. + +Fix this by considering any request not in the MQ_RQ_IDLE state +(so either MQ_RQ_COMPLETE or MQ_RQ_IN_FLIGHT) as "inflight" in +blk_mq_rq_inflight(). + +Fixes: 3c94d83cb3526 ("blk-mq: change blk_mq_queue_busy() to blk_mq_queue_inflight()") +Signed-off-by: Ming Lei +Signed-off-by: Mike Snitzer +Cc: stable@vger.kernel.org +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman + +--- + block/blk-mq.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/block/blk-mq.c ++++ b/block/blk-mq.c +@@ -829,10 +829,10 @@ static bool blk_mq_rq_inflight(struct bl + void *priv, bool reserved) + { + /* +- * If we find a request that is inflight and the queue matches, ++ * If we find a request that isn't idle and the queue matches, + * we know the queue is busy. Return false to stop the iteration. + */ +- if (rq->state == MQ_RQ_IN_FLIGHT && rq->q == hctx->queue) { ++ if (blk_mq_request_started(rq) && rq->q == hctx->queue) { + bool *busy = priv; + + *busy = true; diff --git a/queue-5.4/btrfs-fix-double-put-of-block-group-with-nocow.patch b/queue-5.4/btrfs-fix-double-put-of-block-group-with-nocow.patch new file mode 100644 index 00000000000..c0960f3b405 --- /dev/null +++ b/queue-5.4/btrfs-fix-double-put-of-block-group-with-nocow.patch @@ -0,0 +1,68 @@ +From 230ed397435e85b54f055c524fcb267ae2ce3bc4 Mon Sep 17 00:00:00 2001 +From: Josef Bacik +Date: Mon, 6 Jul 2020 09:14:12 -0400 +Subject: btrfs: fix double put of block group with nocow + +From: Josef Bacik + +commit 230ed397435e85b54f055c524fcb267ae2ce3bc4 upstream. + +While debugging a patch that I wrote I was hitting use-after-free panics +when accessing block groups on unmount. This turned out to be because +in the nocow case if we bail out of doing the nocow for whatever reason +we need to call btrfs_dec_nocow_writers() if we called the inc. This +puts our block group, but a few error cases does + +if (nocow) { + btrfs_dec_nocow_writers(); + goto error; +} + +unfortunately, error is + +error: + if (nocow) + btrfs_dec_nocow_writers(); + +so we get a double put on our block group. Fix this by dropping the +error cases calling of btrfs_dec_nocow_writers(), as it's handled at the +error label now. + +Fixes: 762bf09893b4 ("btrfs: improve error handling in run_delalloc_nocow") +CC: stable@vger.kernel.org # 5.4+ +Reviewed-by: Filipe Manana +Signed-off-by: Josef Bacik +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Greg Kroah-Hartman + +--- + fs/btrfs/inode.c | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +--- a/fs/btrfs/inode.c ++++ b/fs/btrfs/inode.c +@@ -1657,12 +1657,8 @@ out_check: + ret = fallback_to_cow(inode, locked_page, cow_start, + found_key.offset - 1, + page_started, nr_written); +- if (ret) { +- if (nocow) +- btrfs_dec_nocow_writers(fs_info, +- disk_bytenr); ++ if (ret) + goto error; +- } + cow_start = (u64)-1; + } + +@@ -1678,9 +1674,6 @@ out_check: + ram_bytes, BTRFS_COMPRESS_NONE, + BTRFS_ORDERED_PREALLOC); + if (IS_ERR(em)) { +- if (nocow) +- btrfs_dec_nocow_writers(fs_info, +- disk_bytenr); + ret = PTR_ERR(em); + goto error; + } diff --git a/queue-5.4/btrfs-fix-fatal-extent_buffer-readahead-vs-releasepage-race.patch b/queue-5.4/btrfs-fix-fatal-extent_buffer-readahead-vs-releasepage-race.patch new file mode 100644 index 00000000000..7ff7c599ead --- /dev/null +++ b/queue-5.4/btrfs-fix-fatal-extent_buffer-readahead-vs-releasepage-race.patch @@ -0,0 +1,206 @@ +From 6bf9cd2eed9aee6d742bb9296c994a91f5316949 Mon Sep 17 00:00:00 2001 +From: Boris Burkov +Date: Wed, 17 Jun 2020 11:35:19 -0700 +Subject: btrfs: fix fatal extent_buffer readahead vs releasepage race + +From: Boris Burkov + +commit 6bf9cd2eed9aee6d742bb9296c994a91f5316949 upstream. + +Under somewhat convoluted conditions, it is possible to attempt to +release an extent_buffer that is under io, which triggers a BUG_ON in +btrfs_release_extent_buffer_pages. + +This relies on a few different factors. First, extent_buffer reads done +as readahead for searching use WAIT_NONE, so they free the local extent +buffer reference while the io is outstanding. However, they should still +be protected by TREE_REF. However, if the system is doing signficant +reclaim, and simultaneously heavily accessing the extent_buffers, it is +possible for releasepage to race with two concurrent readahead attempts +in a way that leaves TREE_REF unset when the readahead extent buffer is +released. + +Essentially, if two tasks race to allocate a new extent_buffer, but the +winner who attempts the first io is rebuffed by a page being locked +(likely by the reclaim itself) then the loser will still go ahead with +issuing the readahead. The loser's call to find_extent_buffer must also +race with the reclaim task reading the extent_buffer's refcount as 1 in +a way that allows the reclaim to re-clear the TREE_REF checked by +find_extent_buffer. + +The following represents an example execution demonstrating the race: + + CPU0 CPU1 CPU2 +reada_for_search reada_for_search + readahead_tree_block readahead_tree_block + find_create_tree_block find_create_tree_block + alloc_extent_buffer alloc_extent_buffer + find_extent_buffer // not found + allocates eb + lock pages + associate pages to eb + insert eb into radix tree + set TREE_REF, refs == 2 + unlock pages + read_extent_buffer_pages // WAIT_NONE + not uptodate (brand new eb) + lock_page + if !trylock_page + goto unlock_exit // not an error + free_extent_buffer + release_extent_buffer + atomic_dec_and_test refs to 1 + find_extent_buffer // found + try_release_extent_buffer + take refs_lock + reads refs == 1; no io + atomic_inc_not_zero refs to 2 + mark_buffer_accessed + check_buffer_tree_ref + // not STALE, won't take refs_lock + refs == 2; TREE_REF set // no action + read_extent_buffer_pages // WAIT_NONE + clear TREE_REF + release_extent_buffer + atomic_dec_and_test refs to 1 + unlock_page + still not uptodate (CPU1 read failed on trylock_page) + locks pages + set io_pages > 0 + submit io + return + free_extent_buffer + release_extent_buffer + dec refs to 0 + delete from radix tree + btrfs_release_extent_buffer_pages + BUG_ON(io_pages > 0)!!! + +We observe this at a very low rate in production and were also able to +reproduce it in a test environment by introducing some spurious delays +and by introducing probabilistic trylock_page failures. + +To fix it, we apply check_tree_ref at a point where it could not +possibly be unset by a competing task: after io_pages has been +incremented. All the codepaths that clear TREE_REF check for io, so they +would not be able to clear it after this point until the io is done. + +Stack trace, for reference: +[1417839.424739] ------------[ cut here ]------------ +[1417839.435328] kernel BUG at fs/btrfs/extent_io.c:4841! +[1417839.447024] invalid opcode: 0000 [#1] SMP +[1417839.502972] RIP: 0010:btrfs_release_extent_buffer_pages+0x20/0x1f0 +[1417839.517008] Code: ed e9 ... +[1417839.558895] RSP: 0018:ffffc90020bcf798 EFLAGS: 00010202 +[1417839.570816] RAX: 0000000000000002 RBX: ffff888102d6def0 RCX: 0000000000000028 +[1417839.586962] RDX: 0000000000000002 RSI: ffff8887f0296482 RDI: ffff888102d6def0 +[1417839.603108] RBP: ffff88885664a000 R08: 0000000000000046 R09: 0000000000000238 +[1417839.619255] R10: 0000000000000028 R11: ffff88885664af68 R12: 0000000000000000 +[1417839.635402] R13: 0000000000000000 R14: ffff88875f573ad0 R15: ffff888797aafd90 +[1417839.651549] FS: 00007f5a844fa700(0000) GS:ffff88885f680000(0000) knlGS:0000000000000000 +[1417839.669810] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[1417839.682887] CR2: 00007f7884541fe0 CR3: 000000049f609002 CR4: 00000000003606e0 +[1417839.699037] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +[1417839.715187] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 +[1417839.731320] Call Trace: +[1417839.737103] release_extent_buffer+0x39/0x90 +[1417839.746913] read_block_for_search.isra.38+0x2a3/0x370 +[1417839.758645] btrfs_search_slot+0x260/0x9b0 +[1417839.768054] btrfs_lookup_file_extent+0x4a/0x70 +[1417839.778427] btrfs_get_extent+0x15f/0x830 +[1417839.787665] ? submit_extent_page+0xc4/0x1c0 +[1417839.797474] ? __do_readpage+0x299/0x7a0 +[1417839.806515] __do_readpage+0x33b/0x7a0 +[1417839.815171] ? btrfs_releasepage+0x70/0x70 +[1417839.824597] extent_readpages+0x28f/0x400 +[1417839.833836] read_pages+0x6a/0x1c0 +[1417839.841729] ? startup_64+0x2/0x30 +[1417839.849624] __do_page_cache_readahead+0x13c/0x1a0 +[1417839.860590] filemap_fault+0x6c7/0x990 +[1417839.869252] ? xas_load+0x8/0x80 +[1417839.876756] ? xas_find+0x150/0x190 +[1417839.884839] ? filemap_map_pages+0x295/0x3b0 +[1417839.894652] __do_fault+0x32/0x110 +[1417839.902540] __handle_mm_fault+0xacd/0x1000 +[1417839.912156] handle_mm_fault+0xaa/0x1c0 +[1417839.921004] __do_page_fault+0x242/0x4b0 +[1417839.930044] ? page_fault+0x8/0x30 +[1417839.937933] page_fault+0x1e/0x30 +[1417839.945631] RIP: 0033:0x33c4bae +[1417839.952927] Code: Bad RIP value. +[1417839.960411] RSP: 002b:00007f5a844f7350 EFLAGS: 00010206 +[1417839.972331] RAX: 000000000000006e RBX: 1614b3ff6a50398a RCX: 0000000000000000 +[1417839.988477] RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000002 +[1417840.004626] RBP: 00007f5a844f7420 R08: 000000000000006e R09: 00007f5a94aeccb8 +[1417840.020784] R10: 00007f5a844f7350 R11: 0000000000000000 R12: 00007f5a94aecc79 +[1417840.036932] R13: 00007f5a94aecc78 R14: 00007f5a94aecc90 R15: 00007f5a94aecc40 + +CC: stable@vger.kernel.org # 4.4+ +Reviewed-by: Filipe Manana +Signed-off-by: Boris Burkov +Signed-off-by: David Sterba +Signed-off-by: Greg Kroah-Hartman + +--- + fs/btrfs/extent_io.c | 40 ++++++++++++++++++++++++---------------- + 1 file changed, 24 insertions(+), 16 deletions(-) + +--- a/fs/btrfs/extent_io.c ++++ b/fs/btrfs/extent_io.c +@@ -5025,25 +5025,28 @@ struct extent_buffer *alloc_dummy_extent + static void check_buffer_tree_ref(struct extent_buffer *eb) + { + int refs; +- /* the ref bit is tricky. We have to make sure it is set +- * if we have the buffer dirty. Otherwise the +- * code to free a buffer can end up dropping a dirty +- * page ++ /* ++ * The TREE_REF bit is first set when the extent_buffer is added ++ * to the radix tree. It is also reset, if unset, when a new reference ++ * is created by find_extent_buffer. + * +- * Once the ref bit is set, it won't go away while the +- * buffer is dirty or in writeback, and it also won't +- * go away while we have the reference count on the +- * eb bumped. ++ * It is only cleared in two cases: freeing the last non-tree ++ * reference to the extent_buffer when its STALE bit is set or ++ * calling releasepage when the tree reference is the only reference. + * +- * We can't just set the ref bit without bumping the +- * ref on the eb because free_extent_buffer might +- * see the ref bit and try to clear it. If this happens +- * free_extent_buffer might end up dropping our original +- * ref by mistake and freeing the page before we are able +- * to add one more ref. ++ * In both cases, care is taken to ensure that the extent_buffer's ++ * pages are not under io. However, releasepage can be concurrently ++ * called with creating new references, which is prone to race ++ * conditions between the calls to check_buffer_tree_ref in those ++ * codepaths and clearing TREE_REF in try_release_extent_buffer. + * +- * So bump the ref count first, then set the bit. If someone +- * beat us to it, drop the ref we added. ++ * The actual lifetime of the extent_buffer in the radix tree is ++ * adequately protected by the refcount, but the TREE_REF bit and ++ * its corresponding reference are not. To protect against this ++ * class of races, we call check_buffer_tree_ref from the codepaths ++ * which trigger io after they set eb->io_pages. Note that once io is ++ * initiated, TREE_REF can no longer be cleared, so that is the ++ * moment at which any such race is best fixed. + */ + refs = atomic_read(&eb->refs); + if (refs >= 2 && test_bit(EXTENT_BUFFER_TREE_REF, &eb->bflags)) +@@ -5493,6 +5496,11 @@ int read_extent_buffer_pages(struct exte + clear_bit(EXTENT_BUFFER_READ_ERR, &eb->bflags); + eb->read_mirror = 0; + atomic_set(&eb->io_pages, num_reads); ++ /* ++ * It is possible for releasepage to clear the TREE_REF bit before we ++ * set io_pages. See check_buffer_tree_ref for a more detailed comment. ++ */ ++ check_buffer_tree_ref(eb); + for (i = 0; i < num_pages; i++) { + page = eb->pages[i]; + diff --git a/queue-5.4/dm-use-noio-when-sending-kobject-event.patch b/queue-5.4/dm-use-noio-when-sending-kobject-event.patch new file mode 100644 index 00000000000..4d1a71781ac --- /dev/null +++ b/queue-5.4/dm-use-noio-when-sending-kobject-event.patch @@ -0,0 +1,67 @@ +From 6958c1c640af8c3f40fa8a2eee3b5b905d95b677 Mon Sep 17 00:00:00 2001 +From: Mikulas Patocka +Date: Wed, 8 Jul 2020 12:25:20 -0400 +Subject: dm: use noio when sending kobject event + +From: Mikulas Patocka + +commit 6958c1c640af8c3f40fa8a2eee3b5b905d95b677 upstream. + +kobject_uevent may allocate memory and it may be called while there are dm +devices suspended. The allocation may recurse into a suspended device, +causing a deadlock. We must set the noio flag when sending a uevent. + +The observed deadlock was reported here: +https://www.redhat.com/archives/dm-devel/2020-March/msg00025.html + +Reported-by: Khazhismel Kumykov +Reported-by: Tahsin Erdogan +Reported-by: Gabriel Krisman Bertazi +Signed-off-by: Mikulas Patocka +Cc: stable@vger.kernel.org +Signed-off-by: Mike Snitzer +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/md/dm.c | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +--- a/drivers/md/dm.c ++++ b/drivers/md/dm.c +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -2886,17 +2887,25 @@ EXPORT_SYMBOL_GPL(dm_internal_resume_fas + int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action, + unsigned cookie) + { ++ int r; ++ unsigned noio_flag; + char udev_cookie[DM_COOKIE_LENGTH]; + char *envp[] = { udev_cookie, NULL }; + ++ noio_flag = memalloc_noio_save(); ++ + if (!cookie) +- return kobject_uevent(&disk_to_dev(md->disk)->kobj, action); ++ r = kobject_uevent(&disk_to_dev(md->disk)->kobj, action); + else { + snprintf(udev_cookie, DM_COOKIE_LENGTH, "%s=%u", + DM_COOKIE_ENV_VAR_NAME, cookie); +- return kobject_uevent_env(&disk_to_dev(md->disk)->kobj, +- action, envp); ++ r = kobject_uevent_env(&disk_to_dev(md->disk)->kobj, ++ action, envp); + } ++ ++ memalloc_noio_restore(noio_flag); ++ ++ return r; + } + + uint32_t dm_next_uevent_seq(struct mapped_device *md) diff --git a/queue-5.4/dm-writecache-reject-asynchronous-pmem-devices.patch b/queue-5.4/dm-writecache-reject-asynchronous-pmem-devices.patch new file mode 100644 index 00000000000..4ba8a8f671e --- /dev/null +++ b/queue-5.4/dm-writecache-reject-asynchronous-pmem-devices.patch @@ -0,0 +1,39 @@ +From a46624580376a3a0beb218d94cbc7f258696e29f Mon Sep 17 00:00:00 2001 +From: Michal Suchanek +Date: Tue, 30 Jun 2020 17:49:24 +0200 +Subject: dm writecache: reject asynchronous pmem devices + +From: Michal Suchanek + +commit a46624580376a3a0beb218d94cbc7f258696e29f upstream. + +DM writecache does not handle asynchronous pmem. Reject it when +supplied as cache. + +Link: https://lore.kernel.org/linux-nvdimm/87lfk5hahc.fsf@linux.ibm.com/ +Fixes: 6e84200c0a29 ("virtio-pmem: Add virtio pmem driver") +Signed-off-by: Michal Suchanek +Acked-by: Mikulas Patocka +Cc: stable@vger.kernel.org # 5.3+ +Signed-off-by: Mike Snitzer +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/md/dm-writecache.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/md/dm-writecache.c ++++ b/drivers/md/dm-writecache.c +@@ -2104,6 +2104,12 @@ invalid_optional: + } + + if (WC_MODE_PMEM(wc)) { ++ if (!dax_synchronous(wc->ssd_dev->dax_dev)) { ++ r = -EOPNOTSUPP; ++ ti->error = "Asynchronous persistent memory not supported as pmem cache"; ++ goto bad; ++ } ++ + r = persistent_memory_claim(wc); + if (r) { + ti->error = "Unable to map persistent memory for cache"; diff --git a/queue-5.4/drm-amdgpu-don-t-do-soft-recovery-if-gpu_recovery-0.patch b/queue-5.4/drm-amdgpu-don-t-do-soft-recovery-if-gpu_recovery-0.patch new file mode 100644 index 00000000000..f4e27068458 --- /dev/null +++ b/queue-5.4/drm-amdgpu-don-t-do-soft-recovery-if-gpu_recovery-0.patch @@ -0,0 +1,37 @@ +From f4892c327a8e5df7ce16cab40897daf90baf6bec Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= +Date: Mon, 6 Jul 2020 18:23:17 -0400 +Subject: drm/amdgpu: don't do soft recovery if gpu_recovery=0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Marek Olšák + +commit f4892c327a8e5df7ce16cab40897daf90baf6bec upstream. + +It's impossible to debug shader hangs with soft recovery. + +Signed-off-by: Marek Olšák +Reviewed-by: Alex Deucher +Reviewed-by: Christian König +Signed-off-by: Alex Deucher +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +@@ -36,7 +36,8 @@ static void amdgpu_job_timedout(struct d + + memset(&ti, 0, sizeof(struct amdgpu_task_info)); + +- if (amdgpu_ring_soft_recovery(ring, job->vmid, s_job->s_fence->parent)) { ++ if (amdgpu_gpu_recovery && ++ amdgpu_ring_soft_recovery(ring, job->vmid, s_job->s_fence->parent)) { + DRM_ERROR("ring %s timeout, but soft recovered\n", + s_job->sched->name); + return; diff --git a/queue-5.4/drm-radeon-fix-double-free.patch b/queue-5.4/drm-radeon-fix-double-free.patch new file mode 100644 index 00000000000..7dc6b30ff4e --- /dev/null +++ b/queue-5.4/drm-radeon-fix-double-free.patch @@ -0,0 +1,81 @@ +From 41855a898650803e24b284173354cc3e44d07725 Mon Sep 17 00:00:00 2001 +From: Tom Rix +Date: Mon, 6 Jul 2020 05:28:57 -0700 +Subject: drm/radeon: fix double free + +From: Tom Rix + +commit 41855a898650803e24b284173354cc3e44d07725 upstream. + +clang static analysis flags this error + +drivers/gpu/drm/radeon/ci_dpm.c:5652:9: warning: Use of memory after it is freed [unix.Malloc] + kfree(rdev->pm.dpm.ps[i].ps_priv); + ^~~~~~~~~~~~~~~~~~~~~~~~~~ +drivers/gpu/drm/radeon/ci_dpm.c:5654:2: warning: Attempt to free released memory [unix.Malloc] + kfree(rdev->pm.dpm.ps); + ^~~~~~~~~~~~~~~~~~~~~~ + +problem is reported in ci_dpm_fini, with these code blocks. + + for (i = 0; i < rdev->pm.dpm.num_ps; i++) { + kfree(rdev->pm.dpm.ps[i].ps_priv); + } + kfree(rdev->pm.dpm.ps); + +The first free happens in ci_parse_power_table where it cleans up locally +on a failure. ci_dpm_fini also does a cleanup. + + ret = ci_parse_power_table(rdev); + if (ret) { + ci_dpm_fini(rdev); + return ret; + } + +So remove the cleanup in ci_parse_power_table and +move the num_ps calculation to inside the loop so ci_dpm_fini +will know how many array elements to free. + +Fixes: cc8dbbb4f62a ("drm/radeon: add dpm support for CI dGPUs (v2)") + +Signed-off-by: Tom Rix +Signed-off-by: Alex Deucher +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/ci_dpm.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +--- a/drivers/gpu/drm/radeon/ci_dpm.c ++++ b/drivers/gpu/drm/radeon/ci_dpm.c +@@ -5578,6 +5578,7 @@ static int ci_parse_power_table(struct r + if (!rdev->pm.dpm.ps) + return -ENOMEM; + power_state_offset = (u8 *)state_array->states; ++ rdev->pm.dpm.num_ps = 0; + for (i = 0; i < state_array->ucNumEntries; i++) { + u8 *idx; + power_state = (union pplib_power_state *)power_state_offset; +@@ -5587,10 +5588,8 @@ static int ci_parse_power_table(struct r + if (!rdev->pm.power_state[i].clock_info) + return -EINVAL; + ps = kzalloc(sizeof(struct ci_ps), GFP_KERNEL); +- if (ps == NULL) { +- kfree(rdev->pm.dpm.ps); ++ if (ps == NULL) + return -ENOMEM; +- } + rdev->pm.dpm.ps[i].ps_priv = ps; + ci_parse_pplib_non_clock_info(rdev, &rdev->pm.dpm.ps[i], + non_clock_info, +@@ -5612,8 +5611,8 @@ static int ci_parse_power_table(struct r + k++; + } + power_state_offset += 2 + power_state->v2.ucNumDPMLevels; ++ rdev->pm.dpm.num_ps = i + 1; + } +- rdev->pm.dpm.num_ps = state_array->ucNumEntries; + + /* fill in the vce power states */ + for (i = 0; i < RADEON_MAX_VCE_LEVELS; i++) { diff --git a/queue-5.4/mmc-meson-gx-limit-segments-to-1-when-dram-access-quirk-is-needed.patch b/queue-5.4/mmc-meson-gx-limit-segments-to-1-when-dram-access-quirk-is-needed.patch new file mode 100644 index 00000000000..56d39a2dee4 --- /dev/null +++ b/queue-5.4/mmc-meson-gx-limit-segments-to-1-when-dram-access-quirk-is-needed.patch @@ -0,0 +1,51 @@ +From 27a5e7d36d383970affae801d77141deafd536a8 Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Mon, 8 Jun 2020 10:44:58 +0200 +Subject: mmc: meson-gx: limit segments to 1 when dram-access-quirk is needed + +From: Neil Armstrong + +commit 27a5e7d36d383970affae801d77141deafd536a8 upstream. + +The actual max_segs computation leads to failure while using the broadcom +sdio brcmfmac/bcmsdh driver, since the driver tries to make usage of +scatter gather. + +But with the dram-access-quirk we use a 1,5K SRAM bounce buffer, and the +max_segs current value of 3 leads to max transfers to 4,5k, which doesn't +work. + +This patch sets max_segs to 1 to better describe the hardware limitation, +and fix the SDIO functionality with the brcmfmac/bcmsdh driver on Amlogic +G12A/G12B SoCs on boards like SEI510 or Khadas VIM3. + +Reported-by: Art Nikpal +Reported-by: Christian Hewitt +Fixes: acdc8e71d9bb ("mmc: meson-gx: add dram-access-quirk") +Signed-off-by: Neil Armstrong +Reviewed-by: Kevin Hilman +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20200608084458.32014-1-narmstrong@baylibre.com +Signed-off-by: Ulf Hansson +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/mmc/host/meson-gx-mmc.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/drivers/mmc/host/meson-gx-mmc.c ++++ b/drivers/mmc/host/meson-gx-mmc.c +@@ -1151,9 +1151,11 @@ static int meson_mmc_probe(struct platfo + + mmc->caps |= MMC_CAP_CMD23; + if (host->dram_access_quirk) { ++ /* Limit segments to 1 due to low available sram memory */ ++ mmc->max_segs = 1; + /* Limit to the available sram memory */ +- mmc->max_segs = SD_EMMC_SRAM_DATA_BUF_LEN / mmc->max_blk_size; +- mmc->max_blk_count = mmc->max_segs; ++ mmc->max_blk_count = SD_EMMC_SRAM_DATA_BUF_LEN / ++ mmc->max_blk_size; + } else { + mmc->max_blk_count = CMD_CFG_LENGTH_MASK; + mmc->max_segs = SD_EMMC_DESC_BUF_LEN / diff --git a/queue-5.4/perf-scripts-python-export-to-postgresql.py-fix-struct.pack-int-argument.patch b/queue-5.4/perf-scripts-python-export-to-postgresql.py-fix-struct.pack-int-argument.patch new file mode 100644 index 00000000000..9370cf68830 --- /dev/null +++ b/queue-5.4/perf-scripts-python-export-to-postgresql.py-fix-struct.pack-int-argument.patch @@ -0,0 +1,68 @@ +From 640432e6bed08e9d5d2ba26856ba3f55008b07e3 Mon Sep 17 00:00:00 2001 +From: Adrian Hunter +Date: Mon, 29 Jun 2020 12:19:50 +0300 +Subject: perf scripts python: export-to-postgresql.py: Fix struct.pack() int argument + +From: Adrian Hunter + +commit 640432e6bed08e9d5d2ba26856ba3f55008b07e3 upstream. + +Python 3.8 is requiring that arguments being packed as integers are also +integers. Add int() accordingly. + + Before: + + $ perf record -e intel_pt//u uname + $ perf script --itrace=bep -s ~/libexec/perf-core/scripts/python/export-to-postgresql.py perf_data_db branches calls + 2020-06-25 16:09:10.547256 Creating database... + 2020-06-25 16:09:10.733185 Writing to intermediate files... + Traceback (most recent call last): + File "/home/ahunter/libexec/perf-core/scripts/python/export-to-postgresql.py", line 1106, in synth_data + cbr(id, raw_buf) + File "/home/ahunter/libexec/perf-core/scripts/python/export-to-postgresql.py", line 1058, in cbr + value = struct.pack("!hiqiiiiii", 4, 8, id, 4, cbr, 4, MHz, 4, percent) + struct.error: required argument is not an integer + Fatal Python error: problem in Python trace event handler + Python runtime state: initialized + + Current thread 0x00007f35d3695780 (most recent call first): + + Aborted (core dumped) + + After: + + $ dropdb perf_data_db + $ rm -rf perf_data_db-perf-data + $ perf script --itrace=bep -s ~/libexec/perf-core/scripts/python/export-to-postgresql.py perf_data_db branches calls + 2020-06-25 16:09:40.990267 Creating database... + 2020-06-25 16:09:41.207009 Writing to intermediate files... + 2020-06-25 16:09:41.270915 Copying to database... + 2020-06-25 16:09:41.382030 Removing intermediate files... + 2020-06-25 16:09:41.384630 Adding primary keys + 2020-06-25 16:09:41.541894 Adding foreign keys + 2020-06-25 16:09:41.677044 Dropping unused tables + 2020-06-25 16:09:41.703761 Done + +Fixes: aba44287a224 ("perf scripts python: export-to-postgresql.py: Export Intel PT power and ptwrite events") +Signed-off-by: Adrian Hunter +Cc: Jiri Olsa +Cc: stable@vger.kernel.org +Link: http://lore.kernel.org/lkml/20200629091955.17090-2-adrian.hunter@intel.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Greg Kroah-Hartman + +--- + tools/perf/scripts/python/export-to-postgresql.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/perf/scripts/python/export-to-postgresql.py ++++ b/tools/perf/scripts/python/export-to-postgresql.py +@@ -1055,7 +1055,7 @@ def cbr(id, raw_buf): + cbr = data[0] + MHz = (data[4] + 500) / 1000 + percent = ((cbr * 1000 / data[2]) + 5) / 10 +- value = struct.pack("!hiqiiiiii", 4, 8, id, 4, cbr, 4, MHz, 4, percent) ++ value = struct.pack("!hiqiiiiii", 4, 8, id, 4, cbr, 4, int(MHz), 4, int(percent)) + cbr_file.write(value) + + def mwait(id, raw_buf): diff --git a/queue-5.4/perf-scripts-python-exported-sql-viewer.py-fix-unexpanded-find-result.patch b/queue-5.4/perf-scripts-python-exported-sql-viewer.py-fix-unexpanded-find-result.patch new file mode 100644 index 00000000000..d23cf061c91 --- /dev/null +++ b/queue-5.4/perf-scripts-python-exported-sql-viewer.py-fix-unexpanded-find-result.patch @@ -0,0 +1,57 @@ +From 3a3cf7c570a486b07d9a6e68a77548aea6a8421f Mon Sep 17 00:00:00 2001 +From: Adrian Hunter +Date: Mon, 29 Jun 2020 12:19:52 +0300 +Subject: perf scripts python: exported-sql-viewer.py: Fix unexpanded 'Find' result + +From: Adrian Hunter + +commit 3a3cf7c570a486b07d9a6e68a77548aea6a8421f upstream. + +Using Python version 3.8.2 and PySide2 version 5.14.0, ctrl-F ('Find') +would not expand the tree to the result. Fix by using setExpanded(). + +Example: + + $ perf record -e intel_pt//u uname + Linux + [ perf record: Woken up 1 times to write data ] + [ perf record: Captured and wrote 0.034 MB perf.data ] + $ perf script --itrace=bep -s ~/libexec/perf-core/scripts/python/export-to-sqlite.py perf.data.db branches calls + 2020-06-26 15:32:14.928997 Creating database ... + 2020-06-26 15:32:14.933971 Writing records... + 2020-06-26 15:32:15.535251 Adding indexes + 2020-06-26 15:32:15.542993 Dropping unused tables + 2020-06-26 15:32:15.549716 Done + $ python3 ~/libexec/perf-core/scripts/python/exported-sql-viewer.py perf.data.db + + Select: Reports -> Context-Sensitive Call Graph or Reports -> Call Tree + Press: Ctrl-F + Enter: main + Press: Enter + +Before: line showing 'main' does not display + +After: tree is expanded to line showing 'main' + +Fixes: ebd70c7dc2f5f ("perf scripts python: exported-sql-viewer.py: Add ability to find symbols in the call-graph") +Signed-off-by: Adrian Hunter +Cc: Jiri Olsa +Cc: stable@vger.kernel.org +Link: http://lore.kernel.org/lkml/20200629091955.17090-4-adrian.hunter@intel.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Greg Kroah-Hartman + +--- + tools/perf/scripts/python/exported-sql-viewer.py | 1 + + 1 file changed, 1 insertion(+) + +--- a/tools/perf/scripts/python/exported-sql-viewer.py ++++ b/tools/perf/scripts/python/exported-sql-viewer.py +@@ -1018,6 +1018,7 @@ class TreeWindowBase(QMdiSubWindow): + child = self.model.index(row, 0, parent) + if child.internalPointer().dbid == dbid: + found = True ++ self.view.setExpanded(parent, True) + self.view.setCurrentIndex(child) + parent = child + break diff --git a/queue-5.4/perf-scripts-python-exported-sql-viewer.py-fix-zero-id-in-call-graph-find-result.patch b/queue-5.4/perf-scripts-python-exported-sql-viewer.py-fix-zero-id-in-call-graph-find-result.patch new file mode 100644 index 00000000000..bc6ff3c672e --- /dev/null +++ b/queue-5.4/perf-scripts-python-exported-sql-viewer.py-fix-zero-id-in-call-graph-find-result.patch @@ -0,0 +1,58 @@ +From 7ff520b0a71dd2db695b52ad117d81b7eaf6ff9d Mon Sep 17 00:00:00 2001 +From: Adrian Hunter +Date: Mon, 29 Jun 2020 12:19:53 +0300 +Subject: perf scripts python: exported-sql-viewer.py: Fix zero id in call graph 'Find' result + +From: Adrian Hunter + +commit 7ff520b0a71dd2db695b52ad117d81b7eaf6ff9d upstream. + +Using ctrl-F ('Find') would not find 'unknown' because it matches id zero. +Fix by excluding id zero from selection. + +Example: + + $ perf record -e intel_pt//u uname + Linux + [ perf record: Woken up 1 times to write data ] + [ perf record: Captured and wrote 0.034 MB perf.data ] + $ perf script --itrace=bep -s ~/libexec/perf-core/scripts/python/export-to-sqlite.py perf.data.db branches calls + 2020-06-26 15:32:14.928997 Creating database ... + 2020-06-26 15:32:14.933971 Writing records... + 2020-06-26 15:32:15.535251 Adding indexes + 2020-06-26 15:32:15.542993 Dropping unused tables + 2020-06-26 15:32:15.549716 Done + $ python3 ~/libexec/perf-core/scripts/python/exported-sql-viewer.py perf.data.db + + Select: Reports -> Context-Sensitive Call Graph + Press: Ctrl-F + Enter: unknown + Press: Enter + +Before: gets stuck +After: tree is expanded to line showing 'unknown' + +Fixes: 254c0d820b86d ("perf scripts python: exported-sql-viewer.py: Factor out CallGraphModelBase") +Signed-off-by: Adrian Hunter +Cc: Jiri Olsa +Cc: stable@vger.kernel.org +Link: http://lore.kernel.org/lkml/20200629091955.17090-5-adrian.hunter@intel.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Greg Kroah-Hartman + +--- + tools/perf/scripts/python/exported-sql-viewer.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/tools/perf/scripts/python/exported-sql-viewer.py ++++ b/tools/perf/scripts/python/exported-sql-viewer.py +@@ -756,7 +756,8 @@ class CallGraphModel(CallGraphModelBase) + " FROM calls" + " INNER JOIN call_paths ON calls.call_path_id = call_paths.id" + " INNER JOIN symbols ON call_paths.symbol_id = symbols.id" +- " WHERE symbols.name" + match + ++ " WHERE calls.id <> 0" ++ " AND symbols.name" + match + + " GROUP BY comm_id, thread_id, call_path_id" + " ORDER BY comm_id, thread_id, call_path_id") + diff --git a/queue-5.4/perf-scripts-python-exported-sql-viewer.py-fix-zero-id-in-call-tree-find-result.patch b/queue-5.4/perf-scripts-python-exported-sql-viewer.py-fix-zero-id-in-call-tree-find-result.patch new file mode 100644 index 00000000000..c52ad85886d --- /dev/null +++ b/queue-5.4/perf-scripts-python-exported-sql-viewer.py-fix-zero-id-in-call-tree-find-result.patch @@ -0,0 +1,58 @@ +From 031c8d5edb1ddeb6d398f7942ce2a01a1a51ada9 Mon Sep 17 00:00:00 2001 +From: Adrian Hunter +Date: Mon, 29 Jun 2020 12:19:54 +0300 +Subject: perf scripts python: exported-sql-viewer.py: Fix zero id in call tree 'Find' result + +From: Adrian Hunter + +commit 031c8d5edb1ddeb6d398f7942ce2a01a1a51ada9 upstream. + +Using ctrl-F ('Find') would not find 'unknown' because it matches id +zero. Fix by excluding id zero from selection. + +Example: + + $ perf record -e intel_pt//u uname + Linux + [ perf record: Woken up 1 times to write data ] + [ perf record: Captured and wrote 0.034 MB perf.data ] + $ perf script --itrace=bep -s ~/libexec/perf-core/scripts/python/export-to-sqlite.py perf.data.db branches calls + 2020-06-26 15:32:14.928997 Creating database ... + 2020-06-26 15:32:14.933971 Writing records... + 2020-06-26 15:32:15.535251 Adding indexes + 2020-06-26 15:32:15.542993 Dropping unused tables + 2020-06-26 15:32:15.549716 Done + $ python3 ~/libexec/perf-core/scripts/python/exported-sql-viewer.py perf.data.db + + Select: Reports -> Call Tree + Press: Ctrl-F + Enter: unknown + Press: Enter + +Before: displays 'unknown' not found +After: tree is expanded to line showing 'unknown' + +Fixes: ae8b887c00d3f ("perf scripts python: exported-sql-viewer.py: Add call tree") +Signed-off-by: Adrian Hunter +Cc: Jiri Olsa +Cc: stable@vger.kernel.org +Link: http://lore.kernel.org/lkml/20200629091955.17090-6-adrian.hunter@intel.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Greg Kroah-Hartman + +--- + tools/perf/scripts/python/exported-sql-viewer.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/tools/perf/scripts/python/exported-sql-viewer.py ++++ b/tools/perf/scripts/python/exported-sql-viewer.py +@@ -951,7 +951,8 @@ class CallTreeModel(CallGraphModelBase): + " FROM calls" + " INNER JOIN call_paths ON calls.call_path_id = call_paths.id" + " INNER JOIN symbols ON call_paths.symbol_id = symbols.id" +- " WHERE symbols.name" + match + ++ " WHERE calls.id <> 0" ++ " AND symbols.name" + match + + " ORDER BY comm_id, thread_id, call_time, calls.id") + + def FindPath(self, query): diff --git a/queue-5.4/s390-mm-fix-huge-pte-soft-dirty-copying.patch b/queue-5.4/s390-mm-fix-huge-pte-soft-dirty-copying.patch new file mode 100644 index 00000000000..2a5c99d130f --- /dev/null +++ b/queue-5.4/s390-mm-fix-huge-pte-soft-dirty-copying.patch @@ -0,0 +1,35 @@ +From 528a9539348a0234375dfaa1ca5dbbb2f8f8e8d2 Mon Sep 17 00:00:00 2001 +From: Janosch Frank +Date: Tue, 7 Jul 2020 15:38:54 +0200 +Subject: s390/mm: fix huge pte soft dirty copying + +From: Janosch Frank + +commit 528a9539348a0234375dfaa1ca5dbbb2f8f8e8d2 upstream. + +If the pmd is soft dirty we must mark the pte as soft dirty (and not dirty). +This fixes some cases for guest migration with huge page backings. + +Cc: # 4.8 +Fixes: bc29b7ac1d9f ("s390/mm: clean up pte/pmd encoding") +Reviewed-by: Christian Borntraeger +Reviewed-by: Gerald Schaefer +Signed-off-by: Janosch Frank +Signed-off-by: Heiko Carstens +Signed-off-by: Greg Kroah-Hartman + +--- + arch/s390/mm/hugetlbpage.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/s390/mm/hugetlbpage.c ++++ b/arch/s390/mm/hugetlbpage.c +@@ -117,7 +117,7 @@ static inline pte_t __rste_to_pte(unsign + _PAGE_YOUNG); + #ifdef CONFIG_MEM_SOFT_DIRTY + pte_val(pte) |= move_set_bit(rste, _SEGMENT_ENTRY_SOFT_DIRTY, +- _PAGE_DIRTY); ++ _PAGE_SOFT_DIRTY); + #endif + pte_val(pte) |= move_set_bit(rste, _SEGMENT_ENTRY_NOEXEC, + _PAGE_NOEXEC); diff --git a/queue-5.4/s390-setup-init-jump-labels-before-command-line-parsing.patch b/queue-5.4/s390-setup-init-jump-labels-before-command-line-parsing.patch new file mode 100644 index 00000000000..e4d61ebd42b --- /dev/null +++ b/queue-5.4/s390-setup-init-jump-labels-before-command-line-parsing.patch @@ -0,0 +1,42 @@ +From 95e61b1b5d6394b53d147c0fcbe2ae70fbe09446 Mon Sep 17 00:00:00 2001 +From: Vasily Gorbik +Date: Thu, 18 Jun 2020 17:17:19 +0200 +Subject: s390/setup: init jump labels before command line parsing + +From: Vasily Gorbik + +commit 95e61b1b5d6394b53d147c0fcbe2ae70fbe09446 upstream. + +Command line parameters might set static keys. This is true for s390 at +least since commit 6471384af2a6 ("mm: security: introduce init_on_alloc=1 +and init_on_free=1 boot options"). To avoid the following WARN: + +static_key_enable_cpuslocked(): static key 'init_on_alloc+0x0/0x40' used +before call to jump_label_init() + +call jump_label_init() just before parse_early_param(). +jump_label_init() is safe to call multiple times (x86 does that), doesn't +do any memory allocations and hence should be safe to call that early. + +Fixes: 6471384af2a6 ("mm: security: introduce init_on_alloc=1 and init_on_free=1 boot options") +Cc: # 5.3: d6df52e9996d: s390/maccess: add no DAT mode to kernel_write +Cc: # 5.3 +Reviewed-by: Heiko Carstens +Signed-off-by: Vasily Gorbik +Signed-off-by: Heiko Carstens +Signed-off-by: Greg Kroah-Hartman + +--- + arch/s390/kernel/setup.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/s390/kernel/setup.c ++++ b/arch/s390/kernel/setup.c +@@ -1120,6 +1120,7 @@ void __init setup_arch(char **cmdline_p) + if (IS_ENABLED(CONFIG_EXPOLINE_AUTO)) + nospec_auto_detect(); + ++ jump_label_init(); + parse_early_param(); + #ifdef CONFIG_CRASH_DUMP + /* Deactivate elfcorehdr= kernel parameter */ diff --git a/queue-5.4/series b/queue-5.4/series index ca6f93f57e3..78c6c4ab986 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -90,3 +90,20 @@ module-do-not-expose-section-addresses-to-non-cap_syslog.patch kprobes-do-not-expose-probe-addresses-to-non-cap_syslog.patch bpf-check-correct-cred-for-cap_syslog-in-bpf_dump_raw_ok.patch revert-ath9k-fix-general-protection-fault-in-ath9k_hif_usb_rx_cb.patch +btrfs-fix-fatal-extent_buffer-readahead-vs-releasepage-race.patch +btrfs-fix-double-put-of-block-group-with-nocow.patch +drm-radeon-fix-double-free.patch +drm-amdgpu-don-t-do-soft-recovery-if-gpu_recovery-0.patch +dm-use-noio-when-sending-kobject-event.patch +mmc-meson-gx-limit-segments-to-1-when-dram-access-quirk-is-needed.patch +arc-entry-fix-potential-efa-clobber-when-tif_syscall_trace.patch +arc-elf-use-right-elf_arch.patch +s390-setup-init-jump-labels-before-command-line-parsing.patch +s390-mm-fix-huge-pte-soft-dirty-copying.patch +arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch +blk-mq-consider-non-idle-request-as-inflight-in-blk_mq_rq_inflight.patch +dm-writecache-reject-asynchronous-pmem-devices.patch +perf-scripts-python-export-to-postgresql.py-fix-struct.pack-int-argument.patch +perf-scripts-python-exported-sql-viewer.py-fix-zero-id-in-call-graph-find-result.patch +perf-scripts-python-exported-sql-viewer.py-fix-zero-id-in-call-tree-find-result.patch +perf-scripts-python-exported-sql-viewer.py-fix-unexpanded-find-result.patch -- 2.47.3