From patchwork Mon Dec 12 07:26:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupinder Thakur X-Patchwork-Id: 9470101 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 9263760573 for ; Mon, 12 Dec 2016 07:28:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 84DFE28454 for ; Mon, 12 Dec 2016 07:28:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79F202845A; Mon, 12 Dec 2016 07:28:56 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 0362428454 for ; Mon, 12 Dec 2016 07:28:56 +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 1cGL0d-0003ob-7r; Mon, 12 Dec 2016 07:26:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cGL0b-0003o9-TU for xen-devel@lists.xenproject.org; Mon, 12 Dec 2016 07:26:50 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 16/60-28947-9315E485; Mon, 12 Dec 2016 07:26:49 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrFIsWRWlGSWpSXmKPExsVyMfTAJl2LQL8 Ig0NbpS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozz9z+zFsw3qPh36TBrA+Nm1S5GLg4hgRmM Eqvv7WQFcVgE5jFLLD68Fsjh5JAQ6GeVODc3FcKOkTj2tYkRwq6W6Lg+hxnEFhLQkjh6ajYrx KRGJolZcx8AJTg42ARMJGZ1SIDUiAgoSdxbNZkJxGYWCJX496yNHcQWFnCTuLO1iQXEZhFQld h5/QAjSCuvgLfEh//lEKvkJG6e6wRbxSngI7FwNsRpQkAlbzfvY53AKLCAkWEVo0ZxalFZapG uoZFeUlFmekZJbmJmjq6hgbFebmpxcWJ6ak5iUrFecn7uJkZgWDEAwQ7GV93OhxglOZiURHl/ ePtFCPEl5adUZiQWZ8QXleakFh9ilOHgUJLglQ8AygkWpaanVqRl5gADHCYtwcGjJMIbC5LmL S5IzC3OTIdInWK05Dg2a/FTJo5pz0Dkrs41T5mEWPLy81KlxHl9QRoEQBoySvPgxsGi8BKjrJ QwLyPQgUI8BalFuZklqPKvGMU5GJWEed/7A03hycwrgdv6CuggJqCDnu/zBjmoJBEhJdXAWCa 3a+d9ces7czTPcjx6WDQxbEp5ruX9XIOS1WrKk8LTpauEz67tazIVdliZ6TUlXSzjbdGbCKNX S2USP365n3FrYceJf9/uWxfFrD5iduFdyyd1v49H1ga5Z3zRMIjffudS5b9qmbOXCj2XWW24e nP342lX3Rb/WLeBzcSyNvlF2P3LS288i1diKc5INNRiLipOBACP2KdwvQIAAA== X-Env-Sender: bhupinder.thakur@linaro.org X-Msg-Ref: server-13.tower-31.messagelabs.com!1481527606!74948438!1 X-Originating-IP: [209.85.192.178] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11761 invoked from network); 12 Dec 2016 07:26:48 -0000 Received: from mail-pf0-f178.google.com (HELO mail-pf0-f178.google.com) (209.85.192.178) by server-13.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 12 Dec 2016 07:26:48 -0000 Received: by mail-pf0-f178.google.com with SMTP id c4so11641806pfb.1 for ; Sun, 11 Dec 2016 23:26:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZCIYT7FTEDyC6/nsQw7Hd1G2VLK34g6C/vnr3q23rYk=; b=gr7A6L2wDfn72LCyPfd+18pOjGAxovFSkN3SrHMbU4FRJjeQUewIYR89F2E03O+94T 0pWVXEQip4AWRBAHr+ai+rPBwb+9PRMC+tLPQEZ0yyz053vwIhSAdH+O0YtqbuBQMgJ4 XHc0i+i/C9aszhEExA4Np0CU/WA6rgyHoSY0Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZCIYT7FTEDyC6/nsQw7Hd1G2VLK34g6C/vnr3q23rYk=; b=ZFU/xoGOneYidyWa0M781PGwyrfv/ZBSLuL+ZI6xbmycH4TSllIwAfPsOZoiOkC1XH xna51TF7xxisg10BpHdjYuwl2MD/B3cf3jmAgDwfJfROYxvcz9Jd7xfiS3UnCuWoKRBy E/LcpEDxK9jzZanfzVn3dKWdCXxeig3cH7omlBghqOgPpxrHTBnB+k7yqI53IxIfhMBF /oe/b2Z7B7RLhzqywBqZlnzBzQ66Cgka0BaQtEkiWi+sjiUK61wFtLRdqhueSblmyTjS 12pWh5/ssdqUy1vQ7/Fygtm5uUnaVtV4lmbZZxshzA0fbjHdOVzlT/Q6IFd1RG9UJsRv GfWQ== X-Gm-Message-State: AKaTC00G1bfk4GUvB2Wpol3otQvB8xiHY5Fx/sHlZ4SI01j4t0pVVhSzHY+joEYgdjmCGXJo X-Received: by 10.98.141.153 with SMTP id p25mr93852195pfk.148.1481527606445; Sun, 11 Dec 2016 23:26:46 -0800 (PST) Received: from blr-ubuntu-linaro.qualcomm.com ([202.46.23.61]) by smtp.gmail.com with ESMTPSA id y89sm73927696pfk.83.2016.12.11.23.26.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 11 Dec 2016 23:26:46 -0800 (PST) From: Bhupinder Thakur To: xen-devel@lists.xenproject.org Date: Mon, 12 Dec 2016 12:56:38 +0530 Message-Id: <1481527598-15423-2-git-send-email-bhupinder.thakur@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481527598-15423-1-git-send-email-bhupinder.thakur@linaro.org> References: <1481527598-15423-1-git-send-email-bhupinder.thakur@linaro.org> Cc: Julien Grall , Stefano Stabellini Subject: [Xen-devel] [XEN VMID PATCH 2/2 v3] xen/arm: Add support for 16 bit VMIDs 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 VMID space is increased to 16-bits from 8-bits in ARMv8 8.1 revision. This allows more than 256 VMs to be supported by Xen. This change adds support for 16-bit VMIDs in Xen based on whether the architecture supports it. Signed-off-by: Bhupinder Thakur --- xen/arch/arm/p2m.c | 56 ++++++++++++++++++++++++++++++++++------- xen/include/asm-arm/p2m.h | 2 +- xen/include/asm-arm/processor.h | 18 ++++++++++++- 3 files changed, 65 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index d155c1d..0c98616 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -14,15 +15,23 @@ #include #include +#define MAX_VMID_8_BIT (1UL << 8) +#define MAX_VMID_16_BIT (1UL << 16) + +#define INVALID_VMID 0 /* VMID 0 is reserved */ + #ifdef CONFIG_ARM_64 static unsigned int __read_mostly p2m_root_order; static unsigned int __read_mostly p2m_root_level; #define P2M_ROOT_ORDER p2m_root_order #define P2M_ROOT_LEVEL p2m_root_level +static unsigned int __read_mostly max_vmid = MAX_VMID_8_BIT; +#define MAX_VMID max_vmid #else /* First level P2M is alway 2 consecutive pages */ #define P2M_ROOT_LEVEL 1 #define P2M_ROOT_ORDER 1 +#define MAX_VMID MAX_VMID_8_BIT #endif #define P2M_ROOT_PAGES (1<root = page; - p2m->vttbr = page_to_maddr(p2m->root) | ((uint64_t)p2m->vmid & 0xff) << 48; + p2m->vttbr = page_to_maddr(p2m->root) | ((uint64_t)p2m->vmid << 48); /* * Make sure that all TLBs corresponding to the new VMID are flushed @@ -1230,20 +1239,32 @@ static int p2m_alloc_table(struct domain *d) return 0; } -#define MAX_VMID 256 -#define INVALID_VMID 0 /* VMID 0 is reserved */ static spinlock_t vmid_alloc_lock = SPIN_LOCK_UNLOCKED; /* - * VTTBR_EL2 VMID field is 8 bits. Using a bitmap here limits us to - * 256 concurrent domains. + * VTTBR_EL2 VMID field is 8 or 16 bits. Aarch64 supports 16-bit VMID. + * Using a bitmap here limits us to 256 or 65536 (for Aarch64) concurrent + * domains. The bitmap space will be allocated dynamically based on + * whether 8 or 16 bit VMIDs are supported. */ -static DECLARE_BITMAP(vmid_mask, MAX_VMID); +static unsigned long *vmid_mask; -void p2m_vmid_allocator_init(void) +int p2m_vmid_allocator_init(void) { - set_bit(INVALID_VMID, vmid_mask); + int ret = 0; + + /* + * allocate space for vmid_mask based on MAX_VMID + */ + vmid_mask = xzalloc_array(unsigned long, BITS_TO_LONGS(MAX_VMID)); + + if ( vmid_mask ) + set_bit(INVALID_VMID, vmid_mask); + else + ret = -1; + + return ret; } static int p2m_alloc_vmid(struct domain *d) @@ -1632,20 +1653,36 @@ void __init setup_virt_paging(void) unsigned int cpu; unsigned int pa_range = 0x10; /* Larger than any possible value */ + unsigned int vmid_8_bit_flag = 0; for_each_online_cpu ( cpu ) { const struct cpuinfo_arm *info = &cpu_data[cpu]; if ( info->mm64.pa_range < pa_range ) pa_range = info->mm64.pa_range; + + /* set a flag if the current cpu does not suppot 16 bit VMIDs */ + if ( info->mm64.vmid_bits != MM64_VMID_16_BITS_SUPPORT ) + vmid_8_bit_flag = 1; } + /* + * if the flag is not set then it means all CPUs support 16-bit + * VMIDs. + */ + if ( !vmid_8_bit_flag ) + max_vmid = MAX_VMID_16_BIT; + /* pa_range is 4 bits, but the defined encodings are only 3 bits */ if ( pa_range&0x8 || !pa_range_info[pa_range].pabits ) panic("Unknown encoding of ID_AA64MMFR0_EL1.PARange %x\n", pa_range); val |= VTCR_PS(pa_range); val |= VTCR_TG0_4K; + + /* set the VS bit only if 16 bit VMID is supported */ + if ( MAX_VMID == MAX_VMID_16_BIT ) + val |= VTCR_VS; val |= VTCR_SL0(pa_range_info[pa_range].sl0); val |= VTCR_T0SZ(pa_range_info[pa_range].t0sz); @@ -1660,7 +1697,8 @@ void __init setup_virt_paging(void) printk("P2M: %d levels with order-%d root, VTCR 0x%lx\n", 4 - P2M_ROOT_LEVEL, P2M_ROOT_ORDER, val); - p2m_vmid_allocator_init(); + if ( p2m_vmid_allocator_init() != 0 ) + panic("Could not allocate VMID bitmap space"); /* It is not allowed to concatenate a level zero root */ BUG_ON( P2M_ROOT_LEVEL == 0 && P2M_ROOT_ORDER > 0 ); diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 0987be2..9de55fc 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -30,7 +30,7 @@ struct p2m_domain { struct page_info *root; /* Current VMID in use */ - uint8_t vmid; + uint16_t vmid; /* Current Translation Table Base Register for the p2m */ uint64_t vttbr; diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 15bf890..48ce59b 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -215,6 +215,8 @@ #define VTCR_PS(x) ((x)<<16) +#define VTCR_VS (_AC(0x1,UL)<<19) + #endif #define VTCR_RES1 (_AC(1,UL)<<31) @@ -269,6 +271,11 @@ /* FSR long format */ #define FSRL_STATUS_DEBUG (_AC(0x22,UL)<<0) +#ifdef CONFIG_ARM_64 +#define MM64_VMID_8_BITS_SUPPORT 0x0 +#define MM64_VMID_16_BITS_SUPPORT 0x2 +#endif + #ifndef __ASSEMBLY__ struct cpuinfo_arm { @@ -337,7 +344,16 @@ struct cpuinfo_arm { unsigned long tgranule_64K:4; unsigned long tgranule_4K:4; unsigned long __res0:32; - }; + + unsigned long hafdbs:4; + unsigned long vmid_bits:4; + unsigned long vh:4; + unsigned long hpds:4; + unsigned long lo:4; + unsigned long pan:4; + unsigned long __res1:8; + unsigned long __res2:32; + }; } mm64; struct {