]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
Linux 5.15.157 v5.15.157
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 27 Apr 2024 15:06:09 +0000 (17:06 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 27 Apr 2024 15:06:09 +0000 (17:06 +0200)
76 files changed:
queue-5.10/ring-buffer-only-update-pages_touched-when-a-new-pag.patch [deleted file]
queue-5.10/series
queue-5.4/ring-buffer-only-update-pages_touched-when-a-new-pag.patch [deleted file]
queue-5.4/series
releases/5.15.157/af_unix-call-manage_oob-for-every-skb-in-unix_stream.patch [moved from queue-5.15/af_unix-call-manage_oob-for-every-skb-in-unix_stream.patch with 100% similarity]
releases/5.15.157/af_unix-don-t-peek-oob-data-without-msg_oob.patch [moved from queue-5.15/af_unix-don-t-peek-oob-data-without-msg_oob.patch with 100% similarity]
releases/5.15.157/arm64-hibernate-fix-level3-translation-fault-in-swsusp_save.patch [moved from queue-5.15/arm64-hibernate-fix-level3-translation-fault-in-swsusp_save.patch with 100% similarity]
releases/5.15.157/binder-check-offset-alignment-in-binder_get_object.patch [moved from queue-5.15/binder-check-offset-alignment-in-binder_get_object.patch with 100% similarity]
releases/5.15.157/bpf-extend-kfunc-with-ptr_to_ctx-ptr_to_mem-argument-support.patch [moved from queue-5.15/bpf-extend-kfunc-with-ptr_to_ctx-ptr_to_mem-argument-support.patch with 100% similarity]
releases/5.15.157/bpf-fix-out-of-bounds-access-for-ringbuf-helpers.patch [moved from queue-5.15/bpf-fix-out-of-bounds-access-for-ringbuf-helpers.patch with 100% similarity]
releases/5.15.157/bpf-fix-ringbuf-memory-type-confusion-when-passing-to-helpers.patch [moved from queue-5.15/bpf-fix-ringbuf-memory-type-confusion-when-passing-to-helpers.patch with 100% similarity]
releases/5.15.157/bpf-generalize-check_ctx_reg-for-reuse-with-other-types.patch [moved from queue-5.15/bpf-generalize-check_ctx_reg-for-reuse-with-other-types.patch with 100% similarity]
releases/5.15.157/bpf-generally-fix-helper-register-offset-check.patch [moved from queue-5.15/bpf-generally-fix-helper-register-offset-check.patch with 100% similarity]
releases/5.15.157/btrfs-record-delayed-inode-root-in-transaction.patch [moved from queue-5.15/btrfs-record-delayed-inode-root-in-transaction.patch with 100% similarity]
releases/5.15.157/clk-get-runtime-pm-before-walking-tree-during-disabl.patch [moved from queue-5.15/clk-get-runtime-pm-before-walking-tree-during-disabl.patch with 100% similarity]
releases/5.15.157/clk-initialize-struct-clk_core-kref-earlier.patch [moved from queue-5.15/clk-initialize-struct-clk_core-kref-earlier.patch with 100% similarity]
releases/5.15.157/clk-mark-all_lists-as-const.patch [moved from queue-5.15/clk-mark-all_lists-as-const.patch with 100% similarity]
releases/5.15.157/clk-print-an-info-line-before-disabling-unused-clock.patch [moved from queue-5.15/clk-print-an-info-line-before-disabling-unused-clock.patch with 100% similarity]
releases/5.15.157/clk-remove-extra-empty-line.patch [moved from queue-5.15/clk-remove-extra-empty-line.patch with 100% similarity]
releases/5.15.157/clk-remove-prepare_lock-hold-assertion-in-__clk_rele.patch [moved from queue-5.15/clk-remove-prepare_lock-hold-assertion-in-__clk_rele.patch with 100% similarity]
releases/5.15.157/comedi-vmk80xx-fix-incomplete-endpoint-checking.patch [moved from queue-5.15/comedi-vmk80xx-fix-incomplete-endpoint-checking.patch with 100% similarity]
releases/5.15.157/drm-amdgpu-validate-the-parameters-of-bo-mapping-operations-more-clearly.patch [moved from queue-5.15/drm-amdgpu-validate-the-parameters-of-bo-mapping-operations-more-clearly.patch with 100% similarity]
releases/5.15.157/drm-nv04-fix-out-of-bounds-access.patch [moved from queue-5.15/drm-nv04-fix-out-of-bounds-access.patch with 100% similarity]
releases/5.15.157/drm-panel-visionox-rm69299-don-t-unregister-dsi-devi.patch [moved from queue-5.15/drm-panel-visionox-rm69299-don-t-unregister-dsi-devi.patch with 100% similarity]
releases/5.15.157/drm-vmwgfx-sort-primary-plane-formats-by-order-of-preference.patch [moved from queue-5.15/drm-vmwgfx-sort-primary-plane-formats-by-order-of-preference.patch with 100% similarity]
releases/5.15.157/fs-sysfs-fix-reference-leak-in-sysfs_break_active_protection.patch [moved from queue-5.15/fs-sysfs-fix-reference-leak-in-sysfs_break_active_protection.patch with 100% similarity]
releases/5.15.157/init-main.c-fix-potential-static_command_line-memory-overflow.patch [moved from queue-5.15/init-main.c-fix-potential-static_command_line-memory-overflow.patch with 100% similarity]
releases/5.15.157/kprobes-fix-possible-use-after-free-issue-on-kprobe-registration.patch [moved from queue-5.15/kprobes-fix-possible-use-after-free-issue-on-kprobe-registration.patch with 100% similarity]
releases/5.15.157/ksmbd-do-not-set-smb2_global_cap_encryption-for-smb-.patch [moved from queue-5.15/ksmbd-do-not-set-smb2_global_cap_encryption-for-smb-.patch with 100% similarity]
releases/5.15.157/ksmbd-don-t-send-oplock-break-if-rename-fails.patch [moved from queue-5.15/ksmbd-don-t-send-oplock-break-if-rename-fails.patch with 100% similarity]
releases/5.15.157/ksmbd-validate-payload-size-in-ipc-response.patch [moved from queue-5.15/ksmbd-validate-payload-size-in-ipc-response.patch with 100% similarity]
releases/5.15.157/kvm-x86-pmu-do-not-mask-lvtpc-when-handling-a-pmi-on-amd-platforms.patch [moved from queue-5.15/kvm-x86-pmu-do-not-mask-lvtpc-when-handling-a-pmi-on-amd-platforms.patch with 100% similarity]
releases/5.15.157/kvm-x86-snapshot-if-a-vcpu-s-vendor-model-is-amd-vs.-intel-compatible.patch [moved from queue-5.15/kvm-x86-snapshot-if-a-vcpu-s-vendor-model-is-amd-vs.-intel-compatible.patch with 100% similarity]
releases/5.15.157/mei-me-disable-rpl-s-on-sps-and-ign-firmwares.patch [moved from queue-5.15/mei-me-disable-rpl-s-on-sps-and-ign-firmwares.patch with 100% similarity]
releases/5.15.157/net-dsa-introduce-preferred_default_local_cpu_port-and-use-on-mt7530.patch [moved from queue-5.15/net-dsa-introduce-preferred_default_local_cpu_port-and-use-on-mt7530.patch with 100% similarity]
releases/5.15.157/net-dsa-mt7530-fix-enabling-eee-on-mt7531-switch-on-all-boards.patch [moved from queue-5.15/net-dsa-mt7530-fix-enabling-eee-on-mt7531-switch-on-all-boards.patch with 100% similarity]
releases/5.15.157/net-dsa-mt7530-fix-improper-frames-on-all-25mhz-and-40mhz-xtal-mt7530.patch [moved from queue-5.15/net-dsa-mt7530-fix-improper-frames-on-all-25mhz-and-40mhz-xtal-mt7530.patch with 100% similarity]
releases/5.15.157/net-dsa-mt7530-fix-mirroring-frames-received-on-loca.patch [moved from queue-5.15/net-dsa-mt7530-fix-mirroring-frames-received-on-loca.patch with 100% similarity]
releases/5.15.157/net-dsa-mt7530-set-all-cpu-ports-in-mt7531_cpu_pmap.patch [moved from queue-5.15/net-dsa-mt7530-set-all-cpu-ports-in-mt7531_cpu_pmap.patch with 100% similarity]
releases/5.15.157/net-ethernet-ti-am65-cpsw-nuss-cleanup-dma-channels-.patch [moved from queue-5.15/net-ethernet-ti-am65-cpsw-nuss-cleanup-dma-channels-.patch with 100% similarity]
releases/5.15.157/netfilter-br_netfilter-skip-conntrack-input-hook-for.patch [moved from queue-5.15/netfilter-br_netfilter-skip-conntrack-input-hook-for.patch with 100% similarity]
releases/5.15.157/netfilter-flowtable-incorrect-pppoe-tuple.patch [moved from queue-5.15/netfilter-flowtable-incorrect-pppoe-tuple.patch with 100% similarity]
releases/5.15.157/netfilter-flowtable-validate-pppoe-header.patch [moved from queue-5.15/netfilter-flowtable-validate-pppoe-header.patch with 100% similarity]
releases/5.15.157/netfilter-nf_flow_table-count-pending-offload-workqu.patch [moved from queue-5.15/netfilter-nf_flow_table-count-pending-offload-workqu.patch with 100% similarity]
releases/5.15.157/netfilter-nf_tables-fix-potential-data-race-in-__nft.patch [moved from queue-5.15/netfilter-nf_tables-fix-potential-data-race-in-__nft.patch with 100% similarity]
releases/5.15.157/netfilter-nf_tables-fix-potential-data-race-in-__nft.patch-29634 [moved from queue-5.15/netfilter-nf_tables-fix-potential-data-race-in-__nft.patch-29634 with 100% similarity]
releases/5.15.157/netfilter-nft_set_pipapo-do-not-free-live-element.patch [moved from queue-5.15/netfilter-nft_set_pipapo-do-not-free-live-element.patch with 100% similarity]
releases/5.15.157/nilfs2-fix-oob-in-nilfs_set_de_type.patch [moved from queue-5.15/nilfs2-fix-oob-in-nilfs_set_de_type.patch with 100% similarity]
releases/5.15.157/nouveau-fix-instmem-race-condition-around-ptr-stores.patch [moved from queue-5.15/nouveau-fix-instmem-race-condition-around-ptr-stores.patch with 100% similarity]
releases/5.15.157/rdma-cm-print-the-old-state-when-cm_destroy_id-gets-.patch [moved from queue-5.15/rdma-cm-print-the-old-state-when-cm_destroy_id-gets-.patch with 100% similarity]
releases/5.15.157/rdma-mlx5-fix-port-number-for-counter-query-in-multi.patch [moved from queue-5.15/rdma-mlx5-fix-port-number-for-counter-query-in-multi.patch with 100% similarity]
releases/5.15.157/rdma-rxe-fix-the-problem-mutex_destroy-missing.patch [moved from queue-5.15/rdma-rxe-fix-the-problem-mutex_destroy-missing.patch with 100% similarity]
releases/5.15.157/revert-lockd-introduce-safe-async-lock-op.patch [moved from queue-5.15/revert-lockd-introduce-safe-async-lock-op.patch with 100% similarity]
releases/5.15.157/revert-tracing-trigger-fix-to-return-error-if-failed-to-alloc-snapshot.patch [moved from queue-5.15/revert-tracing-trigger-fix-to-return-error-if-failed-to-alloc-snapshot.patch with 100% similarity]
releases/5.15.157/revert-usb-cdc-wdm-close-race-between-read-and-workqueue.patch [moved from queue-5.15/revert-usb-cdc-wdm-close-race-between-read-and-workqueue.patch with 100% similarity]
releases/5.15.157/s390-cio-fix-race-condition-during-online-processing.patch [moved from queue-5.15/s390-cio-fix-race-condition-during-online-processing.patch with 100% similarity]
releases/5.15.157/s390-qdio-handle-deferred-cc1.patch [moved from queue-5.15/s390-qdio-handle-deferred-cc1.patch with 100% similarity]
releases/5.15.157/selftests-ftrace-limit-length-in-subsystem-enable-tests.patch [moved from queue-5.15/selftests-ftrace-limit-length-in-subsystem-enable-tests.patch with 100% similarity]
releases/5.15.157/serial-pmac_zilog-remove-flawed-mitigation-for-rx-irq-flood.patch [moved from queue-5.15/serial-pmac_zilog-remove-flawed-mitigation-for-rx-irq-flood.patch with 100% similarity]
releases/5.15.157/series [moved from queue-5.15/series with 100% similarity]
releases/5.15.157/speakup-avoid-crash-on-very-long-word.patch [moved from queue-5.15/speakup-avoid-crash-on-very-long-word.patch with 100% similarity]
releases/5.15.157/sunrpc-fix-rpcgss_context-trace-event-acceptor-field.patch [moved from queue-5.15/sunrpc-fix-rpcgss_context-trace-event-acceptor-field.patch with 100% similarity]
releases/5.15.157/thunderbolt-avoid-notify-pm-core-about-runtime-pm-resume.patch [moved from queue-5.15/thunderbolt-avoid-notify-pm-core-about-runtime-pm-resume.patch with 100% similarity]
releases/5.15.157/thunderbolt-fix-wake-configurations-after-device-unplug.patch [moved from queue-5.15/thunderbolt-fix-wake-configurations-after-device-unplug.patch with 100% similarity]
releases/5.15.157/tun-limit-printing-rate-when-illegal-packet-received.patch [moved from queue-5.15/tun-limit-printing-rate-when-illegal-packet-received.patch with 100% similarity]
releases/5.15.157/usb-disable-usb3-lpm-at-shutdown.patch [moved from queue-5.15/usb-disable-usb3-lpm-at-shutdown.patch with 100% similarity]
releases/5.15.157/usb-dwc2-host-fix-dereference-issue-in-ddma-completion-flow.patch [moved from queue-5.15/usb-dwc2-host-fix-dereference-issue-in-ddma-completion-flow.patch with 100% similarity]
releases/5.15.157/usb-gadget-f_ncm-fix-uaf-ncm-object-at-re-bind-after-usb-ep-transport-error.patch [moved from queue-5.15/usb-gadget-f_ncm-fix-uaf-ncm-object-at-re-bind-after-usb-ep-transport-error.patch with 100% similarity]
releases/5.15.157/usb-serial-option-add-fibocom-fm135-gl-variants.patch [moved from queue-5.15/usb-serial-option-add-fibocom-fm135-gl-variants.patch with 100% similarity]
releases/5.15.157/usb-serial-option-add-lonsung-u8300-u9300-product.patch [moved from queue-5.15/usb-serial-option-add-lonsung-u8300-u9300-product.patch with 100% similarity]
releases/5.15.157/usb-serial-option-add-rolling-rw101-gl-and-rw135-gl-support.patch [moved from queue-5.15/usb-serial-option-add-rolling-rw101-gl-and-rw135-gl-support.patch with 100% similarity]
releases/5.15.157/usb-serial-option-add-support-for-fibocom-fm650-fg650.patch [moved from queue-5.15/usb-serial-option-add-support-for-fibocom-fm650-fg650.patch with 100% similarity]
releases/5.15.157/usb-serial-option-add-telit-fn920c04-rmnet-compositions.patch [moved from queue-5.15/usb-serial-option-add-telit-fn920c04-rmnet-compositions.patch with 100% similarity]
releases/5.15.157/usb-serial-option-support-quectel-em060k-sub-models.patch [moved from queue-5.15/usb-serial-option-support-quectel-em060k-sub-models.patch with 100% similarity]
releases/5.15.157/x86-bugs-fix-bhi-retpoline-check.patch [moved from queue-5.15/x86-bugs-fix-bhi-retpoline-check.patch with 100% similarity]
releases/5.15.157/x86-cpufeatures-fix-dependencies-for-gfni-vaes-and-v.patch [moved from queue-5.15/x86-cpufeatures-fix-dependencies-for-gfni-vaes-and-v.patch with 100% similarity]

diff --git a/queue-5.10/ring-buffer-only-update-pages_touched-when-a-new-pag.patch b/queue-5.10/ring-buffer-only-update-pages_touched-when-a-new-pag.patch
deleted file mode 100644 (file)
index bfe989a..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-From a61d018c82ac88217d69f08bfc706e49abde2980 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 9 Apr 2024 15:13:09 -0400
-Subject: ring-buffer: Only update pages_touched when a new page is touched
-
-From: Steven Rostedt (Google) <rostedt@goodmis.org>
-
-[ Upstream commit ffe3986fece696cf65e0ef99e74c75f848be8e30 ]
-
-The "buffer_percent" logic that is used by the ring buffer splice code to
-only wake up the tasks when there's no data after the buffer is filled to
-the percentage of the "buffer_percent" file is dependent on three
-variables that determine the amount of data that is in the ring buffer:
-
- 1) pages_read - incremented whenever a new sub-buffer is consumed
- 2) pages_lost - incremented every time a writer overwrites a sub-buffer
- 3) pages_touched - incremented when a write goes to a new sub-buffer
-
-The percentage is the calculation of:
-
-  (pages_touched - (pages_lost + pages_read)) / nr_pages
-
-Basically, the amount of data is the total number of sub-bufs that have been
-touched, minus the number of sub-bufs lost and sub-bufs consumed. This is
-divided by the total count to give the buffer percentage. When the
-percentage is greater than the value in the "buffer_percent" file, it
-wakes up splice readers waiting for that amount.
-
-It was observed that over time, the amount read from the splice was
-constantly decreasing the longer the trace was running. That is, if one
-asked for 60%, it would read over 60% when it first starts tracing, but
-then it would be woken up at under 60% and would slowly decrease the
-amount of data read after being woken up, where the amount becomes much
-less than the buffer percent.
-
-This was due to an accounting of the pages_touched incrementation. This
-value is incremented whenever a writer transfers to a new sub-buffer. But
-the place where it was incremented was incorrect. If a writer overflowed
-the current sub-buffer it would go to the next one. If it gets preempted
-by an interrupt at that time, and the interrupt performs a trace, it too
-will end up going to the next sub-buffer. But only one should increment
-the counter. Unfortunately, that was not the case.
-
-Change the cmpxchg() that does the real switch of the tail-page into a
-try_cmpxchg(), and on success, perform the increment of pages_touched. This
-will only increment the counter once for when the writer moves to a new
-sub-buffer, and not when there's a race and is incremented for when a
-writer and its preempting writer both move to the same new sub-buffer.
-
-Link: https://lore.kernel.org/linux-trace-kernel/20240409151309.0d0e5056@gandalf.local.home
-
-Cc: stable@vger.kernel.org
-Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-Fixes: 2c2b0a78b3739 ("ring-buffer: Add percentage of ring buffer full to wake up reader")
-Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
-Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/trace/ring_buffer.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
-index 2df8e13a29e57..f6a2749cfb880 100644
---- a/kernel/trace/ring_buffer.c
-+++ b/kernel/trace/ring_buffer.c
-@@ -1439,7 +1439,6 @@ static void rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
-       old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
-       old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
--      local_inc(&cpu_buffer->pages_touched);
-       /*
-        * Just make sure we have seen our old_write and synchronize
-        * with any interrupts that come in.
-@@ -1476,8 +1475,9 @@ static void rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
-                */
-               local_set(&next_page->page->commit, 0);
--              /* Again, either we update tail_page or an interrupt does */
--              (void)cmpxchg(&cpu_buffer->tail_page, tail_page, next_page);
-+              /* Either we update tail_page or an interrupt does */
-+              if (try_cmpxchg(&cpu_buffer->tail_page, &tail_page, next_page))
-+                      local_inc(&cpu_buffer->pages_touched);
-       }
- }
--- 
-2.43.0
-
index 3d66cd73008c751e581596e01dc1a4035857dbfc..0b55ae51bc9ff314dde8c8160f1c92ffe8c73e6a 100644 (file)
@@ -30,7 +30,6 @@ irqflags-explicitly-ignore-lockdep_hrtimer_exit-argument.patch
 btrfs-record-delayed-inode-root-in-transaction.patch
 riscv-enable-per-task-stack-canaries.patch
 riscv-process-fix-kernel-gp-leakage.patch
-ring-buffer-only-update-pages_touched-when-a-new-pag.patch
 selftests-ftrace-limit-length-in-subsystem-enable-tests.patch
 kprobes-fix-possible-use-after-free-issue-on-kprobe-registration.patch
 revert-tracing-trigger-fix-to-return-error-if-failed-to-alloc-snapshot.patch
diff --git a/queue-5.4/ring-buffer-only-update-pages_touched-when-a-new-pag.patch b/queue-5.4/ring-buffer-only-update-pages_touched-when-a-new-pag.patch
deleted file mode 100644 (file)
index fed2758..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-From 54668a2133aba01b97c8945fa5eb0483c99ad8fc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 9 Apr 2024 15:13:09 -0400
-Subject: ring-buffer: Only update pages_touched when a new page is touched
-
-From: Steven Rostedt (Google) <rostedt@goodmis.org>
-
-[ Upstream commit ffe3986fece696cf65e0ef99e74c75f848be8e30 ]
-
-The "buffer_percent" logic that is used by the ring buffer splice code to
-only wake up the tasks when there's no data after the buffer is filled to
-the percentage of the "buffer_percent" file is dependent on three
-variables that determine the amount of data that is in the ring buffer:
-
- 1) pages_read - incremented whenever a new sub-buffer is consumed
- 2) pages_lost - incremented every time a writer overwrites a sub-buffer
- 3) pages_touched - incremented when a write goes to a new sub-buffer
-
-The percentage is the calculation of:
-
-  (pages_touched - (pages_lost + pages_read)) / nr_pages
-
-Basically, the amount of data is the total number of sub-bufs that have been
-touched, minus the number of sub-bufs lost and sub-bufs consumed. This is
-divided by the total count to give the buffer percentage. When the
-percentage is greater than the value in the "buffer_percent" file, it
-wakes up splice readers waiting for that amount.
-
-It was observed that over time, the amount read from the splice was
-constantly decreasing the longer the trace was running. That is, if one
-asked for 60%, it would read over 60% when it first starts tracing, but
-then it would be woken up at under 60% and would slowly decrease the
-amount of data read after being woken up, where the amount becomes much
-less than the buffer percent.
-
-This was due to an accounting of the pages_touched incrementation. This
-value is incremented whenever a writer transfers to a new sub-buffer. But
-the place where it was incremented was incorrect. If a writer overflowed
-the current sub-buffer it would go to the next one. If it gets preempted
-by an interrupt at that time, and the interrupt performs a trace, it too
-will end up going to the next sub-buffer. But only one should increment
-the counter. Unfortunately, that was not the case.
-
-Change the cmpxchg() that does the real switch of the tail-page into a
-try_cmpxchg(), and on success, perform the increment of pages_touched. This
-will only increment the counter once for when the writer moves to a new
-sub-buffer, and not when there's a race and is incremented for when a
-writer and its preempting writer both move to the same new sub-buffer.
-
-Link: https://lore.kernel.org/linux-trace-kernel/20240409151309.0d0e5056@gandalf.local.home
-
-Cc: stable@vger.kernel.org
-Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-Fixes: 2c2b0a78b3739 ("ring-buffer: Add percentage of ring buffer full to wake up reader")
-Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
-Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/trace/ring_buffer.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
-index d2dba546fbbe1..1f0ef428b2f1c 100644
---- a/kernel/trace/ring_buffer.c
-+++ b/kernel/trace/ring_buffer.c
-@@ -1163,7 +1163,6 @@ static void rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
-       old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
-       old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
--      local_inc(&cpu_buffer->pages_touched);
-       /*
-        * Just make sure we have seen our old_write and synchronize
-        * with any interrupts that come in.
-@@ -1200,8 +1199,9 @@ static void rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
-                */
-               local_set(&next_page->page->commit, 0);
--              /* Again, either we update tail_page or an interrupt does */
--              (void)cmpxchg(&cpu_buffer->tail_page, tail_page, next_page);
-+              /* Either we update tail_page or an interrupt does */
-+              if (try_cmpxchg(&cpu_buffer->tail_page, &tail_page, next_page))
-+                      local_inc(&cpu_buffer->pages_touched);
-       }
- }
--- 
-2.43.0
-
index f72e0825896aa12b53d66abc87e1663547f3d750..ab415af376a4b0f875058d3cf1f4900b7ca9abe2 100644 (file)
@@ -17,7 +17,6 @@ vhost-add-smp_rmb-in-vhost_vq_avail_empty.patch
 selftests-timers-fix-abs-warning-in-posix_timers-test.patch
 x86-apic-force-native_apic_mem_read-to-use-the-mov-instruction.patch
 btrfs-record-delayed-inode-root-in-transaction.patch
-ring-buffer-only-update-pages_touched-when-a-new-pag.patch
 selftests-ftrace-limit-length-in-subsystem-enable-tests.patch
 kprobes-fix-possible-use-after-free-issue-on-kprobe-registration.patch
 revert-tracing-trigger-fix-to-return-error-if-failed-to-alloc-snapshot.patch
similarity index 100%
rename from queue-5.15/series
rename to releases/5.15.157/series