From patchwork Wed Jul 30 13:47:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 34529 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oi0-f69.google.com (mail-oi0-f69.google.com [209.85.218.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EF48321330 for ; Wed, 30 Jul 2014 13:55:58 +0000 (UTC) Received: by mail-oi0-f69.google.com with SMTP id h136sf5642324oig.0 for ; Wed, 30 Jul 2014 06:55:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=cZQ+z505/yVVLsHHt2V7NW9UmzjuryhpUO88J8fWO1o=; b=h879fly9GWmWllBZ8RkhefrYN9HnBHYtHgS0FwjhsblTxoVTIwuHxnvuEZxoT3sxTf Wtf/4TZa4vzKX9Ygvx4XWeBfYGIjWC4Frclz52aQ/WbJfI3OFzVbNYXzPLqbUWMETzwD JTC698BDheGArrDEOuJnG2YI0GdTI1F+WjcnKyQtbUOv4WBewTGoD7WqvCvXddZcSiS3 3B6SeF8vSLMf6MoDByJGfOL+OBluRRXhJV/YQpt78TSaDmrCZkSCM/u24OEv6O8RisRR WRKkG2FKCJ/G6Lu9tqXpG+7nUEO1zFmzkDwtJONIYmXP8+SsHw830KvDH2OVWkQ4P6RS EkLg== X-Gm-Message-State: ALoCoQlU8QuOuVOsQEZrpDemmzoI5ojiAMa6yxhz3Uf3iCvKXzXPhz6R2UajeJYMqmtB+pesMo8k X-Received: by 10.182.66.33 with SMTP id c1mr1667969obt.39.1406728557768; Wed, 30 Jul 2014 06:55:57 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.169 with SMTP id x38ls621026qgx.28.gmail; Wed, 30 Jul 2014 06:55:57 -0700 (PDT) X-Received: by 10.220.46.5 with SMTP id h5mr4588842vcf.55.1406728557551; Wed, 30 Jul 2014 06:55:57 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id c7si1711033vez.8.2014.07.30.06.55.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 30 Jul 2014 06:55:57 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id id10so1801392vcb.7 for ; Wed, 30 Jul 2014 06:55:57 -0700 (PDT) X-Received: by 10.220.97.5 with SMTP id j5mr4484744vcn.16.1406728557456; Wed, 30 Jul 2014 06:55:57 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp29572vcb; Wed, 30 Jul 2014 06:55:57 -0700 (PDT) X-Received: by 10.50.50.198 with SMTP id e6mr53701255igo.1.1406728556818; Wed, 30 Jul 2014 06:55:56 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id oa8si6462855icb.39.2014.07.30.06.55.56 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 30 Jul 2014 06:55:56 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCUKm-0006Cl-4D; Wed, 30 Jul 2014 13:54:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCUKi-0006A9-H5 for xen-devel@lists.xen.org; Wed, 30 Jul 2014 13:54:20 +0000 Received: from [193.109.254.147:56359] by server-6.bemta-14.messagelabs.com id A7/97-31278-B09F8D35; Wed, 30 Jul 2014 13:54:19 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1406728457!12718668!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17218 invoked from network); 30 Jul 2014 13:54:18 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-14.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 30 Jul 2014 13:54:18 -0000 X-IronPort-AV: E=Sophos;i="5.01,764,1400025600"; d="scan'208";a="157704980" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 30 Jul 2014 13:54:16 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.3.181.6; Wed, 30 Jul 2014 09:54:16 -0400 Received: from drall.uk.xensource.com ([10.80.16.71]) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1XCUDz-0006vN-Ep; Wed, 30 Jul 2014 14:47:24 +0100 Received: by drall.uk.xensource.com (sSMTP sendmail emulation); Wed, 30 Jul 2014 14:47:23 +0100 From: Ian Campbell To: Date: Wed, 30 Jul 2014 14:47:15 +0100 Message-ID: X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <3ef2b68c511f3e31de409b76757b95c78b99d750.1406728037.git.ian.campbell@citrix.com> References: <3ef2b68c511f3e31de409b76757b95c78b99d750.1406728037.git.ian.campbell@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: julien.grall@linaro.org, tim@xen.org, Ian Campbell , vijay.kilari@gmail.com, stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH RFC 7/9] xen: arm: handle variable p2m levels in apply_p2m_changes X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: As with prervious changes this involves conversion from a linear series of lookups into a loop over the levels. Signed-off-by: Ian Campbell --- xen/arch/arm/p2m.c | 178 +++++++++++++++++++++++++--------------------------- 1 file changed, 84 insertions(+), 94 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 557663f..e9938ae 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -15,7 +15,6 @@ /* First level P2M is 2 consecutive pages */ #define P2M_ROOT_ORDER 1 -#define P2M_ROOT_ENTRIES (LPAE_ENTRIES<domain); } -static int p2m_first_level_index(paddr_t addr) -{ - /* - * 1st pages are concatenated so zeroeth offset gives us the - * index of the 1st page - */ - return zeroeth_table_offset(addr); -} - -/* - * Map whichever of the first pages contain addr. The caller should - * then use first_table_offset as an index. - */ -static lpae_t *p2m_map_first(struct p2m_domain *p2m, paddr_t addr) -{ - struct page_info *page; - - if ( first_linear_offset(addr) >= P2M_ROOT_ENTRIES ) - return NULL; - - page = p2m->root + p2m_first_level_index(addr); - - return __map_domain_page(page); -} - /* * Lookup the MFN corresponding to a domain's PFN. * @@ -707,14 +681,13 @@ static int apply_p2m_changes(struct domain *d, int mattr, p2m_type_t t) { - int rc, ret; + int level, rc, ret; struct p2m_domain *p2m = &d->arch.p2m; - lpae_t *first = NULL, *second = NULL, *third = NULL; + lpae_t *mappings[4] = { NULL, }; paddr_t addr; - unsigned long cur_first_page = ~0, - cur_first_offset = ~0, - cur_second_offset = ~0; - unsigned long count = 0; + unsigned int cur_root_table = ~0; + unsigned int cur_offset[4] = { ~0, }; + unsigned int count = 0; bool_t flush = false; bool_t flush_pt; @@ -726,9 +699,27 @@ static int apply_p2m_changes(struct domain *d, spin_lock(&p2m->lock); + if ( P2M_ROOT_PAGES == 1 ) + { + /* Static mapping. P2M_ROOT_PAGES > 1 are handled below */ + mappings[P2M_ROOT_LEVEL] = __map_domain_page(p2m->root); + { + rc = -EINVAL; + goto out; + } + } + addr = start_gpaddr; while ( addr < end_gpaddr ) { + int root_table; + const unsigned int offsets[4] = { + zeroeth_table_offset(addr), + first_table_offset(addr), + second_table_offset(addr), + third_table_offset(addr) + }; + /* * Arbitrarily, preempt every 512 operations or 8192 nops. * 512*P2M_ONE_PROGRESS == 8192*P2M_ONE_PROGRESS_NOP == 0x2000 @@ -748,73 +739,71 @@ static int apply_p2m_changes(struct domain *d, count = 0; } - if ( cur_first_page != p2m_first_level_index(addr) ) + if ( P2M_ROOT_PAGES > 1 ) { - if ( first ) unmap_domain_page(first); - first = p2m_map_first(p2m, addr); - if ( !first ) + int i; + /* + * Concatenated root-level tables. The table number will be the + * offset at the previous level. It is not possible to concetenate + * a level-0 root. + */ + BUG_ON(P2M_ROOT_LEVEL == 0); + root_table = offsets[P2M_ROOT_LEVEL - 1]; + if ( root_table >= P2M_ROOT_PAGES ) { rc = -EINVAL; goto out; } - cur_first_page = p2m_first_level_index(addr); - /* Any mapping further down is now invalid */ - cur_first_offset = cur_second_offset = ~0; - } - - /* We only use a 3 level p2m at the moment, so no level 0, - * current hardware doesn't support super page mappings at - * level 0 anyway */ - - ret = apply_one_level(d, &first[first_table_offset(addr)], - 1, flush_pt, op, - start_gpaddr, end_gpaddr, - &addr, &maddr, &flush, - mattr, t); - if ( ret < 0 ) { rc = ret ; goto out; } - count += ret; - if ( ret != P2M_ONE_DESCEND ) continue; - - BUG_ON(!p2m_valid(first[first_table_offset(addr)])); - - if ( cur_first_offset != first_table_offset(addr) ) - { - if (second) unmap_domain_page(second); - second = map_domain_page(first[first_table_offset(addr)].p2m.base); - cur_first_offset = first_table_offset(addr); - /* Any mapping further down is now invalid */ - cur_second_offset = ~0; + if ( cur_root_table != root_table ) + { + if ( mappings[P2M_ROOT_LEVEL] ) + unmap_domain_page(mappings[P2M_ROOT_LEVEL]); + mappings[P2M_ROOT_LEVEL] = + __map_domain_page(p2m->root + root_table); + if ( !mappings[P2M_ROOT_LEVEL] ) + { + rc = -EINVAL; + goto out; + } + cur_root_table = root_table; + /* Any mapping further down is now invalid */ + for ( i = P2M_ROOT_LEVEL; i < 4; i++ ) + cur_offset[i] = ~0; + } } - /* else: second already valid */ - - ret = apply_one_level(d,&second[second_table_offset(addr)], - 2, flush_pt, op, - start_gpaddr, end_gpaddr, - &addr, &maddr, &flush, - mattr, t); - if ( ret < 0 ) { rc = ret ; goto out; } - count += ret; - if ( ret != P2M_ONE_DESCEND ) continue; - - BUG_ON(!p2m_valid(second[second_table_offset(addr)])); - if ( cur_second_offset != second_table_offset(addr) ) + for ( level = P2M_ROOT_LEVEL; level < 4; level++ ) { - /* map third level */ - if (third) unmap_domain_page(third); - third = map_domain_page(second[second_table_offset(addr)].p2m.base); - cur_second_offset = second_table_offset(addr); + unsigned offset = offsets[level]; + lpae_t *entry = &mappings[level][offset]; + + ret = apply_one_level(d, entry, + level, flush_pt, op, + start_gpaddr, end_gpaddr, + &addr, &maddr, &flush, + mattr, t); + if ( ret < 0 ) { rc = ret ; goto out; } + count += ret; + /* L3 had better have done something! We cannot descend any further */ + BUG_ON(level == 3 && ret == P2M_ONE_DESCEND); + if ( ret != P2M_ONE_DESCEND ) break; + + BUG_ON(!p2m_valid(*entry)); + + if ( cur_offset[level] != offset ) + { + /* Update mapping for next level */ + int i; + if ( mappings[level+1] ) + unmap_domain_page(mappings[level+1]); + mappings[level+1] = map_domain_page(entry->p2m.base); + cur_offset[level] = offset; + /* Any mapping further down is now invalid */ + for ( i = level+1; i < 4; i++ ) + cur_offset[i] = ~0; + } + /* else: next level already valid */ } - - ret = apply_one_level(d, &third[third_table_offset(addr)], - 3, flush_pt, op, - start_gpaddr, end_gpaddr, - &addr, &maddr, &flush, - mattr, t); - if ( ret < 0 ) { rc = ret ; goto out; } - /* L3 had better have done something! We cannot descend any further */ - BUG_ON(ret == P2M_ONE_DESCEND); - count += ret; } if ( flush ) @@ -838,10 +827,11 @@ static int apply_p2m_changes(struct domain *d, rc = 0; out: - if (third) unmap_domain_page(third); - if (second) unmap_domain_page(second); - if (first) unmap_domain_page(first); - + for ( level = P2M_ROOT_LEVEL; level < 4; level ++ ) + { + if ( mappings[level] ) + unmap_domain_page(mappings[level]); + } spin_unlock(&p2m->lock); return rc;