From patchwork Tue Dec 10 14:18:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 22214 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f198.google.com (mail-qc0-f198.google.com [209.85.216.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1537723908 for ; Tue, 10 Dec 2013 14:18:39 +0000 (UTC) Received: by mail-qc0-f198.google.com with SMTP id e9sf9995723qcy.5 for ; Tue, 10 Dec 2013 06:18:38 -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=wAtU7yygm+dsswiupCQK1oIZtkLHIkBaz46nGQTmaBM=; b=myHpJj1eFGGZv0GHy3mMbx6qssSfoPRFIsl16rMv1tGafs+2CVvS9kQi4lVkCcds0G TPwgnWH1eHfc0kzbmsV7dgt4zvQOoStUKwPKlhibq5kaURij4fVRQCuDAi8uJkySQFUh dj5TqytWvD7b0NzduqT0ysrHvqhaW7OoKRzmueoISjn8EMSg45A3JcAS/K+m5JJ8cpOp Vf/e1Ed4OmKBHqk2vTOQPc/22qoJG40DKBwoxT4GGpMD6FweKFNCcReBdVhLvAwlkHKS XMu7cbkJzf3kmNOqklBLN1xyDvyLFzQ7iplx1eFJk9bSi5wPvShl413R2K4HXclPO2yb pefw== X-Gm-Message-State: ALoCoQncUvR4WEwrkikU5hmgoRF6U18AF9bZOSnlWmZwrzvvL5KMIEa08VbxUPoaNdjp9Yl6Qvei X-Received: by 10.58.18.204 with SMTP id y12mr720146ved.36.1386685118916; Tue, 10 Dec 2013 06:18:38 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.27.33 with SMTP id q1ls2410878qeg.80.gmail; Tue, 10 Dec 2013 06:18:38 -0800 (PST) X-Received: by 10.221.58.81 with SMTP id wj17mr27994vcb.38.1386685118693; Tue, 10 Dec 2013 06:18:38 -0800 (PST) Received: from mail-vb0-f43.google.com (mail-vb0-f43.google.com [209.85.212.43]) by mx.google.com with ESMTPS id cx4si5180909vcb.80.2013.12.10.06.18.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Dec 2013 06:18:38 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.43 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.43; Received: by mail-vb0-f43.google.com with SMTP id p6so585142vbe.16 for ; Tue, 10 Dec 2013 06:18:38 -0800 (PST) X-Received: by 10.58.255.233 with SMTP id at9mr974425ved.20.1386685118603; Tue, 10 Dec 2013 06:18:38 -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 u4csp191414vcz; Tue, 10 Dec 2013 06:18:38 -0800 (PST) X-Received: by 10.194.121.133 with SMTP id lk5mr2119640wjb.77.1386685117617; Tue, 10 Dec 2013 06:18:37 -0800 (PST) Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by mx.google.com with ESMTPS id e10si6827725wjb.3.2013.12.10.06.18.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Dec 2013 06:18:37 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.171 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=209.85.212.171; Received: by mail-wi0-f171.google.com with SMTP id bz8so5341426wib.16 for ; Tue, 10 Dec 2013 06:18:37 -0800 (PST) X-Received: by 10.181.11.201 with SMTP id ek9mr19345340wid.54.1386685117183; Tue, 10 Dec 2013 06:18:37 -0800 (PST) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id nb16sm5556779wic.0.2013.12.10.06.18.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Dec 2013 06:18:36 -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 v3 03/10] xen/arm: Implement p2m_type_t as an enum Date: Tue, 10 Dec 2013 14:18:15 +0000 Message-Id: <1386685102-563-4-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1386685102-563-1-git-send-email-julien.grall@linaro.org> References: <1386685102-563-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.43 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: , Until now, Xen doesn't know the type of the page (ram, foreign page, mmio,...). Introduce p2m_type_t with basic types: - p2m_invalid: Nothing is mapped here - p2m_ram_rw: Normal read/write guest RAM - p2m_ram_ro: Read-only guest RAM - p2m_mmio_direct: Read/write mapping of device memory - p2m_map_foreign: RAM page from foreign guest - p2m_grant_map_rw: Read/write grant mapping - p2m_grant_map_ro: Read-only grant mapping Signed-off-by: Julien Grall Acked-by: Ian Campbell --- Changes in v3: - s/ / / - Replace p2m by either pte or p2m entry - Fix compilation (unitialized value) - Add BUILD_BUG_ON (from patch #4) and fix it Changes in v2: - Add comment for future improvement - Add p2m_max_real_type. Will be use later to check the size of the enum - Let the compiler choose the value for each name of the enum - Add grant mapping type --- xen/arch/arm/p2m.c | 2 ++ xen/include/asm-arm/p2m.h | 24 ++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 74636df..691cdfa 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -142,6 +142,8 @@ static lpae_t mfn_to_p2m_entry(unsigned long mfn, unsigned int mattr) .p2m.valid = 1, }; + BUILD_BUG_ON(p2m_max_real_type > (1 << 4)); + ASSERT(!(pa & ~PAGE_MASK)); ASSERT(!(pa & ~PADDR_MASK)); diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 0c554a5..c833c39 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -20,6 +20,25 @@ struct p2m_domain { uint8_t vmid; }; +/* List of possible type for each page in the p2m entry. + * The number of available bit per page in the pte for this purpose is 4 bits. + * So it's possible to only have 16 fields. If we run out of value in the + * future, it's possible to use higher value for pseudo-type and don't store + * them in the p2m entry. + */ +typedef enum { + p2m_invalid = 0, /* Nothing mapped here */ + p2m_ram_rw, /* Normal read/write guest RAM */ + p2m_ram_ro, /* Read-only; writes are silently dropped */ + p2m_mmio_direct, /* Read/write mapping of genuine MMIO area */ + p2m_map_foreign, /* Ram pages from foreign domain */ + p2m_grant_map_rw, /* Read/write grant mapping */ + p2m_grant_map_ro, /* Read-only grant mapping */ + p2m_max_real_type, /* Types after this won't be store in the p2m */ +} p2m_type_t; + +#define p2m_is_foreign(_t) ((_t) == p2m_map_foreign) + /* Initialise vmid allocator */ void p2m_vmid_allocator_init(void); @@ -72,7 +91,6 @@ p2m_pod_decrease_reservation(struct domain *d, unsigned int order); /* Look up a GFN and take a reference count on the backing page. */ -typedef int p2m_type_t; typedef unsigned int p2m_query_t; #define P2M_ALLOC (1u<<0) /* Populate PoD and paged-out entries */ #define P2M_UNSHARE (1u<<1) /* Break CoW sharing */ @@ -83,6 +101,9 @@ static inline struct page_info *get_page_from_gfn( struct page_info *page; unsigned long mfn = gmfn_to_mfn(d, gfn); + if ( t ) + *t = p2m_invalid; + if (!mfn_valid(mfn)) return NULL; page = mfn_to_page(mfn); @@ -108,7 +129,6 @@ static inline int get_page_and_type(struct page_info *page, return rc; } -#define p2m_is_foreign(_t) (0 && (_t)) static inline int xenmem_rem_foreign_from_p2m(struct domain *d, unsigned long gpfn) {