From patchwork Thu Jul 20 16:04:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9855305 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 CAD4B60392 for ; Thu, 20 Jul 2017 16:07:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BBA1328678 for ; Thu, 20 Jul 2017 16:07:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B079A286E2; Thu, 20 Jul 2017 16:07:07 +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 1FA5828678 for ; Thu, 20 Jul 2017 16:07:07 +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 1dYDwK-0000Fr-Cp; Thu, 20 Jul 2017 16:04:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dYDwJ-0000ES-IQ for xen-devel@lists.xenproject.org; Thu, 20 Jul 2017 16:04:35 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id A7/9A-01732-294D0795; Thu, 20 Jul 2017 16:04:34 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrCIsWRWlGSWpSXmKPExsXitHRDpO7EKwW RBptOilp83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBmnL/WwF5zVq9i09wJrA2OzchcjJ4eEgL/E rjfbWEFsNgFliZ+dvWwgtoiAnkTTgeeMXYxcHMwCcxglps7tYgRJCAsESpx985UFxGYRUJXYf X0imM0rYC4xo3UbE8RQeYldbRfBhnIKWEis+fUVLC4EVLN5/3wWCFtBomP6MSaIXkGJkzOfgM WZBSQkDr54wTyBkXcWktQsJKkFjEyrGDWKU4vKUot0DQ30kooy0zNKchMzc4A8U73c1OLixPT UnMSkYr3k/NxNjMDwYQCCHYxrpjofYpTkYFIS5WUJLIgU4kvKT6nMSCzOiC8qzUktPsSowcEh 0Ldm9QVGKZa8/LxUJQneystAdYJFqempFWmZOcAAhymV4OBREoFI8xYXJOYWZ6ZDpE4xGnMs6 NnwhYnj1YT/35iEwCZJifNWgJQKgJRmlObBDYJF3iVGWSlhXkagM4V4ClKLcjNLUOVfMYpzMC oJ8/aCTOHJzCuB2/cK6BQmoFMeuYGdUpKIkJJqYPSbWOTws+JjRlxd/9F1P3V+HbnfnO76N3j /TZWThxqmm7H0bp6tuch9d/jzGTpv7PnzlgfV7HMrissvm8R86QTPHBvutZ+uq/mKRr/5c/rd nvn3kjTdF33f1pmWFPPgvISZpMucY5J6nzZ6xZ6Sv3ihqdBq+QKf3je7pV5MOfTVy/q97JLvB luUWIozEg21mIuKEwFwQSjqtwIAAA== X-Env-Sender: prvs=3674d857a=wei.liu2@citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1500566670!83190143!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.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9109 invoked from network); 20 Jul 2017 16:04:33 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-2.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 20 Jul 2017 16:04:33 -0000 X-IronPort-AV: E=Sophos;i="5.40,384,1496102400"; d="scan'208";a="432307684" From: Wei Liu To: Xen-devel Date: Thu, 20 Jul 2017 17:04:08 +0100 Message-ID: <20170720160426.2343-4-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170720160426.2343-1-wei.liu2@citrix.com> References: <20170720160426.2343-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: George Dunlap , Andrew Cooper , Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH v3 03/21] x86/mm: split HVM grant table code to hvm/grant_table.c 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 Signed-off-by: Wei Liu --- xen/arch/x86/hvm/Makefile | 1 + xen/arch/x86/hvm/grant_table.c | 89 ++++++++++++++++++++++++++++++++++++++++++ xen/arch/x86/mm.c | 53 ------------------------- 3 files changed, 90 insertions(+), 53 deletions(-) create mode 100644 xen/arch/x86/hvm/grant_table.c diff --git a/xen/arch/x86/hvm/Makefile b/xen/arch/x86/hvm/Makefile index c394af7364..5bd38f633f 100644 --- a/xen/arch/x86/hvm/Makefile +++ b/xen/arch/x86/hvm/Makefile @@ -6,6 +6,7 @@ obj-y += dm.o obj-bin-y += dom0_build.init.o obj-y += domain.o obj-y += emulate.o +obj-y += grant_table.o obj-y += hpet.o obj-y += hvm.o obj-y += hypercall.o diff --git a/xen/arch/x86/hvm/grant_table.c b/xen/arch/x86/hvm/grant_table.c new file mode 100644 index 0000000000..7503c2c61b --- /dev/null +++ b/xen/arch/x86/hvm/grant_table.c @@ -0,0 +1,89 @@ +/****************************************************************************** + * arch/x86/hvm/grant_table.c + * + * Grant table interfaces for HVM guests + * + * Copyright (C) 2017 Wei Liu + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; If not, see . + */ + +#include + +#include + +#include + +int create_grant_p2m_mapping(uint64_t addr, unsigned long frame, + unsigned int flags, + unsigned int cache_flags) +{ + p2m_type_t p2mt; + int rc; + + if ( cache_flags || (flags & ~GNTMAP_readonly) != GNTMAP_host_map ) + return GNTST_general_error; + + if ( flags & GNTMAP_readonly ) + p2mt = p2m_grant_map_ro; + else + p2mt = p2m_grant_map_rw; + rc = guest_physmap_add_entry(current->domain, + _gfn(addr >> PAGE_SHIFT), + _mfn(frame), PAGE_ORDER_4K, p2mt); + if ( rc ) + return GNTST_general_error; + else + return GNTST_okay; +} + +int replace_grant_p2m_mapping(uint64_t addr, unsigned long frame, + uint64_t new_addr, unsigned int flags) +{ + unsigned long gfn = (unsigned long)(addr >> PAGE_SHIFT); + p2m_type_t type; + mfn_t old_mfn; + struct domain *d = current->domain; + + if ( new_addr != 0 || (flags & GNTMAP_contains_pte) ) + return GNTST_general_error; + + old_mfn = get_gfn(d, gfn, &type); + if ( !p2m_is_grant(type) || mfn_x(old_mfn) != frame ) + { + put_gfn(d, gfn); + gdprintk(XENLOG_WARNING, + "old mapping invalid (type %d, mfn %" PRI_mfn ", frame %lx)\n", + type, mfn_x(old_mfn), frame); + return GNTST_general_error; + } + if ( guest_physmap_remove_page(d, _gfn(gfn), _mfn(frame), PAGE_ORDER_4K) ) + { + put_gfn(d, gfn); + return GNTST_general_error; + } + + put_gfn(d, gfn); + return GNTST_okay; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index defc2c9bcc..4e6f9f5750 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4245,29 +4245,6 @@ static int destroy_grant_va_mapping( return replace_grant_va_mapping(addr, frame, l1e_empty(), v); } -int create_grant_p2m_mapping(uint64_t addr, unsigned long frame, - unsigned int flags, - unsigned int cache_flags) -{ - p2m_type_t p2mt; - int rc; - - if ( cache_flags || (flags & ~GNTMAP_readonly) != GNTMAP_host_map ) - return GNTST_general_error; - - if ( flags & GNTMAP_readonly ) - p2mt = p2m_grant_map_ro; - else - p2mt = p2m_grant_map_rw; - rc = guest_physmap_add_entry(current->domain, - _gfn(addr >> PAGE_SHIFT), - _mfn(frame), PAGE_ORDER_4K, p2mt); - if ( rc ) - return GNTST_general_error; - else - return GNTST_okay; -} - int create_grant_pv_mapping(uint64_t addr, unsigned long frame, unsigned int flags, unsigned int cache_flags) { @@ -4296,36 +4273,6 @@ int create_grant_pv_mapping(uint64_t addr, unsigned long frame, return create_grant_va_mapping(addr, pte, current); } -int replace_grant_p2m_mapping( - uint64_t addr, unsigned long frame, uint64_t new_addr, unsigned int flags) -{ - unsigned long gfn = (unsigned long)(addr >> PAGE_SHIFT); - p2m_type_t type; - mfn_t old_mfn; - struct domain *d = current->domain; - - if ( new_addr != 0 || (flags & GNTMAP_contains_pte) ) - return GNTST_general_error; - - old_mfn = get_gfn(d, gfn, &type); - if ( !p2m_is_grant(type) || mfn_x(old_mfn) != frame ) - { - put_gfn(d, gfn); - gdprintk(XENLOG_WARNING, - "old mapping invalid (type %d, mfn %" PRI_mfn ", frame %lx)\n", - type, mfn_x(old_mfn), frame); - return GNTST_general_error; - } - if ( guest_physmap_remove_page(d, _gfn(gfn), _mfn(frame), PAGE_ORDER_4K) ) - { - put_gfn(d, gfn); - return GNTST_general_error; - } - - put_gfn(d, gfn); - return GNTST_okay; -} - int replace_grant_pv_mapping(uint64_t addr, unsigned long frame, uint64_t new_addr, unsigned int flags) {