From patchwork Mon Sep 4 08:14:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Dyasli X-Patchwork-Id: 9936801 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 C3CA9601EB for ; Mon, 4 Sep 2017 08:17:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9D5C2878E for ; Mon, 4 Sep 2017 08:17:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9D280287AB; Mon, 4 Sep 2017 08:17:49 +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 27A97287E3 for ; Mon, 4 Sep 2017 08:17:45 +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 1domXK-0006m4-So; Mon, 04 Sep 2017 08:15:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1domXI-0006k8-V0 for xen-devel@lists.xen.org; Mon, 04 Sep 2017 08:15:13 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id EA/F0-02044-F8B0DA95; Mon, 04 Sep 2017 08:15:11 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmphkeJIrShJLcpLzFFi42JxWrohUrefe22 kwZt+RYslHxezODB6HN39mymAMYo1My8pvyKBNWPG/8eMBev5K+Yc+cXewLidp4uRg0NCwF/i ztWMLkZODjYBPYmNs18xgdgiArISq7vmsIPYzAKfmCQajjmC2MICThL/Pq1gBbFZBFQkep5dZ gGxeQXsJL69/gnWKyEgL7Gr7SJYDSdQ/OzqN4wgtpCArUTP4sPMELaqxOsXu6B6BSVOznzCAr FLQuLgixfMExh5ZyFJzUKSWsDItIpRozi1qCy1SNfIQi+pKDM9oyQ3MTNH19DAWC83tbg4MT0 1JzGpWC85P3cTIzB06hkYGHcwtp/wO8QoycGkJMp7//GaSCG+pPyUyozE4oz4otKc1OJDjDIc HEoSvBJcayOFBItS01Mr0jJzgEEMk5bg4FES4ZUDSfMWFyTmFmemQ6ROMSpKifO6gSQEQBIZp XlwbbDIucQoKyXMy8jAwCDEU5BalJtZgir/ilGcg1FJmHcbyBSezLwSuOmvgBYzAS2uerkGZH FJIkJKqoGxKEY2Nup8+7nXN3jyNq7QnPzbu1uif7uLhdnjuStuVASn3+k51fTRtelN5KbLLw9 fUHfkWS+ta+nNeMV0psmU+YUnH6oen6l5aaYTzwrHAwc/H/1/90rnwk1ZGuLOs37f1OL51v75 WmHSs8/OPqJOmz/2l4o+nqrz877Z29ADNd+uT3rw5ZLrPCWW4oxEQy3mouJEAFGWpFaXAgAA X-Env-Sender: prvs=413848043=sergey.dyasli@citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1504512908!113034703!3 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 61248 invoked from network); 4 Sep 2017 08:15:11 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-8.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 4 Sep 2017 08:15:11 -0000 X-IronPort-AV: E=Sophos;i="5.41,473,1498521600"; d="scan'208";a="438259574" From: Sergey Dyasli To: Date: Mon, 4 Sep 2017 09:14:47 +0100 Message-ID: <20170904081452.12960-10-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 09/14] x86/np2m: add 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 The new function returns still write-locked np2m. Signed-off-by: Sergey Dyasli --- xen/arch/x86/mm/p2m.c | 12 +++++++++--- xen/include/asm-x86/p2m.h | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index e5d2fed361..15dedef33b 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1819,7 +1819,7 @@ static void nvcpu_flush(struct vcpu *v) } struct p2m_domain * -p2m_get_nestedp2m(struct vcpu *v) +p2m_get_nestedp2m_locked(struct vcpu *v) { struct nestedvcpu *nv = &vcpu_nestedhvm(v); struct domain *d = v->domain; @@ -1844,7 +1844,6 @@ p2m_get_nestedp2m(struct vcpu *v) nvcpu_flush(v); p2m->np2m_base = np2m_base; assign_np2m(v, p2m); - p2m_unlock(p2m); nestedp2m_unlock(d); return p2m; @@ -1860,12 +1859,19 @@ p2m_get_nestedp2m(struct vcpu *v) p2m->np2m_base = np2m_base; nvcpu_flush(v); assign_np2m(v, p2m); - p2m_unlock(p2m); nestedp2m_unlock(d); return p2m; } +struct p2m_domain *p2m_get_nestedp2m(struct vcpu *v) +{ + struct p2m_domain *p2m = p2m_get_nestedp2m_locked(v); + p2m_unlock(p2m); + + return p2m; +} + struct p2m_domain * p2m_get_p2m(struct vcpu *v) { diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index f873dc4fd9..790635ec0b 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -364,6 +364,8 @@ struct p2m_domain { * Updates vCPU's n2pm to match its np2m_base in VMCX12 and returns that np2m. */ struct p2m_domain *p2m_get_nestedp2m(struct vcpu *v); +/* Similar to the above except that returned p2m is still write-locked */ +struct p2m_domain *p2m_get_nestedp2m_locked(struct vcpu *v); /* If vcpu is in host mode then behaviour matches p2m_get_hostp2m(). * If vcpu is in guest mode then behaviour matches p2m_get_nestedp2m().