.gitignore

@@ -1,12 +1,10 @@
-SOURCES/centossecureboot201.cer
+SOURCES/kernel-abi-stablelists-5.14.0-362.18.1.el9_3.tar.bz2
-SOURCES/centossecurebootca2.cer
+SOURCES/kernel-kabi-dw-5.14.0-362.18.1.el9_3.tar.bz2
-SOURCES/kernel-abi-stablelists-4.18.0-513.tar.bz2
+SOURCES/linux-5.14.0-362.18.1.el9_3.tar.xz
-SOURCES/kernel-kabi-dw-4.18.0-513.tar.bz2
-SOURCES/linux-4.18.0-513.18.1.el8_9.tar.xz
-SOURCES/redhatsecureboot302.cer
-SOURCES/redhatsecureboot303.cer
-SOURCES/redhatsecureboot501.cer
-SOURCES/redhatsecurebootca3.cer
-SOURCES/redhatsecurebootca7.cer
 SOURCES/rheldup3.x509
+SOURCES/rhelima.x509
+SOURCES/rhelima_centos.x509
+SOURCES/rhelimaca1.x509
 SOURCES/rhelkpatch1.x509
+SOURCES/uki-sb-cert-x86_64-centos.crt
+SOURCES/uki-sb-cert-x86_64-rhel.crt

.kernel.metadata

@@ -1,12 +1,10 @@
-2ba40bf9138b48311e5aa1b737b7f0a8ad66066f SOURCES/centossecureboot201.cer
+f823c58b7a797113dec1a2863f3efb9b13a5db01 SOURCES/kernel-abi-stablelists-5.14.0-362.18.1.el9_3.tar.bz2
-bfdb3d7cffc43f579655af5155d50c08671d95e5 SOURCES/centossecurebootca2.cer
+b1d3fe4cf0e3d6db2cb96fc8dc3ccf21cf29b12d SOURCES/kernel-kabi-dw-5.14.0-362.18.1.el9_3.tar.bz2
-6bac4f0d78ba0bb5ead1fb8246e3696a463e9b07 SOURCES/kernel-abi-stablelists-4.18.0-513.tar.bz2
+4c7324ab3eed522ca5d7e0fcee0bfa891ef73328 SOURCES/linux-5.14.0-362.18.1.el9_3.tar.xz
-98694c1cb92f1ff948a817c610e83f44cdefdc46 SOURCES/kernel-kabi-dw-4.18.0-513.tar.bz2
-cb01896ee61636ccd11f3359e7d30d390802cc81 SOURCES/linux-4.18.0-513.18.1.el8_9.tar.xz
-13e5cd3f856b472fde80a4deb75f4c18dfb5b255 SOURCES/redhatsecureboot302.cer
-e89890ca0ded2f9058651cc5fa838b78db2e6cc2 SOURCES/redhatsecureboot303.cer
-ba0b760e594ff668ee72ae348adf3e49b97f75fb SOURCES/redhatsecureboot501.cer
-cf9230e69000076727e5b784ec871d22716dc5da SOURCES/redhatsecurebootca3.cer
-905d91a282727c7f5ad433a49ac42a0772311c6a SOURCES/redhatsecurebootca7.cer
 95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509
+99e571f9de4188f3b5fdf1f84ff73f6cc4bb6a0e SOURCES/rhelima.x509
+61d5a223ff0c79189505abae77e0087c4b2d2b47 SOURCES/rhelima_centos.x509
+f882610d2554fef65703e5d3c342f005af0390ad SOURCES/rhelimaca1.x509
 d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509
+20224d67a583b98009a1c1632bb4b639b0e8be6a SOURCES/uki-sb-cert-x86_64-centos.crt
+1d51d3a037ad287095b0a13c4deeb1252d8ff0cc SOURCES/uki-sb-cert-x86_64-rhel.crt

SOURCES/0001-nvme-pci-add-BOGUS_NID-for-Intel-0a54-device.patch

@@ -0,0 +1,32 @@
+From 5c3f4066462a5f6cac04d3dd81c9f551fabbc6c7 Mon Sep 17 00:00:00 2001
+From: Keith Busch <kbusch@kernel.org>
+Date: Thu, 12 Oct 2023 11:13:51 -0700
+Subject: [PATCH] nvme-pci: add BOGUS_NID for Intel 0a54 device
+
+These ones claim cmic and nmic capable, so need special consideration to ignore
+their duplicate identifiers.
+
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=217981
+Reported-by: welsh@cassens.com
+Signed-off-by: Keith Busch <kbusch@kernel.org>
+---
+ drivers/nvme/host/pci.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
+index 347cb5daebc3..3f0c9ee09a12 100644
+--- a/drivers/nvme/host/pci.c
++++ b/drivers/nvme/host/pci.c
+@@ -3329,7 +3329,8 @@ static const struct pci_device_id nvme_id_table[] = {
+ 	{ PCI_VDEVICE(INTEL, 0x0a54),	/* Intel P4500/P4600 */
+ 		.driver_data = NVME_QUIRK_STRIPE_SIZE |
+ 				NVME_QUIRK_DEALLOCATE_ZEROES |
+-				NVME_QUIRK_IGNORE_DEV_SUBNQN, },
++				NVME_QUIRK_IGNORE_DEV_SUBNQN |
++				NVME_QUIRK_BOGUS_NID, },
+ 	{ PCI_VDEVICE(INTEL, 0x0a55),	/* Dell Express Flash P4600 */
+ 		.driver_data = NVME_QUIRK_STRIPE_SIZE |
+ 				NVME_QUIRK_DEALLOCATE_ZEROES, },
+-- 
+2.27.0
+

SOURCES/Makefile.rhelver

@@ -0,0 +1,67 @@
+RHEL_MAJOR = 9
+RHEL_MINOR = 3
+
+#
+# RHEL_RELEASE
+# -------------
+#
+# Represents build number in 'release' part of RPM's name-version-release.
+#   name is <package_name>, e.g. kernel
+#   version is upstream kernel version this kernel is based on, e.g. 4.18.0
+#   release is <RHEL_RELEASE>.<dist_tag>[<buildid>], e.g. 100.el8
+#
+# Use this spot to avoid future merge conflicts.
+# Do not trim this comment.
+RHEL_RELEASE = 362.18.1
+
+#
+# ZSTREAM
+# -------
+#
+#  This variable controls whether we use zstream numbering or not for the
+#  package release. The zstream release keeps the build number of the last
+#  build done for ystream for the Beta milestone, and increments a second
+#  number for each build. The third number is used for branched builds
+#  (eg.: for builds with security fixes or hot fixes done outside of the
+#  batch release process).
+#
+#  For example, with ZSTREAM unset or set to "no", all builds will contain
+#  a release with only the build number, eg.: kernel-<kernel version>-X.el*,
+#  where X is the build number. With ZSTREAM set to "yes", we will have
+#  builds with kernel-<kernel version>-X.Y.Z.el*, where X is the last
+#  RHEL_RELEASE number before ZSTREAM flag was set to yes, Y will now be the
+#  build number and Z will always be 1 except if you're doing a branched build
+#  (when you give RHDISTGIT_BRANCH on the command line, in which case the Z
+#  number will be incremented instead of the Y).
+#
+ZSTREAM ?= yes
+
+#
+# Early y+1 numbering
+# --------------------
+#
+# In early y+1 process, RHEL_RELEASE consists of 2 numbers: x.y
+# First is RHEL_RELEASE inherited/merged from y as-is, second number
+# is incremented with each build starting from 1. After merge from y,
+# it resets back to 1. This way y+1 nvr reflects status of last merge.
+#
+# Example:
+#
+# rhel8.0                        rhel-8.1
+#   kernel-4.18.0-58.el8   -->     kernel-4.18.0-58.1.el8
+#                                  kernel-4.18.0-58.2.el8
+#   kernel-4.18.0-59.el8           kernel-4.18.0-59.1.el8
+#   kernel-4.18.0-60.el8
+#   kernel-4.18.0-61.el8   -->     kernel-4.18.0-61.1.el8
+#
+#
+# Use this spot to avoid future merge conflicts.
+# Do not trim this comment.
+EARLY_YSTREAM ?= no
+EARLY_YBUILD:=
+EARLY_YRELEASE:=
+ifneq ("$(ZSTREAM)", "yes")
+  ifeq ("$(EARLY_YSTREAM)","yes")
+    RHEL_RELEASE:=$(RHEL_RELEASE).$(EARLY_YRELEASE)
+  endif
+endif

SOURCES/README.rst

@@ -0,0 +1,25 @@
+===================
+The Kernel dist-git
+===================
+
+The kernel is maintained in a `source tree`_ rather than directly in dist-git.
+The specfile is maintained as a `template`_ in the source tree along with a set
+of build scripts to generate configurations, (S)RPMs, and to populate the
+dist-git repository.
+
+The `documentation`_ for the source tree covers how to contribute and maintain
+the tree.
+
+If you're looking for the downstream patch set it's available in the source
+tree with "git log master..ark-patches" or
+`online`_.
+
+Each release in dist-git is tagged in the source repository so you can easily
+check out the source tree for a build. The tags are in the format
+name-version-release, but note release doesn't contain the dist tag since the
+source can be built in different build roots (Fedora, CentOS, etc.)
+
+.. _source tree: https://gitlab.com/cki-project/kernel-ark.git
+.. _template: https://gitlab.com/cki-project/kernel-ark/-/blob/os-build/redhat/kernel.spec.template
+.. _documentation: https://gitlab.com/cki-project/kernel-ark/-/wikis/home
+.. _online: https://gitlab.com/cki-project/kernel-ark/-/commits/ark-patches

SOURCES/Rename-mmu_notifier_seq-to-mmu_invalidate_seq-in-book3s_64_vio_hv.patch

@@ -0,0 +1,12 @@
+diff -aruN linux-5.14.0-362.8.1.el9_3/arch/powerpc/kvm/book3s_64_vio_hv.c linux-5.14.0-362.8.1.el9_3.alma/arch/powerpc/kvm/book3s_64_vio_hv.c
+--- linux-5.14.0-362.8.1.el9_3/arch/powerpc/kvm/book3s_64_vio_hv.c	2023-11-07 20:57:43
++++ linux-5.14.0-362.8.1.el9_3.alma/arch/powerpc/kvm/book3s_64_vio_hv.c	2023-12-07 17:59:41
+@@ -488,7 +488,7 @@
+ 	/*
+ 	 * used to check for invalidations in progress
+ 	 */
+-	mmu_seq = kvm->mmu_notifier_seq;
++	mmu_seq = kvm->mmu_invalidate_seq;
+ 	smp_rmb();
+ 
+ 	stt = kvmppc_find_table(vcpu->kvm, liobn);

SOURCES/check-kabi

@@ -41,7 +41,8 @@ def load_symvers(symvers, filename):
             break
         if in_line == "\n":
             continue
-        checksum, symbol, directory, type = in_line.split()
+        checksum, symbol, directory, type, *ns = in_line.split()
+        ns = ns[0] if ns else None
 
         symvers[symbol] = in_line[0:-1]
 
@@ -57,7 +58,8 @@ def load_kabi(kabi, filename):
             break
         if in_line == "\n":
             continue
-        checksum, symbol, directory, type = in_line.split()
+        checksum, symbol, directory, type, *ns = in_line.split()
+        ns = ns[0] if ns else None
 
         kabi[symbol] = in_line[0:-1]
 
@@ -69,11 +71,14 @@ def check_kabi(symvers, kabi):
     warn = 0
     changed_symbols = []
     moved_symbols = []
+    ns_symbols = []
 
     for symbol in kabi:
-        abi_hash, abi_sym, abi_dir, abi_type = kabi[symbol].split()
+        abi_hash, abi_sym, abi_dir, abi_type, *abi_ns = kabi[symbol].split()
+        abi_ns = abi_ns[0] if abi_ns else None
         if symbol in symvers:
-            sym_hash, sym_sym, sym_dir, sym_type = symvers[symbol].split()
+            sym_hash, sym_sym, sym_dir, sym_type, *sym_ns = symvers[symbol].split()
+            sym_ns = sym_ns[0] if sym_ns else None
             if abi_hash != sym_hash:
                 fail = 1
                 changed_symbols.append(symbol)
@@ -81,6 +86,10 @@ def check_kabi(symvers, kabi):
             if abi_dir != sym_dir:
                 warn = 1
                 moved_symbols.append(symbol)
+
+            if abi_ns != sym_ns:
+                warn = 1
+                ns_symbols.append(symbol)
         else:
             fail = 1
             changed_symbols.append(symbol)
@@ -96,13 +105,21 @@ def check_kabi(symvers, kabi):
 
     if warn:
         print("*** WARNING - ABI SYMBOLS MOVED ***")
-        print("")
+        if moved_symbols:
-        print("The following symbols moved (typically caused by moving a symbol from being")
+            print("")
-        print("provided by the kernel vmlinux out to a loadable module):")
+            print("The following symbols moved (typically caused by moving a symbol from being")
-        print("")
+            print("provided by the kernel vmlinux out to a loadable module):")
-        for symbol in moved_symbols:
+            print("")
-            print(symbol)
+            for symbol in moved_symbols:
-        print("")
+                print(symbol)
+            print("")
+        if ns_symbols:
+            print("")
+            print("The following symbols changed symbol namespaces:")
+            print("")
+            for symbol in ns_symbols:
+                print(symbol)
+            print("")
 
     """Halt the build, if we got errors and/or warnings. In either case,
        double-checkig is required to avoid introducing / concealing

SOURCES/dracut-virt.conf

@@ -0,0 +1,38 @@
+# generic + compressed please
+hostonly="no"
+compress="xz"
+
+# VMs can't update microcode anyway
+early_microcode="no"
+
+# modules: basics
+dracutmodules+=" base systemd systemd-initrd dracut-systemd dbus dbus-broker usrmount shutdown "
+
+# modules: storage support
+dracutmodules+=" dm lvm rootfs-block fs-lib "
+
+# modules: tpm and crypto
+dracutmodules+=" crypt crypt-loop tpm2-tss "
+
+# WALinuxagent-cvm with CVM specific udev rules
+dracutmodules+=" walinuxagentcvm "
+
+# drivers: virtual buses, pci
+drivers+=" virtio-pci virtio-mmio "      # qemu-kvm
+drivers+=" hv-vmbus pci-hyperv "         # hyperv
+drivers+=" xen-pcifront "                # xen
+
+# drivers: storage
+drivers+=" ahci nvme sd_mod sr_mod "     # generic
+drivers+=" virtio-blk virtio-scsi "      # qemu-kvm
+drivers+=" hv-storvsc "                  # hyperv
+drivers+=" xen-blkfront "                # xen
+
+# root encryption
+drivers+=" dm_crypt "
+
+# filesystems
+filesystems+=" vfat ext4 xfs overlay "
+
+# systemd-pcrphase
+install_items+=" /lib/systemd/system/systemd-pcrphase-initrd.service /usr/lib/systemd/systemd-pcrphase /usr/lib/systemd/system/initrd.target.wants/systemd-pcrphase-initrd.service "

SOURCES/eaaaed137eccb9e8f3a88f6297e214f53885196f.patch

@@ -0,0 +1,190 @@
+From eaaaed137eccb9e8f3a88f6297e214f53885196f Mon Sep 17 00:00:00 2001
+From: Sean Christopherson <seanjc@google.com>
+Date: Mon, 6 Dec 2021 20:54:14 +0100
+Subject: [PATCH] KVM: PPC: Avoid referencing userspace memory region in
+ memslot updates
+
+For PPC HV, get the number of pages directly from the new memslot instead
+of computing the same from the userspace memory region, and explicitly
+check for !DELETE instead of inferring the same when toggling mmio_update.
+The motivation for these changes is to avoid referencing the @mem param
+so that it can be dropped in a future commit.
+
+No functional change intended.
+
+Signed-off-by: Sean Christopherson <seanjc@google.com>
+Signed-off-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
+Message-Id: <1e97fb5198be25f98ef82e63a8d770c682264cc9.1638817639.git.maciej.szmigiero@oracle.com>
+---
+ arch/powerpc/include/asm/kvm_ppc.h |  4 ----
+ arch/powerpc/kvm/book3s.c          |  6 ++----
+ arch/powerpc/kvm/book3s_hv.c       | 12 +++---------
+ arch/powerpc/kvm/book3s_pr.c       |  2 --
+ arch/powerpc/kvm/booke.c           |  2 --
+ arch/powerpc/kvm/powerpc.c         |  4 ++--
+ 6 files changed, 7 insertions(+), 23 deletions(-)
+
+diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h
+index b01760dd1374df..935c58dc38c493 100644
+--- a/arch/powerpc/include/asm/kvm_ppc.h
++++ b/arch/powerpc/include/asm/kvm_ppc.h
+@@ -200,12 +200,10 @@ extern void kvmppc_core_destroy_vm(struct kvm *kvm);
+ extern void kvmppc_core_free_memslot(struct kvm *kvm,
+ 				     struct kvm_memory_slot *slot);
+ extern int kvmppc_core_prepare_memory_region(struct kvm *kvm,
+-				const struct kvm_userspace_memory_region *mem,
+ 				const struct kvm_memory_slot *old,
+ 				struct kvm_memory_slot *new,
+ 				enum kvm_mr_change change);
+ extern void kvmppc_core_commit_memory_region(struct kvm *kvm,
+-				const struct kvm_userspace_memory_region *mem,
+ 				struct kvm_memory_slot *old,
+ 				const struct kvm_memory_slot *new,
+ 				enum kvm_mr_change change);
+@@ -275,12 +273,10 @@ struct kvmppc_ops {
+ 	int (*get_dirty_log)(struct kvm *kvm, struct kvm_dirty_log *log);
+ 	void (*flush_memslot)(struct kvm *kvm, struct kvm_memory_slot *memslot);
+ 	int (*prepare_memory_region)(struct kvm *kvm,
+-				     const struct kvm_userspace_memory_region *mem,
+ 				     const struct kvm_memory_slot *old,
+ 				     struct kvm_memory_slot *new,
+ 				     enum kvm_mr_change change);
+ 	void (*commit_memory_region)(struct kvm *kvm,
+-				     const struct kvm_userspace_memory_region *mem,
+ 				     struct kvm_memory_slot *old,
+ 				     const struct kvm_memory_slot *new,
+ 				     enum kvm_mr_change change);
+diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c
+index 8250e8308674c7..6d525285dbe8f2 100644
+--- a/arch/powerpc/kvm/book3s.c
++++ b/arch/powerpc/kvm/book3s.c
+@@ -847,21 +847,19 @@ void kvmppc_core_flush_memslot(struct kvm *kvm, struct kvm_memory_slot *memslot)
+ }
+ 
+ int kvmppc_core_prepare_memory_region(struct kvm *kvm,
+-				      const struct kvm_userspace_memory_region *mem,
+ 				      const struct kvm_memory_slot *old,
+ 				      struct kvm_memory_slot *new,
+ 				      enum kvm_mr_change change)
+ {
+-	return kvm->arch.kvm_ops->prepare_memory_region(kvm, mem, old, new, change);
++	return kvm->arch.kvm_ops->prepare_memory_region(kvm, old, new, change);
+ }
+ 
+ void kvmppc_core_commit_memory_region(struct kvm *kvm,
+-				const struct kvm_userspace_memory_region *mem,
+ 				struct kvm_memory_slot *old,
+ 				const struct kvm_memory_slot *new,
+ 				enum kvm_mr_change change)
+ {
+-	kvm->arch.kvm_ops->commit_memory_region(kvm, mem, old, new, change);
++	kvm->arch.kvm_ops->commit_memory_region(kvm, old, new, change);
+ }
+ 
+ bool kvm_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range)
+diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
+index d7594d49d288a3..2b59ecc5f8c698 100644
+--- a/arch/powerpc/kvm/book3s_hv.c
++++ b/arch/powerpc/kvm/book3s_hv.c
+@@ -4854,15 +4854,12 @@ static void kvmppc_core_free_memslot_hv(struct kvm_memory_slot *slot)
+ }
+ 
+ static int kvmppc_core_prepare_memory_region_hv(struct kvm *kvm,
+-				const struct kvm_userspace_memory_region *mem,
+ 				const struct kvm_memory_slot *old,
+ 				struct kvm_memory_slot *new,
+ 				enum kvm_mr_change change)
+ {
+-	unsigned long npages = mem->memory_size >> PAGE_SHIFT;
+-
+ 	if (change == KVM_MR_CREATE) {
+-		new->arch.rmap = vzalloc(array_size(npages,
++		new->arch.rmap = vzalloc(array_size(new->npages,
+ 					  sizeof(*new->arch.rmap)));
+ 		if (!new->arch.rmap)
+ 			return -ENOMEM;
+@@ -4874,20 +4871,17 @@ static int kvmppc_core_prepare_memory_region_hv(struct kvm *kvm,
+ }
+ 
+ static void kvmppc_core_commit_memory_region_hv(struct kvm *kvm,
+-				const struct kvm_userspace_memory_region *mem,
+ 				struct kvm_memory_slot *old,
+ 				const struct kvm_memory_slot *new,
+ 				enum kvm_mr_change change)
+ {
+-	unsigned long npages = mem->memory_size >> PAGE_SHIFT;
+-
+ 	/*
+-	 * If we are making a new memslot, it might make
++	 * If we are creating or modifying a memslot, it might make
+ 	 * some address that was previously cached as emulated
+ 	 * MMIO be no longer emulated MMIO, so invalidate
+ 	 * all the caches of emulated MMIO translations.
+ 	 */
+-	if (npages)
++	if (change != KVM_MR_DELETE)
+ 		atomic64_inc(&kvm->arch.mmio_update);
+ 
+ 	/*
+diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
+index ffb559cf25f435..30426e8c8cf66b 100644
+--- a/arch/powerpc/kvm/book3s_pr.c
++++ b/arch/powerpc/kvm/book3s_pr.c
+@@ -1899,7 +1899,6 @@ static void kvmppc_core_flush_memslot_pr(struct kvm *kvm,
+ }
+ 
+ static int kvmppc_core_prepare_memory_region_pr(struct kvm *kvm,
+-				const struct kvm_userspace_memory_region *mem,
+ 				const struct kvm_memory_slot *old,
+ 				struct kvm_memory_slot *new,
+ 				enum kvm_mr_change change)
+@@ -1908,7 +1907,6 @@ static int kvmppc_core_prepare_memory_region_pr(struct kvm *kvm,
+ }
+ 
+ static void kvmppc_core_commit_memory_region_pr(struct kvm *kvm,
+-				const struct kvm_userspace_memory_region *mem,
+ 				struct kvm_memory_slot *old,
+ 				const struct kvm_memory_slot *new,
+ 				enum kvm_mr_change change)
+diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
+index 93c2ac2bee0913..53b4c9597c303e 100644
+--- a/arch/powerpc/kvm/booke.c
++++ b/arch/powerpc/kvm/booke.c
+@@ -1821,7 +1821,6 @@ void kvmppc_core_free_memslot(struct kvm *kvm, struct kvm_memory_slot *slot)
+ }
+ 
+ int kvmppc_core_prepare_memory_region(struct kvm *kvm,
+-				      const struct kvm_userspace_memory_region *mem,
+ 				      const struct kvm_memory_slot *old,
+ 				      struct kvm_memory_slot *new,
+ 				      enum kvm_mr_change change)
+@@ -1830,7 +1829,6 @@ int kvmppc_core_prepare_memory_region(struct kvm *kvm,
+ }
+ 
+ void kvmppc_core_commit_memory_region(struct kvm *kvm,
+-				const struct kvm_userspace_memory_region *mem,
+ 				struct kvm_memory_slot *old,
+ 				const struct kvm_memory_slot *new,
+ 				enum kvm_mr_change change)
+diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
+index e875874cf8367d..575140ecb23c82 100644
+--- a/arch/powerpc/kvm/powerpc.c
++++ b/arch/powerpc/kvm/powerpc.c
+@@ -703,7 +703,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm,
+ 				   struct kvm_memory_slot *new,
+ 				   enum kvm_mr_change change)
+ {
+-	return kvmppc_core_prepare_memory_region(kvm, mem, old, new, change);
++	return kvmppc_core_prepare_memory_region(kvm, old, new, change);
+ }
+ 
+ void kvm_arch_commit_memory_region(struct kvm *kvm,
+@@ -712,7 +712,7 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,
+ 				   const struct kvm_memory_slot *new,
+ 				   enum kvm_mr_change change)
+ {
+-	kvmppc_core_commit_memory_region(kvm, mem, old, new, change);
++	kvmppc_core_commit_memory_region(kvm, old, new, change);
+ }
+ 
+ void kvm_arch_flush_shadow_memslot(struct kvm *kvm,

SOURCES/filter-aarch64.sh.rhel

@@ -15,4 +15,4 @@ ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco
 
 drmdrvs="amd arm bridge ast exynos hisilicon i2c imx mgag200 meson msm nouveau panel radeon rockchip tegra sun4i tinydrm vc4"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls"

SOURCES/filter-modules.sh.rhel

@@ -13,8 +13,11 @@
 # subsys should be in kernel-modules on all arches, please change the defaults
 # listed here.
 
+# Overrides is individual modules which need to remain in kernel-core due to deps.
+overrides="cec"
+
 # Set the default dirs/modules to filter out
-driverdirs="atm auxdisplay bcma bluetooth firewire fmc iio infiniband isdn leds media memstick mfd mmc mtd nfc ntb pcmcia platform power ssb staging tty uio uwb w1 virt"
+driverdirs="atm auxdisplay bcma bluetooth firewire fmc iio infiniband isdn leds media memstick mfd mmc mtd nfc ntb pcmcia platform power ssb staging tty uio uwb w1"
 
 chardrvs="mwave pcmcia"
 
@@ -22,6 +25,8 @@ netdrvs="appletalk can dsa hamradio ieee802154 irda ppp slip usb wireless"
 
 ethdrvs="3com adaptec alteon amd aquantia atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti wiznet xircom"
 
+cryptdrvs="bcm caam cavium chelsio hisilicon marvell qat"
+
 inputdrvs="gameport tablet touchscreen"
 
 scsidrvs="aacraid aic7xxx aic94xx be2iscsi bfa bnx2i bnx2fc csiostor cxgbi esas2r fcoe fnic hisi_sas isci libsas lpfc megaraid mpt2sas mpt3sas mvsas pm8001 qla2xxx qla4xxx sym53c8xx_2 ufs qedf"
@@ -34,7 +39,7 @@ netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee80215
 
 drmdrvs="amd ast gma500 i2c i915 mgag200 nouveau radeon via "
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr parport_serial ism xt_u32 act_ct"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls parport_serial ism regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus nct6775 ntc_thermistor video"
 
 # Grab the arch-specific filter list overrides
 source ./filter-$2.sh
@@ -88,7 +93,7 @@ done
 # Filter the char drivers
 for char in ${chardrvs}
 do
-	filter_dir $1 drivers/char/${input}
+	filter_dir $1 drivers/char/${char}
 done
 
 # Filter the ethernet drivers
@@ -97,6 +102,12 @@ do
 	filter_dir $1 drivers/net/ethernet/${eth}
 done
 
+# Filter the crypto drivers
+for crypt in ${cryptdrvs}
+do
+	filter_dir $1 drivers/crypto/${crypt}
+done
+
 # SCSI
 for scsi in ${scsidrvs}
 do
@@ -135,9 +146,7 @@ done
 
 # Just kill sound.
 filter_dir $1 kernel/sound
-filter_ko $1 drivers/base/regmap/regmap-sdw
+filter_dir $1 kernel/drivers/soundwire
-filter_ko $1 drivers/base/regmap/regmap-sdw-mbq
-filter_dir $1 drivers/soundwire
 
 # Now go through and filter any single .ko files that might have deps on the
 # things we filtered above
@@ -146,6 +155,20 @@ do
         filter_ko $1 ${mod}
 done
 
+# Now process the override list to bring those modules back into core
+for mod in ${overrides}
+do
+	grep -v -e "/${mod}.ko" k-d.list > k-d.list.tmp
+	if [ $? -ne 0 ]
+        then
+                echo "Couldn't save ${mod}.ko  Skipping."
+        else
+                grep -e "/${mod}.ko" k-d.list >> $filelist
+                mv k-d.list.tmp k-d.list
+        fi
+
+done
+
 # Go through our generated drivers list and remove the .ko files.  We'll
 # restore them later.
 for mod in `cat k-d.list`

SOURCES/filter-ppc64le.sh.rhel

@@ -11,4 +11,4 @@
 
 driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds media memstick message mmc mtd mwave nfc ntb pcmcia platform power ssb staging tty uio uwb w1"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls"

SOURCES/gating.yaml

@@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-8
+  - rhel-9
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: cki.tier1-aarch64.functional}

SOURCES/generate_all_configs.sh

@@ -1,6 +1,36 @@
 #!/bin/sh
 
-for i in ${NAME}-*.config; do
+# Adjusts the configuration options to build the variants correctly
-	NEW=${NAME}-${VERSION}-`echo $i | cut -d - -f2-`
+
-	mv ${i} ${NEW}
+test -n "$RHTEST" && exit 0
+
+DEBUGBUILDSENABLED=$1
+if [ -z "$DEBUGBUILDSENABLED" ]; then
+	exit 1
+fi
+
+if [ -z "$FLAVOR" ]; then
+	FLAVOR=rhel
+fi
+
+if [ "$FLAVOR" = "fedora" ]; then
+	SECONDARY=rhel
+else
+	SECONDARY=fedora
+fi
+
+for i in kernel-*-"$FLAVOR".config; do
+	NEW=kernel-"$SPECVERSION"-$(echo "$i" | cut -d - -f2- | sed s/-"$FLAVOR"//)
+	#echo $NEW
+	mv "$i" "$NEW"
 done
+
+rm -f kernel-*-"$SECONDARY".config
+
+if [ "$DEBUGBUILDSENABLED" -eq 0 ]; then
+	for i in kernel-*debug*.config; do
+		base=$(echo "$i" | sed -r s/-?debug//g)
+		NEW=kernel-$(echo "$base" | cut -d - -f2-)
+		mv "$i" "$NEW"
+	done
+fi

SOURCES/generate_bls_conf.sh

@@ -1,31 +0,0 @@
-#!/bin/bash
-set -e
-
-. /etc/os-release
-
-kernelver=$1 && shift
-rootfs=$1 && shift
-variant=$1 && shift
-
-output="${rootfs}/lib/modules/${kernelver}/bls.conf"
-date=$(date -u +%Y%m%d%H%M%S)
-
-if [ "${variant:-5}" = "debug" ]; then
-    debugname=" with debugging"
-    debugid="-debug"
-else
-    debugname=""
-    debugid=""
-fi
-
-cat >${output} <<EOF
-title ${NAME} (${kernelver}) ${VERSION}${debugname}
-version ${kernelver}${debugid}
-linux ${bootprefix}/vmlinuz-${kernelver}
-initrd ${bootprefix}/initramfs-${kernelver}.img
-options \$kernelopts
-id ${ID}-${date}-${kernelver}${debugid}
-grub_users \$grub_users
-grub_arg --unrestricted
-grub_class kernel${variant}
-EOF

SOURCES/kernel-local

@@ -0,0 +1,2 @@
+# This file is intentionally left empty in the stock kernel. Its a nicety
+# added for those wanting to do custom rebuilds with altered config opts.

SOURCES/merge.pl

@@ -0,0 +1,72 @@
+#! /usr/bin/perl
+
+my @args=@ARGV;
+my %configvalues;
+my @configoptions;
+my $configcounter = 0;
+
+# optionally print out the architecture as the first line of our output
+my $arch = $args[2];
+if (defined $arch) {
+	print "# $arch\n";
+}
+
+# first, read the override file
+
+open (FILE,"$args[0]") || die "Could not open $args[0]";
+while (<FILE>) {
+	my $str = $_;
+	my $configname;
+
+	if (/\# ([\w]+) is not set/) {
+		$configname = $1;
+	} elsif (/^\#/) {
+		# fall through on comments like 'avoid CONFIG_FOO=y'
+		;
+	} elsif (/([\w]+)=/) {
+		$configname = $1;
+	}
+
+	if (defined($configname) && !exists($configvalues{$configname})) {
+		$configvalues{$configname} = $str;
+		$configoptions[$configcounter] = $configname;
+		$configcounter ++;
+	}
+};
+
+# now, read and output the entire configfile, except for the overridden
+# parts... for those the new value is printed.
+
+open (FILE2,"$args[1]") || die "Could not open $args[1]";
+while (<FILE2>) {
+	my $configname;
+
+	if (/\# ([\w]+) is not set/) {
+		$configname = $1;
+	} elsif (/^\#/) {
+		# fall through on comments like 'avoid CONFIG_FOO=y'
+		;
+	} elsif (/([\w]+)=/) {
+		$configname  = $1;
+	}
+
+	if (defined($configname) && exists($configvalues{$configname})) {
+		print "$configvalues{$configname}";
+		delete($configvalues{$configname});
+	} else {
+		print "$_";
+	}
+}
+
+# now print the new values from the overridden configfile
+my $counter = 0;
+
+while ($counter < $configcounter) {
+	my $configname = $configoptions[$counter];
+	if (exists($configvalues{$configname})) {
+		print "$configvalues{$configname}";
+	}
+	$counter++;
+}
+
+1;

SOURCES/mod-denylist.sh

@@ -1,4 +1,5 @@
 #! /bin/bash
+# shellcheck disable=SC2164
 
 RpmDir=$1
 ModDir=$2
@@ -24,9 +25,9 @@ __EOF__
 
 check_blacklist()
 {
-	mod=$(find $RpmDir/$ModDir -name "$1")
+	mod=$(find "$RpmDir/$ModDir" -name "$1")
 	[ ! "$mod" ] && return 0
-	if modinfo $mod | grep -q '^alias:\s\+net-'; then
+	if modinfo "$mod" | grep -q '^alias:\s\+net-'; then
 		mod="${1##*/}"
 		mod="${mod%.ko*}"
 		echo "$mod has an alias that allows auto-loading. Blacklisting."
@@ -37,7 +38,7 @@ check_blacklist()
 find_depends()
 {
 	dep=$1
-	depends=`modinfo $dep | sed -n -e "/^depends/ s/^depends:[ \t]*//p"`
+	depends=$(modinfo "$dep" | sed -n -e "/^depends/ s/^depends:[ \t]*//p")
 	[ -z "$depends" ] && exit
 	for mod in ${depends//,/ }
 	do
@@ -45,14 +46,14 @@ find_depends()
 		[ -z "$match" ] && continue
 		# check if the module we are looking at is in mod-* too.
 		# if so we do not need to mark the dep as required.
-		mod2=${dep##*/}  # same as `basename $dep`, but faster
+		mod2=${dep##*/}  # same as $(basename $dep), but faster
 		match2=$(grep "^$mod2" "$ListName")
 		if [ -n "$match2" ]
 		then
 			#echo $mod2 >> notreq.list
 			continue
 		fi
-		echo $mod.ko >> req.list
+		echo "$mod".ko >> req.list
 	done
 }
 
@@ -60,11 +61,11 @@ foreachp()
 {
 	P=$(nproc)
 	bgcount=0
-	while read mod; do
+	while read -r mod; do
 		$1 "$mod" &
 
 		bgcount=$((bgcount + 1))
-		if [ $bgcount -eq $P ]; then
+		if [ $bgcount -eq "$P" ]; then
 			wait -n
 			bgcount=$((bgcount - 1))
 		fi
@@ -76,12 +77,12 @@ foreachp()
 # Destination was specified on the command line
 test -n "$4" && echo "$0: Override Destination $Dest has been specified."
 
-pushd $Dir
+pushd "$Dir"
 
-OverrideDir=$(basename $List)
+OverrideDir=$(basename "$List")
 OverrideDir=${OverrideDir%.*}
 OverrideDir=${OverrideDir#*-}
-mkdir -p $OverrideDir
+mkdir -p "$OverrideDir"
 
 rm -rf modnames
 find . -name "*.ko" -type f > modnames
@@ -94,7 +95,8 @@ cp "$List" .
 
 # This variable needs to be exported because it is used in sub-script
 # executed by xargs
-export ListName=$(basename "$List")
+ListName=$(basename "$List")
+export ListName
 
 foreachp find_depends < modnames
 
@@ -102,25 +104,25 @@ sort -u req.list > req2.list
 sort -u "$ListName" > modules2.list
 join -v 1 modules2.list req2.list > modules3.list
 
-for mod in $(cat modules3.list)
+while IFS= read -r mod
 do
-  # get the path for the module
+    # get the path for the module
-  modpath=`grep /$mod modnames`
+    modpath=$(grep /"$mod" modnames)
-  [ -z "$modpath" ] && continue
+    [ -z "$modpath" ] && continue
-  echo $modpath >> dep.list
+    echo "$modpath" >> dep.list
-done
+done < modules3.list
 
 sort -u dep.list > dep2.list
 
 if [ -n "$Dest" ]; then
-	# now move the modules into the $Dest directory
+    # now move the modules into the $Dest directory
-	for mod in `cat dep2.list`
+    while IFS= read -r mod
-	do
+    do
-	  newpath=`dirname $mod | sed -e "s/kernel\\//$Dest\//"`
+	newpath=$(dirname "$mod" | sed -e "s/kernel\\//$Dest\//")
-	  mkdir -p $newpath
+	mkdir -p "$newpath"
-	  mv $mod $newpath
+	mv "$mod" "$newpath"
-	  echo $mod | sed -e "s/kernel\\//$Dest\//" | sed -e "s|^.|${ModDir}|g" >> $RpmDir/$ListName
+	echo "$mod" | sed -e "s/kernel\\//$Dest\//" | sed -e "s|^.|${ModDir}|g" >> "$RpmDir"/"$ListName"
-	done
+    done < dep2.list
 fi
 
 popd
@@ -130,23 +132,33 @@ popd
 # target doesn't try to sign a non-existent file.  This is kinda ugly, but
 # so are the modules-* packages.
 
-for mod in `cat ${Dir}/dep2.list`
+while IFS= read -r mod
 do
-  modfile=`basename $mod | sed -e 's/.ko/.mod/'`
+  modfile=$(basename "$mod" | sed -e 's/.ko/.mod/')
-  rm .tmp_versions/$modfile
+  rm .tmp_versions/"$modfile"
-done
+done < "$Dir"/dep2.list
 
-if [ ! -n "$Dest" ]; then
+if [ -z "$Dest" ]; then
-	sed -e "s|^.|${ModDir}|g" ${Dir}/dep2.list > $RpmDir/$ListName
+	sed -e "s|^.|${ModDir}|g" "$Dir"/dep2.list > "$RpmDir/$ListName"
 	echo "./$RpmDir/$ListName created."
 	[ -d "$RpmDir/etc/modprobe.d/" ] || mkdir -p "$RpmDir/etc/modprobe.d/"
-	foreachp check_blacklist < $List
+	foreachp check_blacklist < "$List"
+fi
+
+# Many BIOS-es export a PNP-id which causes the floppy driver to autoload
+# even though most modern systems don't have a 3.5" floppy driver anymore
+# this replaces the old die_floppy_die.patch which removed the PNP-id from
+# the module
+
+floppylist=("$RpmDir"/"$ModDir"/kernel/drivers/block/floppy.ko*)
+if [[ -n ${floppylist[0]} && -f ${floppylist[0]} ]]; then
+     blacklist "floppy"
 fi
 
 # avoid an empty kernel-extra package
-echo "$ModDir/$OverrideDir" >> $RpmDir/$ListName
+echo "$ModDir/$OverrideDir" >> "$RpmDir/$ListName"
 
-pushd $Dir
+pushd "$Dir"
 rm modnames dep.list dep2.list req.list req2.list
 rm "$ListName" modules2.list modules3.list
 popd

SOURCES/mod-extra.list.rhel

@@ -2,8 +2,6 @@
 a3d.ko
 act200l-sir.ko
 actisys-sir.ko
-act_mpls.ko
-act_ct.ko
 adi.ko
 aer_inject.ko
 af_802154.ko
@@ -17,7 +15,6 @@ avm_cs.ko
 avmfritz.ko
 ax25.ko
 b1.ko
-bareudp.ko
 bas_gigaset.ko
 batman-adv.ko
 baycom_par.ko
@@ -72,7 +69,6 @@ iforce.ko
 interact.ko
 ipddp.ko
 ipx.ko
-ip_vs_mh.ko
 isdn.ko
 joydump.ko
 kingsun-sir.ko
@@ -83,6 +79,7 @@ l2tp_core.ko
 l2tp_debugfs.ko
 l2tp_eth.ko
 l2tp_ip.ko
+l2tp_ip6.ko
 l2tp_netlink.ko
 l2tp_ppp.ko
 lec.ko
@@ -124,11 +121,9 @@ rds_tcp.ko
 rose.ko
 sch_atm.ko
 sch_cbq.ko
-sch_cbs.ko
 sch_choke.ko
 sch_drr.ko
 sch_dsmark.ko
-sch_ets.ko
 sch_gred.ko
 sch_mqprio.ko
 sch_multiq.ko
@@ -139,6 +134,7 @@ sch_sfb.ko
 sch_teql.ko
 sctp.ko
 sctp_diag.ko
+sctp_probe.ko
 sidewinder.ko
 sja1000.ko
 sja1000_platform.ko
@@ -192,7 +188,6 @@ wanrouter.ko
 warrior.ko
 whci.ko
 wire.ko
-xpad.ko
+wwan_hwsim.ko
-xt_u32.ko
 yam.ko
 zhenhua.ko

SOURCES/mod-internal.list

@@ -17,29 +17,13 @@ string-stream-test
 test_linear_ranges
 test_bits
 test_kasan
+time_test
 fat_test
+lib_test
+rational-test
 test_list_sort
 slub_kunit
-memcpy_kunit
+kfence_test
-time_test
-drm_format_helper_test
-drm_damage_helper_test
-drm_cmdline_parser_test
-drm_kunit_helpers
-drm_rect_test
-drm_format_test
-drm_plane_helper_test
-drm_dp_mst_helper_test
-drm_framebuffer_test
-drm_buddy_test
-drm_mm_test
-drm_connector_test
-drm_managed_test
-drm_modes_test
-drm_probe_helper_test
-lib_test
-dev_addr_lists_test
-rational-test
 test_hash
 locktorture
 mac80211_hwsim
@@ -48,8 +32,6 @@ pktgen
 rcutorture
 rocker
 scftorture
-torture
-test_bpf
 test_klp_atomic_replace
 test_klp_callbacks_demo
 test_klp_callbacks_demo2
@@ -60,6 +42,38 @@ test_klp_shadow_vars
 test_klp_state
 test_klp_state2
 test_klp_state3
+torture
+refscale
+rcuscale
+memcpy_kunit
+dev_addr_lists_test
+test_bpf
+stackinit_kunit
+overflow_kunit
+clk-gate_test
+clk_test
+mtty
 test_hmm
 test_vmalloc
-mtty
+test_sort
+cpumask_kunit
+iio-test-format
+iio-test-rescale
+cros_kunit
+cpumask_kunit
+drm_buddy_test
+drm_cmdline_parser_test
+drm_damage_helper_test
+drm_dp_mst_helper_test
+drm_format_helper_test
+drm_format_test
+drm_framebuffer_test
+drm_kunit_helpers
+drm_mm_test
+drm_plane_helper_test
+drm_rect_test
+gss_krb5_test
+drm_connector_test
+drm_managed_test
+drm_modes_test
+drm_probe_helper_test

SOURCES/mod-kvm.list

@@ -0,0 +1,5 @@
+kvm-amd
+kvm-intel
+kvm
+kvmgt
+ptp_kvm

SOURCES/mod-partner.list

@@ -0,0 +1,3 @@
+afs
+rxperf
+rxrpc

SOURCES/mod-sign.sh

@@ -2,7 +2,7 @@
 
 # The modules_sign target checks for corresponding .o files for every .ko that
 # is signed. This doesn't work for package builds which re-use the same build
-# directory for every flavour, and the .config may change between flavours.
+# directory for every variant, and the .config may change between variants.
 # So instead of using this script to just sign lib/modules/$KernelVer/extra,
 # sign all .ko in the buildroot.
 
@@ -13,9 +13,9 @@ MODSECKEY=$1
 MODPUBKEY=$2
 moddir=$3
 
-modules=`find $moddir -type f -name '*.ko'`
+modules=$(find "$moddir" -type f -name '*.ko')
 
-NPROC=`nproc`
+NPROC=$(nproc)
 [ -z "$NPROC" ] && NPROC=1
 
 # NB: this loop runs 2000+ iterations. Try to be fast.
@@ -27,7 +27,7 @@ done
 " DUMMYARG0   # xargs appends ARG1 ARG2..., which go into $mod in for loop.
 
 RANDOMMOD=$(echo "$modules" | sort -R | head -n 1)
-if [ "~Module signature appended~" != "$(tail -c 28 $RANDOMMOD)" ]; then
+if [ "~Module signature appended~" != "$(tail -c 28 "$RANDOMMOD")" ]; then
     echo "*****************************"
     echo "*** Modules are unsigned! ***"
     echo "*****************************"

SOURCES/parallel_xz.sh

@@ -23,4 +23,4 @@ test "$procgroup" = 1 && exec xargs -r xz
 # xz has some startup cost. If files are really small,
 # this cost might be significant. To combat this,
 # process several files (in sequence) by each xz process via -n 16:
-exec xargs -r -n 16 -P $procgroup xz
+exec xargs -r -n 16 -P "$procgroup" xz

SOURCES/partial-kgcov-snip.config

@@ -0,0 +1,5 @@
+# kgcov
+CONFIG_GCOV_KERNEL=y
+CONFIG_GCOV_PROFILE_ALL=y
+# CONFIG_GCOV_PROFILE_FTRACE is not set
+# CONFIG_OPEN_DICE is not set

SOURCES/process_configs.sh

@@ -3,14 +3,27 @@
 # This script takes the merged config files and processes them through oldconfig
 # and listnewconfig
 #
+# Globally disable suggestion of appending '|| exit' or '|| return' to cd/pushd/popd commands
+# shellcheck disable=SC2164
+
+test -n "$RHTEST" && exit 0
 
 usage()
 {
-	echo "process_configs.sh [ -n|-c|-t ] package_name kernel_version [cross_opts]"
+	# alphabetical order please
-	echo "     -n: error on unset config options"
+	echo "process_configs.sh [ options ] package_name kernel_version"
+	echo "     -a: report all errors, equivalent to [-c -n -w -i]"
 	echo "     -c: error on mismatched config options"
+	echo "     -i: continue on error"
+	echo "     -n: error on unset config options"
 	echo "     -t: test run, do not overwrite original config"
 	echo "     -w: error on misconfigured config options"
+	echo "     -z: commit new configs to pending directory"
+	echo ""
+	echo "     A special CONFIG file tag, process_configs_known_broken can be added as a"
+	echo "     comment to any CONFIG file.  This tag indicates that there is no way to "
+	echo "     fix a CONFIG's entry.  This tag should only be used in extreme cases"
+	echo "     and is not to be used as a workaround to solve CONFIG problems."
 	exit 1
 }
 
@@ -20,18 +33,27 @@ die()
 	exit 1
 }
 
+get_cross_compile()
+{
+	arch=$1
+	if [[ "$CC_IS_CLANG" -eq 1 ]]; then
+		echo "$arch"
+	else
+		echo "scripts/dummy-tools/"
+	fi
+}
+
 # stupid function to find top of tree to do kernel make configs
 switch_to_toplevel()
 {
 	path="$(pwd)"
 	while test -n "$path"
 	do
-		test -d $path/firmware && \
+		test -e "$path"/MAINTAINERS && \
-			test -e $path/MAINTAINERS && \
+			test -d "$path"/drivers && \
-			test -d $path/drivers && \
 			break
 
-		path="$(dirname $path)"
+		path=$(dirname "$path")
 	done
 
 	test -n "$path"  || die "Can't find toplevel"
@@ -40,6 +62,9 @@ switch_to_toplevel()
 
 checkoptions()
 {
+	count=$3
+	variant=$4
+
 	/usr/bin/awk '
 
 		/is not set/ {
@@ -62,114 +87,318 @@ checkoptions()
 					 print "Found "a[1]"="a[2]" after generation, had " a[1]"="configs[a[1]]" in Source tree";
 			}
 		}
-	' $1 $2 > .mismatches
+	' "$1" "$2" > .mismatches"${count}"
 
-	if test -s .mismatches
+	checkoptions_error=false
+	if test -s .mismatches"${count}"
 	then
-		echo "Error: Mismatches found in configuration files"
+		while read -r LINE
-		cat .mismatches
+		do
-		exit 1
+			if find "${REDHAT}"/configs -name "$(echo "$LINE" | awk -F "=" ' { print $1 } ' | awk ' { print $2 }')" -print0 | xargs -0 grep ^ | grep -q "process_configs_known_broken"; then
+				# This is a known broken config.
+				# See script help warning.
+				checkoptions_error=false
+			else
+				checkoptions_error=true
+				break
+			fi
+		done < .mismatches"${count}"
+
+		! $checkoptions_error && return
+
+		sed -i "1s/^/Error: Mismatches found in configuration files for ${arch} ${variant}\n/" .mismatches"${count}"
+	else
+		rm -f .mismatches"${count}"
 	fi
 }
 
+parsenewconfigs()
+{
+	tmpdir=$(mktemp -d)
+
+	# This awk script reads the output of make listnewconfig
+	# and puts it into CONFIG_FOO files. Using the output of
+	# listnewconfig is much easier to ensure we get the default
+	# output.
+        /usr/bin/awk -v BASE="$tmpdir" '
+                /is not set/ {
+                        split ($0, a, "#");
+                        split(a[2], b);
+                        OUT_FILE=BASE"/"b[1];
+                        print $0 >> OUT_FILE;
+                }
+
+                /=/     {
+                        split ($0, a, "=");
+                        OUT_FILE=BASE"/"a[1];
+                        if (a[2] == "n")
+                                print "# " a[1] " is not set" >> OUT_FILE;
+                        else
+                                print $0 >> OUT_FILE;
+                }
+
+        ' .newoptions
+
+	# This awk script parses the output of helpnewconfig.
+	# Each option is separated between ----- markers
+	# The goal is to put all the help text as a comment in
+	# each CONFIG_FOO file. Because of how awk works
+	# there's a lot of moving files around and catting to
+	# get what we need.
+        /usr/bin/awk -v BASE="$tmpdir" '
+                BEGIN { inpatch=0;
+			outfile="none";
+                        symbol="none"; }
+                /^Symbol: .*$/ {
+                        split($0, a, " ");
+                        symbol="CONFIG_"a[2];
+                        outfile=BASE "/fake_"symbol
+                }
+                /-----/ {
+			if (inpatch == 0) {
+				inpatch = 1;
+			}
+                        else {
+                                if (symbol != "none") {
+                                    system("cat " outfile " " BASE "/" symbol " > " BASE "/tmpf");
+                                    system("mv " BASE "/tmpf " BASE "/" symbol);
+                                    symbol="none"
+				}
+                                outfile="none"
+				inpatch = 0;
+                        }
+                }
+                !/-----/ {
+                        if (inpatch == 1 && outfile != "none") {
+                                print "# "$0 >> outfile;
+                        }
+                }
+
+
+        ' .helpnewconfig
+
+	pushd "$tmpdir" &> /dev/null
+	rm fake_*
+	popd &> /dev/null
+	for f in "$tmpdir"/*; do
+		[[ -e "$f" ]] || break
+		cp "$f" "$SCRIPT_DIR/pending$FLAVOR/generic/"
+	done
+
+	rm -rf "$tmpdir"
+}
+
+function commit_new_configs()
+{
+	# assume we are in $source_tree/configs, need to get to top level
+	pushd "$(switch_to_toplevel)" &>/dev/null
+
+	for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}"*.config
+	do
+		arch=$(head -1 "$cfg" | cut -b 3-)
+		cfgtmp="${cfg}.tmp"
+		cfgorig="${cfg}.orig"
+		cat "$cfg" > "$cfgorig"
+
+		if [ "$arch" = "EMPTY" ]
+		then
+			# This arch is intentionally left blank
+			continue
+		fi
+		echo -n "Checking for new configs in $cfg ... "
+
+		# shellcheck disable=SC2086
+		make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE="$(get_cross_compile "$arch")" KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig
+		grep -E 'CONFIG_' .listnewconfig > .newoptions
+		if test -s .newoptions
+		then
+		# shellcheck disable=SC2086
+			make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE="$(get_cross_compile "$arch")" KCONFIG_CONFIG="$cfgorig" helpnewconfig >& .helpnewconfig
+			parsenewconfigs
+		fi
+		rm .newoptions
+		echo "done"
+	done
+
+	git add "$SCRIPT_DIR/pending$FLAVOR"
+	git commit -m "[redhat] AUTOMATIC: New configs"
+}
+
+function process_config()
+{
+	local cfg
+	local arch
+	local cfgtmp
+	local cfgorig
+	local count
+	local variant
+
+	cfg=$1
+	count=$2
+
+	arch=$(head -1 "$cfg" | cut -b 3-)
+
+	if [ "$arch" = "EMPTY" ]
+	then
+		# This arch is intentionally left blank
+		return
+	fi
+
+	variant=$(basename "$cfg" | cut -d"-" -f3- | cut -d"." -f1)
+
+	cfgtmp="${cfg}.tmp"
+	cfgorig="${cfg}.orig"
+	cat "$cfg" > "$cfgorig"
+
+	echo "Processing $cfg ... "
+
+	# shellcheck disable=SC2086
+	make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE="$(get_cross_compile "$arch")" KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig"${count}"
+	grep -E 'CONFIG_' .listnewconfig"${count}" > .newoptions"${count}"
+	if test -n "$NEWOPTIONS" && test -s .newoptions"${count}"
+	then
+		echo "Found unset config items in ${arch} ${variant}, please set them to an appropriate value" >> .errors"${count}"
+		cat .newoptions"${count}" >> .errors"${count}"
+		rm .newoptions"${count}"
+		RETURNCODE=1
+	fi
+	rm -f .newoptions"${count}"
+
+	grep -E 'config.*warning' .listnewconfig"${count}" > .warnings"${count}"
+	if test -n "$CHECKWARNINGS" && test -s .warnings"${count}"
+	then
+		echo "Found misconfigured config items in ${arch} ${variant}, please set them to an appropriate value" >> .errors"${count}"
+		cat .warnings"${count}" >> .errors"${count}"
+	fi
+	rm .warnings"${count}"
+
+	rm .listnewconfig"${count}"
+
+	# shellcheck disable=SC2086
+	make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE="$(get_cross_compile "$arch")" KCONFIG_CONFIG="$cfgorig" olddefconfig > /dev/null || exit 1
+	echo "# $arch" > "$cfgtmp"
+	cat "$cfgorig" >> "$cfgtmp"
+	if test -n "$CHECKOPTIONS"
+	then
+		checkoptions "$cfg" "$cfgtmp" "$count" "$variant"
+	fi
+	# if test run, don't overwrite original
+	if test -n "$TESTRUN"
+	then
+		rm -f "$cfgtmp"
+	else
+		mv "$cfgtmp" "$cfg"
+	fi
+	rm -f "$cfgorig"
+	echo "Processing $cfg complete"
+}
+
 function process_configs()
 {
 	# assume we are in $source_tree/configs, need to get to top level
-	pushd $(switch_to_toplevel) &>/dev/null
+	pushd "$(switch_to_toplevel)" &>/dev/null
 
-	for cfg in $SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}*.config
+	# The next line is throwaway code for transition to parallel
+	# processing.  Leaving this line in place is harmless, but it can be
+	# removed the next time anyone updates this function.
+	[ -f .mismatches ] && rm -f .mismatches
+
+	count=0
+	for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}"*.config
 	do
-		arch=$(head -1 $cfg | cut -b 3-)
+		if [ "$count" -eq 0 ]; then
-		cfgtmp="${cfg}.tmp"
+			# do the first one by itself so that tools are built
-		cfgorig="${cfg}.orig"
+			process_config "$cfg" "$count"
-		cat $cfg > $cfgorig
-
-		echo -n "Processing $cfg ... "
-
-		make ARCH=$arch ${CROSSOPTS} KCONFIG_CONFIG=$cfgorig listnewconfig >& .listnewconfig
-		grep -E 'CONFIG_' .listnewconfig > .newoptions
-		if test -n "$NEWOPTIONS" && test -s .newoptions
-		then
-			echo "Found unset config items, please set them to an appropriate value"
-			cat .newoptions
-			rm .newoptions
-			exit 1
 		fi
-		rm .newoptions
+		process_config "$cfg" "$count" &
-
+		waitpids[${count}]=$!
-		grep -E 'config.*warning' .listnewconfig > .warnings
+		((count++))
-		if test -n "$CHECKWARNINGS" && test -s .warnings
+		while [ "$(jobs | grep -c Running)" -ge "$RHJOBS" ]; do :; done
-		then
-			echo "Found misconfigured config items, please set them to an appropriate value"
-			cat .warnings
-			rm .warnings
-			exit 1
-		fi
-		rm .warnings
-
-		rm .listnewconfig
-
-		make ARCH=$arch ${CROSSOPTS} KCONFIG_CONFIG=$cfgorig oldnoconfig > /dev/null || exit 1
-		echo "# $arch" > ${cfgtmp}
-		cat "${cfgorig}" >> ${cfgtmp}
-		if test -n "$CHECKOPTIONS"
-		then
-			checkoptions $cfg $cfgtmp
-		fi
-		# if test run, don't overwrite original
-		if test -n "$TESTRUN"
-		then
-			rm ${cfgtmp}
-		else
-			mv ${cfgtmp} ${cfg}
-		fi
-		rm ${cfgorig}
-		echo "done"
 	done
+	for pid in ${waitpids[*]}; do
+		wait ${pid}
+	done
+
 	rm "$SCRIPT_DIR"/*.config*.old
+
+	if ls .errors* 1> /dev/null 2>&1; then
+		RETURNCODE=1
+		cat .errors*
+		rm .errors* -f
+	fi
+	if ls .mismatches* 1> /dev/null 2>&1; then
+		RETURNCODE=1
+		cat .mismatches*
+		rm .mismatches* -f
+	fi
+
 	popd > /dev/null
 
-	echo "Processed config files are in $SCRIPT_DIR"
+	[ $RETURNCODE -eq 0 ] && echo "Processed config files are in $SCRIPT_DIR"
 }
 
-NEWOPTIONS=""
 CHECKOPTIONS=""
-CHECKWARNINGS=""
+NEWOPTIONS=""
 TESTRUN=""
+CHECKWARNINGS=""
+MAKEOPTS=""
+CC_IS_CLANG=0
+
+RETURNCODE=0
 
 while [[ $# -gt 0 ]]
 do
 	key="$1"
 	case $key in
+		-a)
+			CHECKOPTIONS="x"
+			NEWOPTIONS="x"
+			CHECKWARNINGS="x"
+			;;
+		-c)
+			CHECKOPTIONS="x"
+			;;
 		-h)
 			usage
 			;;
 		-n)
 			NEWOPTIONS="x"
 			;;
-		-c)
-			CHECKOPTIONS="x"
-			;;
 		-t)
 			TESTRUN="x"
 			;;
 		-w)
 			CHECKWARNINGS="x"
 			;;
+		-z)
+			COMMITNEWCONFIGS="x"
+			;;
+		-m)
+			shift
+			if [ "$1" = "CC=clang" ] || [ "$1" = "LLVM=1" ]; then
+				CC_IS_CLANG=1
+			fi
+			MAKEOPTS="$MAKEOPTS $1"
+			;;
 		*)
 			break;;
 	esac
 	shift
 done
 
-PACKAGE_NAME="${1:-kernel}" # defines the package name used
+KVERREL="$(test -n "$1" && echo "-$1" || echo "")"
-KVERREL="$(test -n "$2" && echo "-$2" || echo "")"
+FLAVOR="$(test -n "$2" && echo "-$2" || echo "-rhel")"
-CROSSOPTS="$3"
+# shellcheck disable=SC2015
-SCRIPT="$(readlink -f $0)"
+SCRIPT=$(readlink -f "$0")
-OUTPUT_DIR="$PWD"
+SCRIPT_DIR=$(dirname "$SCRIPT")
-SCRIPT_DIR="$(dirname $SCRIPT)"
 
 # to handle this script being a symlink
-cd $SCRIPT_DIR
+cd "$SCRIPT_DIR"
 
-process_configs
+if test -n "$COMMITNEWCONFIGS"; then
+	commit_new_configs
+else
+	process_configs
+fi
+
+exit $RETURNCODE

SOURCES/rpminspect.yaml

@@ -3,19 +3,11 @@
 ---
 inspections:
     abidiff: off
-    addedfiles: off
-    badfuncs: off
-    changedfiles: off
     kmidiff: off
-    kmod: off
-    manpage: off
-    movedfiles: off
-    permissions: off
-    removedfiles: off
-    rpmdeps: off
     upstream: off
+    subpackages: off
 
-elf:
+badfuncs:
     ignore:
         - /usr/libexec/ksamples/*
         - /usr/libexec/kselftests/*
@@ -24,13 +16,30 @@ emptyrpm:
     expected_empty:
         - kernel
         - kernel-debug
+        - kernel-debug-devel-matched
+        - kernel-devel-matched
+        - kernel-lpae
         - kernel-zfcpdump
+        - kernel-zfcpdump-devel-matched
         - kernel-zfcpdump-modules
 
 patches:
     ignore_list:
         - linux-kernel-test.patch
+        - patch-5.14-redhat.patch
+        - patch-%{patchversion}-redhat.patch
 
-types:
+runpath:
     ignore:
-        - /usr/src/kernel/*
+        - /usr/libexec/kselftests/bpf/urandom_read
+        - /usr/libexec/kselftests/bpf/no_alu32/urandom_read
+
+debuginfo:
+    ignore:
+        - /usr/libexec/kselftests/bpf/*
+        - /usr/lib/debug/usr/libexec/perf-core/tests/shell/coresight/*
+
+elf:
+    ignore:
+        - /usr/libexec/perf-core/tests/shell/coresight/*
+        - /usr/lib/debug/usr/libexec/perf-core/tests/shell/coresight/*

SOURCES/update_scripts.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ -z "$1" ]; then
+	exit 1
+fi
+
+TARGET="$1"
+
+for i in "$RPM_SOURCE_DIR"/*."$TARGET"; do
+	NEW=${i%.$TARGET}
+	cp "$i" "$(basename "$NEW")"
+done

SOURCES/x509.genkey.centos

@@ -5,9 +5,9 @@ prompt = no
 x509_extensions = myexts
 
 [ req_distinguished_name ]
-O = Red Hat
+O = AlmaLinux
-CN = Red Hat Enterprise Linux kernel signing key
+CN = AlmaLinux kernel signing key
-emailAddress = secalert@redhat.com
+emailAddress = security@almalinux.org
 
 [ myexts ]
 basicConstraints=critical,CA:FALSE

SOURCES/x509.genkey.rhel

@@ -0,0 +1,16 @@
+[ req ]
+default_bits = 3072
+distinguished_name = req_distinguished_name
+prompt = no
+x509_extensions = myexts
+
+[ req_distinguished_name ]
+O = AlmaLinux
+CN = AlmaLinux kernel signing key
+emailAddress = security@almalinux.org
+
+[ myexts ]
+basicConstraints=critical,CA:FALSE
+keyUsage=digitalSignature
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid