From patchwork Wed May 3 22:15:41 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: 9708929 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 F01A860351 for ; Wed, 3 May 2017 06:14:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD5A1285EE for ; Wed, 3 May 2017 06:14:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE480285F2; Wed, 3 May 2017 06:14:07 +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 A6240285EE for ; Wed, 3 May 2017 06:14:03 +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 1d5nVU-00066l-J6; Wed, 03 May 2017 06:11:24 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5nVT-00066f-EM for xen-devel@lists.xen.org; Wed, 03 May 2017 06:11:23 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id 10/3B-02956-A8479095; Wed, 03 May 2017 06:11:22 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrILMWRWlGSWpSXmKPExsXS1taRottVwhl p8Hktj8WSj4tZHBg9ju7+zRTAGMWamZeUX5HAmnGrbxZbwUqJip7XAQ2Mk4W7GDk5hAQqJY4e 2cEEYksI8EocWTaDFcIOkHg0cQtbFyMXUE0Lo8Sszi3MIAk2AW2JtX9PsYHYIgLSEtc+X2YEK WIWOMooMe/MS6AEB4ewQJrEph1mIDUsAqoS67/cARvKK+AuMffhI0aIBXISN891Mk9g5F7AyL CKUaM4tagstUjX0EAvqSgzPaMkNzEzB8gz08tNLS5OTE/NSUwq1kvOz93ECPQuAxDsYLy3LOA QoyQHk5Ior/or9kghvqT8lMqMxOKM+KLSnNTiQ4wyHBxKErxZxZyRQoJFqempFWmZOcAwg0lL cPAoiUCkeYsLEnOLM9MhUqcYdTl2zX33nkmIJS8/L1VKnFcNpEgApCijNA9uBCzkLzHKSgnzM gIdJcRTkFqUm1mCKv+KUZyDUUmY1xJkCk9mXgncpldARzABHdEsywFyREkiQkqqgZHHa/6024 s3HN7dEXJxozhX2Jzgj+2f/9yR+3ypz+763465vXf+VTl1RK5IXry228U+Z9WnKbNiv6735BO /7Tml9svuz7W9cw56v+rJd2hiVTH8qSTh3G7332mnYuO6nTt0Tq5Y2CJ2scfr8a8F5t+yw/4v KXp76P2OCRIblTomrfy0Qk3iBP90JZbijERDLeai4kQAYLmYR3QCAAA= X-Env-Sender: xiong.y.zhang@intel.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1493791879!98629234!1 X-Originating-IP: [134.134.136.100] X-SpamReason: No, hits=2.8 required=7.0 tests=BODY_RANDOM_LONG, DATE_IN_FUTURE_12_24 X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 55587 invoked from network); 3 May 2017 06:11:21 -0000 Received: from mga07.intel.com (HELO mga07.intel.com) (134.134.136.100) by server-12.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 3 May 2017 06:11:21 -0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP; 02 May 2017 23:11:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.38,283,1491289200"; d="scan'208"; a="1142982704" Received: from test-optiplex-7040.bj.intel.com ([10.238.154.174]) by fmsmga001.fm.intel.com with ESMTP; 02 May 2017 23:11:17 -0700 From: Xiong Zhang To: xen-devel@lists.xen.org Date: Thu, 4 May 2017 06:15:41 +0800 Message-Id: <1493849741-13355-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 reboot couldn't work 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 reboot couldn't work. This patch will let get_entry(p2m_ioreq_server) return p2m_ioreq_server type instead of p2m_ram_rw type when the type of ioreq_server entries havn't been written. The actual type change happens in recalc funciton. 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 | 4 ++++ xen/arch/x86/mm/p2m-pt.c | 3 +++ xen/include/asm-x86/p2m.h | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index f37a1f2..6178046 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -546,6 +546,10 @@ static int resolve_misconfig(struct p2m_domain *p2m, unsigned long gfn) e.ipat = ipat; nt = p2m_recalc_type(e.recalc, e.sa_p2mt, p2m, gfn + i); + if ( e.sa_p2mt == p2m_ioreq_server && + p2m->ioreq.server == NULL ) + nt = p2m_ram_rw; + if ( nt != e.sa_p2mt ) { if ( e.sa_p2mt == p2m_ioreq_server ) diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index 5079b59..4de500c 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -445,6 +445,9 @@ static int do_recalc(struct p2m_domain *p2m, unsigned long gfn) p2m->domain->domain_id, gfn, level); ot = p2m_flags_to_type(l1e_get_flags(e)); nt = p2m_recalc_type_range(true, ot, p2m, gfn & mask, gfn | ~mask); + if ( ot == p2m_ioreq_server && p2m->ioreq.server == NULL ) + nt = p2m_ram_rw; + if ( nt != ot ) { unsigned long mfn = l1e_get_pfn(e); diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 7574a9b..dde516c 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -760,7 +760,7 @@ static inline p2m_type_t p2m_recalc_type_range(bool recalc, p2m_type_t t, if ( !recalc || !p2m_is_changeable(t) ) return t; - if ( t == p2m_ioreq_server && p2m->ioreq.server != NULL ) + if ( t == p2m_ioreq_server ) return t; return p2m_is_logdirty_range(p2m, gfn_start, gfn_end) ? p2m_ram_logdirty