Fix kernel hang (RHBZ#2303267)

(cherry picked from commit 481bf76bda)

0001-appliance-init-Don-t-set-impossible-noop-disk-schedu.patch

@@ -0,0 +1,108 @@
+From b2d682a4730ead8b4ae07e5aaf6fa230c5eec305 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Fri, 16 Aug 2024 08:26:34 +0100
+Subject: [PATCH] appliance/init: Don't set impossible "noop" disk scheduler
+
+Since RHEL 7.4, the noop scheduler is no longer a thing.  Trying to
+set it results in the error:
+
+  + echo noop
+  /init: line 108: echo: write error: Invalid argument
+
+The current recommendation (https://access.redhat.com/solutions/5427)
+is to use mq-deadline, but that's also the default so we don't have to
+do anything.
+
+A bigger reason to remove these lines is that kernel 6.11.0 has
+introduced a hang where -- rarely -- the ext4 filesystem hangs if you
+try to change the scheduler while handing a page fault, even if you're
+setting a scheduler that doesn't exist.  I couldn't get much detail
+except for a couple of stack traces from different VMs:
+
+  crash> set 234
+      PID: 234
+  COMMAND: "modprobe"
+     TASK: ffff9f5ec3a22f40  [THREAD_INFO: ffff9f5ec3a22f40]
+      CPU: 0
+    STATE: TASK_UNINTERRUPTIBLE
+  crash> bt
+  PID: 234      TASK: ffff9f5ec3a22f40  CPU: 0    COMMAND: "modprobe"
+   #0 [ffffb21e002e7840] __schedule at ffffffffa718f6d0
+   #1 [ffffb21e002e78f8] schedule at ffffffffa7190a27
+   #2 [ffffb21e002e7908] __bio_queue_enter at ffffffffa67e121c
+   #3 [ffffb21e002e7968] blk_mq_submit_bio at ffffffffa67f358c
+   #4 [ffffb21e002e79f0] __submit_bio at ffffffffa67e1e3c
+   #5 [ffffb21e002e7a58] submit_bio_noacct_nocheck at ffffffffa67e2326
+   #6 [ffffb21e002e7ac0] ext4_mpage_readpages at ffffffffa65ceafc
+   #7 [ffffb21e002e7be0] read_pages at ffffffffa6381d17
+   #8 [ffffb21e002e7c40] page_cache_ra_unbounded at ffffffffa6381ff5
+   #9 [ffffb21e002e7ca8] filemap_fault at ffffffffa63761b5
+  #10 [ffffb21e002e7d48] __do_fault at ffffffffa63d1892
+  #11 [ffffb21e002e7d70] do_fault at ffffffffa63d2425
+  #12 [ffffb21e002e7da0] __handle_mm_fault at ffffffffa63d8c6b
+  #13 [ffffb21e002e7e88] handle_mm_fault at ffffffffa63d95c2
+  #14 [ffffb21e002e7ec8] do_user_addr_fault at ffffffffa60b34ea
+  #15 [ffffb21e002e7f28] exc_page_fault at ffffffffa7186e4e
+  #16 [ffffb21e002e7f50] asm_exc_page_fault at ffffffffa72012a6
+      RIP: 000055d16159f8d8  RSP: 00007ffdd4c1f340  RFLAGS: 00010206
+      RAX: 00000000000bec82  RBX: 00007ff2fd00dc82  RCX: 000055d1615b492a
+      RDX: 00007ffdd4c216b0  RSI: 00000000200bec82  RDI: 000055d185725960
+      RBP: 00007ffdd4c1f5a0   R8: 0000000000000000   R9: 0000000000000000
+      R10: 0000000000000000  R11: 0000000000000202  R12: 00000000200bec82
+      R13: 000055d185725960  R14: 00007ffdd4c216b0  R15: 000055d1615b9708
+      ORIG_RAX: ffffffffffffffff  CS: 0033  SS: 002b
+
+  crash> set 230
+      PID: 230
+  COMMAND: "modprobe"
+     TASK: ffff98ce03ca3040  [THREAD_INFO: ffff98ce03ca3040]
+      CPU: 0
+    STATE: TASK_UNINTERRUPTIBLE
+  crash> bt
+  PID: 230      TASK: ffff98ce03ca3040  CPU: 0    COMMAND: "modprobe"
+   #0 [ffffaf9940307840] __schedule at ffffffff9618f6d0
+   #1 [ffffaf99403078f8] schedule at ffffffff96190a27
+   #2 [ffffaf9940307908] __bio_queue_enter at ffffffff957e121c
+   #3 [ffffaf9940307968] blk_mq_submit_bio at ffffffff957f358c
+   #4 [ffffaf99403079f0] __submit_bio at ffffffff957e1e3c
+   #5 [ffffaf9940307a58] submit_bio_noacct_nocheck at ffffffff957e2326
+   #6 [ffffaf9940307ac0] ext4_mpage_readpages at ffffffff955ceafc
+   #7 [ffffaf9940307be0] read_pages at ffffffff95381d1a
+   #8 [ffffaf9940307c40] page_cache_ra_unbounded at ffffffff95381ff5
+   #9 [ffffaf9940307ca8] filemap_fault at ffffffff953761b5
+  #10 [ffffaf9940307d48] __do_fault at ffffffff953d1895
+  #11 [ffffaf9940307d70] do_fault at ffffffff953d2425
+  #12 [ffffaf9940307da0] __handle_mm_fault at ffffffff953d8c6b
+  #13 [ffffaf9940307e88] handle_mm_fault at ffffffff953d95c2
+  #14 [ffffaf9940307ec8] do_user_addr_fault at ffffffff950b34ea
+  #15 [ffffaf9940307f28] exc_page_fault at ffffffff96186e4e
+  #16 [ffffaf9940307f50] asm_exc_page_fault at ffffffff962012a6
+      RIP: 0000556b7a7468d8  RSP: 00007ffde2ffb560  RFLAGS: 00000206
+      RAX: 00000000000bec82  RBX: 00007f5331a0dc82  RCX: 0000556b7a75b92a
+      RDX: 00007ffde2ffd8d0  RSI: 00000000200bec82  RDI: 0000556ba8edf960
+      RBP: 00007ffde2ffb7c0   R8: 0000000000000000   R9: 0000000000000000
+      R10: 0000000000000000  R11: 0000000000000202  R12: 00000000200bec82
+      R13: 0000556ba8edf960  R14: 00007ffde2ffd8d0  R15: 0000556b7a760708
+      ORIG_RAX: ffffffffffffffff  CS: 0033  SS: 002b
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2303267
+---
+ appliance/init | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/appliance/init b/appliance/init
+index 128a3c20e1..dae06dbbe5 100755
+--- a/appliance/init
++++ b/appliance/init
+@@ -104,8 +104,6 @@ udevadm settle --timeout=600
+ # Increase the SCSI timeout so we can read remote images.
+ shopt -s nullglob
+ for f in /sys/block/sd*/device/timeout; do echo 300 > $f; done
+-# https://access.redhat.com/site/solutions/5427
+-for f in /sys/block/{h,s,ub,v}d*/queue/scheduler; do echo noop > $f; done
+ shopt -u nullglob
+ 
+ # Set up the network.
+-- 
+2.46.0
+

gating.yaml

@@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-9
+  - rhel-*
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: xen-ci.brew-build.tier1.functional}

libguestfs.spec

@@ -29,14 +29,6 @@ ExcludeArch: %{ix86}
 # Verify tarball signature with GPGv2.
 %global verify_tarball_signature 1
 
-# If there are patches which touch autotools files, set this to 1.
-%if !0%{?rhel}
-%global patches_touch_autotools %{nil}
-%else
-# On RHEL the downstream patches always touch autotools files.
-%global patches_touch_autotools 1
-%endif
-
 # The source directory.
 %global source_directory 1.52-stable
 
@@ -49,8 +41,8 @@ ExcludeArch: %{ix86}
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.52.0
-Release:       7%{?dist}
+Version:       1.52.2
+Release:       2%{?dist}
 License:       LGPL-2.1-or-later
 
 # Build only for architectures that have a kernel
@@ -84,9 +76,12 @@ Source7:       libguestfs.keyring
 # Maintainer script which helps with handling patches.
 Source8:       copy-patches.sh
 
-%if 0%{patches_touch_autotools}
+# Fix kernel hang.
+# https://bugzilla.redhat.com/show_bug.cgi?id=2303267
+# Upstream in > 1.53.5
+Patch:         0001-appliance-init-Don-t-set-impossible-noop-disk-schedu.patch
+
 BuildRequires: autoconf, automake, libtool, gettext-devel
-%endif
 
 # Basic build requirements.
 BuildRequires: gcc, gcc-c++
@@ -696,9 +691,7 @@ for %{name}.
 %setup -q
 %autopatch -p1
 
-%if 0%{patches_touch_autotools}
-autoreconf -i
-%endif
+autoreconf -fiv
 
 # For sVirt to work, the local temporary directory we use in the tests
 # must be labelled the same way as /tmp.  This doesn't work if either
@@ -1099,6 +1092,15 @@ rm ocaml/html/.gitignore
 
 
 %changelog
+* Fri Aug 16 2024 Richard W.M. Jones <rjones@redhat.com> - 1:1.52.2-2
+- Fix kernel hang (RHBZ#2303267)
+
+* Mon Jul 08 2024 Richard W.M. Jones <rjones@redhat.com> - 1:1.52.2-1
+- New stable branch version 1.52.2
+
+* Mon May 13 2024 Richard W.M. Jones <rjones@redhat.com> - 1:1.52.1-1
+- New stable branch version 1.52.1
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.52.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
-SHA512 (libguestfs-1.52.0.tar.gz) = 48dfaabb6b371ab3476b42310d363addf2fd1dfe43876be3bc984953f6919a30c7de13ef235d83fdd39117d71aa6bbfb5fbb645c1b17bc3031798a2a2b3df9d7
-SHA512 (libguestfs-1.52.0.tar.gz.sig) = c147e3b894c65137145228d70bcda3975a4dd4faa04c066d6783799e3d4825c2eee7c093601002f3a352989d81a75dd63c754f149201921abdded96ecb7a6214
+SHA512 (libguestfs-1.52.2.tar.gz) = 5eb4fbcc8e8879932a212c38c515598cd229e0e10b3e86d5655a10f30f5cc8c3df4e6f4b60095ccdaddbd493114ea84d9c0cdb9db7496dc83283fc4d369ece71
+SHA512 (libguestfs-1.52.2.tar.gz.sig) = d43128be62848372e6c52a39ef8dd5e898e8b8005df5ba2b4269c9757d6f480b21bfd60b16df165b8b4bcadefa71aa8daaae8755789f48b6736f4a5475aa1c59