From patchwork Thu Dec 17 16:31:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 7874281 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A62B8BEEE5 for ; Thu, 17 Dec 2015 16:36:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BB1F020444 for ; Thu, 17 Dec 2015 16:36:25 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DB1A12040F for ; Thu, 17 Dec 2015 16:36:24 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9bUo-00038C-Cg; Thu, 17 Dec 2015 16:33:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9bUn-00037Y-5a for xen-devel@lists.xenproject.org; Thu, 17 Dec 2015 16:33:37 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 60/73-31069-0E3E2765; Thu, 17 Dec 2015 16:33:36 +0000 X-Env-Sender: prvs=78612b3c6=julien.grall@citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1450370013!3927748!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 57809 invoked from network); 17 Dec 2015 16:33:35 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-16.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 17 Dec 2015 16:33:35 -0000 X-IronPort-AV: E=Sophos;i="5.20,441,1444694400"; d="scan'208";a="320056725" From: Julien Grall To: Date: Thu, 17 Dec 2015 16:31:57 +0000 Message-ID: <1450369919-22989-2-git-send-email-julien.grall@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1450369919-22989-1-git-send-email-julien.grall@citrix.com> References: <1450369919-22989-1-git-send-email-julien.grall@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Keir Fraser , ian.campbell@citrix.com, stefano.stabellini@eu.citrix.com, Tim Deegan , Ian Jackson , Julien Grall , Jan Beulich Subject: [Xen-devel] [RFC 1/3] xen/common: memory: Introduce check_range_domain_direct_mapped X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This function will be used in various place to check a given set of contiguous MFN belongs to a direct domain guest. Signed-off-by: Julien Grall --- Cc: Ian Campbell Cc: Ian Jackson Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan --- xen/common/memory.c | 62 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 9ff1145..ac707e9 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -89,6 +89,42 @@ static unsigned int max_order(const struct domain *d) return min(order, MAX_ORDER + 0U); } +/* + * Direct mapped domain has the property gpfn == mfn for RAM region. + * + * Check if a given contiguous set of MFN belongs to the guest. + */ +static bool_t check_range_domain_direct_mapped(struct domain *d, + xen_pfn_t gpfn, + unsigned int order) +{ + unsigned long i; + struct page_info *page; + + ASSERT(is_domain_direct_mapped(d)); + + for ( i = 0; i < (1U << order); i++, gpfn++ ) + { + if ( !mfn_valid(gpfn) ) + { + gdprintk(XENLOG_INFO, "Invalid mfn %#"PRI_xen_pfn"\n", gpfn); + return 0; + } + + page = mfn_to_page(gpfn); + if ( !get_page(page, d) ) + { + gdprintk(XENLOG_INFO, + "mfn %#"PRI_xen_pfn" doesn't belong to d%d\n", gpfn, + d->domain_id); + return 0; + } + put_page(page); + } + + return 1; +} + static void increase_reservation(struct memop_args *a) { struct page_info *page; @@ -171,30 +207,12 @@ static void populate_physmap(struct memop_args *a) { if ( is_domain_direct_mapped(d) ) { - mfn = gpfn; - - for ( j = 0; j < (1U << a->extent_order); j++, mfn++ ) - { - if ( !mfn_valid(mfn) ) - { - gdprintk(XENLOG_INFO, "Invalid mfn %#"PRI_xen_pfn"\n", - mfn); - goto out; - } - - page = mfn_to_page(mfn); - if ( !get_page(page, d) ) - { - gdprintk(XENLOG_INFO, - "mfn %#"PRI_xen_pfn" doesn't belong to d%d\n", - mfn, d->domain_id); - goto out; - } - put_page(page); - } + if ( !check_range_domain_direct_mapped(d, gpfn, + a->extent_order) ) + goto out; + /* For direct mapped domain mfn == gpfn */ mfn = gpfn; - page = mfn_to_page(mfn); } else {