From nobody Mon Feb 9 06:17:27 2026 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1557850512; cv=none; d=zoho.com; s=zohoarc; b=GNuyxcGtWgUNwdbVwIgHzKZlFjEXZwe1TB+ixPPhml414wCMhfGOnQ9Du90PkPoK+f0GFh2wcbIT/wnNqEj2MgC13QUgNbKUE/+TihnOLHSBUb0yUcsGAWoPD5A11SYui/ZqP5Y/Qz1ag7h6T4FDI7Df93oRyNGzpoYx2AW6Z4Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557850512; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=+/Sm9iOOpIDF5k+1WDqlMz9x6aW9I0FNoDmEyEwDIuM=; b=Qgskdo2CzhaC4wTt9TZnS81dWGZGJOvha1+L7gJO9h2JITttUOVogf2LUNsvlvC7gqJ6721XNbT37B0+TPMzPhbGz3rX3Ch/ji30Cm72/7ipPqdfbhu4SR+iE4l0WEibA0CSSKs44SIByJNUlJPhoGm/AuWFgkkqsLMFar5rPI0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1557850512843824.6523620139253; Tue, 14 May 2019 09:15:12 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hQa47-0001ce-9o; Tue, 14 May 2019 16:14:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hQa46-0001cY-BH for xen-devel@lists.xenproject.org; Tue, 14 May 2019 16:14:06 +0000 Received: from mx01.bbu.dsd.mx.bitdefender.com (unknown [91.199.104.161]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 49835262-7663-11e9-b693-b7b8ae3e16fb; Tue, 14 May 2019 16:14:02 +0000 (UTC) Received: from smtp.bitdefender.com (smtp01.buh.bitdefender.com [10.17.80.75]) by mx01.bbu.dsd.mx.bitdefender.com (Postfix) with ESMTPS id 62AD33031EDB; Tue, 14 May 2019 19:14:01 +0300 (EEST) Received: from rcojocaru.npunix.bitdefender.biz (unknown [10.17.12.174]) by smtp.bitdefender.com (Postfix) with ESMTPSA id 46BD8306E477; Tue, 14 May 2019 19:14:01 +0300 (EEST) X-Inumbo-ID: 49835262-7663-11e9-b693-b7b8ae3e16fb From: Razvan Cojocaru To: xen-devel@lists.xenproject.org Date: Tue, 14 May 2019 19:13:57 +0300 Message-Id: <1557850437-27656-1-git-send-email-rcojocaru@bitdefender.com> X-Mailer: git-send-email 2.7.4 Subject: [Xen-devel] [PATCH] x86/altp2m: move altp2m_get_effective_entry() under CONFIG_HVM X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: wei.liu2@citrix.com, Razvan Cojocaru , george.dunlap@eu.citrix.com, andrew.cooper3@citrix.com, jbeulich@suse.com, roger.pau@citrix.com MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" All its callers live inside #ifdef CONFIG_HVM sections. Signed-off-by: Razvan Cojocaru Acked-by: George Dunlap Reviewed-by: Wei Liu --- xen/arch/x86/mm/p2m.c | 72 +++++++++++++++++++++++--------------------= ---- xen/include/asm-x86/p2m.h | 2 ++ 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index cc6661e..57c5eed 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -478,42 +478,6 @@ void p2m_unlock_and_tlb_flush(struct p2m_domain *p2m) mm_write_unlock(&p2m->lock); } =20 -int altp2m_get_effective_entry(struct p2m_domain *ap2m, gfn_t gfn, mfn_t *= mfn, - p2m_type_t *t, p2m_access_t *a, - bool prepopulate) -{ - *mfn =3D ap2m->get_entry(ap2m, gfn, t, a, 0, NULL, NULL); - - /* Check host p2m if no valid entry in alternate */ - if ( !mfn_valid(*mfn) && !p2m_is_hostp2m(ap2m) ) - { - struct p2m_domain *hp2m =3D p2m_get_hostp2m(ap2m->domain); - unsigned int page_order; - int rc; - - *mfn =3D __get_gfn_type_access(hp2m, gfn_x(gfn), t, a, - P2M_ALLOC | P2M_UNSHARE, &page_order,= 0); - - rc =3D -ESRCH; - if ( !mfn_valid(*mfn) || *t !=3D p2m_ram_rw ) - return rc; - - /* If this is a superpage, copy that first */ - if ( prepopulate && page_order !=3D PAGE_ORDER_4K ) - { - unsigned long mask =3D ~((1UL << page_order) - 1); - gfn_t gfn_aligned =3D _gfn(gfn_x(gfn) & mask); - mfn_t mfn_aligned =3D _mfn(mfn_x(*mfn) & mask); - - rc =3D ap2m->set_entry(ap2m, gfn_aligned, mfn_aligned, page_or= der, *t, *a, 1); - if ( rc ) - return rc; - } - } - - return 0; -} - mfn_t __get_gfn_type_access(struct p2m_domain *p2m, unsigned long gfn_l, p2m_type_t *t, p2m_access_t *a, p2m_query_t q, unsigned int *page_order, bool_t locked) @@ -2378,6 +2342,42 @@ int unmap_mmio_regions(struct domain *d, =20 #ifdef CONFIG_HVM =20 +int altp2m_get_effective_entry(struct p2m_domain *ap2m, gfn_t gfn, mfn_t *= mfn, + p2m_type_t *t, p2m_access_t *a, + bool prepopulate) +{ + *mfn =3D ap2m->get_entry(ap2m, gfn, t, a, 0, NULL, NULL); + + /* Check host p2m if no valid entry in alternate */ + if ( !mfn_valid(*mfn) && !p2m_is_hostp2m(ap2m) ) + { + struct p2m_domain *hp2m =3D p2m_get_hostp2m(ap2m->domain); + unsigned int page_order; + int rc; + + *mfn =3D __get_gfn_type_access(hp2m, gfn_x(gfn), t, a, + P2M_ALLOC | P2M_UNSHARE, &page_order,= 0); + + rc =3D -ESRCH; + if ( !mfn_valid(*mfn) || *t !=3D p2m_ram_rw ) + return rc; + + /* If this is a superpage, copy that first */ + if ( prepopulate && page_order !=3D PAGE_ORDER_4K ) + { + unsigned long mask =3D ~((1UL << page_order) - 1); + gfn_t gfn_aligned =3D _gfn(gfn_x(gfn) & mask); + mfn_t mfn_aligned =3D _mfn(mfn_x(*mfn) & mask); + + rc =3D ap2m->set_entry(ap2m, gfn_aligned, mfn_aligned, page_or= der, *t, *a, 1); + if ( rc ) + return rc; + } + } + + return 0; +} + void p2m_altp2m_check(struct vcpu *v, uint16_t idx) { if ( altp2m_active(v->domain) ) diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 2d0bda1..7e71bf0 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -514,6 +514,7 @@ static inline unsigned long mfn_to_gfn(struct domain *d= , mfn_t mfn) return mfn_x(mfn); } =20 +#ifdef CONFIG_HVM #define AP2MGET_prepopulate true #define AP2MGET_query false =20 @@ -525,6 +526,7 @@ static inline unsigned long mfn_to_gfn(struct domain *d= , mfn_t mfn) int altp2m_get_effective_entry(struct p2m_domain *ap2m, gfn_t gfn, mfn_t *= mfn, p2m_type_t *t, p2m_access_t *a, bool prepopulate); +#endif =20 /* Deadlock-avoidance scheme when calling get_gfn on different gfn's */ struct two_gfns { --=20 2.7.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel