From patchwork Wed Apr 2 12:04:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 27615 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f72.google.com (mail-yh0-f72.google.com [209.85.213.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7006E20341 for ; Wed, 2 Apr 2014 12:07:39 +0000 (UTC) Received: by mail-yh0-f72.google.com with SMTP id f10sf218245yha.11 for ; Wed, 02 Apr 2014 05:07:39 -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:message-id:from:to:date:in-reply-to :references:organization: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=h/ITn1Qecnyt0C2iKkLGQL29BrkwQB7srS/iUT0CVyc=; b=M2VPmBEWwFY9gzCo2zYroBsX1oMUcLFBEpqrxMApv2iHVn6fsvm/PfbvCDdoOs/trA ofimrjl802EweEKUdmsEWHedfAD8nDSm3K/je5Op+6sDhgmuu5d34H0oDsZJAlJJsmRD 7463Z0zvB52L6PHhVabaIrm01V4ynOWnYBCym/PPmHaIuV+vRhvz4r6ccqq5FhTczHoI JB1NWHZS1PfM9s4gB0AxhPR4OjsiF4u/ugy0wB1dEn7cMora+HEHYTy7SsOOWt8cylHs 4ArVaM9/BIUiwl3YXNixkCMaRSWwnfgPULRXtXlFexiVg3wn3jnKDBpZGC1iRz39//1W Oaew== X-Gm-Message-State: ALoCoQln9b9VQxiNKYmDm2M2fRj1o9eltM5GlaGoMZ+VETrNTGOh7RzeR/85V0dgyyIUsnSu8TKM X-Received: by 10.236.25.175 with SMTP id z35mr14319243yhz.32.1396440458962; Wed, 02 Apr 2014 05:07:38 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.105.161 with SMTP id c30ls294620qgf.88.gmail; Wed, 02 Apr 2014 05:07:38 -0700 (PDT) X-Received: by 10.52.240.140 with SMTP id wa12mr140502vdc.52.1396440458899; Wed, 02 Apr 2014 05:07:38 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id wy9si485579vdc.19.2014.04.02.05.07.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Apr 2014 05:07:38 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id il7so120528vcb.32 for ; Wed, 02 Apr 2014 05:07:38 -0700 (PDT) X-Received: by 10.52.26.161 with SMTP id m1mr168704vdg.24.1396440458807; Wed, 02 Apr 2014 05:07:38 -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.12.8 with SMTP id v8csp317099vcv; Wed, 2 Apr 2014 05:07:38 -0700 (PDT) X-Received: by 10.50.62.104 with SMTP id x8mr926578igr.37.1396440458162; Wed, 02 Apr 2014 05:07:38 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id d7si5068307igr.14.2014.04.02.05.07.37 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 02 Apr 2014 05:07:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) 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 1WVJuE-0000m1-3c; Wed, 02 Apr 2014 12:04:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WVJuC-0000ls-ME for xen-devel@lists.xen.org; Wed, 02 Apr 2014 12:04:32 +0000 Received: from [85.158.137.68:59105] by server-6.bemta-3.messagelabs.com id CA/E7-00470-FCCFB335; Wed, 02 Apr 2014 12:04:31 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1396440269!4559689!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.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17391 invoked from network); 2 Apr 2014 12:04:31 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-6.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 2 Apr 2014 12:04:31 -0000 X-IronPort-AV: E=Sophos;i="4.97,780,1389744000"; d="scan'208";a="116054683" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 02 Apr 2014 12:04:29 +0000 Received: from [10.80.2.80] (10.80.2.80) by FTLPEX01CL02.citrite.net (10.13.107.79) with Microsoft SMTP Server id 14.2.342.4; Wed, 2 Apr 2014 08:04:29 -0400 Message-ID: <1396440267.8667.327.camel@kazak.uk.xensource.com> From: Ian Campbell To: Julien Grall Date: Wed, 2 Apr 2014 13:04:27 +0100 In-Reply-To: <1390831566.12230.30.camel@kazak.uk.xensource.com> References: <1389327171-3685-1-git-send-email-karim.allah.ahmed@gmail.com> <1389368924.6423.17.camel@kazak.uk.xensource.com> <1389696705.9887.52.camel@kazak.uk.xensource.com> <52E29EB9.7020906@linaro.org> <1390831566.12230.30.camel@kazak.uk.xensource.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.8.5-2+b3 MIME-Version: 1.0 X-Originating-IP: [10.80.2.80] X-DLP: MIA2 Cc: stefano.stabellini@citrix.com, tim@xen.org, xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH] Revert "xen/arm: Allocate memory for dom0 from the bottom with the 1:1 Workaround" 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=neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: On Mon, 2014-01-27 at 14:06 +0000, Ian Campbell wrote: > On Fri, 2014-01-24 at 17:11 +0000, Julien Grall wrote: > > On 01/14/2014 10:51 AM, Ian Campbell wrote: > > > I think this problem is now fixed upstream, the intention was to > > > eventually revert the workaround (Julien was going to tell me when it > > > had gone into stable etc, but this is now a 4.5 era revert candidate). > > > > The patch was merged for 3.13. > > Thanks. I don't think we can revert for 4.4 now, but lets revisit for > 4.5. So should we revert commit 6c21cb36e263de2db8716b477157a5b6cd531e1e Author: Julien Grall Date: Tue Oct 22 11:51:48 2013 +0100 xen/arm: Allocate memory for dom0 from the bottom with the 1:1 Workaround Now? ------8<---------------- >From 2e688b06954663f8ff7bc72e5bcf6a823090af9a Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 2 Apr 2014 13:03:36 +0100 Subject: [PATCH] Revert "xen/arm: Allocate memory for dom0 from the bottom with the 1:1 Workaround" This reverts commit 6c21cb36e263de2db8716b477157a5b6cd531e1e. The Linux = issue which this works around was fixed in v3.13. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 502db84..a0b73d2 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -69,19 +69,12 @@ static void allocate_memory_11(struct domain *d, struct kernel_info *kinfo) { paddr_t start; paddr_t size; - struct page_info *pg = NULL; + struct page_info *pg; unsigned int order = get_order_from_bytes(dom0_mem); int res; paddr_t spfn; - unsigned int bits; - - for ( bits = PAGE_SHIFT + 1; bits < PADDR_BITS; bits++ ) - { - pg = alloc_domheap_pages(d, order, MEMF_bits(bits)); - if ( pg != NULL ) - break; - } + pg = alloc_domheap_pages(d, order, 0); if ( !pg ) panic("Failed to allocate contiguous memory for dom0");