From patchwork Wed Aug 30 18:32:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergej Proskurin X-Patchwork-Id: 9930575 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 F27346032A for ; Wed, 30 Aug 2017 18:35:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA76B285C8 for ; Wed, 30 Aug 2017 18:35:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF6DE28717; Wed, 30 Aug 2017 18:35:39 +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 964752874A for ; Wed, 30 Aug 2017 18:35:39 +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 1dn7nv-0001ld-Fo; Wed, 30 Aug 2017 18:33:31 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dn7nt-0001eq-VP for xen-devel@lists.xenproject.org; Wed, 30 Aug 2017 18:33:30 +0000 Received: from [85.158.143.35] by server-10.bemta-6.messagelabs.com id F4/53-03642-9F407A95; Wed, 30 Aug 2017 18:33:29 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGLMWRWlGSWpSXmKPExsXSPJ+BQ/cHy/J Ig9PXjC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oxDP7pZC27xVbw+c46lgfEzdxcjF4eQwEZG ibVH+5ghnE2MEk+3dLJ1MXJysAkYSEx5vZIVxBYRUJK4t2oyE0gRs0ATo8S9xgdARRwcwgJuE ntfCYKYLAKqEp2XwVp5BWwljm66ANYqISAvce7BbWYQmxMofubADLC4kICNxL2555knMHIvYG RYxahRnFpUllqka2igl1SUmZ5RkpuYmQPkmenlphYXJ6an5iQmFesl5+duYgT6lwEIdjAefx9 3iFGSg0lJlHcF8/JIIb6k/JTKjMTijPii0pzU4kOMMhwcShK87MBwERIsSk1PrUjLzAEGGkxa goNHSYSXBSTNW1yQmFucmQ6ROsWoKCXOawiSEABJZJTmwbXBgvsSo6yUMC8j0CFCPAWpRbmZJ ajyrxjFORiVhHnZQKbwZOaVwE1/BbSYCWhxrNdSkMUliQgpqQZGg66Fr3uDXxyNfsnnM8VJ26 4n5X3AgelXrxeoz9z63OPSsWht4SPvDz2ZsmQv/4G7DuyTWHccWDBJ9pWRubqgAf/3E7eefrC yvesSd7Y/UnBj79HF8wqNNb487OswdIr9kmJovDlz9+x15VGrlCcr+Pwu1rmT9mHyvBsnZ815 OInT14DjZWKekxJLcUaioRZzUXEiAPNQT11pAgAA X-Env-Sender: proskurin@sec.in.tum.de X-Msg-Ref: server-4.tower-21.messagelabs.com!1504118008!74154409!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 65189 invoked from network); 30 Aug 2017 18:33:28 -0000 Received: from mail-out1.informatik.tu-muenchen.de (HELO mail-out1.informatik.tu-muenchen.de) (131.159.0.8) by server-4.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 30 Aug 2017 18:33:28 -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 C727A10CB7DF7; 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 BA8C4491F5; 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:40 +0200 Message-Id: <20170830183258.14612-22-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 21/39] arm/p2m: Cosmetic fix - __p2m_get_mem_access 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 In this commit, we extend the function prototype of "__p2m_get_mem_access" to hold an argument of type "struct p2m_domain*", as we need to distinguish between the host's p2m and different altp2m views. Signed-off-by: Sergej Proskurin --- Cc: Stefano Stabellini Cc: Julien Grall --- v3: Changed the parameter of "p2m_mem_access_check_and_get_page" from "struct p2m_domain*" to "struct vcpu*". v4: We don't need to adjust the function "p2m_mem_access_check_and_get_page" any more, as its change is already part of another patch. --- xen/arch/arm/mem_access.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/mem_access.c b/xen/arch/arm/mem_access.c index 3e2bb4088a..5bc28db8ff 100644 --- a/xen/arch/arm/mem_access.c +++ b/xen/arch/arm/mem_access.c @@ -24,10 +24,9 @@ #include #include -static int __p2m_get_mem_access(struct domain *d, gfn_t gfn, +static int __p2m_get_mem_access(struct p2m_domain *p2m, gfn_t gfn, xenmem_access_t *access) { - struct p2m_domain *p2m = p2m_get_hostp2m(d); void *i; unsigned int index; @@ -148,7 +147,7 @@ p2m_mem_access_check_and_get_page(vaddr_t gva, unsigned long flag, * We do this first as this is faster in the default case when no * permission is set on the page. */ - rc = __p2m_get_mem_access(v->domain, gfn, &xma); + rc = __p2m_get_mem_access(p2m, gfn, &xma); if ( rc < 0 ) goto err; @@ -443,7 +442,7 @@ int p2m_get_mem_access(struct domain *d, gfn_t gfn, struct p2m_domain *p2m = p2m_get_hostp2m(d); p2m_read_lock(p2m); - ret = __p2m_get_mem_access(d, gfn, access); + ret = __p2m_get_mem_access(p2m, gfn, access); p2m_read_unlock(p2m); return ret;