From patchwork Fri Dec 13 19:37:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 22360 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f70.google.com (mail-vb0-f70.google.com [209.85.212.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6A46A202E2 for ; Fri, 13 Dec 2013 19:38:20 +0000 (UTC) Received: by mail-vb0-f70.google.com with SMTP id w5sf3996178vbf.1 for ; Fri, 13 Dec 2013 11:38:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=sdwuglbb5y1wufO6lvFviH4E8pCXkI4JmBoHEUyUSRQ=; b=YsPdevQ89ITvoexptd6B8BTb3T/++en6nn+OfNRKTvyFqhWNkbakNlnk0UuHHj3vqi P5Poc7ZPyIx+9xn72iKzePXtRXVKScryyfc+fLrtPkEqf7piVeBXIH3ON9Z8+yDXDoxR eVNCuGn17gPEd1KcVdibDQsz76fhg6nWrVSrxtMjAsJ0AFt883FtBLKnZLoFhD5pGqua 0QdOY2nnGVggVmygMVE96dRZeNHJjECLlACdOo4uNPpXL7O4hsb75OHSC33vn3gd6jsn 1snI8Nk3Hcr2S4HN52i4meByOWlYD9Uw01hvdqy+aKfYeWS5qZL0YNFBQLBNT9n5VtkN VljA== X-Gm-Message-State: ALoCoQmGxehqnjjkcMu0mO4k0ZW3/dG3d4GCdEaJLFrbf8t+8s4RMzxRN1rd6d0BQzLUkp/P0FeK X-Received: by 10.224.14.79 with SMTP id f15mr1568207qaa.7.1386963499947; Fri, 13 Dec 2013 11:38:19 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.24.174 with SMTP id v14ls1075900qef.74.gmail; Fri, 13 Dec 2013 11:38:19 -0800 (PST) X-Received: by 10.221.18.70 with SMTP id qf6mr1957135vcb.37.1386963499851; Fri, 13 Dec 2013 11:38:19 -0800 (PST) Received: from mail-vb0-f54.google.com (mail-vb0-f54.google.com [209.85.212.54]) by mx.google.com with ESMTPS id df13si148359vec.72.2013.12.13.11.38.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 11:38:19 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.54 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.54; Received: by mail-vb0-f54.google.com with SMTP id g10so1590464vbg.41 for ; Fri, 13 Dec 2013 11:38:19 -0800 (PST) X-Received: by 10.220.199.5 with SMTP id eq5mr2019503vcb.16.1386963499794; Fri, 13 Dec 2013 11:38:19 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp64198vcz; Fri, 13 Dec 2013 11:38:19 -0800 (PST) X-Received: by 10.152.1.100 with SMTP id 4mr24427lal.90.1386963498733; Fri, 13 Dec 2013 11:38:18 -0800 (PST) Received: from mail-ea0-f173.google.com (mail-ea0-f173.google.com [209.85.215.173]) by mx.google.com with ESMTPS id p46si3126586eem.210.2013.12.13.11.38.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 11:38:18 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.173 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=209.85.215.173; Received: by mail-ea0-f173.google.com with SMTP id o10so1058816eaj.18 for ; Fri, 13 Dec 2013 11:38:18 -0800 (PST) X-Received: by 10.14.22.5 with SMTP id s5mr179522ees.115.1386963498130; Fri, 13 Dec 2013 11:38:18 -0800 (PST) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id m1sm10199792eeg.0.2013.12.13.11.38.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Dec 2013 11:38:16 -0800 (PST) From: Julien Grall To: xen-devel@lists.xenproject.org Cc: patches@linaro.org, ian.campbell@citrix.com, tim@xen.org, stefano.stabellini@citrix.com, Julien Grall Subject: [PATCH v4 07/11] xen/arm: Retrieve p2m type in get_page_from_gfn Date: Fri, 13 Dec 2013 19:37:37 +0000 Message-Id: <1386963461-6520-8-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1386963461-6520-1-git-send-email-julien.grall@linaro.org> References: <1386963461-6520-1-git-send-email-julien.grall@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.54 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 Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Signed-off-by: Julien Grall --- Changes in v3: - Return NULL when p2m type is invalid or mmio Changes in v2: - Use p2m_lookup as p2m_get_entry was removed --- xen/include/asm-arm/p2m.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 9d0d1e7..0eb07a8 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -109,11 +109,17 @@ static inline struct page_info *get_page_from_gfn( struct domain *d, unsigned long gfn, p2m_type_t *t, p2m_query_t q) { struct page_info *page; - unsigned long mfn = gmfn_to_mfn(d, gfn); + p2m_type_t p2mt; + paddr_t maddr = p2m_lookup(d, pfn_to_paddr(gfn), &p2mt); + unsigned long mfn = maddr >> PAGE_SHIFT; - ASSERT(t == NULL); + if (t) + *t = p2mt; - if (!mfn_valid(mfn)) + if ( p2mt == p2m_invalid || p2mt == p2m_mmio_direct ) + return NULL; + + if ( !mfn_valid(mfn) ) return NULL; page = mfn_to_page(mfn); if ( !get_page(page, d) )