From patchwork Thu Sep 15 11:28:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 9333215 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6A25A6077F for ; Thu, 15 Sep 2016 11:31:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 584B7295C6 for ; Thu, 15 Sep 2016 11:31:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4D1E7295D7; Thu, 15 Sep 2016 11:31:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B1218295D1 for ; Thu, 15 Sep 2016 11:31:12 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bkUqw-000543-Sf; Thu, 15 Sep 2016 11:29:14 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bkUqv-00050Y-OK for xen-devel@lists.xen.org; Thu, 15 Sep 2016 11:29:13 +0000 Received: from [85.158.143.35] by server-11.bemta-6.messagelabs.com id 66/88-08498-9068AD75; Thu, 15 Sep 2016 11:29:13 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRWlGSWpSXmKPExsVysyfVTZej7Va 4wa4v4hZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa0bnjIdMBbMNK47eXMPawLhEvouRi0NIYBOj xJzj81ghnNOMEg8OnWDrYuTkYBPQlLjz+RMTiC0iIC1x7fNlRpAiZoF2Rom1/b3MXYwcHMICS RJzVsuAmCwCqhJzTruCmLwCrhKNRxVBOiUE5CROHpvMChLmBAoveS4KEhYScJE4dmIn2wRG7g WMDKsYNYpTi8pSi3QNzfSSijLTM0pyEzNzdA0NzPRyU4uLE9NTcxKTivWS83M3MQJ9ywAEOxj vbww4xCjJwaQkyuuWditciC8pP6UyI7E4I76oNCe1+BCjDAeHkgSvWStQTrAoNT21Ii0zBxhk MGkJDh4lEd4fLUBp3uKCxNzizHSI1ClGRSlx3n0gCQGQREZpHlwbLLAvMcpKCfMyAh0ixFOQW pSbWYIq/4pRnINRSZiXFWQ7T2ZeCdz0V0CLmYAWb1lzHWRxSSJCSqqBcT+z7nkmk1cFnbeWNJ s9yfI9+lb8w707y9cr1/+5qpzf1OI85VXTh36jlvxMpkU7Tx6OiGrlPn1WsrV0/gfXu7xOofo 7U9qTVszUujR3iv/Ebw+LXN/NKLU/sU/k9DknY+lit/eHy+9knPaafHgb58a57F4VkXtuSr7f cnRfiVnlo5T8x1n3vyuxFGckGmoxFxUnAgCmndAcZwIAAA== X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1473938951!27286077!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.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13093 invoked from network); 15 Sep 2016 11:29:12 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-4.tower-21.messagelabs.com with SMTP; 15 Sep 2016 11:29:12 -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 863C2B16; Thu, 15 Sep 2016 04:29:11 -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 8359B3F251; Thu, 15 Sep 2016 04:29:10 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Thu, 15 Sep 2016 12:28:35 +0100 Message-Id: <1473938919-31976-20-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1473938919-31976-1-git-send-email-julien.grall@arm.com> References: <1473938919-31976-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] [for-4.8][PATCH v2 19/23] xen/arm: p2m: Re-implement p2m_remove_using using p2m_set_entry 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" X-Virus-Scanned: ClamAV using ClamSMTP The function p2m_insert_mapping can be re-implemented using the generic function p2m_set_entry. Also drop the operation REMOVE in apply_* as nobody is using it anymore. Note that the functions could have been dropped in one go at the end, however I find easier to drop the operations one by one avoiding a big deletion in the patch that converts the last operation. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabelini --- Changes in v2: - Add Stefano's reviewed-by --- xen/arch/arm/p2m.c | 125 ++++++----------------------------------------------- 1 file changed, 13 insertions(+), 112 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index ce09c4c..6c9a6b2 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -753,7 +753,6 @@ static int p2m_mem_access_radix_set(struct p2m_domain *p2m, gfn_t gfn, enum p2m_operation { INSERT, - REMOVE, MEMACCESS, }; @@ -1232,7 +1231,6 @@ static int apply_one_level(struct domain *d, p2m_access_t a) { const paddr_t level_size = level_sizes[level]; - const paddr_t level_mask = level_masks[level]; struct p2m_domain *p2m = &d->arch.p2m; lpae_t pte; @@ -1317,74 +1315,6 @@ static int apply_one_level(struct domain *d, break; - case REMOVE: - if ( !p2m_valid(orig_pte) ) - { - /* Progress up to next boundary */ - *addr = (*addr + level_size) & level_mask; - *maddr = (*maddr + level_size) & level_mask; - return P2M_ONE_PROGRESS_NOP; - } - - if ( level < 3 ) - { - if ( p2m_table(orig_pte) ) - return P2M_ONE_DESCEND; - - if ( op == REMOVE && - !is_mapping_aligned(*addr, end_gpaddr, - 0, /* maddr doesn't matter for remove */ - level_size) ) - { - /* - * Removing a mapping from the middle of a superpage. Shatter - * and descend. - */ - *flush = true; - rc = p2m_shatter_page(p2m, entry, level); - if ( rc < 0 ) - return rc; - - return P2M_ONE_DESCEND; - } - } - - /* - * Ensure that the guest address addr currently being - * handled (that is in the range given as argument to - * this function) is actually mapped to the corresponding - * machine address in the specified range. maddr here is - * the machine address given to the function, while - * orig_pte.p2m.base is the machine frame number actually - * mapped to the guest address: check if the two correspond. - */ - if ( op == REMOVE && - pfn_to_paddr(orig_pte.p2m.base) != *maddr ) - printk(XENLOG_G_WARNING - "p2m_remove dom%d: mapping at %"PRIpaddr" is of maddr %"PRIpaddr" not %"PRIpaddr" as expected\n", - d->domain_id, *addr, pfn_to_paddr(orig_pte.p2m.base), - *maddr); - - *flush = true; - - p2m_remove_pte(entry, p2m->clean_pte); - p2m_mem_access_radix_set(p2m, _gfn(paddr_to_pfn(*addr)), - p2m_access_rwx); - - *addr += level_size; - *maddr += level_size; - - p2m->stats.mappings[level]--; - - if ( level == 3 ) - p2m_put_l3_page(orig_pte); - - /* - * This is still a single pte write, no matter the level, so no need to - * scale. - */ - return P2M_ONE_PROGRESS; - case MEMACCESS: if ( level < 3 ) { @@ -1596,43 +1526,6 @@ static int apply_p2m_changes(struct domain *d, } BUG_ON(level > 3); - - if ( op == REMOVE ) - { - for ( ; level > P2M_ROOT_LEVEL; level-- ) - { - lpae_t old_entry; - lpae_t *entry; - unsigned int offset; - - pg = pages[level]; - - /* - * No need to try the previous level if the current one - * still contains some mappings. - */ - if ( pg->u.inuse.p2m_refcount ) - break; - - offset = offsets[level - 1]; - entry = &mappings[level - 1][offset]; - old_entry = *entry; - - page_list_del(pg, &p2m->pages); - - p2m_remove_pte(entry, p2m->clean_pte); - - p2m->stats.mappings[level - 1]--; - update_reference_mapping(pages[level - 1], old_entry, *entry); - - /* - * We can't free the page now because it may be present - * in the guest TLB. Queue it and free it after the TLB - * has been flushed. - */ - page_list_add(pg, &free_pages); - } - } } if ( op == INSERT ) @@ -1674,8 +1567,10 @@ out: * addr keeps the address of the end of the last successfully-inserted * mapping. */ - apply_p2m_changes(d, REMOVE, sgfn, gfn - gfn_x(sgfn), smfn, - 0, p2m_invalid, d->arch.p2m.default_access); + p2m_write_lock(p2m); + p2m_set_entry(p2m, sgfn, gfn - gfn_x(sgfn), INVALID_MFN, + p2m_invalid, p2m_access_rwx); + p2m_write_unlock(p2m); } return rc; @@ -1696,9 +1591,15 @@ static inline int p2m_remove_mapping(struct domain *d, unsigned long nr, mfn_t mfn) { - return apply_p2m_changes(d, REMOVE, start_gfn, nr, mfn, - /* arguments below not used when removing mapping */ - 0, p2m_invalid, d->arch.p2m.default_access); + struct p2m_domain *p2m = &d->arch.p2m; + int rc; + + p2m_write_lock(p2m); + rc = p2m_set_entry(p2m, start_gfn, nr, INVALID_MFN, + p2m_invalid, p2m_access_rwx); + p2m_write_unlock(p2m); + + return rc; } int map_regions_rw_cache(struct domain *d,