From nobody Sun Apr 28 01:46:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1629213753; cv=none; d=zohomail.com; s=zohoarc; b=kVt7g+KgMy1Dpl85izEwgwY/XtkjhXMnWFvgT9/ofK4OGEx0zPkNTbSsbZTz6z554C22q9CbALzp4D2ZzECZwvWl0ZUP6I38nKrF+gVJKukKy05f8jJFU8leDWolFcZ3IVXvWVzk0SgjnGqgEA9pcFQPYc3DvGBJI357cWxWA7c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629213753; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=5JV8B7ytlrHEqRX3dGfdGiKu10zSQPBiKtB63IFqlAw=; b=SiOu1Q2kI7wbtb8z9XXslPvmil4Xxty2mWgRix/nEaPVOkB0liDpmi2hCqU/HWBk1SV/y+EfJJ0iSwvXqR9w3VEBfISMZGVsU7rVk+DFrK5hvC8CzDm2YhdANBLmCqVeHKfQjg2NXtbw6vZ5r1WQVVk0SjAEd9HH0PP3cHq8Ops= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1629213753558434.9307992944355; Tue, 17 Aug 2021 08:22:33 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.167967.306654 (Exim 4.92) (envelope-from ) id 1mG0uq-00083c-Ab; Tue, 17 Aug 2021 15:22:12 +0000 Received: by outflank-mailman (output) from mailman id 167967.306654; Tue, 17 Aug 2021 15:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mG0uq-00083V-7L; Tue, 17 Aug 2021 15:22:12 +0000 Received: by outflank-mailman (input) for mailman id 167967; Tue, 17 Aug 2021 15:22:10 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mG0uo-00083H-GW for xen-devel@lists.xenproject.org; Tue, 17 Aug 2021 15:22:10 +0000 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 604c8f7d-5024-4711-b71a-28c620c49a9e; Tue, 17 Aug 2021 15:22:09 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 604c8f7d-5024-4711-b71a-28c620c49a9e DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1629213729; h=from:to:cc:subject:date:message-id:mime-version; bh=TY0qismOk1WtVVSMXWeyaUUstM67+EHkiHh7oNQ0olg=; b=J260tM1WOdr8ZScGekElFS1ZZtJNr11cw7rVlXYNSUuw81wODbXvtHrP z8Qd77kIb7U759+aLq+FtsT/xlcdolEEUTb2Etd78GZvZEUfFMHg47jKC kLA3MZYaYWuZUlS1Y0bvDNpJbTSm3cCuP6A50C4v8uJbLbfkmO5RyAt3i Y=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: xjW3u0gF7PP+I0m3LAQkvSQyKUu32M7NAKTvPnRw3IKwkG4BsbspjsMdn/voJ1GJyhelgFebFY pfounqrlRfD24PGH4zP9xkedgFedyLFbiNHy8a00tQaBFnI/0pHsvWqmfk5bThke84zpB4fLoK 6qW04RRjxe+vwpWgDCYWZsKe9W3RJaXcHiCAgn1/VQPVT7N8BSiU9YzOtLnrCimyl+bB1+lC4C VwqK2H+vvxWhfbMWAJsQo617IIlJ/kXPI7fU+T5JgDVMUr0YdvNYGe7OL+TMqJNOHHMyJkyP+n PkaKZPSjtiCaW7QyUV4kzq46 X-SBRS: 5.1 X-MesageID: 50650082 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-HdrOrdr: A9a23:cvk4HanDMkZI9fMNuIRNWXQ5fV7pDfI63DAbv31ZSRFFG/Fxl6 iV8sjztCWE7wr5N0tBpTntAsW9qBDnhPpICOsqTNSftWDd0QPCRuxfBOPZsljd8kbFl9K1u5 0OT0EHMqyTMWRH X-IronPort-AV: E=Sophos;i="5.84,329,1620705600"; d="scan'208";a="50650082" From: Jane Malalane To: Xen-devel CC: Jane Malalane , Ian Jackson , Wei Liu , Juergen Gross Subject: [PATCH] libs/guest: Move the guest ABI check earlier into xc_dom_parse_image() Date: Tue, 17 Aug 2021 16:19:24 +0100 Message-ID: <20210817151924.6674-1-jane.malalane@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1629213755249100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Xen may not support 32-bit PV guest for a number of reasons (lack of CONFIG_PV32, explicit pv=3Dno-32 command line argument, or implicitly due to CET being enabled) and advertises this to the toolstack via the absence of xen-3.0-x86_32p ABI. Currently, when trying to boot a 32-bit PV guest, the ABI check is too late and the build explodes in the following manner yielding an unhelpful error message: xc: error: panic: xg_dom_boot.c:121: xc_dom_boot_mem_init: can't allocate= low memory for domain: Out of memory libxl: error: libxl_dom.c:586:libxl__build_dom: xc_dom_boot_mem_init fail= ed: Operation not supported libxl: error: libxl_create.c:1573:domcreate_rebuild_done: Domain 1:cannot= (re-)build domain: -3 libxl: error: libxl_domain.c:1182:libxl__destroy_domid: Domain 1:Non-exis= tant domain libxl: error: libxl_domain.c:1136:domain_destroy_callback: Domain 1:Unabl= e to destroy guest libxl: error: libxl_domain.c:1063:domain_destroy_cb: Domain 1:Destruction= of domain failed Move the ABI check earlier into xc_dom_parse_image() along with other ELF-note feature checks. With this adjustment, it now looks like this: xc: error: panic: xg_dom_boot.c:88: xc_dom_compat_check: guest type xen-3= .0-x86_32p not supported by xen kernel, sorry: Invalid kernel libxl: error: libxl_dom.c:571:libxl__build_dom: xc_dom_parse_image failed domainbuilder: detail: xc_dom_release: called libxl: error: libxl_create.c:1573:domcreate_rebuild_done: Domain 11:canno= t (re-)build domain: -3 libxl: error: libxl_domain.c:1182:libxl__destroy_domid: Domain 11:Non-exi= stant domain libxl: error: libxl_domain.c:1136:domain_destroy_callback: Domain 11:Unab= le to destroy guest libxl: error: libxl_domain.c:1063:domain_destroy_cb: Domain 11:Destructio= n of domain failed Suggested-by: Andrew Cooper Signed-off-by: Jane Malalane --- CC: Ian Jackson CC: Wei Liu CC: Juergen Gross --- tools/libs/guest/xg_dom_boot.c | 4 ---- tools/libs/guest/xg_dom_core.c | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libs/guest/xg_dom_boot.c b/tools/libs/guest/xg_dom_boot.c index dac96b17a5..f809dcbe97 100644 --- a/tools/libs/guest/xg_dom_boot.c +++ b/tools/libs/guest/xg_dom_boot.c @@ -191,10 +191,6 @@ int xc_dom_boot_image(struct xc_dom_image *dom) } dom->shared_info_mfn =3D info.shared_info_frame; =20 - /* sanity checks */ - if ( !xc_dom_compat_check(dom) ) - return -1; - /* initial mm setup */ if ( dom->arch_hooks->setup_pgtables && (rc =3D dom->arch_hooks->setup_pgtables(dom)) !=3D 0 ) diff --git a/tools/libs/guest/xg_dom_core.c b/tools/libs/guest/xg_dom_core.c index 4918ee517b..2e4c1330ea 100644 --- a/tools/libs/guest/xg_dom_core.c +++ b/tools/libs/guest/xg_dom_core.c @@ -922,6 +922,10 @@ int xc_dom_parse_image(struct xc_dom_image *dom) goto err; } =20 + /* Check guest ABI */ + if ( !xc_dom_compat_check(dom) ) + return -1; + /* check features */ for ( i =3D 0; i < XENFEAT_NR_SUBMAPS; i++ ) { --=20 2.11.0