Merge tag 'kernel-6.12.0-55.3.1.el10_0' into main

JIRA: INTERNAL
Upstream Status: RHEL only

Don't bring in changes from Makefile.rhelver.

Signed-off-by: Jan Stancek <jstancek@redhat.com>

Author: jstancek

arch/arm64/mm/init.c

@@ -116,15 +116,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;
 }
 
@@ -140,6 +131,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

drivers/infiniband/hw/mlx5/mr.c

@@ -1935,7 +1935,8 @@ mlx5_alloc_priv_descs(struct ib_device *device,
 static void
 mlx5_free_priv_descs(struct mlx5_ib_mr *mr)
 {
-	if (!mr->umem && !mr->data_direct && mr->descs) {
+	if (!mr->umem && !mr->data_direct &&
+	    mr->ibmr.type != IB_MR_TYPE_DM && mr->descs) {
 		struct ib_device *device = mr->ibmr.device;
 		int size = mr->max_descs * mr->desc_size;
 		struct mlx5_ib_dev *dev = to_mdev(device);

redhat/dracut-virt.conf

@@ -27,6 +27,11 @@ dracutmodules+=" systemd-sysext "
 # modules: root disk integrity protection
 dracutmodules+=" systemd-veritysetup "
 
+# modules: FIPS
+dracutmodules+=" fips "
+# FIPS mode requires early crypto drivers test
+drivers+=" =crypto "
+
 # drivers: virtual buses, pci
 drivers+=" virtio-pci virtio-mmio "      # qemu-kvm
 drivers+=" hv-vmbus pci-hyperv "         # hyperv

redhat/kernel.changelog-10.0

@@ -1,3 +1,9 @@
+* Thu Mar 06 2025 Jan Stancek <jstancek@redhat.com> [6.12.0-55.3.1.el10_0]
+- RDMA/mlx5: Fix a WARN during dereg_mr for DM type (Benjamin Poirier) [RHEL-41204]
+- arm64: mm: Fix zone_dma_limit calculation (Luiz Capitulino) [RHEL-71568]
+- uki: enable FIPS mode (Vitaly Kuznetsov) [RHEL-80149]
+Resolves: RHEL-41204, RHEL-71568, RHEL-80149
+
 * Mon Mar 03 2025 Jan Stancek <jstancek@redhat.com> [6.12.0-55.2.1.el10_0]
 - Documentation/powerpc/fadump: add additional parameter feature details (Mamatha Inamdar) [RHEL-70827]
 - powerpc: increase MIN RMA size for CAS negotiation (Mamatha Inamdar) [RHEL-70827]

redhat/kernel.spec.template

@@ -860,7 +860,7 @@ BuildRequires: lld
 %endif
 
 %if %{with_efiuki}
-BuildRequires: dracut
+BuildRequires: dracut >= 104
 # For dracut UEFI uki binaries
 BuildRequires: binutils
 # For the initrd