NAS-130427 / 25.04 / Update Linux kernel to next LTS release v6.12

.github/workflows/ci.yml

@@ -0,0 +1,150 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+
+  pre_build:
+
+    runs-on: ubuntu-22.04
+
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+
+    steps:
+      - name: Skip Duplicate Actions
+        id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+        with:
+          concurrent_skipping: 'same_content_newer'
+
+  build_debug_kernel:
+
+    needs: pre_build
+    if: ${{ needs.pre_build.outputs.should_skip != 'true' }}
+
+    runs-on: ubuntu-22.04
+
+    steps:
+
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y build-essential gawk flex bison openssl dkms \
+          libelf-dev libudev-dev libpci-dev libiberty-dev autoconf dwarves \
+          libncurses-dev libssl-dev devscripts debhelper-compat
+
+      - name: Generate .config
+        run: |
+          rm -rf .git .gitattributes .gitignore
+          export EXTRAVERSION="-debug"
+          make ARCH=x86_64 defconfig
+          ./scripts/kconfig/merge_config.sh .config ./scripts/package/truenas/debian_amd64.config
+          ./scripts/kconfig/merge_config.sh .config ./scripts/package/truenas/truenas.config
+          ./scripts/kconfig/merge_config.sh .config ./scripts/package/truenas/tn-debug.config
+          make syncconfig
+          make archprepare
+          ./scripts/package/mkdebian
+          # Workaround to provide additional free space for kernel build
+          # https://github.com/actions/virtual-environments/issues/2840
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf "/usr/local/share/boost"
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+
+      - name: Build Kernel
+        run: |
+          export EXTRAVERSION="-debug"
+          cp .config /tmp/
+          make distclean
+          mv /tmp/.config .config
+          make -j$(nproc) bindeb-pkg
+
+      - name: Prepare artifacts
+        run: |
+          mkdir -p debug-kernel
+          mv ../*.deb ./debug-kernel/
+          mv ../*.changes ./debug-kernel/
+          mv ../*.buildinfo ./debug-kernel/
+          cp .config ./debug-config
+
+      - name: Export artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{github.sha}}-debug
+          path: ./debug-kernel
+
+      - name: Status
+        run: |
+          echo "Status: ${{job.status}}"
+
+  build_production_kernel:
+
+    needs: pre_build
+    if: ${{ needs.pre_build.outputs.should_skip != 'true' }}
+
+    runs-on: ubuntu-22.04
+
+    steps:
+
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y build-essential gawk flex bison openssl dkms \
+          libelf-dev libudev-dev libpci-dev libiberty-dev autoconf dwarves \
+          libncurses-dev libssl-dev libelf-dev libdw-dev systemtap-sdt-dev \
+          libunwind-dev libslang2-dev libperl-dev binutils-dev libiberty-dev \
+          python3-dev liblzma-dev libzstd-dev libcap-dev libnuma-dev \
+          libbabeltrace-dev openjdk-11-jdk devscripts libncurses-dev \
+          libssl-dev debhelper-compat libpfm4-dev libtraceevent-dev \
+          libcapstone-dev llvm-dev
+
+      - name: Generate .config
+        run: |
+          rm -rf .git .gitattributes .gitignore
+          export EXTRAVERSION="-production"
+          make ARCH=x86_64 defconfig
+          ./scripts/kconfig/merge_config.sh .config ./scripts/package/truenas/debian_amd64.config
+          ./scripts/kconfig/merge_config.sh .config ./scripts/package/truenas/truenas.config
+          ./scripts/kconfig/merge_config.sh .config ./scripts/package/truenas/tn-production.config
+          make syncconfig
+          make archprepare
+          ./scripts/package/mkdebian
+          # Workaround to provide additional free space for kernel build
+          # https://github.com/actions/virtual-environments/issues/2840
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf "/usr/local/share/boost"
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+
+      - name: Build Kernel
+        run: |
+          export EXTRAVERSION="-production"
+          cp .config /tmp/
+          make distclean
+          mv /tmp/.config .config
+          make -j$(nproc) bindeb-pkg
+
+      - name: Prepare artifacts
+        run: |
+          mkdir -p production-kernel
+          mv ../*.deb ./production-kernel/
+          mv ../*.changes ./production-kernel/
+          mv ../*.buildinfo ./production-kernel/
+          cp .config ./production-config
+
+      - name: Export artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{github.sha}}-production
+          path: ./production-kernel
+
+      - name: Status
+        run: |
+          echo "Status: ${{job.status}}"

.gitignore

@@ -108,6 +108,7 @@ modules.order
 !.get_maintainer.ignore
 !.gitattributes
 !.gitignore
+!.github
 !.kunitconfig
 !.mailmap
 !.rustfmt.toml

Documentation/admin-guide/kernel-parameters.txt

@@ -4473,6 +4473,14 @@
 		nomsi		[MSI] If the PCI_MSI kernel config parameter is
 				enabled, this kernel boot option can be used to
 				disable the use of MSI interrupts system-wide.
+		pci_acs_override [PCIE] Override missing PCIe ACS support for:
+				downstream
+					All downstream ports - full ACS capabilities
+				multifunction
+					Add multifunction devices - multifunction ACS subset
+				id:nnnn:nnnn
+					Specific device - full ACS capabilities
+					Specified as vid:did (vendor/device ID) in hex
 		noioapicquirk	[APIC] Disable all boot interrupt quirks.
 				Safety option to keep boot IRQs enabled. This
 				should never be necessary.

Makefile

@@ -2,9 +2,12 @@
 VERSION = 6
 PATCHLEVEL = 12
 SUBLEVEL = 0
-EXTRAVERSION =
 NAME = Baby Opossum Posse
 
+ifndef EXTRAVERSION
+EXTRAVERSION = -production
+endif
+
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
 # More info can be located in ./README

arch/x86/Kconfig

@@ -1666,6 +1666,20 @@ config X86_PMEM_LEGACY
 
 	  Say Y if unsure.
 
+config ARCH_FORCE_MAX_ORDER
+	int "Maximum zone order"
+	default "11"
+	help
+	  The kernel memory allocator divides physically contiguous memory
+	  blocks into "zones", where each zone is a power of two number of
+	  pages.  This option selects the largest power of two that the kernel
+	  keeps in the memory allocator.  If you need to allocate very large
+	  blocks of physically contiguous memory, then you may need to
+	  increase this value.
+
+	  This config option is actually maximum order plus one. For example,
+	  a value of 11 means that the largest free memory block is 2^10 pages.
+
 config HIGHPTE
 	bool "Allocate 3rd-level pagetables from highmem"
 	depends on HIGHMEM

drivers/acpi/nfit/core.c

@@ -1839,7 +1839,7 @@ static int acpi_nfit_add_dimm(struct acpi_nfit_desc *acpi_desc,
 	 */
 	clear_bit(NVDIMM_FAMILY_INTEL, &nd_desc->dimm_family_mask);
 	for (i = 0; i <= NVDIMM_FAMILY_MAX; i++)
-		if (acpi_check_dsm(adev_dimm->handle, to_nfit_uuid(i), 1, 1)) {
+		if (acpi_check_dsm(adev_dimm->handle, to_nfit_uuid(i), 1, 0xfffffffe)) {
 			set_bit(i, &nd_desc->dimm_family_mask);
 			if (family < 0 || i == default_dsm_family)
 				family = i;
@@ -1896,8 +1896,17 @@ static int acpi_nfit_add_dimm(struct acpi_nfit_desc *acpi_desc,
 	else {
 		if (acpi_nvdimm_has_method(adev_dimm, "_LSI")
 				&& acpi_nvdimm_has_method(adev_dimm, "_LSR")) {
-			dev_dbg(dev, "%s: has _LSR\n", dev_name(&adev_dimm->dev));
-			set_bit(NFIT_MEM_LSR, &nfit_mem->flags);
+			union acpi_object *obj = acpi_label_info(adev_dimm->handle);
+			if (!obj || obj->type != ACPI_TYPE_BUFFER ||
+			    obj->buffer.length < 12 ||
+			    ((u32 *)obj->buffer.pointer)[0] != 0) {
+				dev_err(dev, "%s: has broken _LSI\n",
+				    dev_name(&adev_dimm->dev));
+			} else {
+				ACPI_FREE(obj);
+				dev_dbg(dev, "%s: has _LSR\n", dev_name(&adev_dimm->dev));
+				set_bit(NFIT_MEM_LSR, &nfit_mem->flags);
+			}
 		}
 
 		if (test_bit(NFIT_MEM_LSR, &nfit_mem->flags)

drivers/ata/Makefile

@@ -3,7 +3,7 @@
 obj-$(CONFIG_ATA)		+= libata.o
 
 # non-SFF interface
-obj-$(CONFIG_SATA_AHCI)		+= ahci.o libahci.o
+obj-$(CONFIG_SATA_AHCI)		+= ahci.o ahciem.o libahci.o
 obj-$(CONFIG_SATA_ACARD_AHCI)	+= acard-ahci.o libahci.o
 obj-$(CONFIG_SATA_AHCI_SEATTLE)	+= ahci_seattle.o libahci.o libahci_platform.o
 obj-$(CONFIG_SATA_AHCI_PLATFORM) += ahci_platform.o libahci.o libahci_platform.o

drivers/ata/ahci.c

@@ -653,6 +653,10 @@ static struct pci_driver ahci_pci_driver = {
 	},
 };
 
+static int ahciem_enable = -1;
+module_param(ahciem_enable, int, 0644);
+MODULE_PARM_DESC(ahciem_enable, "Emulate SES enclosure (-1 = detected, 0 = disabled, 1 = forced)");
+
 #if IS_ENABLED(CONFIG_PATA_MARVELL)
 static int marvell_enable;
 #else
@@ -2050,6 +2054,13 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	if (rc)
 		goto err_rm_sysfs_file;
 
+	if (ahciem_enable == 1 ||
+	    (ahciem_enable == -1 && (pi.flags & ATA_FLAG_EM))) {
+		rc = ahciem_host_activate(host);
+		if (rc)
+			goto err_rm_sysfs_file;
+	}
+
 	pm_runtime_put_noidle(&pdev->dev);
 	return 0;
 

drivers/ata/ahci.h

@@ -342,6 +342,7 @@ struct ahci_host_priv {
 	u32 			em_loc; /* enclosure management location */
 	u32			em_buf_sz;	/* EM buffer size in byte */
 	u32			em_msg_type;	/* EM message type */
+	struct Scsi_Host	*em_shost;	/* EM SCSI host */
 	u32			remapped_nvme;	/* NVMe remapped device count */
 	bool			got_runtime_pm; /* Did we do pm_runtime_get? */
 	unsigned int		n_clks;
@@ -453,4 +454,8 @@ static inline int ahci_nr_ports(u32 cap)
 	return (cap & 0x1f) + 1;
 }
 
+bool scsi_is_ahci(struct scsi_device *sdev);
+bool scsi_is_ahciem(struct scsi_device *sdev);
+int ahciem_host_activate(struct ata_host *host);
+
 #endif /* _AHCI_H */