From patchwork Mon Sep 4 08:14:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Dyasli X-Patchwork-Id: 9936817 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 2524F601EB for ; Mon, 4 Sep 2017 08:18:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 172BE28781 for ; Mon, 4 Sep 2017 08:18:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BE8628783; Mon, 4 Sep 2017 08:18:36 +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 B7F8228777 for ; Mon, 4 Sep 2017 08:18:35 +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-0007WO-GV; 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 1domYe-0007V2-UG for xen-devel@lists.xen.org; Mon, 04 Sep 2017 08:16:37 +0000 Received: from [85.158.143.35] by server-11.bemta-6.messagelabs.com id 67/E1-03616-4EB0DA95; Mon, 04 Sep 2017 08:16:36 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpkkeJIrShJLcpLzFFi42JxWrohUvcx99p Ig1mvVS2WfFzM4sDocXT3b6YAxijWzLyk/IoE1oyJC/exFLzjrmhbGdHAeIOzi5GTQ0LAX2L6 5hZmEJtNQE9i4+xXTCC2iICsxOquOewgNrPAJyaJhmOOXYwcHMICThI3LwqChFkEVCR63v1lB gnzCthJHN7jBjFRXmJX20VWEJsTKHx29RtGEFtIwFaiZ/FhZghbVeL1i10sIDavgKDEyZlPWC A2SUgcfPGCeQIj7ywkqVlIUgsYmVYxqhenFpWlFuma6iUVZaZnlOQmZuboGhqY6eWmFhcnpqf mJCYV6yXn525iBAYNAxDsYJx+2f8QoyQHk5Io7/3HayKF+JLyUyozEosz4otKc1KLDzHKcHAo SfAe5FobKSRYlJqeWpGWmQMMX5i0BAePkggvPzCEhXiLCxJzizPTIVKnGBWlxHnvg/QJgCQyS vPg2mAxc4lRVkqYlxHoECGegtSi3MwSVPlXjOIcjErCvB9BpvBk5pXATX8FtJgJaHHVyzUgi0 sSEVJSDYypnudPhzr1FzFFWuw+dcFiamxIt/Duum7Dxj3P5lQVq+n3mp1R3l06wde3a7nLSun jMTN8l8sF7+deLnngxu4+HwbWFbaT2zpEZ0xPLNL/kbxkyd6VR5sOPSnTPJTRPSO0nmfKrpeS LzIEPm5uVKq4eu/Lgd2vL+iG/VstIMzDs+Pl/4oGkxwlluKMREMt5qLiRADLRFI5lAIAAA== X-Env-Sender: prvs=413848043=sergey.dyasli@citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1504512993!80963348!1 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 24193 invoked from network); 4 Sep 2017 08:16:35 -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:35 -0000 X-IronPort-AV: E=Sophos;i="5.41,473,1498521600"; d="scan'208";a="438259702" From: Sergey Dyasli To: Date: Mon, 4 Sep 2017 09:14:51 +0100 Message-ID: <20170904081452.12960-14-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 13/14] x86/np2m: add break to np2m_flush_eptp() 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 Now that np2m sharing is implemented, there can be only one np2m object with the same np2m_base. Break from loop if the required np2m was found during np2m_flush_eptp(). Signed-off-by: Sergey Dyasli --- xen/arch/x86/mm/p2m.c | 4 ++++ xen/include/asm-x86/p2m.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index f783f25fa8..f11355b0d1 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1792,7 +1792,11 @@ void np2m_flush_base(struct vcpu *v, unsigned long np2m_base) p2m = d->arch.nested_p2m[i]; p2m_lock(p2m); if ( p2m->np2m_base == np2m_base ) + { p2m_flush_table_locked(p2m); + p2m_unlock(p2m); + break; + } p2m_unlock(p2m); } nestedp2m_unlock(d); diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 790635ec0b..a17e589c07 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -786,7 +786,7 @@ int p2m_pt_handle_deferred_changes(uint64_t gpa); void p2m_flush(struct vcpu *v, struct p2m_domain *p2m); /* Flushes all nested p2m tables */ void p2m_flush_nestedp2m(struct domain *d); -/* Flushes all np2m objects with the specified np2m_base */ +/* Flushes the np2m specified by np2m_base (if it exists) */ void np2m_flush_base(struct vcpu *v, unsigned long np2m_base); void nestedp2m_write_p2m_entry(struct p2m_domain *p2m, unsigned long gfn,