From patchwork Thu Sep 4 16:14:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 36738 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0C003202E4 for ; Thu, 4 Sep 2014 16:16:30 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id at20sf52280735iec.7 for ; Thu, 04 Sep 2014 09:16:29 -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=AIWpo7Tr0XcLD7TgWpo3nr6xM1LYB3eF/G9VKP6BFJA=; b=WG9vTq247Ald3UZxv++O0Ypi68hAtnHZq0zxt446DAXcPRyoKdIcD1U/bvrq6Ki5HB y7oohJjClTYzH1eiG/jHnBiY+xPvd3iUKwA8sx3R/rahLoVZAE4MX+wsfVCHkf+kMzo9 Sa2MJbR1oXmAentF8b+BAVVvharNrZ4MWJJHrjafksyGY3XDaaCzivVbnD0KXduTT3PK kg66JrCmyoQDWxg4jYbF9FMI4gekxZcVdp9ZfkgdtfyTN0rYO9vl1Re/mQym8n3Otz/h zkapMvUjhqjSOj6BExIz9hJYG9p+HPxQJdvIeGrtWaKHO8N/oDE1nzGe/Qw8K5QEQLKC pDLA== X-Gm-Message-State: ALoCoQkRqB3LaDXypQQaVOBWhjR9CWVK948X3JO+L18DoSxjyESGezq+oDdu91L2HBJQ5SIHE9nY X-Received: by 10.42.225.77 with SMTP id ir13mr3051313icb.3.1409847389669; Thu, 04 Sep 2014 09:16:29 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.19.203 with SMTP id 69ls310102qgh.27.gmail; Thu, 04 Sep 2014 09:16:29 -0700 (PDT) X-Received: by 10.52.148.2 with SMTP id to2mr4367577vdb.38.1409847389534; Thu, 04 Sep 2014 09:16:29 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id h8si3280644vdj.81.2014.09.04.09.16.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 04 Sep 2014 09:16:29 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id lf12so10599561vcb.25 for ; Thu, 04 Sep 2014 09:16:29 -0700 (PDT) X-Received: by 10.221.5.137 with SMTP id og9mr5240684vcb.18.1409847387735; Thu, 04 Sep 2014 09:16:27 -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.45.67 with SMTP id uj3csp863205vcb; Thu, 4 Sep 2014 09:16:27 -0700 (PDT) X-Received: by 10.224.130.138 with SMTP id t10mr8989261qas.2.1409847386916; Thu, 04 Sep 2014 09:16:26 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id 105si15203079qgm.44.2014.09.04.09.16.26 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 04 Sep 2014 09:16:26 -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 1XPZgo-0001lV-Sz; Thu, 04 Sep 2014 16:15:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPZgg-0001jZ-NL for xen-devel@lists.xen.org; Thu, 04 Sep 2014 16:15:09 +0000 Received: from [193.109.254.147:12507] by server-3.bemta-14.messagelabs.com id 5A/FF-23707-A0098045; Thu, 04 Sep 2014 16:15:06 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1409847304!13546273!1 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 29290 invoked from network); 4 Sep 2014 16:15:05 -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; 4 Sep 2014 16:15:05 -0000 X-IronPort-AV: E=Sophos;i="5.04,467,1406592000"; d="scan'208";a="169157077" 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; Thu, 4 Sep 2014 12:14:19 -0400 Received: from drall.uk.xensource.com ([10.80.16.71]) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1XPZfu-0004Pv-P9; Thu, 04 Sep 2014 17:14:19 +0100 Received: by drall.uk.xensource.com (sSMTP sendmail emulation); Thu, 04 Sep 2014 17:14:18 +0100 From: Ian Campbell To: Date: Thu, 4 Sep 2014 17:14:10 +0100 Message-ID: X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <4427aba8dad3155fca151a0b63bfdf78e3a91033.1409847257.git.ian.campbell@citrix.com> References: <4427aba8dad3155fca151a0b63bfdf78e3a91033.1409847257.git.ian.campbell@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: julien.grall@linaro.org, tim@xen.org, Ian Campbell , vijay.kilari@gmail.com, stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH v2 2/9] xen: arm: Implement variable levels in dump_pt_walk 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.180 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: This allows us to correctly dump 64-bit hypervisor addresses, which use a 4 level table. It also paves the way for boot-time selection of the number of levels to use in the p2m, which is required to support both 40-bit and 48-bit systems. To support multiple levels it is convenient to recast the page table walk as a loop over the levels instead of the current open coding. Signed-off-by: Ian Campbell --- v2: - map_domain_page cannot fail, so don't check - don't map an extra page for a valid L3 entry - avoid unmapping levels which we didn't map. - root_level argument is unsigned int. - fold in spurious whitespace change from next patch --- xen/arch/arm/mm.c | 60 ++++++++++++++++++++++++++++---------------- xen/arch/arm/p2m.c | 4 ++- xen/include/asm-arm/page.h | 2 +- 3 files changed, 42 insertions(+), 24 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 0a243b0..ab91275 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -84,10 +84,12 @@ lpae_t boot_third[LPAE_ENTRIES] __attribute__((__aligned__(4096))); */ #ifdef CONFIG_ARM_64 +#define HYP_PT_ROOT_LEVEL 0 lpae_t xen_pgtable[LPAE_ENTRIES] __attribute__((__aligned__(4096))); lpae_t xen_first[LPAE_ENTRIES] __attribute__((__aligned__(4096))); #define THIS_CPU_PGTABLE xen_pgtable #else +#define HYP_PT_ROOT_LEVEL 1 /* Per-CPU pagetable pages */ /* xen_pgtable == root of the trie (zeroeth level on 64-bit, first on 32-bit) */ static DEFINE_PER_CPU(lpae_t *, xen_pgtable); @@ -165,34 +167,48 @@ static inline void check_memory_layout_alignment_constraints(void) { #endif } -void dump_pt_walk(lpae_t *first, paddr_t addr) +void dump_pt_walk(lpae_t *root, paddr_t addr, + unsigned int root_level) { - lpae_t *second = NULL, *third = NULL; + static const char *level_strs[4] = { "0TH", "1ST", "2ND", "3RD" }; + const unsigned int offsets[4] = { + zeroeth_table_offset(addr), + first_table_offset(addr), + second_table_offset(addr), + third_table_offset(addr) + }; + lpae_t pte, *mappings[4] = { 0, }; + unsigned int level; + + BUG_ON(!root); +#ifdef CONFIG_ARM_32 + BUG_ON(root_level < 1); +#endif - if ( first_table_offset(addr) >= LPAE_ENTRIES ) - return; + mappings[root_level] = root; + + for ( level = root_level; ; level++ ) + { + if ( offsets[level] > LPAE_ENTRIES ) + break; - printk("1ST[0x%x] = 0x%"PRIpaddr"\n", first_table_offset(addr), - first[first_table_offset(addr)].bits); - if ( !first[first_table_offset(addr)].walk.valid || - !first[first_table_offset(addr)].walk.table ) - goto done; + pte = mappings[level][offsets[level]]; - second = map_domain_page(first[first_table_offset(addr)].walk.base); - printk("2ND[0x%x] = 0x%"PRIpaddr"\n", second_table_offset(addr), - second[second_table_offset(addr)].bits); - if ( !second[second_table_offset(addr)].walk.valid || - !second[second_table_offset(addr)].walk.table ) - goto done; + printk("%s[0x%x] = 0x%"PRIpaddr"\n", + level_strs[level], offsets[level], pte.bits); - third = map_domain_page(second[second_table_offset(addr)].walk.base); - printk("3RD[0x%x] = 0x%"PRIpaddr"\n", third_table_offset(addr), - third[third_table_offset(addr)].bits); + if ( level == 3 || !pte.walk.valid || !pte.walk.table ) + break; -done: - if (third) unmap_domain_page(third); - if (second) unmap_domain_page(second); + mappings[level+1] = map_domain_page(pte.walk.base); + } + /* mappings[root_level] is provided by the caller so don't unmap that */ + do + { + unmap_domain_page(mappings[level]); + } + while( level-- > root_level ); } void dump_hyp_walk(vaddr_t addr) @@ -208,7 +224,7 @@ void dump_hyp_walk(vaddr_t addr) BUG_ON( (lpae_t *)(unsigned long)(ttbr - phys_offset) != pgtable ); else BUG_ON( virt_to_maddr(pgtable) != ttbr ); - dump_pt_walk(pgtable, addr); + dump_pt_walk(pgtable, addr, HYP_PT_ROOT_LEVEL); } /* Map a 4k page in a fixmap entry */ diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index ec3b451..6a19e37 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -11,6 +11,8 @@ #include #include +#define P2M_ROOT_LEVEL 1 + /* First level P2M is 2 consecutive pages */ #define P2M_ROOT_ORDER 1 #define P2M_ROOT_ENTRIES (LPAE_ENTRIES<root, page_to_mfn(p2m->root)); first = __map_domain_page(p2m->root); - dump_pt_walk(first, addr); + dump_pt_walk(first, addr, P2M_ROOT_LEVEL); unmap_domain_page(first); } diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 739038a..4c21863 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -352,7 +352,7 @@ static inline void flush_xen_data_tlb_range_va(unsigned long va, void flush_page_to_ram(unsigned long mfn); /* Print a walk of an arbitrary page table */ -void dump_pt_walk(lpae_t *table, paddr_t addr); +void dump_pt_walk(lpae_t *table, paddr_t addr, unsigned int root_level); /* Print a walk of the hypervisor's page tables for a virtual addr. */ extern void dump_hyp_walk(vaddr_t addr);