From patchwork Thu May 22 09:46:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 30586 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f72.google.com (mail-qg0-f72.google.com [209.85.192.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 531DA20671 for ; Thu, 22 May 2014 09:49:02 +0000 (UTC) Received: by mail-qg0-f72.google.com with SMTP id q108sf7013311qgd.11 for ; Thu, 22 May 2014 02:49:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=Q05mcuHvQB+pju7EbTGHLL70PhXaIo3noESE5p62RTY=; b=TfKNZnbibGeU2qoBUiEVhJo54RMOzBWT3/TZpwRIU+aYxmszoL4kvecxdvMjsp3bca tS2eUWAnd0mciGEE9/fsCVWiJ2bQcby9syEya41qz/Ee8L7HfU+OpR92rJRvGl3m0AT9 e1wDhGRk3FDA/5VMzabz52layTo4AnBhAJ0wWULQZAWP0Dy0ScL2i6LGhcr593LtmQq3 Et5IUOy4r08iQyWvvMzWw+7WG5z3PdFtS8MZmk6l0ZINYOoNVj566H7WdqoGSR6dpZO9 OlzYw7NvdEDAJpyPvYbjl4Y1To/937ez/shWH/eeatFBJWob/6EV/FaldFzP5E+R4eay bb8A== X-Gm-Message-State: ALoCoQkb7cQ7I3k6qUS2BcJL3UwcfHKcmcPkKKKhlme2ubn+OkUplIcEX/c7NcOkbckkwmFMpDCJ X-Received: by 10.236.85.131 with SMTP id u3mr21447480yhe.40.1400752142141; Thu, 22 May 2014 02:49:02 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.97.99 with SMTP id l90ls1261389qge.13.gmail; Thu, 22 May 2014 02:49:02 -0700 (PDT) X-Received: by 10.52.164.113 with SMTP id yp17mr151555vdb.48.1400752142036; Thu, 22 May 2014 02:49:02 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id 3si4534909vcs.47.2014.05.22.02.49.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 22 May 2014 02:49:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id hy4so718206vcb.40 for ; Thu, 22 May 2014 02:49:01 -0700 (PDT) X-Received: by 10.58.207.74 with SMTP id lu10mr47901320vec.15.1400752141903; Thu, 22 May 2014 02:49:01 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp183763vcb; Thu, 22 May 2014 02:49:01 -0700 (PDT) X-Received: by 10.220.98.143 with SMTP id q15mr247530vcn.38.1400752141420; Thu, 22 May 2014 02:49:01 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id cj7si2826579vdb.40.2014.05.22.02.49.00 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 22 May 2014 02:49:01 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WnPai-0005GP-Ad; Thu, 22 May 2014 09:47:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WnPah-0005Et-C6 for xen-devel@lists.xen.org; Thu, 22 May 2014 09:47:11 +0000 Received: from [193.109.254.147:4851] by server-4.bemta-14.messagelabs.com id D0/F2-02781-E97CD735; Thu, 22 May 2014 09:47:10 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1400752028!3138366!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10974 invoked from network); 22 May 2014 09:47:09 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-11.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 22 May 2014 09:47:09 -0000 X-IronPort-AV: E=Sophos;i="4.98,886,1392163200"; d="scan'208";a="133839208" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 22 May 2014 09:46:50 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.3.181.6; Thu, 22 May 2014 05:46:50 -0400 Received: from marilith-n13-p0.uk.xensource.com ([10.80.229.115] helo=localhost.localdomain) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1WnPaL-0000mE-6A; Thu, 22 May 2014 10:46:50 +0100 Received: by localhost.localdomain (sSMTP sendmail emulation); Thu, 22 May 2014 10:46:49 +0100 From: Ian Campbell To: , , , Date: Thu, 22 May 2014 10:46:40 +0100 Message-ID: <1400752004-9731-5-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1400751582.11409.46.camel@kazak.uk.xensource.com> References: <1400751582.11409.46.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH v5 5/9] tools: arm: refactor code to setup guest p2m and fill it with RAM X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: This will help when we have more guest RAM banks. Mostly code motion of the p2m_host initialisation and allocation loop into the new function populate_guest_memory, but in addition in the caller we now initialise the p2m all the INVALID_MFN to handle any holes, although in this patch we still fill in the entire allocated region. Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Ian Jackson --- v4: Moved before "prepare for multiple banks of guest RAM" to allow for refactoring of that patch. Dropped unnecessary !nr_pfns early return from populate_guest_memory. v2: New patch --- tools/libxc/xc_dom_arm.c | 60 +++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 19 deletions(-) diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index 81d5fc7..f663206 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -248,16 +248,48 @@ static int set_mode(xc_interface *xch, domid_t domid, char *guest_type) return rc; } +static int populate_guest_memory(struct xc_dom_image *dom, + xen_pfn_t base_pfn, xen_pfn_t nr_pfns) +{ + int rc; + xen_pfn_t allocsz, pfn; + + DOMPRINTF("%s: populating RAM @ %016"PRIx64"-%016"PRIx64" (%"PRId64"MB)", + __FUNCTION__, + (uint64_t)base_pfn << XC_PAGE_SHIFT, + (uint64_t)(base_pfn + nr_pfns) << XC_PAGE_SHIFT, + (uint64_t)nr_pfns >> (20-XC_PAGE_SHIFT)); + + for ( pfn = 0; pfn < nr_pfns; pfn++ ) + dom->p2m_host[pfn] = base_pfn + pfn; + + for ( pfn = rc = allocsz = 0; (pfn < nr_pfns) && !rc; pfn += allocsz ) + { + allocsz = nr_pfns - pfn; + if ( allocsz > 1024*1024 ) + allocsz = 1024*1024; + + rc = xc_domain_populate_physmap_exact( + dom->xch, dom->guest_domid, allocsz, + 0, 0, &dom->p2m_host[pfn]); + } + + return rc; +} + int arch_setup_meminit(struct xc_dom_image *dom) { int rc; - xen_pfn_t pfn, allocsz, i; + xen_pfn_t pfn; uint64_t modbase; /* Convenient */ const uint64_t rambase = dom->rambase_pfn << XC_PAGE_SHIFT; const uint64_t ramsize = dom->total_pages << XC_PAGE_SHIFT; const uint64_t ramend = rambase + ramsize; + + const xen_pfn_t p2m_size = dom->total_pages; + const uint64_t kernbase = dom->kernel_seg.vstart; const uint64_t kernend = ROUNDUP(dom->kernel_seg.vend, 21/*2MB*/); const uint64_t kernsize = kernend - kernbase; @@ -289,27 +321,17 @@ int arch_setup_meminit(struct xc_dom_image *dom) dom->shadow_enabled = 1; - dom->p2m_host = xc_dom_malloc(dom, sizeof(xen_pfn_t) * dom->total_pages); + dom->p2m_host = xc_dom_malloc(dom, sizeof(xen_pfn_t) * p2m_size); if ( dom->p2m_host == NULL ) return -EINVAL; + for ( pfn = 0; pfn < p2m_size; pfn++ ) + dom->p2m_host[pfn] = INVALID_MFN; - /* setup initial p2m */ - for ( pfn = 0; pfn < dom->total_pages; pfn++ ) - dom->p2m_host[pfn] = pfn + dom->rambase_pfn; - - /* allocate guest memory */ - for ( i = rc = allocsz = 0; - (i < dom->total_pages) && !rc; - i += allocsz ) - { - allocsz = dom->total_pages - i; - if ( allocsz > 1024*1024 ) - allocsz = 1024*1024; - - rc = xc_domain_populate_physmap_exact( - dom->xch, dom->guest_domid, allocsz, - 0, 0, &dom->p2m_host[i]); - } + /* setup initial p2m and allocate guest memory */ + if ((rc = populate_guest_memory(dom, + GUEST_RAM_BASE >> XC_PAGE_SHIFT, + ramsize >> XC_PAGE_SHIFT))) + return rc; /* * We try to place dtb+initrd at 128MB or if we have less RAM