From patchwork Wed Jul 23 16:45:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 34167 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EBA492061E for ; Wed, 23 Jul 2014 16:48:09 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id y10sf9235160pdj.8 for ; Wed, 23 Jul 2014 09:48:09 -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 :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=ii8VCYsRi3PNOaMKoS5Em/bon0VlTilmaTHIqSvgFFk=; b=OQp7xQizxFaQ1bLFDvymekBKGSD+3gHhkD+qOrK2jYBfZwuLHLwc2/k73QIaEZYUZa R/cmxNSYdX3tKP9WqtHHF0ryA3vlYv37tXaiOCelIv+fsFilLI/TgS4+FY4obEMiAdEJ 32yNN0ZzjzpYTOAx2tk04p7CG+8n8TU4DWZHbx4umYcwrd00CdVFySuN7joLFcOIEVOD coaGn4cfd/QIVrhuFm25TJqmCnmqfr5v+pL8QkedNNGwNn3BT3GltE75r9KoP9myzv1/ adqJS/Q6pWAx3z7TphPqXsGYNW7t6PpcyZ7tyNM7/n7qOADSuSHTNNMiKSgLrHTUiYkI 3eUw== X-Gm-Message-State: ALoCoQll06HNCehsO+DJBFuFWFrPy6dyPbiKIGnqWoDBur1uwJtee1atTZJVmAGJxn+dv3c7y7r0 X-Received: by 10.68.135.99 with SMTP id pr3mr1209133pbb.9.1406134086942; Wed, 23 Jul 2014 09:48:06 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.85.213 with SMTP id n79ls430040qgd.29.gmail; Wed, 23 Jul 2014 09:48:06 -0700 (PDT) X-Received: by 10.52.186.103 with SMTP id fj7mr3259901vdc.53.1406134086794; Wed, 23 Jul 2014 09:48:06 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id kj3si2728337veb.59.2014.07.23.09.48.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Jul 2014 09:48:06 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id hy4so2616251vcb.22 for ; Wed, 23 Jul 2014 09:48:06 -0700 (PDT) X-Received: by 10.52.244.138 with SMTP id xg10mr3430661vdc.40.1406134086378; Wed, 23 Jul 2014 09:48:06 -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.221.37.5 with SMTP id tc5csp295464vcb; Wed, 23 Jul 2014 09:48:05 -0700 (PDT) X-Received: by 10.50.164.202 with SMTP id ys10mr5629201igb.6.1406134075679; Wed, 23 Jul 2014 09:47:55 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id h15si12263538igt.51.2014.07.23.09.47.36 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 23 Jul 2014 09:47:55 -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 1X9zfc-0002vf-Ol; Wed, 23 Jul 2014 16:45:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9zfa-0002vX-UZ for xen-devel@lists.xen.org; Wed, 23 Jul 2014 16:45:35 +0000 Received: from [85.158.139.211:61332] by server-11.bemta-5.messagelabs.com id FB/56-31757-EA6EFC35; Wed, 23 Jul 2014 16:45:34 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1406133932!11884454!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16301 invoked from network); 23 Jul 2014 16:45:33 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-10.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 23 Jul 2014 16:45:33 -0000 X-IronPort-AV: E=Sophos;i="5.01,718,1400025600"; d="scan'208";a="155009312" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 23 Jul 2014 16:45:32 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Wed, 23 Jul 2014 12:45:31 -0400 Received: from drall.uk.xensource.com ([10.80.16.71]) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1X9zfW-0007Vp-8N; Wed, 23 Jul 2014 17:45:31 +0100 Received: by drall.uk.xensource.com (sSMTP sendmail emulation); Wed, 23 Jul 2014 17:45:30 +0100 From: Ian Campbell To: Date: Wed, 23 Jul 2014 17:45:30 +0100 Message-ID: <0dddfee6c0817bd548ed4f8c69d7032455eec5a9.1406133930.git.ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell , stefano.stabellini@eu.citrix.com, julien.grall@linaro.org, tim@xen.org, Roy Franz , Fu Wei Subject: [Xen-devel] [PATCH] xen: arm: don't release modules which aren't in RAM into the heap 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.177 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: They might be in e.g. flash or something but more likely they could bein a bank of RAM which we aren't handling or in RAM which the bootloader hasn't told us about for some reason. Signed-off-by: Ian Campbell Cc: Fu Wei Cc: Roy Franz Acked-by: Julien Grall --- xen/arch/arm/setup.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index e53e491..446b4dc 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -247,8 +247,13 @@ void __init discard_initial_modules(void) paddr_t s = mi->module[i].start; paddr_t e = s + PAGE_ALIGN(mi->module[i].size); - if ( mi->module[i].kind != BOOTMOD_XEN ) - dt_unreserved_regions(s, e, init_domheap_pages, 0); + if ( mi->module[i].kind == BOOTMOD_XEN ) + continue; + + if ( !mfn_valid(paddr_to_pfn(s)) || !mfn_valid(paddr_to_pfn(e))) + continue; + + dt_unreserved_regions(s, e, init_domheap_pages, 0); } mi->nr_mods = 0;