From patchwork Mon Sep 12 08:16:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongli Zhang X-Patchwork-Id: 9325905 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 B057F6089F for ; Mon, 12 Sep 2016 08:19:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A343E28BD4 for ; Mon, 12 Sep 2016 08:19:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9760E28BDA; Mon, 12 Sep 2016 08:19:42 +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, UNPARSEABLE_RELAY 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 1D86D28BD9 for ; Mon, 12 Sep 2016 08:19:42 +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 1bjMQl-0007hG-6B; Mon, 12 Sep 2016 08:17:31 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bjMQk-0007gv-BQ for xen-devel@lists.xen.org; Mon, 12 Sep 2016 08:17:30 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id D4/F9-29421-99466D75; Mon, 12 Sep 2016 08:17:29 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBLMWRWlGSWpSXmKPExsXSO6nOVXdmyrV wg5dTeC2WfFzM4sDocXT3b6YAxijWzLyk/IoE1oyHFx0L1htXzPvD1cD4VrWLkZNDSKCNSeLp Kd8uRi4g+wujxOR1c5khnA2MEofO32eEqOpmlHjVwg5iswnoSEw7cIoFxBYRkJa49vkyWA0zy KR3211AbGGBJIkLV9aC1bAIqEocPfibDcTmFXCTWP7wHVi9hICcxMljk1lBbE4Bd4m99z6xQu xyk+jZe4wVosZQ4vTDbYwTGPkWMDKsYlQvTi0qSy3SNdJLKspMzyjJTczM0TU0MNPLTS0uTkx PzUlMKtZLzs/dxAgMEQYg2MG47K/TIUZJDiYlUd4kwWvhQnxJ+SmVGYnFGfFFpTmpxYcYZTg4 lCR4U5OBcoJFqempFWmZOcBghUlLcPAoifB2gqR5iwsSc4sz0yFSpxgVpcR5TUESAiCJjNI8u DZYhFxilJUS5mUEOkSIpyC1KDezBFX+FaM4B6OSMO9EkCk8mXklcNNfAS1mAlr8dOtlkMUliQ gpqQZGA+myCKNL36cvW/JXjjn5vgQv16XMqD7Dx1POtE6yOL9lyrOzn4wU+E+InRK66Xsv4Nn hjqkLFPgs7t8P/OPNIrSsdVnmdsEwg+P333LwSN9+e3PGxT5NqaeL02/9n6G9z+xj4N8oo0fr 6rhnhr2KT2ebv6RnAlv6StX232pL8mstMs4lJs8RVGIpzkg01GIuKk4EAHvRENuLAgAA X-Env-Sender: dongli.zhang@oracle.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1473668247!58454378!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjc3MjE4\n X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28067 invoked from network); 12 Sep 2016 08:17:28 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-16.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 12 Sep 2016 08:17:28 -0000 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u8C8HOxF004344 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Sep 2016 08:17:24 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u8C8HOBt019762 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Sep 2016 08:17:24 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id u8C8HM11027588; Mon, 12 Sep 2016 08:17:23 GMT Received: from linux.cn.oracle.com (/10.182.70.252) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 12 Sep 2016 01:17:22 -0700 From: Dongli Zhang To: xen-devel@lists.xen.org Date: Mon, 12 Sep 2016 16:16:15 +0800 Message-Id: <1473668175-3088-2-git-send-email-dongli.zhang@oracle.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1473668175-3088-1-git-send-email-dongli.zhang@oracle.com> References: <1473668175-3088-1-git-send-email-dongli.zhang@oracle.com> X-Source-IP: userv0021.oracle.com [156.151.31.71] Cc: sstabellini@kernel.org, wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, david.vrabel@citrix.com, jbeulich@suse.com Subject: [Xen-devel] [PATCH v4 2/2] xen: move TLB-flush filtering out into populate_physmap during vm creation 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 This patch implemented parts of TODO left in commit id a902c12ee45fc9389eb8fe54eeddaf267a555c58. It moved TLB-flush filtering out into populate_physmap. Because of TLB-flush in alloc_heap_pages, it's very slow to create a guest with memory size of more than 100GB on host with 100+ cpus. This patch introduced a "MEMF_no_tlbflush" bit to memflags to indicate whether TLB-flush should be done in alloc_heap_pages or its caller populate_physmap. Once this bit is set in memflags, alloc_heap_pages will ignore TLB-flush. To use this bit after vm is created might lead to security issue, that is, this would make pages accessible to the guest B, when guest A may still have a cached mapping to them. Therefore, this patch also introduced a "is_ever_unpaused" field to struct domain to indicate whether this domain has ever got unpaused by hypervisor. MEMF_no_tlbflush can be set only during vm creation phase when is_ever_unpaused is still false before this domain gets unpaused for the first time. Signed-off-by: Dongli Zhang --- Changed since v3: * Set the flag to true in domain_unpause_by_systemcontroller when unpausing the guest domain for the first time. * Use true/false for all boot_t variables. * Add unlikely to optimize "if statement". * Correct comment style. Changed since v2: * Limit this optimization to domain creation time. --- xen/common/domain.c | 11 +++++++++++ xen/common/memory.c | 34 ++++++++++++++++++++++++++++++++++ xen/common/page_alloc.c | 3 ++- xen/include/xen/mm.h | 2 ++ xen/include/xen/sched.h | 3 +++ 5 files changed, 52 insertions(+), 1 deletion(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index a8804e4..7be1bee 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -303,6 +303,8 @@ struct domain *domain_create(domid_t domid, unsigned int domcr_flags, if ( !zalloc_cpumask_var(&d->domain_dirty_cpumask) ) goto fail; + d->is_ever_unpaused = false; + if ( domcr_flags & DOMCRF_hvm ) d->guest_type = guest_type_hvm; else if ( domcr_flags & DOMCRF_pvh ) @@ -1004,6 +1006,15 @@ int domain_unpause_by_systemcontroller(struct domain *d) { int old, new, prev = d->controller_pause_count; + /* + * Set is_ever_unpaused to true when this domain gets unpaused for the + * first time. We record this information here to help populate_physmap + * verify whether the domain has ever been unpaused. MEMF_no_tlbflush + * is allowed to be set by populate_physmap only during vm creation. + */ + if ( unlikely(!d->is_ever_unpaused) ) + d->is_ever_unpaused = true; + do { old = prev; diff --git a/xen/common/memory.c b/xen/common/memory.c index cc0f69e..f3a733b 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -141,6 +141,8 @@ static void populate_physmap(struct memop_args *a) unsigned int i, j; xen_pfn_t gpfn, mfn; struct domain *d = a->domain, *curr_d = current->domain; + bool_t need_tlbflush = false; + uint32_t tlbflush_timestamp = 0; if ( !guest_handle_subrange_okay(a->extent_list, a->nr_done, a->nr_extents-1) ) @@ -150,6 +152,14 @@ static void populate_physmap(struct memop_args *a) max_order(curr_d)) ) return; + /* + * MEMF_no_tlbflush can be set only during vm creation phase when + * is_ever_unpaused is still false before this domain gets unpaused for + * the first time. + */ + if ( unlikely(!d->is_ever_unpaused) ) + a->memflags |= MEMF_no_tlbflush; + for ( i = a->nr_done; i < a->nr_extents; i++ ) { if ( i != a->nr_done && hypercall_preempt_check() ) @@ -214,6 +224,20 @@ static void populate_physmap(struct memop_args *a) goto out; } + if ( unlikely(!d->is_ever_unpaused) ) + { + for ( j = 0; j < (1U << a->extent_order); j++ ) + { + if ( page_needs_tlbflush(&page[j], need_tlbflush, + tlbflush_timestamp, + tlbflush_current_time()) ) + { + need_tlbflush = true; + tlbflush_timestamp = page[j].tlbflush_timestamp; + } + } + } + mfn = page_to_mfn(page); } @@ -232,6 +256,16 @@ static void populate_physmap(struct memop_args *a) } out: + if ( need_tlbflush ) + { + cpumask_t mask = cpu_online_map; + tlbflush_filter(mask, tlbflush_timestamp); + if ( !cpumask_empty(&mask) ) + { + perfc_incr(need_flush_tlb_flush); + flush_tlb_mask(&mask); + } + } a->nr_done = i; } diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 5b93a01..04ca26a 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -827,7 +827,8 @@ static struct page_info *alloc_heap_pages( BUG_ON(pg[i].count_info != PGC_state_free); pg[i].count_info = PGC_state_inuse; - if ( page_needs_tlbflush(&pg[i], need_tlbflush, + if ( !(memflags & MEMF_no_tlbflush) && + page_needs_tlbflush(&pg[i], need_tlbflush, tlbflush_timestamp, tlbflush_current_time()) ) { diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 766559d..04b10e9 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -221,6 +221,8 @@ struct npfec { #define MEMF_exact_node (1U<<_MEMF_exact_node) #define _MEMF_no_owner 5 #define MEMF_no_owner (1U<<_MEMF_no_owner) +#define _MEMF_no_tlbflush 6 +#define MEMF_no_tlbflush (1U<<_MEMF_no_tlbflush) #define _MEMF_node 8 #define MEMF_node_mask ((1U << (8 * sizeof(nodeid_t))) - 1) #define MEMF_node(n) ((((n) + 1) & MEMF_node_mask) << _MEMF_node) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 2f9c15f..7fe8841 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -474,6 +474,9 @@ struct domain unsigned int guest_request_enabled : 1; unsigned int guest_request_sync : 1; } monitor; + + /* set to true the first time this domain gets unpaused. */ + bool_t is_ever_unpaused; }; /* Protect updates/reads (resp.) of domain_list and domain_hash. */