From patchwork Fri Sep 29 15:01:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Dunlap X-Patchwork-Id: 9978253 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 223A860311 for ; Fri, 29 Sep 2017 15:04:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 151042766D for ; Fri, 29 Sep 2017 15:04:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 09FBA28448; Fri, 29 Sep 2017 15:04:06 +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 B5AF62766D for ; Fri, 29 Sep 2017 15:04:05 +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 1dxwnq-0003ed-Dk; Fri, 29 Sep 2017 15:02:10 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dxwnp-0003do-Bn for xen-devel@lists.xenproject.org; Fri, 29 Sep 2017 15:02:09 +0000 Received: from [85.158.143.35] by server-8.bemta-6.messagelabs.com id A6/95-17770-0706EC95; Fri, 29 Sep 2017 15:02:08 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphkeJIrShJLcpLzFFi42JxWrrBXrcg4Vy kQeNyMYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNWPB9oqCVqGKh49VGhgn8nYxcnJICPhLvJz2 gBHEZhPQk5h3/CtLFyMHh4iAisTtvQYgJrNApcSpWckgprCAk8SLWQ4gxSwCqhLblmxlArF5B WwkZjSsY4cYKC9x7sFtZhCbU8BWYlN/N5gtBFTz7NpddghbVWLxg6PsEL2CEidnPmEBsZkFJC QOvnjBPIGRdxaS1CwkqQWMTKsYNYpTi8pSi3QNDfSSijLTM0pyEzNzgDwzvdzU4uLE9NScxKR iveT83E2MwJBhAIIdjMffxx1ilORgUhLlFYg9FynEl5SfUpmRWJwRX1Sak1p8iFGGg0NJgndj PFBOsCg1PbUiLTMHGLwwaQkOHiUR3j0gad7igsTc4sx0iNQpRl2Ojpt3/zAJseTl56VKifP2g BQJgBRllObBjYBF0iVGWSlhXkago4R4ClKLcjNLUOVfMYpzMCoJ8/qDTOHJzCuB2/QK6AgmoC MmTzwDckRJIkJKqoHRujwg8nfk5/d9wblOz8Lr1sXueqbIeX6b+IELpgekFax37hbnaz6xIj1 njskuj0suM/0rAlZM2Sr/sDpad2GLaql0hndRRMS+6sTS5ewrtmY4Ze5P3C8fs0agX+cl0x4J 0UXv/L1CpGawVbMddWnwNww3ff33kkPirXUp3U8fCO/OnLNn6RElluKMREMt5qLiRAAHePDDn wIAAA== X-Env-Sender: prvs=438a79e6a=George.Dunlap@citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1506697324!79105423!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61560 invoked from network); 29 Sep 2017 15:02:08 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 29 Sep 2017 15:02:08 -0000 X-IronPort-AV: E=Sophos;i="5.42,452,1500940800"; d="scan'208";a="449785857" From: George Dunlap To: Date: Fri, 29 Sep 2017 16:01:43 +0100 Message-ID: <20170929150144.7602-8-george.dunlap@citrix.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170929150144.7602-1-george.dunlap@citrix.com> References: <20170929150144.7602-1-george.dunlap@citrix.com> MIME-Version: 1.0 Cc: Sergey Dyasli , Jan Beulich , Andrew Cooper Subject: [Xen-devel] [PATCH 8/9] 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 From: Sergey Dyasli Remove some code duplication. Suggested-by: George Dunlap Signed-off-by: Sergey Dyasli Reviewed-by: George Dunlap --- CC: Andrew Cooper CC: Jan Beulich --- 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 4eac61e95b..dee6d7f0f2 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1829,6 +1829,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); @@ -1845,14 +1846,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 ) { @@ -1867,15 +1864,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); } @@ -1884,8 +1876,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);