From 6dedd93cb302d66dd39b2fe75d133b38ef368d99 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 18 Nov 2016 16:21:20 +0000 Subject: [PATCH 1/2] efi: add 'noautodetect' to kernel commandline This stops device auto-detect in 'hwdrivers'. On Docker for Windows driver auto-detect should not be necessary as all drivers are compiled in. Further, on slow machines (and in CI) th 'hwdrivers' seems to have race as it does a 'find' on '/sys/devices' and then performs actions. On slow machines (and in CI) it appears that VMBus devices get removed (and possibly re-added) causing the script to error. Signed-off-by: Rolf Neugebauer --- alpine/Dockerfile.efi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile.efi b/alpine/Dockerfile.efi index b5ae1a798..9a20167b7 100644 --- a/alpine/Dockerfile.efi +++ b/alpine/Dockerfile.efi @@ -9,7 +9,7 @@ COPY kernel/x86_64/vmlinuz64 ./ # Create a EFI boot file with kernel and initrd. From: # https://github.com/haraldh/mkrescue-uefi/blob/master/mkrescue-uefi.sh RUN cp /usr/lib/gummiboot/linuxx64.efi.stub . && \ - echo "earlyprintk=ttyS0,115200 console=ttyS0,115200 mobyplatform=windows rootdelay=300" > cmdline.txt && \ + echo "earlyprintk=ttyS0,115200 console=ttyS0,115200 mobyplatform=windows rootdelay=300 noautodetect" > cmdline.txt && \ objcopy \ --add-section .osrel=/etc/os-release --change-section-vma .osrel=0x20000 \ --add-section .cmdline=./cmdline.txt --change-section-vma .cmdline=0x30000 \ From d3b065090e0f16ac1cc98bc3c25050fdf57e6c44 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 18 Nov 2016 16:34:50 +0000 Subject: [PATCH 2/2] kernel: limit number of CPUs to 128 128 CPUs seems plenty for now and it allows for the debug kernels to boot on Hyper-V without modifications. It may also have the added benefit of reducing some data structures allocated per CPU (in particular for Debug kernels). Signed-off-by: Rolf Neugebauer --- alpine/kernel/kernel_config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alpine/kernel/kernel_config b/alpine/kernel/kernel_config index 483a7b0f4..c8ea9d651 100644 --- a/alpine/kernel/kernel_config +++ b/alpine/kernel/kernel_config @@ -442,8 +442,8 @@ CONFIG_DMI=y # CONFIG_CALGARY_IOMMU is not set CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y -CONFIG_MAXSMP=y -CONFIG_NR_CPUS=8192 +# CONFIG_MAXSMP is not set +CONFIG_NR_CPUS=128 # CONFIG_SCHED_SMT is not set CONFIG_SCHED_MC=y # CONFIG_PREEMPT_NONE is not set