From nobody Mon Feb 9 08:57:21 2026 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=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1616410748; cv=none; d=zohomail.com; s=zohoarc; b=eNtE8DdmYx6FDNID00uTnKDJx/LB8nJWU8KMKDiy3Bj13RiTK7dQhVhSkQ2nctrmOilu+NKmCCfT5p3X00d31cP3F2NGV5AMiUa1GgebOFi38UCK/gcPCZS5exeX9ckNWZ/kh3oFQzHGpAzzmjs77q6ZdOxQufiWggMesrlHpVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616410748; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hsU1Tia/8TAchqKhiuRA5Y2svprMqymbiqcqRl8SGa0=; b=KWQXhgkJ+sWvBxoANydick2/xKGkSY3boGTRktmRgMzWg0qHHKjh2i0fz0Y9ah2GI22ip2kxzbYozzd2ugaTgiEFKJUnzwVHE0HLKQyNlQfCyeR4pSw5bW4wlVk91EbjZMXDOam19uJhnM9YsOjQOJhJSHrKQtgIP63aM55ATNg= 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=quarantine dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1616410748338977.4189757876115; Mon, 22 Mar 2021 03:59:08 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.100145.190635 (Exim 4.92) (envelope-from ) id 1lOIGp-0002yw-7D; Mon, 22 Mar 2021 10:58:51 +0000 Received: by outflank-mailman (output) from mailman id 100145.190635; Mon, 22 Mar 2021 10:58:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lOIGp-0002yo-30; Mon, 22 Mar 2021 10:58:51 +0000 Received: by outflank-mailman (input) for mailman id 100145; Mon, 22 Mar 2021 10:58:50 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lOIGo-0002uF-1D for xen-devel@lists.xenproject.org; Mon, 22 Mar 2021 10:58:50 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 2d8f94fb-3b04-4247-a4e5-e9ccfe4f623c; Mon, 22 Mar 2021 10:58:44 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 52529ADAA; Mon, 22 Mar 2021 10:58:43 +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: 2d8f94fb-3b04-4247-a4e5-e9ccfe4f623c X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1616410723; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hsU1Tia/8TAchqKhiuRA5Y2svprMqymbiqcqRl8SGa0=; b=Xa3SH5Jm9gvR826bDKnDRnIOARNUe4kStg8hl41mD5GQ862r2UKEzmZcQA3UpYGRfRbs7z F/EJ7IwZOl22S0M5lcI89ZgbWafNrPp5q5axS64Hlve7Q/xzugJa/TT0lhhdvA+KfPniCG 9Ml1Yg27h/mrXr6l7mkPzFO+zg+2ZrU= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Ian Jackson , Wei Liu Subject: [PATCH 2/6] tools/libs/ctrl: fix xc_core_arch_map_p2m() to support linear p2m table Date: Mon, 22 Mar 2021 11:58:36 +0100 Message-Id: <20210322105840.11224-3-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210322105840.11224-1-jgross@suse.com> References: <20210322105840.11224-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" The core of a pv linux guest produced via "xl dump-core" is nor usable as since kernel 4.14 only the linear p2m table is kept if Xen indicates it is supporting that. Unfortunately xc_core_arch_map_p2m() is still supporting the 3-level p2m tree only. Fix that by copying the functionality of map_p2m() from libxenguest to libxenctrl. Additionally the mapped p2m isn't of a fixed length now, so the interface to the mapping functions needs to be adapted. In order not to add even more parameters, expand struct domain_info_context and use a pointer to that as a parameter. Fixes: dc6d60937121 ("libxc: set flag for support of linear p2m list in dom= ain builder") Signed-off-by: Juergen Gross --- This is a backport candidate. --- tools/include/xenguest.h | 1 + tools/libs/ctrl/xc_core.c | 5 +- tools/libs/ctrl/xc_core.h | 8 +- tools/libs/ctrl/xc_core_arm.c | 23 +-- tools/libs/ctrl/xc_core_x86.c | 256 ++++++++++++++++++++++++++++------ tools/libs/ctrl/xc_private.h | 1 + tools/libs/guest/xg_domain.c | 17 +-- 7 files changed, 233 insertions(+), 78 deletions(-) diff --git a/tools/include/xenguest.h b/tools/include/xenguest.h index 217022b6e7..781d40c119 100644 --- a/tools/include/xenguest.h +++ b/tools/include/xenguest.h @@ -700,6 +700,7 @@ struct xc_domain_meminfo { xen_pfn_t *pfn_type; xen_pfn_t *p2m_table; unsigned long p2m_size; + unsigned int p2m_frames; }; =20 int xc_map_domain_meminfo(xc_interface *xch, uint32_t domid, diff --git a/tools/libs/ctrl/xc_core.c b/tools/libs/ctrl/xc_core.c index b47ab2f6d8..9576bec5a3 100644 --- a/tools/libs/ctrl/xc_core.c +++ b/tools/libs/ctrl/xc_core.c @@ -574,8 +574,7 @@ xc_domain_dumpcore_via_callback(xc_interface *xch, goto out; } =20 - sts =3D xc_core_arch_map_p2m(xch, dinfo->guest_width, &info, live_= shinfo, - &p2m, &dinfo->p2m_size); + sts =3D xc_core_arch_map_p2m(xch, dinfo, &info, live_shinfo, &p2m); if ( sts !=3D 0 ) goto out; =20 @@ -945,7 +944,7 @@ out: if ( memory_map !=3D NULL ) free(memory_map); if ( p2m !=3D NULL ) - munmap(p2m, PAGE_SIZE * P2M_FL_ENTRIES); + munmap(p2m, PAGE_SIZE * dinfo->p2m_frames); if ( p2m_array !=3D NULL ) free(p2m_array); if ( pfn_array !=3D NULL ) diff --git a/tools/libs/ctrl/xc_core.h b/tools/libs/ctrl/xc_core.h index 36fb755da2..8ea1f93a10 100644 --- a/tools/libs/ctrl/xc_core.h +++ b/tools/libs/ctrl/xc_core.h @@ -138,14 +138,14 @@ int xc_core_arch_memory_map_get(xc_interface *xch, xc_dominfo_t *info, shared_info_any_t *liv= e_shinfo, xc_core_memory_map_t **mapp, unsigned int *nr_entries); -int xc_core_arch_map_p2m(xc_interface *xch, unsigned int guest_width, +int xc_core_arch_map_p2m(xc_interface *xch, struct domain_info_context *di= nfo, xc_dominfo_t *info, shared_info_any_t *live_shinf= o, - xen_pfn_t **live_p2m, unsigned long *pfnp); + xen_pfn_t **live_p2m); =20 -int xc_core_arch_map_p2m_writable(xc_interface *xch, unsigned int guest_wi= dth, +int xc_core_arch_map_p2m_writable(xc_interface *xch, struct domain_info_co= ntext *dinfo, xc_dominfo_t *info, shared_info_any_t *live_shinfo, - xen_pfn_t **live_p2m, unsigned long *pfn= p); + xen_pfn_t **live_p2m); =20 int xc_core_arch_get_scratch_gpfn(xc_interface *xch, uint32_t domid, xen_pfn_t *gpfn); diff --git a/tools/libs/ctrl/xc_core_arm.c b/tools/libs/ctrl/xc_core_arm.c index 7b587b4cc5..93765a565f 100644 --- a/tools/libs/ctrl/xc_core_arm.c +++ b/tools/libs/ctrl/xc_core_arm.c @@ -66,33 +66,24 @@ xc_core_arch_memory_map_get(xc_interface *xch, struct x= c_core_arch_context *unus =20 static int xc_core_arch_map_p2m_rw(xc_interface *xch, struct domain_info_context *din= fo, xc_dominfo_t *info, - shared_info_any_t *live_shinfo, xen_pfn_t **live_p= 2m, - unsigned long *pfnp, int rw) + shared_info_any_t *live_shinfo, xen_pfn_t **live_p= 2m, int rw) { errno =3D ENOSYS; return -1; } =20 int -xc_core_arch_map_p2m(xc_interface *xch, unsigned int guest_width, xc_domin= fo_t *info, - shared_info_any_t *live_shinfo, xen_pfn_t **live_p= 2m, - unsigned long *pfnp) +xc_core_arch_map_p2m(xc_interface *xch, struct domain_info_context *dinfo,= xc_dominfo_t *info, + shared_info_any_t *live_shinfo, xen_pfn_t **live_p= 2m) { - struct domain_info_context _dinfo =3D { .guest_width =3D guest_width }; - struct domain_info_context *dinfo =3D &_dinfo; - return xc_core_arch_map_p2m_rw(xch, dinfo, info, - live_shinfo, live_p2m, pfnp, 0); + return xc_core_arch_map_p2m_rw(xch, dinfo, info, live_shinfo, live_p2m= , 0); } =20 int -xc_core_arch_map_p2m_writable(xc_interface *xch, unsigned int guest_width,= xc_dominfo_t *info, - shared_info_any_t *live_shinfo, xen_pfn_t **= live_p2m, - unsigned long *pfnp) +xc_core_arch_map_p2m_writable(xc_interface *xch, struct domain_info_contex= t *dinfo, xc_dominfo_t *info, + shared_info_any_t *live_shinfo, xen_pfn_t **= live_p2m) { - struct domain_info_context _dinfo =3D { .guest_width =3D guest_width }; - struct domain_info_context *dinfo =3D &_dinfo; - return xc_core_arch_map_p2m_rw(xch, dinfo, info, - live_shinfo, live_p2m, pfnp, 1); + return xc_core_arch_map_p2m_rw(xch, dinfo, info, live_shinfo, live_p2m= , 1); } =20 int diff --git a/tools/libs/ctrl/xc_core_x86.c b/tools/libs/ctrl/xc_core_x86.c index cb76e6207b..c8f71d4b75 100644 --- a/tools/libs/ctrl/xc_core_x86.c +++ b/tools/libs/ctrl/xc_core_x86.c @@ -17,6 +17,7 @@ * */ =20 +#include #include "xc_private.h" #include "xc_core.h" #include @@ -65,34 +66,169 @@ xc_core_arch_memory_map_get(xc_interface *xch, struct = xc_core_arch_context *unus return 0; } =20 -static int -xc_core_arch_map_p2m_rw(xc_interface *xch, struct domain_info_context *din= fo, xc_dominfo_t *info, - shared_info_any_t *live_shinfo, xen_pfn_t **live_p= 2m, - unsigned long *pfnp, int rw) +static inline bool is_canonical_address(uint64_t vaddr) { - /* Double and single indirect references to the live P2M table */ - xen_pfn_t *live_p2m_frame_list_list =3D NULL; - xen_pfn_t *live_p2m_frame_list =3D NULL; - /* Copies of the above. */ - xen_pfn_t *p2m_frame_list_list =3D NULL; - xen_pfn_t *p2m_frame_list =3D NULL; + return ((int64_t)vaddr >> 47) =3D=3D ((int64_t)vaddr >> 63); +} =20 - uint32_t dom =3D info->domid; - int ret =3D -1; - int err; - int i; +/* Virtual address ranges reserved for hypervisor. */ +#define HYPERVISOR_VIRT_START_X86_64 0xFFFF800000000000ULL +#define HYPERVISOR_VIRT_END_X86_64 0xFFFF87FFFFFFFFFFULL =20 - if ( xc_domain_nr_gpfns(xch, info->domid, &dinfo->p2m_size) < 0 ) +#define HYPERVISOR_VIRT_START_X86_32 0x00000000F5800000ULL +#define HYPERVISOR_VIRT_END_X86_32 0x00000000FFFFFFFFULL + +static xen_pfn_t * +xc_core_arch_map_p2m_list_rw(xc_interface *xch, struct domain_info_context= *dinfo, + uint32_t dom, shared_info_any_t *live_shinfo, + uint64_t p2m_cr3) +{ + uint64_t p2m_vaddr, p2m_end, mask, off; + xen_pfn_t p2m_mfn, mfn, saved_mfn, max_pfn; + uint64_t *ptes =3D NULL; + xen_pfn_t *mfns =3D NULL; + unsigned int fpp, n_pages, level, n_levels, shift, + idx_start, idx_end, idx, saved_idx; + + p2m_vaddr =3D GET_FIELD(live_shinfo, arch.p2m_vaddr, dinfo->guest_widt= h); + fpp =3D PAGE_SIZE / dinfo->guest_width; + dinfo->p2m_frames =3D (dinfo->p2m_size - 1) / fpp + 1; + p2m_end =3D p2m_vaddr + dinfo->p2m_frames * PAGE_SIZE - 1; + + if ( dinfo->guest_width =3D=3D 8 ) { - ERROR("Could not get maximum GPFN!"); - goto out; + mask =3D 0x0000ffffffffffffULL; + n_levels =3D 4; + p2m_mfn =3D p2m_cr3 >> 12; + if ( !is_canonical_address(p2m_vaddr) || + !is_canonical_address(p2m_end) || + p2m_end < p2m_vaddr || + (p2m_vaddr <=3D HYPERVISOR_VIRT_END_X86_64 && + p2m_end > HYPERVISOR_VIRT_START_X86_64) ) + { + ERROR("Bad virtual p2m address range %#" PRIx64 "-%#" PRIx64, + p2m_vaddr, p2m_end); + errno =3D ERANGE; + goto out; + } + } + else + { + mask =3D 0x00000000ffffffffULL; + n_levels =3D 3; + if ( p2m_cr3 & ~mask ) + p2m_mfn =3D ~0UL; + else + p2m_mfn =3D (uint32_t)((p2m_cr3 >> 12) | (p2m_cr3 << 20)); + if ( p2m_vaddr > mask || p2m_end > mask || p2m_end < p2m_vaddr || + (p2m_vaddr <=3D HYPERVISOR_VIRT_END_X86_32 && + p2m_end > HYPERVISOR_VIRT_START_X86_32) ) + { + ERROR("Bad virtual p2m address range %#" PRIx64 "-%#" PRIx64, + p2m_vaddr, p2m_end); + errno =3D ERANGE; + goto out; + } } =20 - if ( dinfo->p2m_size < info->nr_pages ) + mfns =3D malloc(sizeof(*mfns)); + if ( !mfns ) { - ERROR("p2m_size < nr_pages -1 (%lx < %lx", dinfo->p2m_size, info->= nr_pages - 1); + ERROR("Cannot allocate memory for array of %u mfns", 1); goto out; } + mfns[0] =3D p2m_mfn; + off =3D 0; + saved_mfn =3D 0; + idx_start =3D idx_end =3D saved_idx =3D 0; + + for ( level =3D n_levels; level > 0; level-- ) + { + n_pages =3D idx_end - idx_start + 1; + ptes =3D xc_map_foreign_pages(xch, dom, PROT_READ, mfns, n_pages); + if ( !ptes ) + { + PERROR("Failed to map %u page table pages for p2m list", n_pag= es); + goto out; + } + free(mfns); + + shift =3D level * 9 + 3; + idx_start =3D ((p2m_vaddr - off) & mask) >> shift; + idx_end =3D ((p2m_end - off) & mask) >> shift; + idx =3D idx_end - idx_start + 1; + mfns =3D malloc(sizeof(*mfns) * idx); + if ( !mfns ) + { + ERROR("Cannot allocate memory for array of %u mfns", idx); + goto out; + } + + for ( idx =3D idx_start; idx <=3D idx_end; idx++ ) + { + mfn =3D (ptes[idx] & 0x000ffffffffff000ULL) >> PAGE_SHIFT; + if ( mfn =3D=3D 0 ) + { + ERROR("Bad mfn %#lx during page table walk for vaddr %#" P= RIx64 " at level %d of p2m list", + mfn, off + ((uint64_t)idx << shift), level); + errno =3D ERANGE; + goto out; + } + mfns[idx - idx_start] =3D mfn; + + /* Maximum pfn check at level 2. Same reasoning as for p2m tre= e. */ + if ( level =3D=3D 2 ) + { + if ( mfn !=3D saved_mfn ) + { + saved_mfn =3D mfn; + saved_idx =3D idx - idx_start; + } + } + } + + if ( level =3D=3D 2 ) + { + if ( saved_idx =3D=3D idx_end ) + saved_idx++; + max_pfn =3D ((xen_pfn_t)saved_idx << 9) * fpp; + if ( max_pfn < dinfo->p2m_size ) + { + dinfo->p2m_size =3D max_pfn; + dinfo->p2m_frames =3D (dinfo->p2m_size + fpp - 1) / fpp; + p2m_end =3D p2m_vaddr + dinfo->p2m_frames * PAGE_SIZE - 1; + idx_end =3D idx_start + saved_idx; + } + } + + munmap(ptes, n_pages * PAGE_SIZE); + ptes =3D NULL; + off =3D p2m_vaddr & ((mask >> shift) << shift); + } + + return mfns; + + out: + free(mfns); + if ( ptes ) + munmap(ptes, n_pages * PAGE_SIZE); + + return NULL; +} + +static xen_pfn_t * +xc_core_arch_map_p2m_tree_rw(xc_interface *xch, struct domain_info_context= *dinfo, + uint32_t dom, shared_info_any_t *live_shinfo) +{ + /* Double and single indirect references to the live P2M table */ + xen_pfn_t *live_p2m_frame_list_list; + xen_pfn_t *live_p2m_frame_list =3D NULL; + /* Copies of the above. */ + xen_pfn_t *p2m_frame_list_list =3D NULL; + xen_pfn_t *p2m_frame_list; + + int err; + int i; =20 live_p2m_frame_list_list =3D xc_map_foreign_range(xch, dom, PAGE_SIZE, PROT_READ, @@ -151,10 +287,60 @@ xc_core_arch_map_p2m_rw(xc_interface *xch, struct dom= ain_info_context *dinfo, xc for ( i =3D P2M_FL_ENTRIES - 1; i >=3D 0; i-- ) p2m_frame_list[i] =3D ((uint32_t *)p2m_frame_list)[i]; =20 + dinfo->p2m_frames =3D P2M_FL_ENTRIES; + + return p2m_frame_list; + + out: + err =3D errno; + + if ( live_p2m_frame_list_list ) + munmap(live_p2m_frame_list_list, PAGE_SIZE); + + if ( live_p2m_frame_list ) + munmap(live_p2m_frame_list, P2M_FLL_ENTRIES * PAGE_SIZE); + + free(p2m_frame_list_list); + + errno =3D err; + + return NULL; +} + +static int +xc_core_arch_map_p2m_rw(xc_interface *xch, struct domain_info_context *din= fo, xc_dominfo_t *info, + shared_info_any_t *live_shinfo, xen_pfn_t **live_p= 2m, int rw) +{ + xen_pfn_t *p2m_frame_list =3D NULL; + uint64_t p2m_cr3; + uint32_t dom =3D info->domid; + int ret =3D -1; + int err; + + if ( xc_domain_nr_gpfns(xch, info->domid, &dinfo->p2m_size) < 0 ) + { + ERROR("Could not get maximum GPFN!"); + goto out; + } + + if ( dinfo->p2m_size < info->nr_pages ) + { + ERROR("p2m_size < nr_pages -1 (%lx < %lx", dinfo->p2m_size, info->= nr_pages - 1); + goto out; + } + + p2m_cr3 =3D GET_FIELD(live_shinfo, arch.p2m_cr3, dinfo->guest_width); + + p2m_frame_list =3D p2m_cr3 ? xc_core_arch_map_p2m_list_rw(xch, dinfo, = dom, live_shinfo, p2m_cr3) + : xc_core_arch_map_p2m_tree_rw(xch, dinfo, do= m, live_shinfo); + + if ( !p2m_frame_list ) + goto out; + *live_p2m =3D xc_map_foreign_pages(xch, dom, rw ? (PROT_READ | PROT_WRITE) : PROT_R= EAD, p2m_frame_list, - P2M_FL_ENTRIES); + dinfo->p2m_frames); =20 if ( !*live_p2m ) { @@ -162,21 +348,11 @@ xc_core_arch_map_p2m_rw(xc_interface *xch, struct dom= ain_info_context *dinfo, xc goto out; } =20 - *pfnp =3D dinfo->p2m_size; - ret =3D 0; =20 out: err =3D errno; =20 - if ( live_p2m_frame_list_list ) - munmap(live_p2m_frame_list_list, PAGE_SIZE); - - if ( live_p2m_frame_list ) - munmap(live_p2m_frame_list, P2M_FLL_ENTRIES * PAGE_SIZE); - - free(p2m_frame_list_list); - free(p2m_frame_list); =20 errno =3D err; @@ -184,25 +360,17 @@ out: } =20 int -xc_core_arch_map_p2m(xc_interface *xch, unsigned int guest_width, xc_domin= fo_t *info, - shared_info_any_t *live_shinfo, xen_pfn_t **live_p= 2m, - unsigned long *pfnp) +xc_core_arch_map_p2m(xc_interface *xch, struct domain_info_context *dinfo,= xc_dominfo_t *info, + shared_info_any_t *live_shinfo, xen_pfn_t **live_p= 2m) { - struct domain_info_context _dinfo =3D { .guest_width =3D guest_width }; - struct domain_info_context *dinfo =3D &_dinfo; - return xc_core_arch_map_p2m_rw(xch, dinfo, info, - live_shinfo, live_p2m, pfnp, 0); + return xc_core_arch_map_p2m_rw(xch, dinfo, info, live_shinfo, live_p2m= , 0); } =20 int -xc_core_arch_map_p2m_writable(xc_interface *xch, unsigned int guest_width,= xc_dominfo_t *info, - shared_info_any_t *live_shinfo, xen_pfn_t **= live_p2m, - unsigned long *pfnp) +xc_core_arch_map_p2m_writable(xc_interface *xch, struct domain_info_contex= t *dinfo, xc_dominfo_t *info, + shared_info_any_t *live_shinfo, xen_pfn_t **= live_p2m) { - struct domain_info_context _dinfo =3D { .guest_width =3D guest_width }; - struct domain_info_context *dinfo =3D &_dinfo; - return xc_core_arch_map_p2m_rw(xch, dinfo, info, - live_shinfo, live_p2m, pfnp, 1); + return xc_core_arch_map_p2m_rw(xch, dinfo, info, live_shinfo, live_p2m= , 1); } =20 int diff --git a/tools/libs/ctrl/xc_private.h b/tools/libs/ctrl/xc_private.h index f0b5f83ac8..8ebc0b59da 100644 --- a/tools/libs/ctrl/xc_private.h +++ b/tools/libs/ctrl/xc_private.h @@ -79,6 +79,7 @@ struct iovec { =20 struct domain_info_context { unsigned int guest_width; + unsigned int p2m_frames; unsigned long p2m_size; }; =20 diff --git a/tools/libs/guest/xg_domain.c b/tools/libs/guest/xg_domain.c index 5019c84e0e..dd7db2cbd8 100644 --- a/tools/libs/guest/xg_domain.c +++ b/tools/libs/guest/xg_domain.c @@ -24,13 +24,9 @@ =20 int xc_unmap_domain_meminfo(xc_interface *xch, struct xc_domain_meminfo *m= info) { - struct domain_info_context _di =3D { .guest_width =3D minfo->guest_wid= th, - .p2m_size =3D minfo->p2m_size}; - struct domain_info_context *dinfo =3D &_di; - free(minfo->pfn_type); if ( minfo->p2m_table ) - munmap(minfo->p2m_table, P2M_FL_ENTRIES * PAGE_SIZE); + munmap(minfo->p2m_table, minfo->p2m_frames * PAGE_SIZE); minfo->p2m_table =3D NULL; =20 return 0; @@ -40,7 +36,6 @@ int xc_map_domain_meminfo(xc_interface *xch, uint32_t dom= id, struct xc_domain_meminfo *minfo) { struct domain_info_context _di; - struct domain_info_context *dinfo =3D &_di; =20 xc_dominfo_t info; shared_info_any_t *live_shinfo; @@ -96,16 +91,16 @@ int xc_map_domain_meminfo(xc_interface *xch, uint32_t d= omid, return -1; } =20 - if ( xc_core_arch_map_p2m_writable(xch, minfo->guest_width, &info, - live_shinfo, &minfo->p2m_table, - &minfo->p2m_size) ) + if ( xc_core_arch_map_p2m_writable(xch, &_di, &info, + live_shinfo, &minfo->p2m_table) ) { PERROR("Could not map the P2M table"); munmap(live_shinfo, PAGE_SIZE); return -1; } munmap(live_shinfo, PAGE_SIZE); - _di.p2m_size =3D minfo->p2m_size; + minfo->p2m_size =3D _di.p2m_size; + minfo->p2m_frames =3D _di.p2m_frames; =20 /* Make space and prepare for getting the PFN types */ minfo->pfn_type =3D calloc(sizeof(*minfo->pfn_type), minfo->p2m_size); @@ -141,7 +136,7 @@ failed: } if ( minfo->p2m_table ) { - munmap(minfo->p2m_table, P2M_FL_ENTRIES * PAGE_SIZE); + munmap(minfo->p2m_table, minfo->p2m_frames * PAGE_SIZE); minfo->p2m_table =3D NULL; } =20 --=20 2.26.2