From patchwork Wed Jul 9 12:07:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 33292 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f69.google.com (mail-qg0-f69.google.com [209.85.192.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 01332203F4 for ; Wed, 9 Jul 2014 12:09:41 +0000 (UTC) Received: by mail-qg0-f69.google.com with SMTP id j107sf16993329qga.0 for ; Wed, 09 Jul 2014 05:09:41 -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=GxmsB0k277J/nfvfMHEEQYzK83bjUGnrd+E94Jz00Yk=; b=S2pk6z1/o9o+CM0NstTkXLcunVlDa48RxkLdunrusZCNxKnwoELFHMlKUGCVA/0oqN UzPwuqECIjc5rz3jdnjUy+NjX1bkFwyv8RIcsBWB5iSEvU6oF8X3rTaFugG75rlGoeYM sfIQ4TbJ90982C/EZpCGCoqkn/TE2hJDMwzF+FZ5m5sdEiykIvCPlVxoWSijunieaDTF Kn7F6u3yjqcONrdxogH4BIHCDGTR59VVKqMm/GLGMeP2tBCJ5XVHGPBOnBjzsNlc3N2n CRE68MNQnrJCY+0wKLQJ/hjkHJ4AlvuzdZVNHgUS6H4O2wNGQdGnyf50BPLD5qSXNpbV FMMw== X-Gm-Message-State: ALoCoQkg64VfzDIfgOLpHKPJ14d42tY7226vqINhsV8l5Xm5TA10xX9tx6pofzNv6Q6MQTFJpafw X-Received: by 10.224.41.74 with SMTP id n10mr19748586qae.1.1404907781803; Wed, 09 Jul 2014 05:09:41 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.91.86 with SMTP id y80ls2575017qgd.0.gmail; Wed, 09 Jul 2014 05:09:41 -0700 (PDT) X-Received: by 10.52.244.138 with SMTP id xg10mr1547972vdc.40.1404907781735; Wed, 09 Jul 2014 05:09:41 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id xv6si665635vdc.77.2014.07.09.05.09.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Jul 2014 05:09:41 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.172 as permitted sender) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id db12so2411615veb.17 for ; Wed, 09 Jul 2014 05:09:41 -0700 (PDT) X-Received: by 10.220.122.132 with SMTP id l4mr45529vcr.41.1404907781502; Wed, 09 Jul 2014 05:09:41 -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 tc5csp41963vcb; Wed, 9 Jul 2014 05:09:41 -0700 (PDT) X-Received: by 10.224.167.7 with SMTP id o7mr69193554qay.53.1404907781025; Wed, 09 Jul 2014 05:09:41 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id t47si36522671qge.73.2014.07.09.05.09.40 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 09 Jul 2014 05:09:41 -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 1X4qfJ-0006MB-1q; Wed, 09 Jul 2014 12:08:01 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X4qfC-0006Jl-TI for xen-devel@lists.xen.org; Wed, 09 Jul 2014 12:07:55 +0000 Received: from [85.158.143.35:19893] by server-2.bemta-4.messagelabs.com id CD/7A-18579-A903DB35; Wed, 09 Jul 2014 12:07:54 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1404907669!16872645!4 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 23700 invoked from network); 9 Jul 2014 12:07:53 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 9 Jul 2014 12:07:53 -0000 X-IronPort-AV: E=Sophos;i="5.01,631,1400025600"; d="scan'208";a="151203277" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 09 Jul 2014 12:07:53 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Wed, 9 Jul 2014 08:07:52 -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 1X4qf9-00010z-HJ; Wed, 09 Jul 2014 13:07:52 +0100 Received: by localhost.localdomain (sSMTP sendmail emulation); Wed, 09 Jul 2014 13:07:51 +0100 From: Ian Campbell To: Date: Wed, 9 Jul 2014 13:07:43 +0100 Message-ID: <1404907666-8594-5-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1404907608.16789.18.camel@kazak.uk.xensource.com> References: <1404907608.16789.18.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: julien.grall@linaro.org, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH v5 5/8] xen: arm: handle superpage mappings in p2m_lookup 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.128.172 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: Currently none are actually created, but they will be shortly. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index ea05b6d..8a6d295 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -123,6 +123,7 @@ paddr_t p2m_lookup(struct domain *d, paddr_t paddr, p2m_type_t *t) struct p2m_domain *p2m = &d->arch.p2m; lpae_t pte, *first = NULL, *second = NULL, *third = NULL; paddr_t maddr = INVALID_PADDR; + paddr_t mask; p2m_type_t _t; /* Allow t to be NULL */ @@ -136,15 +137,21 @@ paddr_t p2m_lookup(struct domain *d, paddr_t paddr, p2m_type_t *t) if ( !first ) goto err; + mask = FIRST_MASK; pte = first[first_table_offset(paddr)]; if ( !pte.p2m.valid || !pte.p2m.table ) goto done; + mask = SECOND_MASK; second = map_domain_page(pte.p2m.base); pte = second[second_table_offset(paddr)]; if ( !pte.p2m.valid || !pte.p2m.table ) goto done; + mask = THIRD_MASK; + + BUILD_BUG_ON(THIRD_MASK != PAGE_MASK); + third = map_domain_page(pte.p2m.base); pte = third[third_table_offset(paddr)]; @@ -156,7 +163,7 @@ done: if ( pte.p2m.valid ) { ASSERT(pte.p2m.type != p2m_invalid); - maddr = (pte.bits & PADDR_MASK & PAGE_MASK) | (paddr & ~PAGE_MASK); + maddr = (pte.bits & PADDR_MASK & mask) | (paddr & ~mask); *t = pte.p2m.type; }