From patchwork Thu Jul 28 14:20:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 72961 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp880545qga; Thu, 28 Jul 2016 07:24:39 -0700 (PDT) X-Received: by 10.36.86.134 with SMTP id o128mr41732555itb.5.1469715877342; Thu, 28 Jul 2016 07:24:37 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id v11si13332621ith.30.2016.07.28.07.24.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jul 2016 07:24:37 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bSmAs-00079R-1y; Thu, 28 Jul 2016 14:20:34 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bSmAr-00078F-K1 for xen-devel@lists.xen.org; Thu, 28 Jul 2016 14:20:33 +0000 Received: from [85.158.143.35] by server-4.bemta-6.messagelabs.com id 11/D3-07858-1B41A975; Thu, 28 Jul 2016 14:20:33 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRWlGSWpSXmKPExsVysyfVTXeDyKx wg/W/ZCyWfFzM4sDocXT3b6YAxijWzLyk/IoE1ozdE6IL/jtVbLt0jrWB8ZR2FyMXh5DAJkaJ 2Zvus0E4pxklpq+cwdTFyMnBJqApcefzJzBbREBa4trny4wgRcwC7YwSa/t7mUESwgIREnN/z 2XtYuTgYBFQleiYYAIS5hVwlpi8bAkjiC0hICdx8thkVhCbU8BF4l7bdzBbCKjm9N3t7BMYuR cwMqxiVC9OLSpLLdI11ksqykzPKMlNzMzRNTQw08tNLS5OTE/NSUwq1kvOz93ECPQuAxDsYOz 453SIUZKDSUmUNyx0ZrgQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCd4TwrPChQSLUtNTK9Iyc4Bh BpOW4OBREuGNBEnzFhck5hZnpkOkTjEqSonz5oIkBEASGaV5cG2w0L7EKCslzMsIdIgQT0FqU W5mCar8K0ZxDkYlYd5XIFN4MvNK4Ka/AlrMBLS4OHYGyOKSRISUVANjU15GZ6rzaauN/Fbut8 N/XXwrUVHYcNy5Tm7GdiO/9+F7FqdvT7mlb6kvZbCj7d5yTsX8O9sXliwKPVc1f92k0HeON1T ltgYcWRgvK1BYu67U/MueFTK8L0Lz6qv32h+2OzuzbuMr8+IbbyNk/k1RWKTB174rqo6xf4II G+ui57d4v/Xu776rxFKckWioxVxUnAgAVhQ1c2gCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1469715631!26170011!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43603 invoked from network); 28 Jul 2016 14:20:32 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-12.tower-21.messagelabs.com with SMTP; 28 Jul 2016 14:20:32 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BC29AB7F; Thu, 28 Jul 2016 07:21:48 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.218.32]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8D2BE3F21A; Thu, 28 Jul 2016 07:20:30 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Thu, 28 Jul 2016 15:20:09 +0100 Message-Id: <1469715620-4670-5-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1469715620-4670-1-git-send-email-julien.grall@arm.com> References: <1469715620-4670-1-git-send-email-julien.grall@arm.com> Cc: proskurin@sec.in.tum.de, Julien Grall , sstabellini@kernel.org, steve.capper@arm.com, wei.chen@linaro.org Subject: [Xen-devel] [PATCH v2 04/15] xen/arm: p2m: Find the memory attributes based on the p2m type X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" Currently, mfn_to_p2m_entry is relying on the caller to provide the correct memory attribute and will deduce the sharability based on it. Some of the callers, such as p2m_create_table, are using same memory attribute regardless the underlying p2m type. For instance, this will lead to use change the memory attribute from MATTR_DEV to MATTR_MEM when a MMIO superpage is shattered. Furthermore, it makes more difficult to support different shareability with the same memory attribute. All the memory attributes could be deduced via the p2m type. This will simplify the code by dropping one parameter. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- I am not sure whether p2m_direct_mmio_c (cacheable MMIO) should use the outer-shareability or inner-shareability. Any opinions? Changes in v2: - Forgot to add my signed-off-by - Add Stefano's reviewed-by --- xen/arch/arm/p2m.c | 55 ++++++++++++++++++++++++------------------------------ 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index cffb12e..08f3f17 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -325,8 +325,7 @@ static void p2m_set_permission(lpae_t *e, p2m_type_t t, p2m_access_t a) } } -static lpae_t mfn_to_p2m_entry(mfn_t mfn, unsigned int mattr, - p2m_type_t t, p2m_access_t a) +static lpae_t mfn_to_p2m_entry(mfn_t mfn, p2m_type_t t, p2m_access_t a) { /* * sh, xn and write bit will be defined in the following switches @@ -335,7 +334,6 @@ static lpae_t mfn_to_p2m_entry(mfn_t mfn, unsigned int mattr, lpae_t e = (lpae_t) { .p2m.af = 1, .p2m.read = 1, - .p2m.mattr = mattr, .p2m.table = 1, .p2m.valid = 1, .p2m.type = t, @@ -343,18 +341,21 @@ static lpae_t mfn_to_p2m_entry(mfn_t mfn, unsigned int mattr, BUILD_BUG_ON(p2m_max_real_type > (1 << 4)); - switch (mattr) + switch ( t ) { - case MATTR_MEM: - e.p2m.sh = LPAE_SH_INNER; + case p2m_mmio_direct_nc: + e.p2m.mattr = MATTR_DEV; + e.p2m.sh = LPAE_SH_OUTER; break; - case MATTR_DEV: + case p2m_mmio_direct_c: + e.p2m.mattr = MATTR_MEM; e.p2m.sh = LPAE_SH_OUTER; break; + default: - BUG(); - break; + e.p2m.mattr = MATTR_MEM; + e.p2m.sh = LPAE_SH_INNER; } p2m_set_permission(&e, t, a); @@ -422,7 +423,7 @@ static int p2m_create_table(struct domain *d, lpae_t *entry, for ( i=0 ; i < LPAE_ENTRIES; i++ ) { pte = mfn_to_p2m_entry(mfn_add(mfn, i << (level_shift - LPAE_SHIFT)), - MATTR_MEM, t, p2m->default_access); + t, p2m->default_access); /* * First and second level super pages set p2m.table = 0, but @@ -444,7 +445,7 @@ static int p2m_create_table(struct domain *d, lpae_t *entry, unmap_domain_page(p); - pte = mfn_to_p2m_entry(_mfn(page_to_mfn(page)), MATTR_MEM, p2m_invalid, + pte = mfn_to_p2m_entry(_mfn(page_to_mfn(page)), p2m_invalid, p2m->default_access); p2m_write_pte(entry, pte, flush_cache); @@ -665,7 +666,6 @@ static int apply_one_level(struct domain *d, paddr_t *addr, paddr_t *maddr, bool_t *flush, - int mattr, p2m_type_t t, p2m_access_t a) { @@ -694,7 +694,7 @@ static int apply_one_level(struct domain *d, return rc; /* New mapping is superpage aligned, make it */ - pte = mfn_to_p2m_entry(_mfn(*maddr >> PAGE_SHIFT), mattr, t, a); + pte = mfn_to_p2m_entry(_mfn(*maddr >> PAGE_SHIFT), t, a); if ( level < 3 ) pte.p2m.table = 0; /* Superpage entry */ @@ -914,7 +914,6 @@ static int apply_p2m_changes(struct domain *d, gfn_t sgfn, unsigned long nr, mfn_t smfn, - int mattr, uint32_t mask, p2m_type_t t, p2m_access_t a) @@ -1053,7 +1052,7 @@ static int apply_p2m_changes(struct domain *d, level, flush_pt, op, start_gpaddr, end_gpaddr, &addr, &maddr, &flush, - mattr, t, a); + t, a); if ( ret < 0 ) { rc = ret ; goto out; } count += ret; @@ -1162,7 +1161,7 @@ out: * mapping. */ apply_p2m_changes(d, REMOVE, sgfn, gfn - gfn_x(sgfn), smfn, - mattr, 0, p2m_invalid, d->arch.p2m.default_access); + 0, p2m_invalid, d->arch.p2m.default_access); } return rc; @@ -1172,10 +1171,10 @@ static inline int p2m_insert_mapping(struct domain *d, gfn_t start_gfn, unsigned long nr, mfn_t mfn, - int mattr, p2m_type_t t) + p2m_type_t t) { return apply_p2m_changes(d, INSERT, start_gfn, nr, mfn, - mattr, 0, t, d->arch.p2m.default_access); + 0, t, d->arch.p2m.default_access); } static inline int p2m_remove_mapping(struct domain *d, @@ -1185,8 +1184,7 @@ static inline int p2m_remove_mapping(struct domain *d, { return apply_p2m_changes(d, REMOVE, start_gfn, nr, mfn, /* arguments below not used when removing mapping */ - MATTR_MEM, 0, p2m_invalid, - d->arch.p2m.default_access); + 0, p2m_invalid, d->arch.p2m.default_access); } int map_regions_rw_cache(struct domain *d, @@ -1194,8 +1192,7 @@ int map_regions_rw_cache(struct domain *d, unsigned long nr, mfn_t mfn) { - return p2m_insert_mapping(d, gfn, nr, mfn, - MATTR_MEM, p2m_mmio_direct_c); + return p2m_insert_mapping(d, gfn, nr, mfn, p2m_mmio_direct_c); } int unmap_regions_rw_cache(struct domain *d, @@ -1211,8 +1208,7 @@ int map_mmio_regions(struct domain *d, unsigned long nr, mfn_t mfn) { - return p2m_insert_mapping(d, start_gfn, nr, mfn, - MATTR_DEV, p2m_mmio_direct_nc); + return p2m_insert_mapping(d, start_gfn, nr, mfn, p2m_mmio_direct_nc); } int unmap_mmio_regions(struct domain *d, @@ -1250,8 +1246,7 @@ int guest_physmap_add_entry(struct domain *d, unsigned long page_order, p2m_type_t t) { - return p2m_insert_mapping(d, gfn, (1 << page_order), mfn, - MATTR_MEM, t); + return p2m_insert_mapping(d, gfn, (1 << page_order), mfn, t); } void guest_physmap_remove_page(struct domain *d, @@ -1411,7 +1406,7 @@ int relinquish_p2m_mapping(struct domain *d) nr = gfn_x(p2m->max_mapped_gfn) - gfn_x(p2m->lowest_mapped_gfn); return apply_p2m_changes(d, RELINQUISH, p2m->lowest_mapped_gfn, nr, - INVALID_MFN, MATTR_MEM, 0, p2m_invalid, + INVALID_MFN, 0, p2m_invalid, d->arch.p2m.default_access); } @@ -1424,8 +1419,7 @@ int p2m_cache_flush(struct domain *d, gfn_t start, unsigned long nr) end = gfn_min(end, p2m->max_mapped_gfn); return apply_p2m_changes(d, CACHEFLUSH, start, nr, INVALID_MFN, - MATTR_MEM, 0, p2m_invalid, - d->arch.p2m.default_access); + 0, p2m_invalid, d->arch.p2m.default_access); } mfn_t gfn_to_mfn(struct domain *d, gfn_t gfn) @@ -1826,8 +1820,7 @@ long p2m_set_mem_access(struct domain *d, gfn_t gfn, uint32_t nr, } rc = apply_p2m_changes(d, MEMACCESS, gfn_add(gfn, start), - (nr - start), INVALID_MFN, - MATTR_MEM, mask, 0, a); + (nr - start), INVALID_MFN, mask, 0, a); if ( rc < 0 ) return rc; else if ( rc > 0 )