From patchwork Wed Aug 30 18:32:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergej Proskurin X-Patchwork-Id: 9930583 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 3A0686032A for ; Wed, 30 Aug 2017 18:35:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 31AE328700 for ; Wed, 30 Aug 2017 18:35:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 265132874B; Wed, 30 Aug 2017 18:35: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 935D728700 for ; Wed, 30 Aug 2017 18:35: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 1dn7np-0001YK-DM; Wed, 30 Aug 2017 18:33:25 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dn7nn-0001UH-K8 for xen-devel@lists.xenproject.org; Wed, 30 Aug 2017 18:33:23 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id 5B/BC-03283-3F407A95; Wed, 30 Aug 2017 18:33:23 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGLMWRWlGSWpSXmKPExsXSPJ+BQ/cTy/J IgzdzjS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozujp3MBVOEK7Y9FW1gnMXfxcjFISSwkVFi 5aNvTBDOJkaJT4sXATmcHGwCBhJTXq9kBbFFBJQk7q2aDFbELNDEKHGv8QEbSEJYwE5i5e8vL CA2i4CqxLH5s5lBbF4BW4m2yVPBBkkIyEuce3AbLM4JFD9zYAbYUCEBG4l7c88zT2DkXsDIsI pRvTi1qCy1SNdUL6koMz2jJDcxM0fX0MBMLze1uDgxPTUnMalYLzk/dxMj0L8MQLCDcfpl/0O MkhxMSqK8Fr+WRQrxJeWnVGYkFmfEF5XmpBYfYpTh4FCS4F3HtDxSSLAoNT21Ii0zBxhoMGkJ Dh4lEd5rIGne4oLE3OLMdIjUKUZFKXHeVSAJAZBERmkeXBssuC8xykoJ8zICHSLEU5BalJtZg ir/ilGcg1FJmPc6yBSezLwSuOmvgBYzAS2O9VoKsrgkESEl1cDI7cT24gPnv5Nun5oDv4bJme QFFZxMCL81xeT5bsHmPAvTCWKde2zeNV9QymKLWLjhmcikVP/ZhecTL09iVbE0+pbCJTKbe/u flsh3x5++filg+fVZkEfEsx1/HQP2srFfi2lldN30Iupj+YN1W9k+zDxRcVbh3Cf35V2H1CZv bzZk+LKKZdoSJZbijERDLeai4kQAZP0WAGkCAAA= X-Env-Sender: proskurin@sec.in.tum.de X-Msg-Ref: server-14.tower-27.messagelabs.com!1504118002!101798023!1 X-Originating-IP: [131.159.0.8] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61562 invoked from network); 30 Aug 2017 18:33:22 -0000 Received: from mail-out1.informatik.tu-muenchen.de (HELO mail-out1.informatik.tu-muenchen.de) (131.159.0.8) by server-14.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 30 Aug 2017 18:33:22 -0000 Received: from files.sec.in.tum.de (files.sec.in.tum.de [131.159.50.1]) by services.sec.in.tum.de (Postfix) with ESMTP id 722CC10CB7DF7; Wed, 30 Aug 2017 20:33:08 +0200 (CEST) Received: from thanatos.sec.in.tum.de (thanatos.sec.in.tum.de [131.159.50.57]) by files.sec.in.tum.de (Postfix) with ESMTP id 6588F491F5; Wed, 30 Aug 2017 20:33:08 +0200 (CEST) From: Sergej Proskurin To: xen-devel@lists.xenproject.org Date: Wed, 30 Aug 2017 20:32:34 +0200 Message-Id: <20170830183258.14612-16-proskurin@sec.in.tum.de> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170830183258.14612-1-proskurin@sec.in.tum.de> References: <20170830183258.14612-1-proskurin@sec.in.tum.de> Cc: Sergej Proskurin , Julien Grall , Stefano Stabellini Subject: [Xen-devel] [PATCH v4 15/39] arm/p2m: Add HVMOP_altp2m_create_p2m 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Sergej Proskurin Acked-by: Julien Grall --- Cc: Stefano Stabellini Cc: Julien Grall --- v2: Cosmetic fixes. v3: Cosmetic fixes. Renamed the function "altp2m_init_next" to "altp2m_init_next_available". Exchanged the check "altp2m_vttbr[idx] == INVALID_VTTBR" for "altp2m_p2m[idx] == NULL" in "altp2m_init_next_available". --- xen/arch/arm/altp2m.c | 23 +++++++++++++++++++++++ xen/arch/arm/hvm.c | 3 ++- xen/include/asm-arm/altp2m.h | 4 ++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/altp2m.c b/xen/arch/arm/altp2m.c index 43e95c5681..6b1e34709f 100644 --- a/xen/arch/arm/altp2m.c +++ b/xen/arch/arm/altp2m.c @@ -117,6 +117,29 @@ int altp2m_init_by_id(struct domain *d, unsigned int idx) return rc; } +int altp2m_init_next_available(struct domain *d, uint16_t *idx) +{ + int rc = -EINVAL; + uint16_t i; + + altp2m_lock(d); + + for ( i = 0; i < MAX_ALTP2M; i++ ) + { + if ( d->arch.altp2m_p2m[i] != NULL ) + continue; + + rc = altp2m_init_helper(d, i); + *idx = i; + + break; + } + + altp2m_unlock(d); + + return rc; +} + int altp2m_init(struct domain *d) { spin_lock_init(&d->arch.altp2m_lock); diff --git a/xen/arch/arm/hvm.c b/xen/arch/arm/hvm.c index ec8e259797..caa2e1b516 100644 --- a/xen/arch/arm/hvm.c +++ b/xen/arch/arm/hvm.c @@ -126,7 +126,8 @@ static int do_altp2m_op(XEN_GUEST_HANDLE_PARAM(void) arg) break; case HVMOP_altp2m_create_p2m: - rc = -EOPNOTSUPP; + if ( !(rc = altp2m_init_next_available(d, &a.u.view.view)) ) + rc = __copy_to_guest(arg, &a, 1) ? -EFAULT : 0; break; case HVMOP_altp2m_destroy_p2m: diff --git a/xen/include/asm-arm/altp2m.h b/xen/include/asm-arm/altp2m.h index 2ef88cec35..b9719f9d5b 100644 --- a/xen/include/asm-arm/altp2m.h +++ b/xen/include/asm-arm/altp2m.h @@ -53,6 +53,10 @@ struct p2m_domain *altp2m_get_altp2m(struct vcpu *v); int altp2m_init_by_id(struct domain *d, unsigned int idx); +/* Find and initialize the next available alternate p2m. */ +int altp2m_init_next_available(struct domain *d, + uint16_t *idx); + /* Flush all the alternate p2m's for a domain. */ void altp2m_flush_complete(struct domain *d);