From patchwork Fri May 5 03:52:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Xiong Y" X-Patchwork-Id: 9711619 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 CD4BE60235 for ; Thu, 4 May 2017 11:50:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B028E2867A for ; Thu, 4 May 2017 11:50:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A4D3F28683; Thu, 4 May 2017 11:50:11 +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=-1.0 required=2.0 tests=BAYES_00, DATE_IN_FUTURE_12_24, RCVD_IN_DNSWL_MED autolearn=no 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 DF7C32867A for ; Thu, 4 May 2017 11:50:09 +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 1d6FEb-0001py-Sq; Thu, 04 May 2017 11:47:49 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d6FEa-0001ps-ER for xen-devel@lists.xen.org; Thu, 04 May 2017 11:47:48 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id 0B/23-03058-3E41B095; Thu, 04 May 2017 11:47:47 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRWlGSWpSXmKPExsXS1tYhoftYhDv SoGORqMWSj4tZHBg9ju7+zRTAGMWamZeUX5HAmnFsfydbQY9WxaW7bYwNjA0KXYxcHEIC0xgl Npz4z9zFyMkhIcArcWTZDFYIO0Bi045FrBBFLYwSO69sBStiE9CWWPv3FBuILSIgLXHt82VGk CJmgaOMEp+mTQQrEhZIlPg+by7YJBYBVYnzr9czgdi8Am4SP+6cZ4LYICdx81wn8wRG7gWMDK sY1YtTi8pSi3Qt9JKKMtMzSnITM3N0DQ3M9HJTi4sT01NzEpOK9ZLzczcxAj3MAAQ7GGdf9j/ EKMnBpCTKq/6KPVKILyk/pTIjsTgjvqg0J7X4EKMMB4eSBG+EMHekkGBRanpqRVpmDjDUYNIS HDxKIrxiIGne4oLE3OLMdIjUKUZdjl1z371nEmLJy89LlRLn/SMEVCQAUpRRmgc3Ahb2lxhlp YR5GYGOEuIpSC3KzSxBlX/FKM7BqCTMmwayiiczrwRu0yugI5iAjmiW5QA5oiQRISXVwKhear LJZ54cr4k901tlm6n7IvlL/+lvulRz0mKmx9WWCxM7Ai8csO+MWWDxNaVhRWmJ6AZJp73cfOw zt/Pyz+yJWL1kydcPu+RX/33BLZLikvPnWLv8McOfp69Lp78//6f0iO/uRJY+1jP3TcTeiqda Pmpz5A58GaPhla9wNeDg8n0184wu7FJiKc5INNRiLipOBABpmU+kdgIAAA== X-Env-Sender: xiong.y.zhang@intel.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1493898464!60517282!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzkwOTcx\n X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22050 invoked from network); 4 May 2017 11:47:47 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-4.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 4 May 2017 11:47:47 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 May 2017 04:47:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.38,287,1491289200"; d="scan'208"; a="1126380891" Received: from test-optiplex-7040.bj.intel.com ([10.238.154.174]) by orsmga001.jf.intel.com with ESMTP; 04 May 2017 04:47:42 -0700 From: Xiong Zhang To: xen-devel@lists.xen.org Date: Fri, 5 May 2017 11:52:14 +0800 Message-Id: <1493956334-3310-1-git-send-email-xiong.y.zhang@intel.com> X-Mailer: git-send-email 2.7.4 Cc: george.dunlap@eu.citrix.com, andrew.cooper3@citrix.com, paul.durrant@citrix.com, yu.c.zhang@linux.intel.com, zhiyuan.lv@intel.com, JBeulich@suse.com, Xiong Zhang Subject: [Xen-devel] [PATCH] x86/ioreq server: Fix DomU couldn't reboot when using p2m_ioreq_server p2m_type 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 'commit 1679e0df3df6 ("x86/ioreq server: asynchronously reset outstanding p2m_ioreq_server entries")' will call p2m_change_entry_type_global() which set entry.recalc=1. Then the following get_entry(p2m_ioreq_server) will return p2m_ram_rw type. But 'commit 6d774a951696 ("x86/ioreq server: synchronously reset outstanding p2m_ioreq_server entries when an ioreq server unmaps")' assume get_entry(p2m_ioreq_server) will return p2m_ioreq_server type, then reset p2m_ioreq_server entries. The fact is the assumption isn't true, and sysnchronously reset function couldn't work. Then ioreq.entry_count is larger than zero after an ioreq server unmaps, finally this results DomU couldn't reboot. This patch add a P2M_PRE_RECALC flag to p2m_query_t, then get_entry(P2M_PRE_RECALC) will return p2m_ioreq_server type for p2m_ioreq_server pfn, and finally change mem type through set_entry. Fix: 'commit 6d774a951696 ("x86/ioreq server: synchronously reset outstanding p2m_ioreq_server entries when an ioreq server unmaps")' Signed-off-by: Xiong Zhang Signed-off-by: Yu Zhang --- xen/arch/x86/mm/p2m-ept.c | 7 +++++-- xen/arch/x86/mm/p2m-pt.c | 19 ++++++++++++++----- xen/arch/x86/mm/p2m.c | 8 +++++--- xen/include/asm-x86/p2m.h | 1 + 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index f37a1f2..8f88d2b 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -991,8 +991,11 @@ static mfn_t ept_get_entry(struct p2m_domain *p2m, if ( is_epte_valid(ept_entry) ) { - *t = p2m_recalc_type(recalc || ept_entry->recalc, - ept_entry->sa_p2mt, p2m, gfn); + if ( !(q & P2M_PRE_RECALC) ) + *t = p2m_recalc_type(recalc || ept_entry->recalc, + ept_entry->sa_p2mt, p2m, gfn); + else + *t = ept_entry->sa_p2mt; *a = ept_entry->access; if ( sve ) *sve = ept_entry->suppress_ve; diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index 5079b59..50e74f5 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -840,8 +840,11 @@ pod_retry_l3: mfn = _mfn(l3e_get_pfn(*l3e) + l2_table_offset(addr) * L1_PAGETABLE_ENTRIES + l1_table_offset(addr)); - *t = p2m_recalc_type(recalc || _needs_recalc(flags), - p2m_flags_to_type(flags), p2m, gfn); + if ( !(q & P2M_PRE_RECALC) ) + *t = p2m_recalc_type(recalc || _needs_recalc(flags), + p2m_flags_to_type(flags), p2m, gfn); + else + *t = p2m_flags_to_type(flags); unmap_domain_page(l3e); ASSERT(mfn_valid(mfn) || !p2m_is_ram(*t)); @@ -879,8 +882,11 @@ pod_retry_l2: if ( flags & _PAGE_PSE ) { mfn = _mfn(l2e_get_pfn(*l2e) + l1_table_offset(addr)); - *t = p2m_recalc_type(recalc || _needs_recalc(flags), - p2m_flags_to_type(flags), p2m, gfn); + if ( !(q & P2M_PRE_RECALC) ) + *t = p2m_recalc_type(recalc || _needs_recalc(flags), + p2m_flags_to_type(flags), p2m, gfn); + else + *t = p2m_flags_to_type(flags); unmap_domain_page(l2e); ASSERT(mfn_valid(mfn) || !p2m_is_ram(*t)); @@ -916,7 +922,10 @@ pod_retry_l1: return INVALID_MFN; } mfn = _mfn(l1e_get_pfn(*l1e)); - *t = p2m_recalc_type(recalc || _needs_recalc(flags), l1t, p2m, gfn); + if ( !(q & P2M_PRE_RECALC) ) + *t = p2m_recalc_type(recalc || _needs_recalc(flags), l1t, p2m, gfn); + else + *t = l1t; unmap_domain_page(l1e); ASSERT(mfn_valid(mfn) || !p2m_is_ram(*t) || p2m_is_paging(*t)); diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 1d57e5c..1c3e22f 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1020,6 +1020,8 @@ void p2m_finish_type_change(struct domain *d, p2m_type_t t; unsigned long gfn = gfn_x(first_gfn); unsigned long last_gfn = gfn + max_nr - 1; + mfn_t mfn; + p2m_access_t a; ASSERT(ot != nt); ASSERT(p2m_is_changeable(ot) && p2m_is_changeable(nt)); @@ -1029,10 +1031,10 @@ void p2m_finish_type_change(struct domain *d, last_gfn = min(last_gfn, p2m->max_mapped_pfn); while ( gfn <= last_gfn ) { - get_gfn_query_unlocked(d, gfn, &t); - + mfn = p2m->get_entry(p2m, gfn, &t, &a, P2M_PRE_RECALC, NULL, NULL); if ( t == ot ) - p2m_change_type_one(d, gfn, t, nt); + p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, nt, + p2m->default_access); gfn++; } diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 7574a9b..9645260 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -78,6 +78,7 @@ typedef enum { typedef unsigned int p2m_query_t; #define P2M_ALLOC (1u<<0) /* Populate PoD and paged-out entries */ #define P2M_UNSHARE (1u<<1) /* Break CoW sharing */ +#define P2M_PRE_RECALC (1u<<2) /* Get p2m type before recalc */ /* We use bitmaps and maks to handle groups of types */ #define p2m_to_mask(_t) (1UL << (_t))