From patchwork Tue Jul 18 10:34:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Dyasli X-Patchwork-Id: 9847689 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 6E8BC602C8 for ; Tue, 18 Jul 2017 10:36:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B4292853A for ; Tue, 18 Jul 2017 10:36:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 602F52854A; Tue, 18 Jul 2017 10:36:47 +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 E659D2853A for ; Tue, 18 Jul 2017 10:36:46 +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 1dXPpt-000636-Q3; Tue, 18 Jul 2017 10:34:37 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dXPpt-00062Q-0n for xen-devel@lists.xen.org; Tue, 18 Jul 2017 10:34:37 +0000 Received: from [193.109.254.147] by server-2.bemta-6.messagelabs.com id 7C/8A-27137-C34ED695; Tue, 18 Jul 2017 10:34:36 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRWlGSWpSXmKPExsXitHSDva71k9x Ig1Mn1C2WfFzM4sDocXT3b6YAxijWzLyk/IoE1oyH+2+xFvwWqZj+pY+pgbFNsIuRk0NCwF/i 09NpTCA2m4CexMbZr8BsEQFZidVdc9hBbGaBT0wSDcccQWxhASuJ33OegcVZBFQlWj/dZgOxe QVsJfY3rmWEmCkvsavtIiuIzSlgJzHveScLiC0EVLP6wi5WCFtV4vWLXSwQvYISJ2c+YYHYJS Fx8MUL5gmMvLOQpGYhSS1gZFrFqFGcWlSWWqRraKKXVJSZnlGSm5iZo2toYKaXm1pcnJiempO YVKyXnJ+7iREYPAxAsIPx+saAQ4ySHExKoryrD+RGCvEl5adUZiQWZ8QXleakFh9ilOHgUJLg PfoIKCdYlJqeWpGWmQMMY5i0BAePkghv0GOgNG9xQWJucWY6ROoUoy7Hqwn/vzEJseTl56VKi fMGgxQJgBRllObBjYDF1CVGWSlhXkago4R4ClKLcjNLUOVfMYpzMCoJ824BuYQnM68EbtMroC OYgI4Q9s0BOaIkESEl1cA4q9b6ocO8e1XyDoy7ZvamPFiZ8dD+3KU7lY6Fu5QdnV0OfE5bz9F /+8cbVdeojQbeoUwuhaXnujr0frVXdx37euWmy5wff+u7axPM3DecPPG7sup5kaFOjeGem0l7 M9Zfc3U9dPj5jKonkwuqBNrKnxpeu2ycpWnnKXBBgiNqfobirtrlJk1KLMUZiYZazEXFiQCr9 0K6pAIAAA== X-Env-Sender: prvs=365bef495=sergey.dyasli@citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1500374074!48111968!1 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.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 34231 invoked from network); 18 Jul 2017 10:34:35 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-2.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 18 Jul 2017 10:34:35 -0000 X-IronPort-AV: E=Sophos;i="5.40,377,1496102400"; d="scan'208";a="440264634" From: Sergey Dyasli To: Date: Tue, 18 Jul 2017 11:34:19 +0100 Message-ID: <20170718103429.25020-3-sergey.dyasli@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170718103429.25020-1-sergey.dyasli@citrix.com> References: <20170718103429.25020-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 RFC 02/12] x86/np2m: add 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 The new function finds all np2m objects with the specified eptp and flushes them. p2m_flush_table_locked() is added in order not to release the p2m lock after np2m_base check. Signed-off-by: Sergey Dyasli --- xen/arch/x86/mm/p2m.c | 34 +++++++++++++++++++++++++++++++--- xen/include/asm-x86/p2m.h | 2 ++ 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index b8c8bba421..bc330d8f52 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1708,15 +1708,14 @@ p2m_getlru_nestedp2m(struct domain *d, struct p2m_domain *p2m) return p2m; } -/* Reset this p2m table to be empty */ static void -p2m_flush_table(struct p2m_domain *p2m) +p2m_flush_table_locked(struct p2m_domain *p2m) { struct page_info *top, *pg; struct domain *d = p2m->domain; mfn_t mfn; - p2m_lock(p2m); + ASSERT(p2m_locked_by_me(p2m)); /* * "Host" p2m tables can have shared entries &c that need a bit more care @@ -1756,6 +1755,14 @@ p2m_flush_table(struct p2m_domain *p2m) p2m_unlock(p2m); } +/* Reset this p2m table to be empty */ +static void +p2m_flush_table(struct p2m_domain *p2m) +{ + p2m_lock(p2m); + p2m_flush_table_locked(p2m); +} + void p2m_flush(struct vcpu *v, struct p2m_domain *p2m) { @@ -1773,6 +1780,27 @@ p2m_flush_nestedp2m(struct domain *d) p2m_flush_table(d->arch.nested_p2m[i]); } +void np2m_flush_eptp(struct vcpu *v, unsigned long eptp) +{ + struct domain *d = v->domain; + struct p2m_domain *p2m; + unsigned int i; + + eptp &= ~(0xfffull); + + nestedp2m_lock(d); + for ( i = 0; i < MAX_NESTEDP2M; i++ ) + { + p2m = d->arch.nested_p2m[i]; + p2m_lock(p2m); + if ( p2m->np2m_base == eptp ) + p2m_flush_table_locked(p2m); + else + p2m_unlock(p2m); + } + nestedp2m_unlock(d); +} + static void assign_np2m(struct vcpu *v, struct p2m_domain *p2m) { struct nestedvcpu *nv = &vcpu_nestedhvm(v); diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 9086bb35dc..0e39999387 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -779,6 +779,8 @@ 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 eptp */ +void np2m_flush_eptp(struct vcpu *v, unsigned long eptp); void nestedp2m_write_p2m_entry(struct p2m_domain *p2m, unsigned long gfn, l1_pgentry_t *p, l1_pgentry_t new, unsigned int level);