From patchwork Mon Apr 3 11:22:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9659363 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 AD5DC60352 for ; Mon, 3 Apr 2017 11:25:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 915C027F93 for ; Mon, 3 Apr 2017 11:25:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8608E28447; Mon, 3 Apr 2017 11:25:08 +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 499C527F93 for ; Mon, 3 Apr 2017 11:25:04 +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 1cv04T-00023H-Ku; Mon, 03 Apr 2017 11:22:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cv04R-00022T-Vl for xen-devel@lists.xenproject.org; Mon, 03 Apr 2017 11:22:52 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id B4/F0-23940-B8032E85; Mon, 03 Apr 2017 11:22:51 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpjkeJIrShJLcpLzFFi42JxWrohUrfL4FG EwbJ9Ehbft0xmcmD0OPzhCksAYxRrZl5SfkUCa0Zn5xOWgiW8Faee/GRqYJzH1cXIySEh4C+x aVE/O4jNJqAs8bOzlw3EFhHQk2g68Jyxi5GLg1lgG6PE13dXmEASwgJ+En179oIVsQioSNxrn wjWzCtgLvF3UgM7xFB5iV1tF1lBbE4BC4k9C48zgthCQDWXzv5ih7AVJDqmH2OC6BWUODnzCQ uIzSwgIXHwxQvmCYy8s5CkZiFJLWBkWsWoUZxaVJZapGtkqJdUlJmeUZKbmJmja2hgrJebWly cmJ6ak5hUrJecn7uJERg+9QwMjDsYe/b6HWKU5GBSEuX9oPAoQogvKT+lMiOxOCO+qDQntfgQ owwHh5IE7y89oJxgUWp6akVaZg4wkGHSEhw8SiK8qvpAad7igsTc4sx0iNQpRkUpcV59kIQAS CKjNA+uDRY9lxhlpYR5GRkYGIR4ClKLcjNLUOVfMYpzMCoJQ0zhycwrgZv+CmgxE9DiJ3cegi wuSURISTUwejbyTInlvjRvlt0T2/jFm549+yuR+j2149CuuY2uJ51zzz8OWLk7WFrGsLzoYMe b26rsU368unm9t5n/9TLN5vAvYhy8bzJ5ni6aWtH0RczKmEeq76jiFN2OO1OKTCXrDh5u+cx9 5uQWGS9JzQk5kdbZfZp2LRyHb2u5r9LO93TafLVlQvN8JZbijERDLeai4kQAJZ0o9pkCAAA= X-Env-Sender: prvs=259a6150d=wei.liu2@citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1491218568!82089228!1 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 50657 invoked from network); 3 Apr 2017 11:22:50 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-2.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 3 Apr 2017 11:22:50 -0000 X-IronPort-AV: E=Sophos;i="5.36,270,1486425600"; d="scan'208";a="417178888" From: Wei Liu To: Xen-devel Date: Mon, 3 Apr 2017 12:22:41 +0100 Message-ID: <20170403112246.6975-4-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170403112246.6975-1-wei.liu2@citrix.com> References: <20170403112246.6975-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: George Dunlap , Andrew Cooper , Tim Deegan , Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH v2 for-next v2 3/8] x86/mm: carve out replace_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 | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 2137f2b6f8..823aba01a8 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4332,23 +4332,20 @@ static int replace_grant_p2m_mapping( return GNTST_okay; } -int replace_grant_host_mapping( - uint64_t addr, unsigned long frame, uint64_t new_addr, unsigned int flags) +static int replace_grant_pv_mapping(uint64_t addr, unsigned long frame, + uint64_t new_addr, unsigned int flags) { struct vcpu *curr = current; l1_pgentry_t *pl1e, ol1e; unsigned long gl1mfn; struct page_info *l1pg; int rc; - - if ( paging_mode_external(current->domain) ) - return replace_grant_p2m_mapping(addr, frame, new_addr, flags); if ( flags & GNTMAP_contains_pte ) { if ( !new_addr ) return destroy_grant_pte_mapping(addr, frame, curr->domain); - + return GNTST_general_error; } @@ -4408,6 +4405,15 @@ int replace_grant_host_mapping( return rc; } +int replace_grant_host_mapping(uint64_t addr, unsigned long frame, + uint64_t new_addr, unsigned int flags) +{ + if ( paging_mode_external(current->domain) ) + return replace_grant_p2m_mapping(addr, frame, new_addr, flags); + + return replace_grant_pv_mapping(addr, frame, new_addr, flags); +} + int donate_page( struct domain *d, struct page_info *page, unsigned int memflags) {