From patchwork Wed Apr 9 11:28:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 4147 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 09 Apr 2025 13:29:17 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f60.google.com (mail-wm1-f60.google.com [209.85.128.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 539BTG51005644 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 9 Apr 2025 13:29:16 +0200 Received: by mail-wm1-f60.google.com with SMTP id 5b1f17b1804b1-43d5ca7c86asf43278585e9.0 for ; Wed, 09 Apr 2025 04:29:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1744198150; cv=pass; d=google.com; s=arc-20240605; b=lVIG+lF8rXIVHY6LK8CEUI+kp04t2iGIWi+mkpYLQbxXmSoeaLF62hzDkPUglQKCk2 UCH7LLR5h1oCq/NDDGc1AwDb2UxxgN/06kaj1ej94tAhuO0vWmJFsI2j+tlvV9/H2ke7 Mp2Z3spoJNVUuBCZzDs+grpMqU+cOs4ozGkviP0gBWjdMDIUN/1qtfw32n0mDWNP9rWK 9HWm3nupnBfe9mjNEcrRTHcLDlcIfFD1Zmr8dtJJpKQCEE1e+G5BbxcD9w9Us90P4waI mOAUtXVUHZrwiYZwdmA1ms26ELvJWQvBPLScx2wiS58/sNMnhS0sRnjJB1b5jqRiOmY8 a4eQ== 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=7AZk09mok4zorJSt5eRhzaCMYCWDcEUc9hSXzaqMong=; fh=0P6cJcjTlswStPQlKQM52kexZntOeOmvlgi6ZFkgHQY=; b=FuPUsgSKfwgSKS1tx1lRYnEEtKsaSpZ0rglGa2BPS1GiUEpIz8KbnukBGTkmMLkihU zLFSs8OhrReCgDJUbddRQzqoo85MmGg5KrYbZGLd9vlm/Ie3URISX7oQLufsQ+LpdD47 XT1ckdaVocslXXKjI+K3qoZ0wywjIOvn8yv/853cimS2BI5mrUlCjSe1T7UJjCnfr5VB 5Dg1rppZp6UZRhL3OXOdC1ppoZUUfNTDuOBzZ7baJEwOJnEY1+UvRh67wTFmuCWnmDT8 Ty6QWV4+mqb4Fg57Ha7c8k4BgO4YMdWjzSURNIvspP25/wZ2MIayt+4CJpSZrNPdgU7C LNzA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=KuhENiOW; spf=pass (google.com: domain of fm-1321639-20250409112906598b5dd74b9f5b3224-xz8tmk@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1321639-20250409112906598b5dd74b9f5b3224-xz8tmK@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=1744198150; x=1744802950; 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=7AZk09mok4zorJSt5eRhzaCMYCWDcEUc9hSXzaqMong=; b=W0u4hEkyF9dkgQ0GjJpEUFkieaPBw5xxgwE5GXryKsC4jrP7UPZvFWklHkYGhVzwie j/7AVIoNUjzMPaLa/1ahjNfSpFFepI6GdQrWIDM/AZMxmH1HhIm/4usv17d0s5ZsKqoQ JeTvp4d8+V1ZaX9bC1eAzv7lk6Ds+F6EOHb6jfYQL+kNMY7tW7V+Z+xJV/oMHDQ7V08u ZSAdF1X5B8QB/zvoBPAKEAUD+TgYj19YhldPil/svS2mPGDOHsZH2YMMQqzJC4pWo9Pl /gRfTILRJdqd/W/RL5iG7c0QV0c6HFNazh9jt9XBzKCS6KK0CyB2XGEdXz5A8972xrSb Qn/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744198150; x=1744802950; 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=7AZk09mok4zorJSt5eRhzaCMYCWDcEUc9hSXzaqMong=; b=O2/LefEOm3gJuB9M8FmD1ZUf1zQ5na6XRy4cv+sinFjFRm6njbwL8ZxiXwMtXZgBsj PylpuMz6VHvanGSqQ5XCtlu4JFAwdr3JYl8v49rHveHyLeMpdQAY0Vb8I7hoYZU59qWC JAVfbTbXYu/JXa6so0L9xqXRlHULm83q0tG25P52lZsxqyOk6DtGRyxPZlHoVnPJvBYF R6z2S2O5jKOaOV/PcPL0GHDE8EIaTtSVMDD00TCzhHaa1CWVy2//gnYP7AkCBQ2muFDC aPVrneGLwS1sRJAATUjagz/2hsIKDs0WbQOmEs/Aep0/FhqT2bH6VyWNUd1mH2T3tYnZ cLHA== X-Forwarded-Encrypted: i=2; AJvYcCVyoAstCllHss5eIQ+LTi5NBoPR3Dbw34yo5/1JdAsM+ppQEhmVYlAaUKs2eGQp7pMfA7ckbAo=@isar-build.org X-Gm-Message-State: AOJu0YwnsxeiJ9IDdMq0+8oyMAbBonK7ZFweLzM/fkVjhPK8ZmwcpMxM GG1cLTYe12bwSVN0hqZJU/UqAX5tv73rRlU6xHCMT7pj6ZT1IPVY X-Google-Smtp-Source: AGHT+IEbPbYM/wzBG3tM5VHZPOPmXyKTeOKXH7P4gcFuSQnxcFtysl+9Sbgtx3BuEqHw9ISFsQx0Rw== X-Received: by 2002:a05:600c:1f89:b0:43b:cc3c:60bc with SMTP id 5b1f17b1804b1-43f1ecd6b3amr26578575e9.15.1744198149612; Wed, 09 Apr 2025 04:29:09 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARLLPAJYmpKByR4XWKGeoa8BpYNQHRFKKl7hCSzo65cW4waTLw== Received: by 2002:a05:600c:1911:b0:43d:40b0:33 with SMTP id 5b1f17b1804b1-43ebea4f8eals8802735e9.0.-pod-prod-01-eu; Wed, 09 Apr 2025 04:29:07 -0700 (PDT) X-Received: by 2002:a05:600c:5486:b0:43b:c0fa:f9dd with SMTP id 5b1f17b1804b1-43f1ed4b4a3mr18999235e9.25.1744198147005; Wed, 09 Apr 2025 04:29:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744198146; cv=none; d=google.com; s=arc-20240605; b=cpV8mgwo99Voa+BG4FcaoJmNNZjhojbvcubxFaRPlT8K2JffjI+DESpR8tBm8Jfku6 fTJ+hhzbg4aPOmwNBqnxcFHcT6+MFftrhNQGA7Z/2oNP5MSg8YqOE4HAAoAk7JX7c3x/ pg3nhc7wwQdKiUDeQIW3/trERH2bAwhoXDIuyr4JMeQrG28evfgNhs7GlUFkCmwvJ4nU MTGr6hiCq6Y0aEhECVS1QNk+C7GKT8hdWrrazpaKCXeeWLYuiHoiEzZbwditV7fQhOR6 QY6P1NboLl3PlGT23q48F8SRCAp5GXMqC+hn3dWPQxa9VHjDkRiI31SbBzSmKDJQWJ9Q mYeQ== 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=2WjB82fWDFzXzerXyqysNj8YxnwoitJ9rx7WC+MuApM=; fh=ihiGjvo7NUvpz5Iu2nNH4iKRnWbkT1eQ96FbYrmsmqY=; b=ZSFh/pUk+5fch4ZWeuLQC+s7obrUJ0hmZ3SIZIYBORg0scWd8lbesqhKQJOWrJZCCm oVgbvPu5MByubCsa4ucsssfqoyywgpahyVijiSq/r8hXHEcqttMjQnTX1uZU+m3EEKwU /Bz0mT/siZFp3W/6EQOaCzAtTcaGatGx58UIUbk51/rvRuYgoQjW5ZIr9/J6w/B3s0Uo 6Z97sOZQF9nMNqsGFGCljBHe8hmT1f//qVBICRsZ+gpeK4ghf85rKCz2wjQBTEPFKaB1 I+85QU1067suYoCmbDNwi2Y6O0K8jeuI1YEnql9Ni5hecTcBnN9twp07qyQD/FqxEne9 eMvQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=KuhENiOW; spf=pass (google.com: domain of fm-1321639-20250409112906598b5dd74b9f5b3224-xz8tmk@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1321639-20250409112906598b5dd74b9f5b3224-xz8tmK@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-43f233b7d71si209695e9.2.2025.04.09.04.29.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Apr 2025 04:29:06 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1321639-20250409112906598b5dd74b9f5b3224-xz8tmk@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20250409112906598b5dd74b9f5b3224 for ; Wed, 09 Apr 2025 13:29:06 +0200 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: Felix Moessbauer To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, cedric.hombourger@siemens.com, Felix Moessbauer Subject: [RFC v3 2/2] report approximate progress during initrd generation Date: Wed, 9 Apr 2025 13:28:47 +0200 Message-Id: <20250409112847.3395116-3-felix.moessbauer@siemens.com> In-Reply-To: <20250409112847.3395116-1-felix.moessbauer@siemens.com> References: <20250409112847.3395116-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=KuhENiOW; spf=pass (google.com: domain of fm-1321639-20250409112906598b5dd74b9f5b3224-xz8tmk@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1321639-20250409112906598b5dd74b9f5b3224-xz8tmK@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_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,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?= On non native architectures, the initrd generation has to be emulated. In combination with kernels that provide many modules (like the distro kernels), this leads to long initrd build times. To give a rough estimation of the duration, we add progress reporting to that step. As we always build the initrd with MODULES=most, we know from experiments, that ~50% of the kernel modules of the rootfs are included in the initrd. We use that number as a guesstimate, as we don't have precise numbers when starting the task. Signed-off-by: Felix Moessbauer --- meta/classes/rootfs.bbclass | 6 ++++++ meta/lib/rootfs_progress.py | 33 ++++++++++++++++++++++++++++----- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 8ab44472..adf1b2cf 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -454,6 +454,10 @@ do_generate_initramfs[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}" python do_generate_initramfs() { bb.build.exec_func('rootfs_do_mounts', d) bb.build.exec_func('rootfs_do_qemu', d) + + progress_reporter = bb.progress.ProgressHandler(d) + d.rootfs_progress = progress_reporter + try: bb.build.exec_func('rootfs_generate_initramfs', d) finally: @@ -468,7 +472,9 @@ rootfs_generate_initramfs[progress] = "custom:rootfs_progress.InitrdProgressHand rootfs_generate_initramfs() { if [ -n "$(sudo find '${ROOTFSDIR}/boot' -type f -name 'vmlinu[xz]*')" ]; then sudo -E chroot "${ROOTFSDIR}" sh -c '\ + mods_total="$(find /usr/lib/modules -type f -name '*.ko*' | wc -l)"; \ export kernel_version=$(basename /boot/vmlinu[xz]* | cut -d'-' -f2-); \ + echo "Total number of modules: $mods_total"; \ echo "Generating initrd"; \ update-initramfs -u -v -k "$kernel_version";' if [ -n "${INITRD_DEPLOY_FILE}" ]; then diff --git a/meta/lib/rootfs_progress.py b/meta/lib/rootfs_progress.py index f808852f..1cc70c87 100644 --- a/meta/lib/rootfs_progress.py +++ b/meta/lib/rootfs_progress.py @@ -28,14 +28,16 @@ class PkgsProgressHandler(bb.progress.ProgressHandler): self._linebuffer = self._linebuffer[breakpos:] if self._stage == 'prepare': - match = re.search( - r'^([0-9]+) upgraded, ([0-9]+) newly installed', line) - if match: - self._num_pkgs = int(match.group(1)) + int(match.group(2)) - self._stage = 'post-prepare' + self.process_total(line) else: self.process_line(line) + def process_total(self, line): + m = re.search(r'^([0-9]+) upgraded, ([0-9]+) newly installed', line) + if m: + self._num_pkgs = int(m.group(1)) + int(m.group(2)) + self._stage = 'post-prepare' + def process_line(self, line): return @@ -65,3 +67,24 @@ class PkgsInstallProgressHandler(PkgsProgressHandler): progress = 99 * (self._pkg + self._pkg_set_up) / (self._num_pkgs * 2) self._progress.update(progress) + + +class InitrdProgressHandler(PkgsProgressHandler): + def __init__(self, d, outfile, otherargs=None): + super().__init__(d, outfile) + + def process_total(self, line): + m = re.search(r'^Total number of modules: ([0-9]+)', line) + if m: + # in MODULES=most mode, we install ~half of all modules + self._num_pkgs = int(m.group(1)) // 2 + self._stage = 'post-prepare' + + def process_line(self, line): + if line.startswith('Adding module'): + self._pkg += 1 + elif line.startswith('(excluding'): + self._pkg += len(line.split(' ')) - 1 + else: + return + self._progress.update(99 * self._pkg / self._num_pkgs)