From patchwork Mon Jun 27 16:54:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 70945 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1167659qgy; Mon, 27 Jun 2016 09:56:48 -0700 (PDT) X-Received: by 10.36.68.69 with SMTP id o66mr9561444ita.78.1467046595358; Mon, 27 Jun 2016 09:56:35 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id n145si2842648ita.106.2016.06.27.09.56.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Jun 2016 09:56:35 -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 1bHZo1-0005nJ-MO; Mon, 27 Jun 2016 16:54:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bHZo0-0005kN-OY for xen-devel@lists.xen.org; Mon, 27 Jun 2016 16:54:40 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 8E/25-04210-05A51775; Mon, 27 Jun 2016 16:54:40 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRWlGSWpSXmKPExsVysyfVTdcnqjD coP2YmcWSj4tZHBg9ju7+zRTAGMWamZeUX5HAmrHr/w+2gpkqFS+nT2RpYHwj0cXIySEksIlR 4v416S5GLiD7NKPE1+P7GUESbAKaEnc+f2ICsUUEpCWufb4MFmcWCJO4/WYXmC0s4CFx7P0zZ hCbRUBVYv+EeWA2r4CLxM0nv1hBbAkBOYmTxyaD2ZxA8b0XljJDLHaWODjtO/sERu4FjAyrGN WLU4vKUot0DfWSijLTM0pyEzNzdA0NTPVyU4uLE9NTcxKTivWS83M3MQK9W8/AwLiDsanX+RC jJAeTkijvtke54UJ8SfkplRmJxRnxRaU5qcWHGGU4OJQkeJ9HFIYLCRalpqdWpGXmAMMMJi3B waMkwmsSCZTmLS5IzC3OTIdInWJUlBLnVQJJCIAkMkrz4NpgoX2JUVZKmJeRgYFBiKcgtSg3s wRV/hWjOAejkjCvJ8gUnsy8Erjpr4AWMwEtZq3OB1lckoiQkmpgnCa+6/K1q9JROlz/t13bqn NV8tSTq0tq+CVTlp/08L/1gk08caIG3zn2B9wztkgcnfhps9tkl/72ipR7z0J+nEzxfzJXUsT gxhF+Vja1hy/2ezVqT3x5I7GyWEXSQF2jLSCYpXvGdO917HVMYTe2zYx4VqD5+M6JZexLhae8 3+HFpOkYOCtEXomlOCPRUIu5qDgRABsOwxFoAgAA X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1467046476!31151146!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.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39738 invoked from network); 27 Jun 2016 16:54:36 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-2.tower-206.messagelabs.com with SMTP; 27 Jun 2016 16:54:36 -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 6C4CC433; Mon, 27 Jun 2016 09:55:27 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.215.28]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3E4AD3F246; Mon, 27 Jun 2016 09:54:35 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Mon, 27 Jun 2016 17:54:07 +0100 Message-Id: <1467046452-1261-12-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467046452-1261-1-git-send-email-julien.grall@arm.com> References: <1467046452-1261-1-git-send-email-julien.grall@arm.com> Cc: Julien Grall , sstabellini@kernel.org, wei.chen@linaro.org Subject: [Xen-devel] [PATCH v4 11/16] xen/arm: p2m: Remove unused operation ALLOCATE 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" The operation ALLOCATE is unused. If we ever need it, it could be reimplemented with INSERT. Signed-off-by: Julien Grall --- Changes in v4: - Patch added --- xen/arch/arm/p2m.c | 67 ++--------------------------------------------- xen/include/asm-arm/p2m.h | 3 --- 2 files changed, 2 insertions(+), 68 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 4f3564f..685dc94 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -547,7 +547,6 @@ static int p2m_mem_access_radix_set(struct p2m_domain *p2m, unsigned long pfn, enum p2m_operation { INSERT, - ALLOCATE, REMOVE, RELINQUISH, CACHEFLUSH, @@ -667,7 +666,6 @@ static int apply_one_level(struct domain *d, { const paddr_t level_size = level_sizes[level]; const paddr_t level_mask = level_masks[level]; - const paddr_t level_shift = level_shifts[level]; struct p2m_domain *p2m = &d->arch.p2m; lpae_t pte; @@ -678,58 +676,6 @@ static int apply_one_level(struct domain *d, switch ( op ) { - case ALLOCATE: - ASSERT(level < 3 || !p2m_valid(orig_pte)); - ASSERT(*maddr == 0); - - if ( p2m_valid(orig_pte) ) - return P2M_ONE_DESCEND; - - if ( is_mapping_aligned(*addr, end_gpaddr, 0, level_size) && - /* We only create superpages when mem_access is not in use. */ - (level == 3 || (level < 3 && !p2m->mem_access_enabled)) ) - { - struct page_info *page; - - page = alloc_domheap_pages(d, level_shift - PAGE_SHIFT, 0); - if ( page ) - { - rc = p2m_mem_access_radix_set(p2m, paddr_to_pfn(*addr), a); - if ( rc < 0 ) - { - free_domheap_page(page); - return rc; - } - - pte = mfn_to_p2m_entry(page_to_mfn(page), mattr, t, a); - if ( level < 3 ) - pte.p2m.table = 0; - p2m_write_pte(entry, pte, flush_cache); - p2m->stats.mappings[level]++; - - *addr += level_size; - - return P2M_ONE_PROGRESS; - } - else if ( level == 3 ) - return -ENOMEM; - } - - /* L3 is always suitably aligned for mapping (handled, above) */ - BUG_ON(level == 3); - - /* - * If we get here then we failed to allocate a sufficiently - * large contiguous region for this level (which can't be - * L3) or mem_access is in use. Create a page table and - * continue to descend so we try smaller allocations. - */ - rc = p2m_create_table(d, entry, 0, flush_cache); - if ( rc < 0 ) - return rc; - - return P2M_ONE_DESCEND; - case INSERT: if ( is_mapping_aligned(*addr, end_gpaddr, *maddr, level_size) && /* @@ -1169,7 +1115,7 @@ static int apply_p2m_changes(struct domain *d, } } - if ( op == ALLOCATE || op == INSERT ) + if ( op == INSERT ) { p2m->max_mapped_gfn = max(p2m->max_mapped_gfn, egfn); p2m->lowest_mapped_gfn = min(p2m->lowest_mapped_gfn, sgfn); @@ -1197,7 +1143,7 @@ out: spin_unlock(&p2m->lock); - if ( rc < 0 && ( op == INSERT || op == ALLOCATE ) && + if ( rc < 0 && ( op == INSERT ) && addr != start_gpaddr ) { BUG_ON(addr == end_gpaddr); @@ -1212,15 +1158,6 @@ out: return rc; } -int p2m_populate_ram(struct domain *d, - paddr_t start, - paddr_t end) -{ - return apply_p2m_changes(d, ALLOCATE, start, end, - 0, MATTR_MEM, 0, p2m_ram_rw, - d->arch.p2m.default_access); -} - int map_regions_rw_cache(struct domain *d, unsigned long start_gfn, unsigned long nr, diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 8a96e68..4752161 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -141,9 +141,6 @@ mfn_t p2m_lookup(struct domain *d, gfn_t gfn, p2m_type_t *t); /* Clean & invalidate caches corresponding to a region of guest address space */ int p2m_cache_flush(struct domain *d, gfn_t start, unsigned long nr); -/* Setup p2m RAM mapping for domain d from start-end. */ -int p2m_populate_ram(struct domain *d, paddr_t start, paddr_t end); - int map_regions_rw_cache(struct domain *d, unsigned long start_gfn, unsigned long nr_mfns,