Merge ~michal-maloszewski99/ubuntu/+source/iotop:ubuntu/jammy-devel into ubuntu/+source/iotop:ubuntu/jammy-devel

[Michał Małoszewski]

PPA: https://launchpad.net/~michal-maloszewski99/+archive/ubuntu/lp-1982727-jammy-kernel-ppa

[Michał Małoszewski (michal-maloszewski99)]

SRU template attached to the bug report

Unmerged commits

070a3c7... by Michał Małoszewski on 2023-06-09

changelog

61ddf7a... by Michał Małoszewski on 2023-06-09

Fix the iotop package to show valid data

d/p/lp1982727-config_task_delay_acct.patch: Fix the iotop which did
not show the valid disk usage data due to sysctl_task_delayacct which
was missing. (LP: #1982727)

diff --git a/debian/changelog b/debian/changelog
index 6e03788..76172b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+iotop (0.6-24-g733f3f8-1.1ubuntu0.1) jammy; urgency=medium
+
+  * d/p/lp1982727-config_task_delay_acct.patch: Fix the not valid
+    data coming from iotop by detecting the kernel.task_delayacct
+    sysctl value. (LP: #1982727)
+
+ -- Michal Maloszewski <[e-mail]>  Fri, 09 Jun 2023 11:25:54 +0200
+
 iotop (0.6-24-g733f3f8-1.1build2) jammy; urgency=high
 
   * No change rebuild for ppc64el baseline bump.
diff --git a/debian/patches/lp1982727-config_task_delay_acct.patch b/debian/patches/lp1982727-config_task_delay_acct.patch
new file mode 100644
index 0000000..cb3d7d5
--- /dev/null
+++ b/debian/patches/lp1982727-config_task_delay_acct.patch
@@ -0,0 +1,75 @@
+From ab35334d374e588bec12d201fb8869c536f0545d Mon Sep 17 00:00:00 2001
+From: Paul Wise <[e-mail]>
+Date: Sat, 2 Oct 2021 12:13:16 +0800
+Subject: [PATCH] Detect the kernel.task_delayacct sysctl value
+
+If you have ever turned on the kernel.task_delayacct sysctl for the current
+Linux boot, then the heuristic that iotop uses to find out if swapin/io are
+available, gives a false negative, so the sysctl has to be checked too now.
+
+Origin: upstream, https://repo.or.cz/iotop.git/commit/ab35334d374e588bec12d201fb8869c536f0545d
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/iotop/+bug/1982727
+Last-Update: 2023-06-09
+---
+ iotop/data.py |  8 ++++++++
+ iotop/ui.py   | 14 +++++++++++---
+ 2 files changed, 19 insertions(+), 3 deletions(-)
+
+--- a/iotop/data.py
++++ b/iotop/data.py
+@@ -471,3 +471,11 @@
+ 
+     def clear(self):
+         self.processes = {}
++
++
++def sysctl_task_delayacct():
++    try:
++        with open('/proc/sys/kernel/task_delayacct') as f:
++            return bool(int(f.read().strip()))
++    except FileNotFoundError:
++        return None
+--- a/iotop/ui.py
++++ b/iotop/ui.py
+@@ -43,7 +43,7 @@
+ 
+ from collections import OrderedDict
+ 
+-from iotop.data import find_uids, TaskStatsNetlink, ProcessList, Stats
++from iotop.data import find_uids, TaskStatsNetlink, ProcessList, Stats, sysctl_task_delayacct
+ from iotop.data import ThreadInfo
+ from iotop.version import VERSION
+ from iotop import ioprio
+@@ -421,7 +421,7 @@
+         def format(p):
+             stats = format_stats(self.options, p, self.process_list.duration)
+             io_delay, swapin_delay, read_bytes, write_bytes = stats
+-            if Stats.has_blkio_delay_total:
++            if self.has_swapin_io:
+                 delay_stats = '%7s %7s ' % (swapin_delay, io_delay)
+             else:
+                 delay_stats = ' ?unavailable?  '
+@@ -473,6 +473,14 @@
+             pid += 'TID'
+         titles = [pid, '  PRIO', '  USER', '     DISK READ', '  DISK WRITE',
+                   '  SWAPIN', '      IO', '    COMMAND']
++        self.has_swapin_io = Stats.has_blkio_delay_total
++        if self.has_swapin_io:
++            # Linux kernels without the sysctl return None and
++            # iotop just uses the heuristic for those versions.
++            # Linux kernels with the sysctl return True or False
++            # and iotop then uses the sysctl value instead.
++            if sysctl_task_delayacct() == False:
++                self.has_swapin_io = False
+         lines = self.get_data()
+         if self.options.time:
+             titles = ['    TIME'] + titles
+@@ -491,7 +499,7 @@
+         else:
+             self.win.erase()
+ 
+-            if Stats.has_blkio_delay_total:
++            if self.has_swapin_io:
+                 status_msg = None
+             else:
+                 status_msg = ('CONFIG_TASK_DELAY_ACCT not enabled in kernel, '
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9b35470
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+lp1982727-config_task_delay_acct.patch