From patchwork Mon Jun 17 15:08:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3616 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 17 Jun 2024 17:09:22 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f185.google.com (mail-lj1-f185.google.com [209.85.208.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 45HF9K4k019131 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 17 Jun 2024 17:09:21 +0200 Received: by mail-lj1-f185.google.com with SMTP id 38308e7fff4ca-2eae96cecaesf33190371fa.2 for ; Mon, 17 Jun 2024 08:09:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1718636955; cv=pass; d=google.com; s=arc-20160816; b=w6yIhFLhvqaYcdjR5XsZl9v0qcwNW9R5Nb8KNrGq+kn9yIxcMI2gndPtCvqLJcwgwI yxBIWSwSyR1Og46v9I1DXTKbu90Ior60XS7zlUF6arNvfRKLce6eJYiQE0fCvwYEuR2Q efLcXFQZ8QGBadEuLWITbkzeGVhmVNadnEZLC3bxoJ56ya1UoJWJDWficQxBvjMDvTaP qGb8ZZypmPNHFFP4sFSiVu9IRKEwixGTGimnlz2qas9KWMIDULUsuAs6uY8awI9ml34C q7/UNhdVtneTKBppc06Jilno3wyysJ55ImsPPv7psQ/G5CK7hr54921fHzfkdSryp7LV MQqw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:sender:dkim-signature; bh=GrsaYY3/1YOJELHbZr/Z69Nldcskx6OAUAgn/B6Slzw=; fh=AbwzcCUjVvEB9SeuIj/TChFsI3EIF6ytTCf1FvjcVkU=; b=tjP+ucCQcm9jRcrzTwExYw1CuOXSHZKR4ImLMGrJnpMBCBHtEgaVTl7QzLDW3S3IYv JsU0dblA8F+VfEK0bO7WaJL7iHg+VOveOj4h6f5M7sITQ+x15FBBMmcBq64iexh5VARc klvrfhyyPNsJBJLYYYIPeOcvgT9XBD57u+JOSSq3QLTyV6agXOD4M014A8u/4WJQGXiA dkJijWj9xLcEMxSA2hwjh4LS6sZCUdTLNkOvxbxeLlKUxq8XN4ls9PcZJPoHm4KyKDJc OgMtWJ1SVIY0snH+2ZveOETbKfGJkgWc2B7Z1aNWmY/DE1a4tJ7wWXP4dNfdnTf8tDyq g1Xw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1718636955; x=1719241755; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender:from:to:cc :subject:date:message-id:reply-to; bh=GrsaYY3/1YOJELHbZr/Z69Nldcskx6OAUAgn/B6Slzw=; b=nh+EaTrC95+fVcyc6WVRSTWM+XwpuqWAHUwhzSUVwKuj715NgysPnf674gVE5kl1sW f/VaDPUeKMrJxUe4OoSrNrSXARRU6qs6GXwpxmzsmmJEK3kSY24ztYJEpsM/RBD4pB6V XSlrvBNLQ9nj4R1pGJ3y9k7exi3Jbu92FHHF0eOQoRQaGXxWyEq9kILgZIfamvhosBEe 3kq4Y9REdNeIyxIUJ08vVFCsrDC0jjUOj6aJ6TNbw1VUty45oppetJbdlRvx9uvLQKPu 0Km2LR+DOeWfQVJoD2ehFz3xrGflr506FSczQhrOfaJ1lzqR7fHC28+2hJNWCKtGyfE4 KrWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718636955; x=1719241755; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=GrsaYY3/1YOJELHbZr/Z69Nldcskx6OAUAgn/B6Slzw=; b=Cf2gnUUA1R8BO0OF8vFjH7eSnbFuiwyKWe/7mu+G8maH0NtfopJL8ErWNjcgABRKly COJvM1/SeMJ+PBrwC21O9NT2i5EzWMx3ywZyyTe/8AgioplpqggreNPNv6X2ep2Al6++ Dcvha2B34Mmst5qF3B5c8uQNzAA61uRP7bgQqJumBKrf/Dbw53sEy8xBtjVZNj0aOsBd UvFE+gjBsWljuA+lz/fL+abZ3zmtA+7+IShvUYYC87OdtzP0nYlrcMrwKp2JA8HQ+hEB aB5OcZk3ykZEHRehg2DSsj2j5Hp2HM7MeskN98aVc1ptdfy+ECeNxW66y+7thvFvGn4T TWdQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWf98F8lpTWus/t59Ejd31WcpzT+B7rA5qHrO0POoh1siE28FK52JuIkIcn3u7zNArv7EipI1t9kVvUpk1AOig5LX8NAxI= X-Gm-Message-State: AOJu0YzPkf2z1uCUK7TOhQ8jylGHkGt/URRNvL5KOH3wwbLjVEtR3Enr 3+xduibO1/qTaNRRckl4ZBiZS3jfztCAyOzEFJKXzrVCT8JAhguV X-Google-Smtp-Source: AGHT+IFSvzdy/K1fZyqGx6b0+wjQwnWYkm/ku+BszTod2rtzQRVpRVa/ScmTLgndSKd0dTyMkVnN3Q== X-Received: by 2002:a2e:8188:0:b0:2ec:2ccb:8efb with SMTP id 38308e7fff4ca-2ec2ccb8f7amr19139901fa.38.1718636955182; Mon, 17 Jun 2024 08:09:15 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1056:b0:2ec:3d9:4072 with SMTP id 38308e7fff4ca-2ec03d944dals17979931fa.1.-pod-prod-02-eu; Mon, 17 Jun 2024 08:09:13 -0700 (PDT) X-Received: by 2002:a2e:a0d7:0:b0:2ec:343d:9679 with SMTP id 38308e7fff4ca-2ec343d97c8mr707961fa.5.1718636953227; Mon, 17 Jun 2024 08:09:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718636953; cv=none; d=google.com; s=arc-20160816; b=I8Ow2pB0I3ABAMwKtri0dyCv2T1UUS0fND+FCEeOW90NHhB/kucntzbQC8BU8VabvX +Q7NUjOh5PixN8TIjK2/MMK9PlJajGbiuPKP4gRcyyAw8gk5MwWVvncn/CbuMyMop4yy ZnNo+qlMOyjWvitzrl6bXsK3CxVYEz/B3C3OIpg3H99fzPncnWDKrgxBXt99EC6YTXl1 +A0MsMuIwZT54cBmtyadgli35zsBTzU+QXTiZn2Oja/rpi7h1N34M2fZYOb09bGu76rL TjJgUA6QnlkCRaOP2RWhG+vxwQgAhhydoyqUVPwU5W39yZ7r/J7fpUgJAFTHzQf1kxIi uopA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=HPeIJmEiGTWQKAdIqLWluFtfIB+lJjJ26SLa3HKeSJ4=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=HKnHf8idOn0P+UK+/333mbzC1cwtJp3ienknADYFrA2fWmrmFB6WKAE94zbF0BBRFh CwGEe2cdRQegdfMOCyrNFC1OE0Hfc3F0NfQobJ6b4OTqtdwDC7WDtID2T8ArlsMLe3cy d9bQeHdIw+4eziAXV1QD1pChUyTqNQH4z3yeLZsQMMExxsetvH7/FK4p19BjZwNXgZPs b1h5pqXDxT29l/49EiEbwYWtoXWD8T/ItNHorMPm8yW+MWFCSOQrsMD8ylOP/eTiPcpi soBa0qoxzNoI7rqix2zjTPUjEM3yX5gsqnswuRGVGMVsHWGtpL4j1VVqqRD6cEsCZ9eX x+3g==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 38308e7fff4ca-2ec05cc82efsi2123371fa.7.2024.06.17.08.09.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Jun 2024 08:09:13 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.promwad.corp ([159.148.83.114]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 45HF9AkN019081 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 17 Jun 2024 17:09:12 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 2/5] start_vm: Add secureboot support Date: Mon, 17 Jun 2024 18:08:58 +0300 Message-Id: <20240617150901.55853-3-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240617150901.55853-1-amikan@ilbers.de> References: <20240617150901.55853-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,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-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Add sb_copy_vars()/sb_cleanup() API for creation of OVMF variables file copy in case it was declared in QEMU_DISK_ARGS value. If OVMF_VARS_4M.ms.fd is already exists it will be reused, otherwise created copy will be deleted after QEMU exit. sb_copy_vars() returns True if cleanup needed. Signed-off-by: Anton Mikanovich --- meta-isar/conf/machine/qemuamd64-sb.conf | 2 +- testsuite/cibuilder.py | 13 ++++++--- testsuite/start_vm.py | 37 +++++++++++++++++++++--- 3 files changed, 43 insertions(+), 9 deletions(-) diff --git a/meta-isar/conf/machine/qemuamd64-sb.conf b/meta-isar/conf/machine/qemuamd64-sb.conf index 2bec553b..9ad5f8d6 100644 --- a/meta-isar/conf/machine/qemuamd64-sb.conf +++ b/meta-isar/conf/machine/qemuamd64-sb.conf @@ -18,4 +18,4 @@ IMAGER_INSTALL:wic += "${GRUB_DEBIAN_SB_MOK}" IMAGE_PREINSTALL += "mokutil" # overwrite qemu disk args for signed boot -QEMU_DISK_ARGS = "-drive file=##ROOTFS_IMAGE##,format=raw -global driver=cfi.pflash01,property=secure,value=on -drive if=pflash,format=raw,unit=0,file=/usr/share/OVMF/OVMF_CODE_4M.ms.fd,readonly=on" +QEMU_DISK_ARGS = "-drive file=##ROOTFS_IMAGE##,format=raw -global driver=cfi.pflash01,property=secure,value=on -drive if=pflash,format=raw,unit=0,file=/usr/share/OVMF/OVMF_CODE_4M.ms.fd,readonly=on -drive if=pflash,format=raw,unit=1,file=OVMF_VARS_4M.ms.fd" diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 12c48180..a51d6f7e 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -477,6 +477,8 @@ BBPATH .= ":${LAYERDIR}"\ boot_log, None, enforce_pcbios) cmdline.insert(1, '-nographic') + need_sb_cleanup = start_vm.sb_copy_vars(cmdline) + self.log.info('QEMU boot line:\n' + ' '.join(cmdline)) self.log.info('QEMU boot log:\n' + boot_log) @@ -485,7 +487,7 @@ BBPATH .= ":${LAYERDIR}"\ universal_newlines=True) self.log.info("Started VM with pid %s" % (p1.pid)) - return p1, cmdline, boot_log + return p1, cmdline, boot_log, need_sb_cleanup def vm_wait_boot(self, p1, timeout): @@ -564,6 +566,9 @@ BBPATH .= ":${LAYERDIR}"\ pid = self.vm_dict[vm][0] os.kill(pid, signal.SIGKILL) + if self.vm_dict[vm][3]: + start_vm.sb_cleanup() + del(self.vm_dict[vm]) self.vm_dump_dict(vm) @@ -600,7 +605,7 @@ BBPATH .= ":${LAYERDIR}"\ stderr = "" if vm in self.vm_dict: - pid, cmdline, boot_log = self.vm_dict[vm] + pid, cmdline, boot_log, need_sb_cleanup = self.vm_dict[vm] # Check that corresponding process exists proc = subprocess.run("ps -o cmd= %d" % (pid), shell=True, text=True, @@ -612,8 +617,8 @@ BBPATH .= ":${LAYERDIR}"\ if run_qemu: self.log.info("No qemu-system process for `%s` found, run new VM" % (vm)) - p1, cmdline, boot_log = self.vm_turn_on(arch, distro, image, enforce_pcbios) - self.vm_dict[vm] = p1.pid, cmdline, boot_log + p1, cmdline, boot_log, need_sb_cleanup = self.vm_turn_on(arch, distro, image, enforce_pcbios) + self.vm_dict[vm] = p1.pid, cmdline, boot_log, need_sb_cleanup self.vm_dump_dict(vm) rc = self.vm_wait_boot(p1, timeout) diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py index 2c07b816..45e509a7 100755 --- a/testsuite/start_vm.py +++ b/testsuite/start_vm.py @@ -1,15 +1,18 @@ #!/usr/bin/env python3 # # Helper script to start QEMU with Isar image -# Copyright (c) 2019, ilbers GmbH +# Copyright (c) 2019-2024, ilbers GmbH import argparse import os import socket import subprocess import sys +import shutil import time +OVMF_VARS_PATH = '/usr/share/OVMF/OVMF_VARS_4M.ms.fd' + def get_bitbake_env(arch, distro, image): multiconfig = 'mc:qemu' + arch + '-' + distro + ':' + image output = subprocess.check_output(['bitbake', '-e', str(multiconfig)]) @@ -91,16 +94,42 @@ def format_qemu_cmdline(arch, build, distro, image, out, pid, enforce_pcbios=Fal return cmd +def sb_copy_vars(cmdline): + ovmf_vars_filename = os.path.basename(OVMF_VARS_PATH) + + for param in cmdline: + if ovmf_vars_filename in param: + if os.path.exists(ovmf_vars_filename): + break + if not os.path.exists(OVMF_VARS_PATH): + print('%s required but not found!' % OVMF_VARS_PATH, file=sys.stderr) + break + shutil.copy(OVMF_VARS_PATH, ovmf_vars_filename) + return True + + return False + +def sb_cleanup(): + os.remove(os.path.basename(OVMF_VARS_PATH)) + def start_qemu(arch, build, distro, image, out, pid, enforce_pcbios): - cmdline = format_qemu_cmdline(arch, build, distro, image, out, pid, enforce_pcbios) + cmdline = format_qemu_cmdline(arch, build, distro, image, out, pid, + enforce_pcbios) cmdline.insert(1, '-nographic') + need_cleanup = sb_copy_vars(cmdline) + print(cmdline) - p1 = subprocess.call('exec ' + ' '.join(cmdline), shell=True) + + try: + subprocess.call('exec ' + ' '.join(cmdline), shell=True) + finally: + if need_cleanup: + sb_cleanup() def parse_args(): parser = argparse.ArgumentParser() - parser.add_argument('-a', '--arch', choices=['arm', 'arm64', 'amd64', 'i386', 'mipsel'], help='set isar machine architecture.', default='arm') + parser.add_argument('-a', '--arch', choices=['arm', 'arm64', 'amd64', 'amd64-sb', 'i386', 'mipsel'], help='set isar machine architecture.', default='arm') parser.add_argument('-b', '--build', help='set path to build directory.', default=os.getcwd()) parser.add_argument('-d', '--distro', choices=['buster', 'bullseye', 'bookworm', 'trixie', 'focal', 'jammy'], help='set isar Debian distribution.', default='bookworm') parser.add_argument('-i', '--image', help='set image name.', default='isar-image-base')