Skip to contentSkip to conversation

lttng-modules: backport patch to fix build for linux-5.4.62+

PATCH In review Jens Rehsack 3 participants 4 messages Sep 14, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lttng-modules: backport patch to fix build for linux-5.4.62+

From: Jens Rehsack <[email protected]>

Backport patch from lttng-modules/stable-2.12
87b2aff fix: writeback: Fix sync livelock due to b_dirty_time processing (v5.9)

with minor modfication to catch
6623c19042b6 writeback: Fix sync livelock due to b_dirty_time processing

from linux/stable-5.4 v5.4.62+

---
 ...x-sync-livelock-due-to-b_dirty_time-.patch | 117 ++++++++++++++++++
 .../lttng/lttng-modules_2.12.2.bb             |   1 +
 2 files changed, 118 insertions(+)
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch
meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch new file +117 -0
new file mode 100644
index 0000000000..96a1c486ef
@@ -0,0 +1,117 @@
+From 87b2affc3eb06f3fb2d0923f18af37713eb6814b Mon Sep 17 00:00:00 2001
+From: Michael Jeanson <[email protected]>
+Date: Mon, 31 Aug 2020 14:16:01 -0400
+Subject: [PATCH] fix: writeback: Fix sync livelock due to b_dirty_time
+ processing (v5.9)
+
+See upstream commit:
+
+  commit f9cae926f35e8230330f28c7b743ad088611a8de
+  Author: Jan Kara <[email protected]>
+  Date:   Fri May 29 16:08:58 2020 +0200
+
+    writeback: Fix sync livelock due to b_dirty_time processing
+
+    When we are processing writeback for sync(2), move_expired_inodes()
+    didn't set any inode expiry value (older_than_this). This can result in
+    writeback never completing if there's steady stream of inodes added to
+    b_dirty_time list as writeback rechecks dirty lists after each writeback
+    round whether there's more work to be done. Fix the problem by using
+    sync(2) start time is inode expiry value when processing b_dirty_time
+    list similarly as for ordinarily dirtied inodes. This requires some
+    refactoring of older_than_this handling which simplifies the code
+    noticeably as a bonus.
+
+Change-Id: I8b894b13ccc14d9b8983ee4c2810a927c319560b
+Signed-off-by: Michael Jeanson <[email protected]>
+Signed-off-by: Mathieu Desnoyers <[email protected]>
+---
+ .../events/lttng-module/writeback.h           | 39 ++++++++++++-------
+ 1 file changed, 26 insertions(+), 13 deletions(-)
+
+Upstream Status: Backport
+
+diff --git a/instrumentation/events/lttng-module/writeback.h b/instrumentation/events/lttng-module/writeback.h
+index ece67ad..e9018dd 100644
+--- a/instrumentation/events/lttng-module/writeback.h
++++ b/instrumentation/events/lttng-module/writeback.h
+@@ -384,34 +384,48 @@ LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_balance_dirty_wait, writeback_wbc_balanc
+ #endif
+ LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_writepage, writeback_wbc_writepage)
+ 
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,62))
++LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
++	TP_PROTO(struct bdi_writeback *wb,
++		 struct wb_writeback_work *work,
++		 unsigned long dirtied_before,
++		 int moved),
++	TP_ARGS(wb, work, dirtied_before, moved),
++	TP_FIELDS(
++		ctf_array_text(char, name, dev_name(wb->bdi->dev), 32)
++		ctf_integer(unsigned long, older, dirtied_before)
++		ctf_integer(int, moved, moved)
++	)
++)
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+ LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
+ 	TP_PROTO(struct bdi_writeback *wb,
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+ 		 struct wb_writeback_work *work,
+-#else
+-		 unsigned long *older_than_this,
+-#endif
+ 		 int moved),
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+ 	TP_ARGS(wb, work, moved),
+-#else
++	TP_FIELDS(
++		ctf_array_text(char, name, dev_name(wb->bdi->dev), 32)
++		ctf_integer(int, moved, moved)
++	)
++)
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
++LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
++	TP_PROTO(struct bdi_writeback *wb,
++		 unsigned long *older_than_this,
++		 int moved),
+ 	TP_ARGS(wb, older_than_this, moved),
+-#endif
+ 	TP_FIELDS(
+ 		ctf_array_text(char, name, dev_name(wb->bdi->dev), 32)
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+-#else
+ 		ctf_integer(unsigned long, older,
+ 			older_than_this ? *older_than_this : 0)
+ 		ctf_integer(long, age,
+ 			older_than_this ?
+ 				(jiffies - *older_than_this) * 1000 / HZ
+ 				: -1)
+-#endif
+ 		ctf_integer(int, moved, moved)
+ 	)
+ )
++#endif
+ 
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0))
+ LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
+@@ -460,7 +474,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
+ 		ctf_integer(unsigned long, dirty_limit, global_dirty_limit)
+ 	)
+ )
+-#else
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
+ LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
+ 
+ 	writeback_global_dirty_state,
+@@ -485,7 +499,6 @@ LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
+ 	)
+ )
+ #endif
+-#endif
+ 
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+ 
+-- 
+2.17.1
+
meta/recipes-kernel/lttng/lttng-modules_2.12.2.bb +1 -0
index 0e1a209ce8..f58b3bf0d7 100644
@@ -10,6 +10,7 @@ include lttng-platforms.inc
 
 SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \
+           file://0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch \
            file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
            "
 
Signature · 1 line
2.17.1
#1 lore raw

In my latest round of linux-yocto reference updates, I ran into these same issues, but I needed to pull in more of the fixes on the 2.12 branch than just this to get things building against 5.8.9.

I didn't need to tweak any of the patches for v5.4.64+ here.

I have 10 backported patches and confirmed my 5.8.9 and 5.4.65 both build with the changes.

I can submit that patch along with my reference kernel bumps later today.

Bruce

Quoted 154 lines · Jens Rehsack

From: Jens Rehsack <[email protected]>

Backport patch from lttng-modules/stable-2.12
87b2aff fix: writeback: Fix sync livelock due to b_dirty_time processing (v5.9)

with minor modfication to catch
6623c19042b6 writeback: Fix sync livelock due to b_dirty_time processing

from linux/stable-5.4 v5.4.62+

---
 ...x-sync-livelock-due-to-b_dirty_time-.patch | 117 ++++++++++++++++++
 .../lttng/lttng-modules_2.12.2.bb             |   1 +
 2 files changed, 118 insertions(+)
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch
meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch new file +117 -0
new file mode 100644
index 0000000000..96a1c486ef
@@ -0,0 +1,117 @@
+From 87b2affc3eb06f3fb2d0923f18af37713eb6814b Mon Sep 17 00:00:00 2001
+From: Michael Jeanson <[email protected]>
+Date: Mon, 31 Aug 2020 14:16:01 -0400
+Subject: [PATCH] fix: writeback: Fix sync livelock due to b_dirty_time
+ processing (v5.9)
+
+See upstream commit:
+
+  commit f9cae926f35e8230330f28c7b743ad088611a8de
+  Author: Jan Kara <[email protected]>
+  Date:   Fri May 29 16:08:58 2020 +0200
+
+    writeback: Fix sync livelock due to b_dirty_time processing
+
+    When we are processing writeback for sync(2), move_expired_inodes()
+    didn't set any inode expiry value (older_than_this). This can result in
+    writeback never completing if there's steady stream of inodes added to
+    b_dirty_time list as writeback rechecks dirty lists after each writeback
+    round whether there's more work to be done. Fix the problem by using
+    sync(2) start time is inode expiry value when processing b_dirty_time
+    list similarly as for ordinarily dirtied inodes. This requires some
+    refactoring of older_than_this handling which simplifies the code
+    noticeably as a bonus.
+
+Change-Id: I8b894b13ccc14d9b8983ee4c2810a927c319560b
+Signed-off-by: Michael Jeanson <[email protected]>
+Signed-off-by: Mathieu Desnoyers <[email protected]>
+---
+ .../events/lttng-module/writeback.h           | 39 ++++++++++++-------
+ 1 file changed, 26 insertions(+), 13 deletions(-)
+
+Upstream Status: Backport
+
+diff --git a/instrumentation/events/lttng-module/writeback.h b/instrumentation/events/lttng-module/writeback.h
+index ece67ad..e9018dd 100644
+--- a/instrumentation/events/lttng-module/writeback.h
++++ b/instrumentation/events/lttng-module/writeback.h
+@@ -384,34 +384,48 @@ LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_balance_dirty_wait, writeback_wbc_balanc
+ #endif
+ LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_writepage, writeback_wbc_writepage)
+
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,62))
++LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
++      TP_PROTO(struct bdi_writeback *wb,
++               struct wb_writeback_work *work,
++               unsigned long dirtied_before,
++               int moved),
++      TP_ARGS(wb, work, dirtied_before, moved),
++      TP_FIELDS(
++              ctf_array_text(char, name, dev_name(wb->bdi->dev), 32)
++              ctf_integer(unsigned long, older, dirtied_before)
++              ctf_integer(int, moved, moved)
++      )
++)
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+ LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
+       TP_PROTO(struct bdi_writeback *wb,
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+                struct wb_writeback_work *work,
+-#else
+-               unsigned long *older_than_this,
+-#endif
+                int moved),
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+       TP_ARGS(wb, work, moved),
+-#else
++      TP_FIELDS(
++              ctf_array_text(char, name, dev_name(wb->bdi->dev), 32)
++              ctf_integer(int, moved, moved)
++      )
++)
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
++LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
++      TP_PROTO(struct bdi_writeback *wb,
++               unsigned long *older_than_this,
++               int moved),
+       TP_ARGS(wb, older_than_this, moved),
+-#endif
+       TP_FIELDS(
+               ctf_array_text(char, name, dev_name(wb->bdi->dev), 32)
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+-#else
+               ctf_integer(unsigned long, older,
+                       older_than_this ? *older_than_this : 0)
+               ctf_integer(long, age,
+                       older_than_this ?
+                               (jiffies - *older_than_this) * 1000 / HZ
+                               : -1)
+-#endif
+               ctf_integer(int, moved, moved)
+       )
+ )
++#endif
+
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0))
+ LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
+@@ -460,7 +474,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
+               ctf_integer(unsigned long, dirty_limit, global_dirty_limit)
+       )
+ )
+-#else
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
+ LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
+
+       writeback_global_dirty_state,
+@@ -485,7 +499,6 @@ LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
+       )
+ )
+ #endif
+-#endif
+
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+
+--
+2.17.1
+
meta/recipes-kernel/lttng/lttng-modules_2.12.2.bb +1 -1
index 0e1a209ce8..f58b3bf0d7 100644
@@ -10,6 +10,7 @@ include lttng-platforms.inc
 
 SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \
+           file://0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch \
            file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
            "
 
--
Quoted 3 lines

2.17.1

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

#2 lore raw

Is this exact backport from lttng-modules repo?

I came across this issue in
https://github.com/agherzan/meta-raspberrypi/pull/722
and
https://github.com/lttng/lttng-modules/commit/817e02f9e256b8f2cbb9e3125eb061757b83bd4a
+
https://github.com/lttng/lttng-modules/commit/b6af46d166c48c9e59600a60b5a2a7ead10f179a
look a bit different than this one (and are more correct with fixed kernel ranges as not every > 5.4.62 kernel had this change).

Quoted 200 lines · Bruce Ashfield

In my latest round of linux-yocto reference updates, I ran into these same issues, but I needed to pull in more of the fixes on the 2.12 branch than just this to get things building against 5.8.9.

I didn't need to tweak any of the patches for v5.4.64+ here.

I have 10 backported patches and confirmed my 5.8.9 and 5.4.65 both build with the changes.

I can submit that patch along with my reference kernel bumps later today.

Bruce

Quoted 5 lines · Jens Rehsack

From: Jens Rehsack <[email protected]>

Backport patch from lttng-modules/stable-2.12
87b2aff fix: writeback: Fix sync livelock due to b_dirty_time

processing (v5.9)

Quoted 3 lines

with minor modfication to catch
6623c19042b6 writeback: Fix sync livelock due to b_dirty_time

processing

Quoted 9 lines

from linux/stable-5.4 v5.4.62+

---
 ...x-sync-livelock-due-to-b_dirty_time-.patch | 117 ++++++++++++++++++
 .../lttng/lttng-modules_2.12.2.bb             |   1 +
 2 files changed, 118 insertions(+)
 create mode 100644

meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch

Quoted 2 lines

diff --git

a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch

Quoted 4 lines

new file mode 100644
index 0000000000..96a1c486ef
--- /dev/null
+++

b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch

Quoted 7 lines
meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch new file +6 -0
@@ -0,0 +1,117 @@
+From 87b2affc3eb06f3fb2d0923f18af37713eb6814b Mon Sep 17 00:00:00 2001
+From: Michael Jeanson <[email protected]>
+Date: Mon, 31 Aug 2020 14:16:01 -0400
+Subject: [PATCH] fix: writeback: Fix sync livelock due to b_dirty_time
+ processing (v5.9)
+

meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch line 16

Quoted 10 lines
meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch new file +10 -0
+See upstream commit:
+
+  commit f9cae926f35e8230330f28c7b743ad088611a8de
+  Author: Jan Kara <[email protected]>
+  Date:   Fri May 29 16:08:58 2020 +0200
+
+    writeback: Fix sync livelock due to b_dirty_time processing
+
+    When we are processing writeback for sync(2), move_expired_inodes()
+    didn't set any inode expiry value (older_than_this). This can

result in

Review line 17

Quoted 1 line
(quoted diff) +1 -0
+    writeback never completing if there's steady stream of inodes added

to

Review line 18

Quoted 1 line
(quoted diff) +1 -0
+    b_dirty_time list as writeback rechecks dirty lists after each

writeback

Review line 20

Quoted 2 lines
(quoted diff) +2 -0
+    round whether there's more work to be done. Fix the problem by using
+    sync(2) start time is inode expiry value when processing

b_dirty_time

Quoted 4 lines
meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch new file +4 -0
+    list similarly as for ordinarily dirtied inodes. This requires some
+    refactoring of older_than_this handling which simplifies the code
+    noticeably as a bonus.
+

meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch

Quoted 10 lines
meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch new file +10 -0
+Change-Id: I8b894b13ccc14d9b8983ee4c2810a927c319560b
+Signed-off-by: Michael Jeanson <[email protected]>
+Signed-off-by: Mathieu Desnoyers <[email protected]>
+---
+ .../events/lttng-module/writeback.h           | 39 ++++++++++++-------
+ 1 file changed, 26 insertions(+), 13 deletions(-)
+
+Upstream Status: Backport
+
+diff --git a/instrumentation/events/lttng-module/writeback.h

b/instrumentation/events/lttng-module/writeback.h

meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch

Quoted 4 lines
meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch new file +4 -0
+index ece67ad..e9018dd 100644
+--- a/instrumentation/events/lttng-module/writeback.h
++++ b/instrumentation/events/lttng-module/writeback.h
+@@ -384,34 +384,48 @@

LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_balance_dirty_wait, writeback_wbc_balanc

Review line 40

Quoted 2 lines
(quoted diff) +2 -0
+ #endif
+ LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_writepage,

writeback_wbc_writepage)

meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch

Quoted 3 lines
meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch new file +3 -0
+
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)) ||

(LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,62))

Quoted 46 lines
meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch new file +46 -0
++LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
++      TP_PROTO(struct bdi_writeback *wb,
++               struct wb_writeback_work *work,
++               unsigned long dirtied_before,
++               int moved),
++      TP_ARGS(wb, work, dirtied_before, moved),
++      TP_FIELDS(
++              ctf_array_text(char, name, dev_name(wb->bdi->dev), 32)
++              ctf_integer(unsigned long, older, dirtied_before)
++              ctf_integer(int, moved, moved)
++      )
++)
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+ LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
+       TP_PROTO(struct bdi_writeback *wb,
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+                struct wb_writeback_work *work,
+-#else
+-               unsigned long *older_than_this,
+-#endif
+                int moved),
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+       TP_ARGS(wb, work, moved),
+-#else
++      TP_FIELDS(
++              ctf_array_text(char, name, dev_name(wb->bdi->dev), 32)
++              ctf_integer(int, moved, moved)
++      )
++)
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
++LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
++      TP_PROTO(struct bdi_writeback *wb,
++               unsigned long *older_than_this,
++               int moved),
+       TP_ARGS(wb, older_than_this, moved),
+-#endif
+       TP_FIELDS(
+               ctf_array_text(char, name, dev_name(wb->bdi->dev), 32)
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+-#else
+               ctf_integer(unsigned long, older,
+                       older_than_this ? *older_than_this : 0)
+               ctf_integer(long, age,
+                       older_than_this ?
+                               (jiffies - *older_than_this) * 1000 / HZ
+                               : -1)

meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch

Quoted 10 lines
meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch new file +10 -0
+-#endif
+               ctf_integer(int, moved, moved)
+       )
+ )
++#endif
+
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0))
+ LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
+@@ -460,7 +474,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
+               ctf_integer(unsigned long, dirty_limit,

global_dirty_limit)

Review

Quoted 19 lines
meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch new file +18 -0
+       )
+ )
+-#else
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
+ LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
+
+       writeback_global_dirty_state,
+@@ -485,7 +499,6 @@ LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
+       )
+ )
+ #endif
+-#endif
+
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+
+--
+2.17.1
+
(quoted diff) +0 -0

b/meta/recipes-kernel/lttng/lttng-modules_2.12.2.bb

meta/recipes-kernel/lttng/lttng-modules_2.12.2.bb include lttng-platforms.inc · line 12

Quoted 7 lines

index 0e1a209ce8..f58b3bf0d7 100644

meta/recipes-kernel/lttng/lttng-modules_2.12.2.bb +0 -0
@@ -10,6 +10,7 @@ include lttng-platforms.inc
 
 SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
 

file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \

meta/recipes-kernel/lttng/lttng-modules_2.12.2.bb include lttng-platforms.inc · line 13

Quoted 1 line
meta/recipes-kernel/lttng/lttng-modules_2.12.2.bb +1 -0
+

file://0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch \

Quoted 7 lines
meta/recipes-kernel/lttng/lttng-modules_2.12.2.bb +0 -1
            file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
            "
 
--

2.17.1

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

#3 lore raw

For my 5.4 and 5.8 and 5.9 builds of linux-yocto, I went ahead and backported the 10 changes that are on the tip of the 2.12 branch, since they are all bug fixes and support changes, they were safe to grab.

My builds across the versions worked with that, and I sent that variant in my series a few minutes ago.

Bruce

Quoted 192 lines · Martin Jansa

Is this exact backport from lttng-modules repo?

I came across this issue in https://github.com/agherzan/meta-raspberrypi/pull/722
and
https://github.com/lttng/lttng-modules/commit/817e02f9e256b8f2cbb9e3125eb061757b83bd4a
+
https://github.com/lttng/lttng-modules/commit/b6af46d166c48c9e59600a60b5a2a7ead10f179a
look a bit different than this one (and are more correct with fixed kernel ranges as not every > 5.4.62 kernel had this change).

Quoted 181 lines · Bruce Ashfield

In my latest round of linux-yocto reference updates, I ran into these same issues, but I needed to pull in more of the fixes on the 2.12 branch than just this to get things building against 5.8.9.

I didn't need to tweak any of the patches for v5.4.64+ here.

I have 10 backported patches and confirmed my 5.8.9 and 5.4.65 both build with the changes.

I can submit that patch along with my reference kernel bumps later today.

Bruce

Quoted 154 lines · Jens Rehsack

From: Jens Rehsack <[email protected]>

Backport patch from lttng-modules/stable-2.12
87b2aff fix: writeback: Fix sync livelock due to b_dirty_time processing (v5.9)

with minor modfication to catch
6623c19042b6 writeback: Fix sync livelock due to b_dirty_time processing

from linux/stable-5.4 v5.4.62+

---
 ...x-sync-livelock-due-to-b_dirty_time-.patch | 117 ++++++++++++++++++
 .../lttng/lttng-modules_2.12.2.bb             |   1 +
 2 files changed, 118 insertions(+)
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch
meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch new file +117 -0
new file mode 100644
index 0000000000..96a1c486ef
@@ -0,0 +1,117 @@
+From 87b2affc3eb06f3fb2d0923f18af37713eb6814b Mon Sep 17 00:00:00 2001
+From: Michael Jeanson <[email protected]>
+Date: Mon, 31 Aug 2020 14:16:01 -0400
+Subject: [PATCH] fix: writeback: Fix sync livelock due to b_dirty_time
+ processing (v5.9)
+
+See upstream commit:
+
+  commit f9cae926f35e8230330f28c7b743ad088611a8de
+  Author: Jan Kara <[email protected]>
+  Date:   Fri May 29 16:08:58 2020 +0200
+
+    writeback: Fix sync livelock due to b_dirty_time processing
+
+    When we are processing writeback for sync(2), move_expired_inodes()
+    didn't set any inode expiry value (older_than_this). This can result in
+    writeback never completing if there's steady stream of inodes added to
+    b_dirty_time list as writeback rechecks dirty lists after each writeback
+    round whether there's more work to be done. Fix the problem by using
+    sync(2) start time is inode expiry value when processing b_dirty_time
+    list similarly as for ordinarily dirtied inodes. This requires some
+    refactoring of older_than_this handling which simplifies the code
+    noticeably as a bonus.
+
+Change-Id: I8b894b13ccc14d9b8983ee4c2810a927c319560b
+Signed-off-by: Michael Jeanson <[email protected]>
+Signed-off-by: Mathieu Desnoyers <[email protected]>
+---
+ .../events/lttng-module/writeback.h           | 39 ++++++++++++-------
+ 1 file changed, 26 insertions(+), 13 deletions(-)
+
+Upstream Status: Backport
+
+diff --git a/instrumentation/events/lttng-module/writeback.h b/instrumentation/events/lttng-module/writeback.h
+index ece67ad..e9018dd 100644
+--- a/instrumentation/events/lttng-module/writeback.h
++++ b/instrumentation/events/lttng-module/writeback.h
+@@ -384,34 +384,48 @@ LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_balance_dirty_wait, writeback_wbc_balanc
+ #endif
+ LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_writepage, writeback_wbc_writepage)
+
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,62))
++LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
++      TP_PROTO(struct bdi_writeback *wb,
++               struct wb_writeback_work *work,
++               unsigned long dirtied_before,
++               int moved),
++      TP_ARGS(wb, work, dirtied_before, moved),
++      TP_FIELDS(
++              ctf_array_text(char, name, dev_name(wb->bdi->dev), 32)
++              ctf_integer(unsigned long, older, dirtied_before)
++              ctf_integer(int, moved, moved)
++      )
++)
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+ LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
+       TP_PROTO(struct bdi_writeback *wb,
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+                struct wb_writeback_work *work,
+-#else
+-               unsigned long *older_than_this,
+-#endif
+                int moved),
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+       TP_ARGS(wb, work, moved),
+-#else
++      TP_FIELDS(
++              ctf_array_text(char, name, dev_name(wb->bdi->dev), 32)
++              ctf_integer(int, moved, moved)
++      )
++)
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
++LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
++      TP_PROTO(struct bdi_writeback *wb,
++               unsigned long *older_than_this,
++               int moved),
+       TP_ARGS(wb, older_than_this, moved),
+-#endif
+       TP_FIELDS(
+               ctf_array_text(char, name, dev_name(wb->bdi->dev), 32)
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+-#else
+               ctf_integer(unsigned long, older,
+                       older_than_this ? *older_than_this : 0)
+               ctf_integer(long, age,
+                       older_than_this ?
+                               (jiffies - *older_than_this) * 1000 / HZ
+                               : -1)
+-#endif
+               ctf_integer(int, moved, moved)
+       )
+ )
++#endif
+
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0))
+ LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
+@@ -460,7 +474,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
+               ctf_integer(unsigned long, dirty_limit, global_dirty_limit)
+       )
+ )
+-#else
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
+ LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
+
+       writeback_global_dirty_state,
+@@ -485,7 +499,6 @@ LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
+       )
+ )
+ #endif
+-#endif
+
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+
+--
+2.17.1
+
meta/recipes-kernel/lttng/lttng-modules_2.12.2.bb +1 -1
index 0e1a209ce8..f58b3bf0d7 100644
@@ -10,6 +10,7 @@ include lttng-platforms.inc
 
 SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \
+           file://0001-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch \
            file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
            "
 
--
Quoted 3 lines

2.17.1

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II