From patchwork Mon Mar 27 09:10:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9645715 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 4F1A1602BF for ; Mon, 27 Mar 2017 09:13:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3794F27F95 for ; Mon, 27 Mar 2017 09:13:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C8A728335; Mon, 27 Mar 2017 09:13:04 +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 0812027F95 for ; Mon, 27 Mar 2017 09:13:03 +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 1csQg8-0006ST-0n; Mon, 27 Mar 2017 09:11:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1csQg6-0006Ll-GF for xen-devel@lists.xenproject.org; Mon, 27 Mar 2017 09:11:06 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 30/F1-13971-A27D8D85; Mon, 27 Mar 2017 09:11:06 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmphkeJIrShJLcpLzFFi42JxWrohUlft+o0 Ig4dvjSy+b5nM5MDocfjDFZYAxijWzLyk/IoE1ox/v5uYCrbyVmz/3MbWwHieq4uRk0NCwF/i x85FrCA2m4CyxM/OXjYQW0RAT6LpwHPGLkYuDmaBbYwSx3pfsoMkhAVcJE59PccEYrMIqErca LwD1swrYC7R9/MeC8RQeYldbReB4hwcnAIWEs+WCIKYQkAlfzaCVQsJKEh0TD/GBNEpKHFy5h OwTmYBCYmDL14wT2DknYUkNQtJagEj0ypGjeLUorLUIl0jQ72kosz0jJLcxMwcXUMDU73c1OL ixPTUnMSkYr3k/NxNjMDQqWdgYNzBeHey3yFGSQ4mJVHeD6dvRAjxJeWnVGYkFmfEF5XmpBYf YpTh4FCS4DW9BpQTLEpNT61Iy8wBBjFMWoKDR0mEd8VVoDRvcUFibnFmOkTqFKOilDjvVJCEA EgiozQPrg0WOZcYZaWEeRkZGBiEeApSi3IzS1DlXzGKczAqCfN+A5nCk5lXAjf9FdBiJqDFh+ eDLS5JREhJNTC6bi6Zy8tauz35rK9LdgVvmmzDhaL3s5X2fc31XBFpvPzC1KUzlgQ6HHmyQ7M 0nv1VlG997fVpnPHx3mJzXibd0pc8FM0RtGzt9cfcN+/cjp/CI5MZfyDlhVG5yDYlbg0zZeXH 6RpZZ85df3BQ/OuWrzt80ufJ+DctFX6z7OZRpeSM/WvV60KVWIozEg21mIuKEwHvc8FRlwIAA A== X-Env-Sender: prvs=25272e2f3=wei.liu2@citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1490605860!91630205!2 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.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21085 invoked from network); 27 Mar 2017 09:11:02 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-9.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 27 Mar 2017 09:11:02 -0000 X-IronPort-AV: E=Sophos;i="5.36,229,1486425600"; d="scan'208";a="416031916" From: Wei Liu To: Xen-devel Date: Mon, 27 Mar 2017 10:10:50 +0100 Message-ID: <20170327091059.8452-5-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170327091059.8452-1-wei.liu2@citrix.com> References: <20170327091059.8452-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: George Dunlap , Andrew Cooper , Tim Deegan , Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH RFC 04/13] x86/mm: carve out create_grant_pv_mapping 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 We will later split out PV specific code to pv/mm.c. No functional change. Signed-off-by: Wei Liu --- xen/arch/x86/mm.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 4bf94227cc..b44d44c782 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4242,15 +4242,12 @@ static int create_grant_p2m_mapping(uint64_t addr, unsigned long frame, return GNTST_okay; } -int create_grant_host_mapping(uint64_t addr, unsigned long frame, - unsigned int flags, unsigned int cache_flags) +static int create_grant_pv_mapping(uint64_t addr, unsigned long frame, + unsigned int flags, unsigned int cache_flags) { l1_pgentry_t pte; uint32_t grant_pte_flags; - if ( paging_mode_external(current->domain) ) - return create_grant_p2m_mapping(addr, frame, flags, cache_flags); - grant_pte_flags = _PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_GNTTAB; if ( cpu_has_nx ) @@ -4273,6 +4270,15 @@ int create_grant_host_mapping(uint64_t addr, unsigned long frame, return create_grant_va_mapping(addr, pte, current); } +int create_grant_host_mapping(uint64_t addr, unsigned long frame, + unsigned int flags, unsigned int cache_flags) +{ + if ( paging_mode_external(current->domain) ) + return create_grant_p2m_mapping(addr, frame, flags, cache_flags); + + return create_grant_pv_mapping(addr, frame, flags, cache_flags); +} + static int replace_grant_p2m_mapping( uint64_t addr, unsigned long frame, uint64_t new_addr, unsigned int flags) {