From patchwork Mon Sep 4 08:14:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Dyasli X-Patchwork-Id: 9936815 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 3A961601EB for ; Mon, 4 Sep 2017 08:18:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2BCB828781 for ; Mon, 4 Sep 2017 08:18:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 20AE728784; Mon, 4 Sep 2017 08:18:33 +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 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 CD9FC28781 for ; Mon, 4 Sep 2017 08:18:32 +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 1domYg-0007Wr-NW; Mon, 04 Sep 2017 08:16:38 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1domYf-0007VA-EO for xen-devel@lists.xen.org; Mon, 04 Sep 2017 08:16:37 +0000 Received: from [85.158.143.35] by server-7.bemta-6.messagelabs.com id 1B/6F-03610-4EB0DA95; Mon, 04 Sep 2017 08:16:36 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpkkeJIrShJLcpLzFFi42JxWrohUvcJ99p IgxNPhSyWfFzM4sDocXT3b6YAxijWzLyk/IoE1oxDcy0KTgpUvG1aydrA+Jy7i5GTQ0LAX2J3 92xGEJtNQE9i4+xXTCC2iICsxOquOewgNrPAJyaJhmOOXYwcHMIC7hL7fqqCmCwCKhLnt4FV8 ArYSTQfXcoGMVFeYlfbRVYQmxMofnb1G7DpQgK2Ej2LDzND2KoSr1/sYoHoFZQ4OfMJC8QmCY mDL14wT2DknYUkNQtJagEj0ypG9eLUorLUIl1TvaSizPSMktzEzBxdQwMzvdzU4uLE9NScxKR iveT83E2MwKBhAIIdjNMv+x9ilORgUhLlvf94TaQQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCd6D XGsjhQSLUtNTK9Iyc4DhC5OW4OBREuHlB4awEG9xQWJucWY6ROoUo6KUOO99kD4BkERGaR5cG yxmLjHKSgnzMgIdIsRTkFqUm1mCKv+KUZyDUUmY9yPIFJ7MvBK46a+AFjMBLa56uQZkcUkiQk qqgXFCT2zVhy2XU6yYWMI4vQ61rTQ5K+L/N2Dvm9VWMxS49Db8LKxmrr6vwiLh1zLr/qmIyef WH3B5d8HXjGFTsO4SxabbqktPn1vByjzHrjdAJsfe2Vfe+bq65alr1zykHzrff/mmjbvgTQ/v GoVDC2/7rpn8q6xD0/J279mmHbzi3/f931ShlKTEUpyRaKjFXFScCADxXOxJlAIAAA== X-Env-Sender: prvs=413848043=sergey.dyasli@citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1504512993!80963348!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24272 invoked from network); 4 Sep 2017 08:16:36 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 4 Sep 2017 08:16:36 -0000 X-IronPort-AV: E=Sophos;i="5.41,473,1498521600"; d="scan'208";a="438259710" From: Sergey Dyasli To: Date: Mon, 4 Sep 2017 09:14:50 +0100 Message-ID: <20170904081452.12960-13-sergey.dyasli@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170904081452.12960-1-sergey.dyasli@citrix.com> References: <20170904081452.12960-1-sergey.dyasli@citrix.com> MIME-Version: 1.0 Cc: Sergey Dyasli , Kevin Tian , Jun Nakajima , George Dunlap , Andrew Cooper , Tim Deegan , Jan Beulich , Boris Ostrovsky , Suravee Suthikulpanit Subject: [Xen-devel] [PATCH v1 12/14] x86/np2m: refactor p2m_get_nestedp2m_locked() 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: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Remove some code duplication. Suggested-by: George Dunlap Signed-off-by: Sergey Dyasli --- xen/arch/x86/mm/p2m.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index d6a474fa20..f783f25fa8 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1826,6 +1826,7 @@ p2m_get_nestedp2m_locked(struct vcpu *v) struct p2m_domain *p2m; uint64_t np2m_base = nhvm_vcpu_p2m_base(v); unsigned int i; + bool needs_flush = true; /* Mask out low bits; this avoids collisions with P2M_BASE_EADDR */ np2m_base &= ~(0xfffull); @@ -1842,14 +1843,10 @@ p2m_get_nestedp2m_locked(struct vcpu *v) if ( p2m->np2m_base == np2m_base ) { /* Check if np2m was flushed just before the lock */ - if ( nv->np2m_generation != p2m->np2m_generation ) - nvcpu_flush(v); + if ( nv->np2m_generation == p2m->np2m_generation ) + needs_flush = false; /* np2m is up-to-date */ - p2m->np2m_base = np2m_base; - assign_np2m(v, p2m); - nestedp2m_unlock(d); - - return p2m; + goto found; } else if ( p2m->np2m_base != P2M_BASE_EADDR ) { @@ -1864,15 +1861,10 @@ p2m_get_nestedp2m_locked(struct vcpu *v) { p2m = d->arch.nested_p2m[i]; p2m_lock(p2m); + if ( p2m->np2m_base == np2m_base ) - { - nvcpu_flush(v); - p2m->np2m_base = np2m_base; - assign_np2m(v, p2m); - nestedp2m_unlock(d); + goto found; - return p2m; - } p2m_unlock(p2m); } @@ -1881,8 +1873,11 @@ p2m_get_nestedp2m_locked(struct vcpu *v) p2m = p2m_getlru_nestedp2m(d, NULL); p2m_flush_table(p2m); p2m_lock(p2m); + + found: + if ( needs_flush ) + nvcpu_flush(v); p2m->np2m_base = np2m_base; - nvcpu_flush(v); assign_np2m(v, p2m); nestedp2m_unlock(d);