From patchwork Tue Sep 17 09:15:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 3826 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 17 Sep 2024 11:15:27 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pl1-f188.google.com (mail-pl1-f188.google.com [209.85.214.188]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 48H9FQvN004610 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 17 Sep 2024 11:15:27 +0200 Received: by mail-pl1-f188.google.com with SMTP id d9443c01a7336-207464a9b59sf68479505ad.3 for ; Tue, 17 Sep 2024 02:15:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1726564520; cv=pass; d=google.com; s=arc-20240605; b=Z4FbqYHe2UPxOBKGE30tO28qaImncNIDxnYRu/vUoaVB0L1BQBkCmhmx7nVnHFStZv /nuoSb2whBASMrD3sImd+UT29R/JiP0bGmcNYG9swy+VcS77ViEKxjJTPQ57N8kpEsL4 bSfiq0ACCx/g+4XQd05+mpnkp1vTn64ig9lS7mbSEGjylqn8BlidhTSgdCreK5nLsbbl uKvidv9eRT13q+RbU7CXHG+1tPIG6wlt/g05XllOkOh1P+AMvkFCcwzqIwdUHxmhqhg6 m+Ww7YwYaNYYITd7ZP1YKIE0DUUvbStd880XuTvQOqhkPOFzzmeM/exV7ipebLQuqQlA sXug== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tpXm8MNvgqwc/Qa1Kal6iW7SgGgzKDlhGZV4UHGE8yw=; fh=LjsA44N6AY/BrbJ/M/fblaolYUQipOEFY0a5TrYmAKI=; b=W61vW33sKMR+aH9XYNooLYxNDVt6/yNDY51tzOnnN/kl5gSy16bnEdZbh1W+8KU2ds omPZ6jSOhG1yCBgqqjzIuXRG6Q3qh/eDSxSgRiKG2415z+sVbKsh12Cc061zxKKMGsXD 66jsb1mETqhw99KDmbZ+oQXzm2uoaCQ+QqLmAZBiUb/p7ofmyKGQZ6aMhh+ThWp8h1T8 aoOkPfSPr3PY93nhdOI1dfDhc8osX1J1o7qkOoj+dEDbnEcSV0i0578sWPvs3g8rM8X6 zWVyzHtKfeCDLc55xaz+vcN241L/Tjuyv439StFlDN39x+av8/rXED4ialmyc45PlsvI +1mA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=RS+j7SCX; spf=pass (google.com: domain of fm-1321639-2024091709151633d5fbc78a73267740-xiujew@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1321639-2024091709151633d5fbc78a73267740-XiUJew@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1726564520; x=1727169320; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=tpXm8MNvgqwc/Qa1Kal6iW7SgGgzKDlhGZV4UHGE8yw=; b=bQEPdxSrkOp0JDImUd672Kl3oaCChtX7DOr4RFJncunlMAmh0+F4Ube80Pa+ZSi07y XbvFzMayvAfnY34aboUvFik/Wp0XjK4Ux92+VFuTNI5CYH2KFGO1kjrncx5AbqAnYpnD qa2tkZjmuNzdrsezchZ7Mp0R1r7LW8ffnsKY4WOn1aQcFd815SSzy7GXCtHOqrN2b/67 nY2wW1i2MCzUDfwZ2vTyZ/OcaXT+EH0qljfu94fHPT0Sk4lD8g++Cp5IPvjQj+czrqu6 2Ua6OkWuG0baJqNcEiejDCpZfZ6ha+l3em1mTzGEZFTzFQSxQAsRuky/1teRKDOq+4e/ AiIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726564520; x=1727169320; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=tpXm8MNvgqwc/Qa1Kal6iW7SgGgzKDlhGZV4UHGE8yw=; b=VsygIcpDPVCxvlpiMqfoe7WO63ieOhEDv42YDojbR/TzHTH6ByRm8DTy3lGacT25bB h+Xch5poBVQ20o/w9pBpoogY8YkqLoJDwH/oUeCeMcMpmAlQknYI6w8eObThCP/pfrTW vgpAZPbPcVWN0bvWj1Z4akXfBOtN6lPsVoaFpq51VsP2dmTaKu9W+CREzlDAFRJI4jii 9lW+xFEjC7Uk5C7zLQCVXZI4vRX36FjlPIX/8PaL3EeQgtWEs6DBo31qG6QqiwK+Gi8K snyRtODxedhLu9p451TZ+KhpxlLNqxj+6ImFWEiHd8M9W7QhDfeA+0YpSQqgmGcd4VKI OTHw== X-Forwarded-Encrypted: i=2; AJvYcCXHXhjUVZtky1eMGzY8OIN1y+VY4EKOqMf48or2vXJ/PVRzv53DfAaaTO+YdvBuOOn7Rk75y6w=@isar-build.org X-Gm-Message-State: AOJu0YxOW76Ue+L0eK10m8pOqPkApaki55RHtTuhAR6/C4zofNETdXuv oF1VNvEVWZwIO+LZ9BKrMc62ZvDEXd67X7IgcJDUhhhxkmQXycxB X-Google-Smtp-Source: AGHT+IGCv0JjJdeY2vCfTYUWi81v2ajJV4syE+dqVqVqIC8ExI2OTDSI6G+pjQzyWpC7k4J0uUd2Ig== X-Received: by 2002:a17:902:e88a:b0:205:8a25:904b with SMTP id d9443c01a7336-2076e45c40emr273152445ad.57.1726564520063; Tue, 17 Sep 2024 02:15:20 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:903:32cf:b0:206:9820:463c with SMTP id d9443c01a7336-2076cafaf19ls10470475ad.1.-pod-prod-01-us; Tue, 17 Sep 2024 02:15:19 -0700 (PDT) X-Received: by 2002:a17:902:d50e:b0:207:ded:9cbd with SMTP id d9443c01a7336-2076e370cadmr263841565ad.24.1726564518722; Tue, 17 Sep 2024 02:15:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726564518; cv=none; d=google.com; s=arc-20240605; b=hPygGS81oiLx5mOFY58YK0jwsE5PDCnUOu1bUkVS0+4Z2xkeELUFp7S/rtZowWIwRm eo+zriUZnATg7pMGFVmAsnsNMryTbUuwhL6ntGPR77xqGzGpMFXm3vO+QqelktM4KZzc lYlHX5/cJFEjOdBPi72yegBeCKo1dogFNAPBF8HI30KHQ0vsVSrdanKcC7b1LNgf5Wny IEZ6qq2G5CWCp4O7ecikm+wKSjtzIdt9PLW8rjtidACqRjg+HowlWAnF8kpmSRRDuB4X 9e0pDJfD6kAB2NGHvN7sFiExsfdnJLJwKLLs82RI1wocKhlEMrn7rOYM97XyuRyMiirn uRdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=PgQFQrj4bMhchxQMFG0fCBitlAX781ezjnzBRu3bjms=; fh=2vPEtVRFZgJExMSCfX53nKBFsjiPYp/60rbGy5S5Mwo=; b=UWoYR7+WL6PEI1WFXH0VsAFkpaIRUz2jfMY4TR0HBYAVR3xky8iPlbi1pkTBwQBE+S ltFyOmXvhuL2CrK5pkV/LG6VpTB/Cqg2RH+FKPCNrSzmnSbL4aEY5wS/7/yjRoSAeq01 DWtJEJLxmvkUSk34SyQI18HamkVzNU2i7yml0htJWu0NBQ7O2PnLq9L+JmBXtCay/F+u WQ7oCVTrLt3VwIuO9dGem9KDYu3TDXPeY9HNl+DOPBUgVYUJLC81BYFfCWs4lbS/8jl9 3tg8F9yYKYDI5G/ZrlChUisCjc/xaMnGMxfIMLukV1JTiybRv3nOrWc9Q3Ktq2i+hait 7MPw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=RS+j7SCX; spf=pass (google.com: domain of fm-1321639-2024091709151633d5fbc78a73267740-xiujew@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1321639-2024091709151633d5fbc78a73267740-XiUJew@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id d9443c01a7336-207946c2f60si2770715ad.8.2024.09.17.02.15.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Sep 2024 02:15:18 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1321639-2024091709151633d5fbc78a73267740-xiujew@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 2024091709151633d5fbc78a73267740 for ; Tue, 17 Sep 2024 11:15:16 +0200 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: "MOESSBAUER, Felix" To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH v2 RESEND 2/2] delay creation of initrd until end of rootfs install Date: Tue, 17 Sep 2024 11:15:07 +0200 Message-Id: <20240917091507.1714450-2-felix.moessbauer@siemens.com> In-Reply-To: <20240917091507.1714450-1-felix.moessbauer@siemens.com> References: <20240917091507.1714450-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1321639:519-21489:flowmailer X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=RS+j7SCX; spf=pass (google.com: domain of fm-1321639-2024091709151633d5fbc78a73267740-xiujew@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1321639-2024091709151633d5fbc78a73267740-XiUJew@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= This patch solves major performance issues around the initramfs creation by ensuring that the initrd is only created once. This is implemented by stubbing the update-initramfs call during the package installing. After all apt operations are completed, we manually trigger the initrd creation. In case a custom initramfs is used, the creation is completely skipped in the image rootfs, as this would anyways not be used. Before that, each package install that made a initrd relevant change triggered the update of the initrd. As we have multiple apt calls during the build, this step was sometimes executed multiple times. In addition, the apt install step is emulated, further slowing down the initrd generation. On some layers on non native architecutes, this summed up to over 10 minutes of initrd generation time. Signed-off-by: Felix Moessbauer --- meta/classes/image.bbclass | 4 +++ meta/classes/rootfs.bbclass | 32 +++++++++++++++++++ .../isar-bootstrap/isar-bootstrap.inc | 2 ++ 3 files changed, 38 insertions(+) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 0dea06fa..b6763d73 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -67,6 +67,8 @@ inherit essential ROOTFSDIR = "${IMAGE_ROOTFS}" ROOTFS_FEATURES += "clean-package-cache clean-pycache generate-manifest export-dpkg-status clean-log-files clean-debconf-cache" +# when using a custom initrd, do not generate one as part of the image rootfs +ROOTFS_FEATURES += "${@ '' if d.getVar('INITRD_IMAGE') == '' else 'no-generate-initrd'}" ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${@isar_multiarch_packages('IMAGE_INSTALL', d)}" ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" ROOTFS_DPKGSTATUS_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" @@ -458,6 +460,8 @@ do_rootfs_quality_check() { args="${ROOTFS_QA_FIND_ARGS}" # rootfs_finalize chroot-setup.sh args="${args} ! -path ${ROOTFSDIR}/var/lib/dpkg/diversions" + # initramfs is generated outside of the image rootfs + args="${args} ! -path ${ROOTFSDIR}/boot/initrd.img*" for cmd in ${ROOTFS_POSTPROCESS_COMMAND}; do case "${cmd}" in image_postprocess_mark) diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index f0abd795..5c7a4c9a 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -14,6 +14,7 @@ ROOTFS_BASE_DISTRO ?= "${BASE_DISTRO}" # 'generate-manifest' - generate a package manifest of the rootfs into ${ROOTFS_MANIFEST_DEPLOY_DIR} # 'export-dpkg-status' - exports /var/lib/dpkg/status file to ${ROOTFS_DPKGSTATUS_DEPLOY_DIR} # 'clean-log-files' - delete log files that are not owned by packages +# 'no-generate-initrd' - do not generate debian default initrd ROOTFS_FEATURES ?= "" ROOTFS_APT_ARGS="install --yes -o Debug::pkgProblemResolver=yes" @@ -127,6 +128,16 @@ rootfs_configure_apt() { EOSUDO } +ROOTFS_CONFIGURE_COMMAND += "rootfs_disable_initrd_generation" +rootfs_disable_initrd_generation[weight] = "1" +rootfs_disable_initrd_generation() { + # fully disable initrd generation + echo "replace update-initramfs with stub" + sudo mv "${ROOTFSDIR}/usr/sbin/update-initramfs" \ + "${ROOTFSDIR}/usr/sbin/update-initramfs.isar" + sudo chroot "${ROOTFSDIR}" ln -s "/usr/bin/true" "/usr/sbin/update-initramfs" +} + ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_update" rootfs_install_pkgs_update[weight] = "5" @@ -331,6 +342,27 @@ rootfs_cleanup_base_apt() { EOSUDO } +ROOTFS_POSTPROCESS_COMMAND += "rootfs_restore_initrd_tooling" +rootfs_restore_initrd_tooling[weight] = "1" +rootfs_restore_initrd_tooling() { + if [ -e "${ROOTFSDIR}/usr/sbin/update-initramfs.isar" ]; then + sudo mv -f "${ROOTFSDIR}/usr/sbin/update-initramfs.isar" \ + "${ROOTFSDIR}/usr/sbin/update-initramfs" + fi +} + +ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'no-generate-initrd', '', 'rootfs_generate_initrd', d)}" +rootfs_generate_initrd[weight] = "10" +rootfs_generate_initrd() { + if [ -n "$(sudo find '${ROOTFSDIR}/boot' -type f -name 'vmlinu[xz]*')" ]; then + sudo -E chroot "${ROOTFSDIR}" sh -c '\ + export kernel_version=$(basename /boot/vmlinu[xz]* | cut -d'-' -f2-); \ + update-initramfs -u -v -k "$kernel_version";' + else + echo "no kernel in this rootfs, do not generate initrd" + fi +} + do_rootfs_postprocess[vardeps] = "${ROOTFS_POSTPROCESS_COMMAND}" do_rootfs_postprocess[network] = "${TASK_USE_SUDO}" python do_rootfs_postprocess() { diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 12f32ff0..e85c2894 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -28,6 +28,8 @@ DISTRO_BOOTSTRAP_KEYS ?= "" THIRD_PARTY_APT_KEYS ?= "" DEPLOY_ISAR_BOOTSTRAP ?= "" DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales" +# install early, so we can stub the update-initramfs script before rootfs install +DISTRO_BOOTSTRAP_BASE_PACKAGES:append = ",initramfs-tools" DISTRO_BOOTSTRAP_BASE_PACKAGES:append:gnupg = ",gnupg" DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = ",ca-certificates" DISTRO_VARS_PREFIX ?= "${@'HOST_' if bb.utils.to_boolean(d.getVar('BOOTSTRAP_FOR_HOST')) else ''}"