Merge: Draft: CKI_BUILD_ONLY Merge up kernel-5.14.0-570.4.1.el9_6

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6585

This brings all the post-branching changes from 9.6 into c9s.

Signed-off-by: Jan Stancek <[email protected]>

Merged-by: Augusto Caringi <[email protected]>

Author: caringi

.gitlab-ci.yml

@@ -41,18 +41,33 @@ workflow: !reference [.workflow]
     skip_test: 'true'
     skip_results: 'true'
 
-.automotive_full_c9s:
+.automotive_disttag:
   variables:
-    kpet_tree_name: autosd
     disttag_override: '.el9iv'
-    AWS_UPT_IMAGE_NAME_FILTER: 'auto-osbuild-qemu-cs9-cki-ostree-*'
+
+.automotive_branch:
+  variables:
     RUN_ONLY_FOR_AUTOMOTIVE: 'true'
 
-.automotive_check_c9s_overrides:
-  trigger:
-    branch: c9s-automotive
+.automotive_autosd:
+  variables:
+    kpet_tree_name: autosd
+
+.automotive_rhivos:
   variables:
-    RUN_ONLY_FOR_AUTOMOTIVE: 'false'
+    kpet_tree_name: rhivos
+
+.automotive_pipeline_c9s:
+  extends: [.automotive_disttag, .automotive_autosd, .automotive_branch]
+
+.automotive_check_c9s:
+  extends: [.automotive_disttag, .automotive_autosd]
+
+.automotive_pipeline_rhel9:
+  extends: [.automotive_disttag, .automotive_rhivos, .automotive_branch]
+
+.automotive_check_rhel9:
+  extends: [.automotive_disttag, .automotive_rhivos]
 
 # c9s CI
 c9s_merge_request:
@@ -79,12 +94,13 @@ c9s_64k_merge_request:
 
 c9s_automotive_check_merge_request:
   extends: [.trusted, .merge_request,
-            .9-common, .trigger_c9s_pipeline, .automotive_full_c9s, .automotive_check_c9s_overrides,
-            .automotive_check_common]
+            .9-common, .trigger_c9s_pipeline,
+            .automotive_check_common, .automotive_check_c9s]
 
 c9s_baseline_coverage_build:
   extends: [.trusted, .baseline, .rhel_common, .only_build_and_publish,
-            .9-common, .coverage, .trigger_c9s_pipeline]
+            .9-common, .trigger_c9s_pipeline,
+            .coverage]
 
 c9s_rhel9_compat_merge_request:
   extends: [.centos_stream_rhel_internal, .merge_request, .rhel_common, .with_notifications,
@@ -93,15 +109,14 @@ c9s_rhel9_compat_merge_request:
 # c9s automotive branch CI
 c9s_automotive_merge_request:
   extends: [.trusted, .merge_request,
-            .9-common,
-            .automotive_pipeline_common,
-            .trigger_c9s_pipeline, .automotive_full_c9s]
+            .9-common, .trigger_c9s_pipeline,
+            .automotive_pipeline_common, .automotive_pipeline_c9s]
 
 c9s_automotive_baseline_coverage:
-  extends: [.trusted, .baseline, .9-common,
-            .automotive_pipeline_common,
-            .coverage,
-            .trigger_c9s_pipeline, .automotive_full_c9s]
+  extends: [.trusted, .baseline,
+            .9-common, .trigger_c9s_pipeline,
+            .automotive_pipeline_common, .automotive_pipeline_c9s,
+            .coverage]
 
 # RHEL9 CI
 rhel9_merge_request:
@@ -126,9 +141,22 @@ rhel9_64k_merge_request:
             .9-common, .trigger_rhel9_pipeline,
             .64k_common]
 
+rhel9_automotive_check_merge_request:
+  # Don't add .rhel_common as we overwrite those configs
+  extends: [.internal, .merge_request, .with_notifications,
+            .9-common, .trigger_rhel9_pipeline,
+            .automotive_check_common, .automotive_check_rhel9]
+
 rhel9_baseline_coverage_build:
   extends: [.internal, .baseline, .rhel_common, .only_build_and_publish,
-            .9-common, .coverage, .trigger_rhel9_pipeline]
+            .9-common, .trigger_rhel9_pipeline,
+            .coverage]
+
+# RHEL9 automotive branch CI
+rhel9_automotive_merge_request:
+  extends: [.internal, .merge_request,
+            .9-common, .trigger_rhel9_pipeline,
+            .automotive_pipeline_common, .automotive_pipeline_rhel9]
 
 # RHEL9 private CI (including RT branches)
 rhel9_merge_request_private:
@@ -152,3 +180,9 @@ rhel9_64k_merge_request_private:
   extends: [.scratch, .merge_request,
             .9-common, .trigger_rhel9_pipeline,
             .64k_common]
+
+rhel9_automotive_check_merge_request_private:
+  # Don't add .rhel_common as we overwrite those configs
+  extends: [.scratch, .merge_request,
+            .9-common, .trigger_rhel9_pipeline,
+            .automotive_check_common, .automotive_check_rhel9]

Documentation/ABI/testing/sysfs-kernel-fadump

@@ -44,4 +44,5 @@ Date:		May 2024
 Contact:	[email protected]
 Description:	read/write
 		This is a special sysfs file available to setup additional
-		parameters to be passed to capture kernel.
+		parameters to be passed to capture kernel. For HASH MMU it
+		is exported only if RMA size higher than 768MB.

Documentation/powerpc/firmware-assisted-dump.rst

@@ -120,6 +120,28 @@ to ensure that crash data is preserved to process later.
    e.g.
      # echo 1 > /sys/firmware/opal/mpipl/release_core
 
+-- Support for Additional Kernel Arguments in Fadump
+   Fadump has a feature that allows passing additional kernel arguments
+   to the fadump kernel. This feature was primarily designed to disable
+   kernel functionalities that are not required for the fadump kernel
+   and to reduce its memory footprint while collecting the dump.
+
+  Command to Add Additional Kernel Parameters to Fadump:
+  e.g.
+  # echo "nr_cpus=16" > /sys/kernel/fadump/bootargs_append
+
+  The above command is sufficient to add additional arguments to fadump.
+  An explicit service restart is not required.
+
+  Command to Retrieve the Additional Fadump Arguments:
+  e.g.
+  # cat /sys/kernel/fadump/bootargs_append
+
+Note: Additional kernel arguments for fadump with HASH MMU is only
+      supported if the RMA size is greater than 768 MB. If the RMA
+      size is less than 768 MB, the kernel does not export the
+      /sys/kernel/fadump/bootargs_append sysfs node.
+
 Implementation details:
 -----------------------
 

arch/arm64/kernel/setup.c

@@ -31,6 +31,7 @@
 #include <linux/psci.h>
 #include <linux/sched/task.h>
 #include <linux/mm.h>
+#include <linux/security.h>
 
 #include <asm/acpi.h>
 #include <asm/fixmap.h>
@@ -294,6 +295,10 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p)
 
 	parse_early_param();
 
+	/* Initialize the lockdown LSM */
+	static_call_init();
+	early_security_init();
+
 	/*
 	 * The primary CPU enters the kernel with all DAIF exceptions masked.
 	 *

arch/arm64/mm/init.c

@@ -115,15 +115,6 @@ static void __init arch_reserve_crashkernel(void)
 
 static phys_addr_t __init max_zone_phys(phys_addr_t zone_limit)
 {
-	/**
-	 * Information we get from firmware (e.g. DT dma-ranges) describe DMA
-	 * bus constraints. Devices using DMA might have their own limitations.
-	 * Some of them rely on DMA zone in low 32-bit memory. Keep low RAM
-	 * DMA zone on platforms that have RAM there.
-	 */
-	if (memblock_start_of_DRAM() < U32_MAX)
-		zone_limit = min(zone_limit, U32_MAX);
-
 	return min(zone_limit, memblock_end_of_DRAM() - 1) + 1;
 }
 
@@ -139,6 +130,14 @@ static void __init zone_sizes_init(void)
 	acpi_zone_dma_limit = acpi_iort_dma_get_max_cpu_address();
 	dt_zone_dma_limit = of_dma_get_max_cpu_address(NULL);
 	zone_dma_limit = min(dt_zone_dma_limit, acpi_zone_dma_limit);
+	/*
+	 * Information we get from firmware (e.g. DT dma-ranges) describe DMA
+	 * bus constraints. Devices using DMA might have their own limitations.
+	 * Some of them rely on DMA zone in low 32-bit memory. Keep low RAM
+	 * DMA zone on platforms that have RAM there.
+	 */
+	if (memblock_start_of_DRAM() < U32_MAX)
+		zone_dma_limit = min(zone_dma_limit, U32_MAX);
 	arm64_dma_phys_limit = max_zone_phys(zone_dma_limit);
 	max_zone_pfns[ZONE_DMA] = PFN_DOWN(arm64_dma_phys_limit);
 #endif

arch/powerpc/include/asm/prom.h

@@ -22,6 +22,8 @@
 #include <linux/of_irq.h>
 #include <linux/platform_device.h>
 
+#define MIN_RMA			768		/* Minimum RMA (in MB) for CAS negotiation */
+
 #define OF_DT_BEGIN_NODE	0x1		/* Start of node, full name */
 #define OF_DT_END_NODE		0x2		/* End node */
 #define OF_DT_PROP		0x3		/* Property: name off, size,

arch/powerpc/kernel/fadump.c

@@ -33,6 +33,7 @@
 #include <asm/fadump-internal.h>
 #include <asm/setup.h>
 #include <asm/interrupt.h>
+#include <asm/prom.h>
 
 /*
  * The CPU who acquired the lock to trigger the fadump crash should
@@ -1712,19 +1713,19 @@ void __init fadump_setup_param_area(void)
 		range_end = memblock_end_of_DRAM();
 	} else {
 		/*
-		 * Passing additional parameters is supported for hash MMU only
-		 * if the first memory block size is 768MB or higher.
+		 * Memory range for passing additional parameters for HASH MMU
+		 * must meet the following conditions:
+		 * 1. The first memory block size must be higher than the
+		 *    minimum RMA (MIN_RMA) size. Bootloader can use memory
+		 *    upto RMA size. So it should be avoided.
+		 * 2. The range should be between MIN_RMA and RMA size (ppc64_rma_size)
+		 * 3. It must not overlap with the fadump reserved area.
 		 */
-		if (ppc64_rma_size < 0x30000000)
+		if (ppc64_rma_size < MIN_RMA*1024*1024)
 			return;
 
-		/*
-		 * 640 MB to 768 MB is not used by PFW/bootloader. So, try reserving
-		 * memory for passing additional parameters in this range to avoid
-		 * being stomped on by PFW/bootloader.
-		 */
-		range_start = 0x2A000000;
-		range_end = range_start + 0x4000000;
+		range_start = MIN_RMA * 1024 * 1024;
+		range_end = min(ppc64_rma_size, fw_dump.boot_mem_top);
 	}
 
 	fw_dump.param_area = memblock_phys_alloc_range(COMMAND_LINE_SIZE,

arch/powerpc/kernel/prom_init.c

@@ -1067,7 +1067,7 @@ static const struct ibm_arch_vec ibm_architecture_vec_template __initconst = {
 		.virt_base = cpu_to_be32(0xffffffff),
 		.virt_size = cpu_to_be32(0xffffffff),
 		.load_base = cpu_to_be32(0xffffffff),
-		.min_rma = cpu_to_be32(512),		/* 512MB min RMA */
+		.min_rma = cpu_to_be32(MIN_RMA),
 		.min_load = cpu_to_be32(0xffffffff),	/* full client load */
 		.min_rma_percent = 0,	/* min RMA percentage of total RAM */
 		.max_pft_size = 48,	/* max log_2(hash table size) */

arch/powerpc/kernel/setup-common.c

@@ -870,6 +870,11 @@ void __init setup_arch(char **cmdline_p)
 	 */
 	initialize_cache_info();
 
+	/* Initialize the lockdown LSM */
+	jump_label_init();
+	static_call_init();
+	early_security_init();
+
 	/*
 	 * Lock down the kernel if booted in secure mode. This is required to
 	 * maintain kernel integrity.

arch/s390/kernel/setup.c

@@ -892,6 +892,11 @@ void __init setup_arch(char **cmdline_p)
 
 	log_component_list();
 
+	/* Initialize the lockdown LSM */
+	jump_label_init();
+	static_call_init();
+	early_security_init();
+
 	if (ipl_get_secureboot())
 		security_lock_kernel_down("Secure IPL mode", LOCKDOWN_INTEGRITY_MAX);
 
@@ -906,7 +911,6 @@ void __init setup_arch(char **cmdline_p)
 	if (IS_ENABLED(CONFIG_EXPOLINE_AUTO))
 		nospec_auto_detect();
 
-	jump_label_init();
 	parse_early_param();
 #ifdef CONFIG_CRASH_DUMP
 	/* Deactivate elfcorehdr= kernel parameter */