From patchwork Mon Oct 16 17:07:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petre Ovidiu PIRCALABU X-Patchwork-Id: 10009367 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 E0659601E7 for ; Mon, 16 Oct 2017 17:10:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C292F28666 for ; Mon, 16 Oct 2017 17:10:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B346828669; Mon, 16 Oct 2017 17:10:43 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 A0E4B28666 for ; Mon, 16 Oct 2017 17:10:41 +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 1e48s0-0004Iz-Dc; Mon, 16 Oct 2017 17:08:04 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e48ry-0004Is-3w for xen-devel@lists.xen.org; Mon, 16 Oct 2017 17:08:02 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id 15/26-14867-177E4E95; Mon, 16 Oct 2017 17:08:01 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuplkeJIrShJLcpLzFFi42KJPp7Rqlvw/Em kQcdqIYslHxezODB6HN39mymAMYo1My8pvyKBNWPbn6nsBT8qK1Z+msvYwHg1touRk4NZwFqi 918zYxcjFweLQDOLxMvLe1ggnJ/MEj/e/2YHqRIScJfYevsNK4S9n1Hi6wuPLkYOsPiJ544g9 UICixklnr9pBqtnEzCSWLLsLZgtIiAtce3zZbANzALzmCSe93wGSwgLuElMOPKGDcRmEVCV2L WoAyzOK+ApMfPHbxYQW0JATuLmuU7mCYx8CxgZVjGqF6cWlaUW6ZrrJRVlpmeU5CZm5ugaGpj p5aYWFyemp+YkJhXrJefnbmIEBgoDEOxgnHnZ/xCjJAeTkiivs+GTSCG+pPyUyozE4oz4otKc 1OJDjDIcHEoSvFrPgHKCRanpqRVpmTnAkIVJS3DwKInw/n4KlOYtLkjMLc5Mh0idYjTmOLbp8 h8mjo6bd/8wCbHk5eelSonzNoBMEgApzSjNgxsEi6VLjLJSwryMQKcJ8RSkFuVmlqDKv2IU52 BUEuZNBJnCk5lXArfvFdApTECnrHMCO6UkESEl1cDoOG95uVJX5/Kbun7hr67GPvBlmCmkaHn vkQu3jMiXU76/Tnz3zbndtCig71P9ydkWJw/6Mm443Pv06lmGm9svb12ZLekqvuy14s4nTMmt i5cGSO1iX1bW9j5udUfnw0WH8mb/Fb/CrnFZWjWzN+4k0ycVBqHywC9TnyxbXTmR/cCdC51SK iLMSizFGYmGWsxFxYkAN+rewKACAAA= X-Env-Sender: ppircalabu@bitdefender.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1508173679!70770290!1 X-Originating-IP: [91.199.104.133] 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 28162 invoked from network); 16 Oct 2017 17:08:00 -0000 Received: from mx02.bbu.dsd.mx.bitdefender.com (HELO mx02.buh.bitdefender.com) (91.199.104.133) by server-14.tower-21.messagelabs.com with DHE-RSA-AES128-GCM-SHA256 encrypted SMTP; 16 Oct 2017 17:08:00 -0000 Comment: DomainKeys? See http://domainkeys.sourceforge.net/ DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=bitdefender.com; b=cFQkfLXAI9p7w+Lgm+SWfeX4V/Siy8rRP0S/mVzLBbpsnKvSv2YuLcxs3AIafKMxIgfYZPYUn9MT3k4F0IkrU424BxR7+v3wP55KEffdsEYsHz1r2U8vP8SUqBJGgEh/uGdbAgg7xYF7vhpqANCzGE6+gBgCZ6kz2SK0Smg6MZmYN2c+RpWNjx8vNzXr0JFBj5Y22P7A7M13l1Llxdl0EctT0sBcPRIrUrbcz+/GFh0DmoRv3s79V+jEHZzkYjqScUrSimkoGCumdf2bLfdYMVpKk5NW60ISyefH+CcwRNtCEzsgkjN3cXCUl0KSxrvb25dwU2x9dtEE9sCArfZHiA==; h=Received:Received:Received:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer; DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=bitdefender.com; h=from:to :cc:subject:date:message-id; s=default; bh=ofcqgw2KVhq1H5w1QwnYw L1e5j8=; b=P3iwRv3T+6HM6LMqo1+++LUi/LeF3UcISJdt55w+BUEuV/5WbYxN/ 9syQkqz96qGn4iKLlqNYuQlCQ35e4ZCgqA+KDG7i+PAmEUVq3hSe1/eudJGOohtK 277AVKb+46h7vQPV78cNNyiN9dlKb0Mg+skcDPFeIdLvRVCb8rjsDBQaW8v/sKWB lnG0HefwylwhMp+kjyvmhaS08CalmoUxxxrhxHrt/wL1sFBQ0zFCAXkosnNkRKab 5zf9AL4riuRDQJahvZZhCr646OthlcgF/s4VhBcb9KdilHEEeNr5Ifidy0oqnhAu aB9XshxRNsEK2ac1StCD8SJ/XL634Bx2g== Received: (qmail 9200 invoked from network); 16 Oct 2017 20:07:43 +0300 Received: from mx-robo.bitdefender.biz (HELO mx01robo.bbu.dsd.mx.bitdefender.com) (10.17.80.60) by mx02.buh.bitdefender.com with AES128-GCM-SHA256 encrypted SMTP; 16 Oct 2017 20:07:43 +0300 Received: (qmail 7957 invoked from network); 16 Oct 2017 20:07:43 +0300 Received: from unknown (HELO pepi-OptiPlex-9020.bbu.bitdefender.biz) (10.10.194.146) by mx01robo.bbu.dsd.mx.bitdefender.com with SMTP; 16 Oct 2017 20:07:43 +0300 From: Petre Pircalabu To: xen-devel@lists.xen.org Date: Mon, 16 Oct 2017 20:07:41 +0300 Message-Id: <1508173661-2975-1-git-send-email-ppircalabu@bitdefender.com> X-Mailer: git-send-email 2.7.4 Cc: Petre Pircalabu , sstabellini@kernel.org, wei.liu2@citrix.com, Razvan Cojocaru , konrad.wilk@oracle.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, jbeulich@suse.com Subject: [Xen-devel] [PATCH v7] x86/altp2m: Added xc_altp2m_set_mem_access_multi() 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 From: Razvan Cojocaru For the default EPT view we have xc_set_mem_access_multi(), which is able to set an array of pages to an array of access rights with a single hypercall. However, this functionality was lacking for the altp2m subsystem, which could only set page restrictions for one page at a time. This patch addresses the gap. HVMOP_altp2m_set_mem_access_multi has been added as a HVMOP (as opposed to a DOMCTL) for consistency with its HVMOP_altp2m_set_mem_access counterpart (and hence with the original altp2m design, where domains are allowed - with the proper altp2m access rights - to alter these settings), in the absence of an official position on the issue from the original altp2m designers. Signed-off-by: Razvan Cojocaru Signed-off-by: Petre Pircalabu --- Changed since v2: * Added support for compat arguments translation Changed since v3: * Replaced __copy_to_guest with __copy_field_to_guest * Removed the un-needed parentheses. * Fixed xlat.lst ordering * Added comment to patch description explaining why the functionality was added as an HVMOP. * Guard using XEN_GENERATING_COMPAT_HEADERS the hvmmem_type_t definition. This will prevent suplicate definitions to be generated for the compat equivalent. * Added comment describing the manual translation of xen_hvm_altp2m_op_t generic fields from compat_hvm_altp2m_op_t. Changed since v4: * Changed the mask parameter to 0x3F. * Split long lines. * Added "improperly named HVMMEM_(*)" to the comment explaining the XEN_GENERATING_COMPAT_HEADERS guard. * Removed typedef and XEN_GUEST_HANDLE for xen_hvm_altp2m_set_mem_access_multi. * Copied the "opaque" field to guest in compat_altp2m_op. * Added build time test to check if the size of xen_hvm_altp2m_set_mem_access_multi at least equal to the size of compat_hvm_altp2m_set_mem_access_multi. Changed since v5: * Changed the domid parameter type to uint32_t to match 5b42c82f. * Added comment to explain why the 0x3F value was chosen. * Fixed switch indentation in compat_altp2m_op. * Changed the condition used to check if the opaque field has to be copied to the guest. * Added CHECK_hvm_altp2m_op and CHECK_hvm_altp2m_set_mem_access_multi. Changed since v6: * Removed trailing semicolon from the definitions of CHECK_hvm_altp2m_op and CHECK_hvm_altp2m_set_mem_access_multi. * Removed BUILD_BUG_ON check. * Added comment describing the reason for manually defining the CHECK_ macros. * Added ASSERT_UNREACHABLE as the default switch label action in compat_altp2m_op. * Added ASSERT(rc == __HYPERVISOR_hvm_op) to make sure the return code was actually sey by hypercall_create_continuation. --- tools/libxc/include/xenctrl.h | 3 + tools/libxc/xc_altp2m.c | 40 ++++++++++++ xen/arch/x86/hvm/hvm.c | 138 +++++++++++++++++++++++++++++++++++++++- xen/include/Makefile | 1 + xen/include/public/hvm/hvm_op.h | 36 +++++++++-- xen/include/xlat.lst | 1 + 6 files changed, 213 insertions(+), 6 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 666db0b..f171668 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1974,6 +1974,9 @@ int xc_altp2m_set_mem_access(xc_interface *handle, uint32_t domid, int xc_altp2m_change_gfn(xc_interface *handle, uint32_t domid, uint16_t view_id, xen_pfn_t old_gfn, xen_pfn_t new_gfn); +int xc_altp2m_set_mem_access_multi(xc_interface *handle, uint32_t domid, + uint16_t view_id, uint8_t *access, + uint64_t *pages, uint32_t nr); /** * Mem paging operations. diff --git a/tools/libxc/xc_altp2m.c b/tools/libxc/xc_altp2m.c index 07fcd18..e170fe3 100644 --- a/tools/libxc/xc_altp2m.c +++ b/tools/libxc/xc_altp2m.c @@ -213,3 +213,43 @@ int xc_altp2m_change_gfn(xc_interface *handle, uint32_t domid, return rc; } +int xc_altp2m_set_mem_access_multi(xc_interface *xch, uint32_t domid, + uint16_t view_id, uint8_t *access, + uint64_t *pages, uint32_t nr) +{ + int rc; + + DECLARE_HYPERCALL_BUFFER(xen_hvm_altp2m_op_t, arg); + DECLARE_HYPERCALL_BOUNCE(access, nr, XC_HYPERCALL_BUFFER_BOUNCE_IN); + DECLARE_HYPERCALL_BOUNCE(pages, nr * sizeof(uint64_t), + XC_HYPERCALL_BUFFER_BOUNCE_IN); + + arg = xc_hypercall_buffer_alloc(xch, arg, sizeof(*arg)); + if ( arg == NULL ) + return -1; + + arg->version = HVMOP_ALTP2M_INTERFACE_VERSION; + arg->cmd = HVMOP_altp2m_set_mem_access_multi; + arg->domain = domid; + arg->u.set_mem_access_multi.view = view_id; + arg->u.set_mem_access_multi.nr = nr; + + if ( xc_hypercall_bounce_pre(xch, pages) || + xc_hypercall_bounce_pre(xch, access) ) + { + PERROR("Could not bounce memory for HVMOP_altp2m_set_mem_access_multi"); + return -1; + } + + set_xen_guest_handle(arg->u.set_mem_access_multi.pfn_list, pages); + set_xen_guest_handle(arg->u.set_mem_access_multi.access_list, access); + + rc = xencall2(xch->xcall, __HYPERVISOR_hvm_op, HVMOP_altp2m, + HYPERCALL_BUFFER_AS_ARG(arg)); + + xc_hypercall_buffer_free(xch, arg); + xc_hypercall_bounce_post(xch, access); + xc_hypercall_bounce_post(xch, pages); + + return rc; +} diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 205b4cb..02e280d 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -73,6 +73,8 @@ #include #include +#include + bool_t __read_mostly hvm_enabled; #ifdef DBG_LEVEL_0 @@ -4451,6 +4453,7 @@ static int do_altp2m_op( case HVMOP_altp2m_destroy_p2m: case HVMOP_altp2m_switch_p2m: case HVMOP_altp2m_set_mem_access: + case HVMOP_altp2m_set_mem_access_multi: case HVMOP_altp2m_change_gfn: break; default: @@ -4568,6 +4571,37 @@ static int do_altp2m_op( a.u.set_mem_access.view); break; + case HVMOP_altp2m_set_mem_access_multi: + if ( a.u.set_mem_access_multi.pad || + a.u.set_mem_access_multi.opaque >= a.u.set_mem_access_multi.nr ) + { + rc = -EINVAL; + break; + } + + /* + * The mask was set (arbitrary) to 0x3F to match the value used for + * MEMOP, despite the fact there are no encoding limitations for the + * start parameter. + */ + rc = p2m_set_mem_access_multi(d, a.u.set_mem_access_multi.pfn_list, + a.u.set_mem_access_multi.access_list, + a.u.set_mem_access_multi.nr, + a.u.set_mem_access_multi.opaque, + 0x3F, + a.u.set_mem_access_multi.view); + if ( rc > 0 ) + { + a.u.set_mem_access_multi.opaque = rc; + if ( __copy_field_to_guest(guest_handle_cast(arg, xen_hvm_altp2m_op_t), + &a, u.set_mem_access_multi.opaque) ) + rc = -EFAULT; + else + rc = hypercall_create_continuation(__HYPERVISOR_hvm_op, "lh", + HVMOP_altp2m, arg); + } + break; + case HVMOP_altp2m_change_gfn: if ( a.u.change_gfn.pad1 || a.u.change_gfn.pad2 ) rc = -EINVAL; @@ -4586,6 +4620,108 @@ static int do_altp2m_op( return rc; } +DEFINE_XEN_GUEST_HANDLE(compat_hvm_altp2m_op_t); + +/* + * Manually define the CHECK_ macros for hvm_altp2m_op and + * hvm_altp2m_set_mem_access_multi as the generated versions can't handle + * correctly the translation of all fields from compat_(*) to xen_(*). + */ +#ifndef CHECK_hvm_altp2m_op +#define CHECK_hvm_altp2m_op \ + CHECK_SIZE_(struct, hvm_altp2m_op); \ + CHECK_FIELD_(struct, hvm_altp2m_op, version); \ + CHECK_FIELD_(struct, hvm_altp2m_op, cmd); \ + CHECK_FIELD_(struct, hvm_altp2m_op, domain); \ + CHECK_FIELD_(struct, hvm_altp2m_op, pad1); \ + CHECK_FIELD_(struct, hvm_altp2m_op, pad2) +#endif /* CHECK_hvm_altp2m_op */ + +#ifndef CHECK_hvm_altp2m_set_mem_access_multi +#define CHECK_hvm_altp2m_set_mem_access_multi \ + CHECK_FIELD_(struct, hvm_altp2m_set_mem_access_multi, view); \ + CHECK_FIELD_(struct, hvm_altp2m_set_mem_access_multi, pad); \ + CHECK_FIELD_(struct, hvm_altp2m_set_mem_access_multi, nr); \ + CHECK_FIELD_(struct, hvm_altp2m_set_mem_access_multi, opaque) +#endif /* CHECK_hvm_altp2m_set_mem_access_multi */ + +CHECK_hvm_altp2m_op; +CHECK_hvm_altp2m_set_mem_access_multi; + +static int compat_altp2m_op( + XEN_GUEST_HANDLE_PARAM(void) arg) +{ + int rc = 0; + struct compat_hvm_altp2m_op a; + union + { + XEN_GUEST_HANDLE_PARAM(void) hnd; + struct xen_hvm_altp2m_op *altp2m_op; + } nat; + + if ( !hvm_altp2m_supported() ) + return -EOPNOTSUPP; + + if ( copy_from_guest(&a, arg, 1) ) + return -EFAULT; + + if ( a.pad1 || a.pad2 || + (a.version != HVMOP_ALTP2M_INTERFACE_VERSION) ) + return -EINVAL; + + set_xen_guest_handle(nat.hnd, COMPAT_ARG_XLAT_VIRT_BASE); + + switch ( a.cmd ) + { + case HVMOP_altp2m_set_mem_access_multi: +#define XLAT_hvm_altp2m_set_mem_access_multi_HNDL_pfn_list(_d_, _s_); \ + guest_from_compat_handle((_d_)->pfn_list, (_s_)->pfn_list) +#define XLAT_hvm_altp2m_set_mem_access_multi_HNDL_access_list(_d_, _s_); \ + guest_from_compat_handle((_d_)->access_list, (_s_)->access_list) + XLAT_hvm_altp2m_set_mem_access_multi(&nat.altp2m_op->u.set_mem_access_multi, + &a.u.set_mem_access_multi); +#undef XLAT_hvm_altp2m_set_mem_access_multi_HNDL_pfn_list +#undef XLAT_hvm_altp2m_set_mem_access_multi_HNDL_access_list + break; + default: + return do_altp2m_op(arg); + } + + /* Manually fill the common part of the xen_hvm_altp2m_op structure. */ + nat.altp2m_op->version = a.version; + nat.altp2m_op->cmd = a.cmd; + nat.altp2m_op->domain = a.domain; + nat.altp2m_op->pad1 = a.pad1; + nat.altp2m_op->pad2 = a.pad2; + + rc = do_altp2m_op(nat.hnd); + + switch ( a.cmd ) + { + case HVMOP_altp2m_set_mem_access_multi: + /* + * The return code can be positive only if it is the return value + * of hypercall_create_continuation. In this case, the opaque value + * must be copied back to the guest. + */ + if ( rc > 0 ) + { + ASSERT(rc == __HYPERVISOR_hvm_op); + a.u.set_mem_access_multi.opaque = + nat.altp2m_op->u.set_mem_access_multi.opaque; + if ( __copy_field_to_guest(guest_handle_cast(arg, + compat_hvm_altp2m_op_t), + &a, u.set_mem_access_multi.opaque) ) + rc = -EFAULT; + } + break; + default: + ASSERT_UNREACHABLE(); + } + + return rc; +} + static int hvmop_get_mem_type( XEN_GUEST_HANDLE_PARAM(xen_hvm_get_mem_type_t) arg) { @@ -4733,7 +4869,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) break; case HVMOP_altp2m: - rc = do_altp2m_op(arg); + rc = current->hcall_compat ? compat_altp2m_op(arg) : do_altp2m_op(arg); break; default: diff --git a/xen/include/Makefile b/xen/include/Makefile index 1299b19..8fc6e2b 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -28,6 +28,7 @@ headers-$(CONFIG_X86) += compat/arch-x86/xen.h headers-$(CONFIG_X86) += compat/arch-x86/xen-$(compat-arch-y).h headers-$(CONFIG_X86) += compat/hvm/hvm_vcpu.h headers-$(CONFIG_X86) += compat/hvm/dm_op.h +headers-$(CONFIG_X86) += compat/hvm/hvm_op.h headers-y += compat/arch-$(compat-arch-y).h compat/pmu.h compat/xlat.h headers-$(CONFIG_FLASK) += compat/xsm/flask_op.h diff --git a/xen/include/public/hvm/hvm_op.h b/xen/include/public/hvm/hvm_op.h index 0bdafdf..12de88ac 100644 --- a/xen/include/public/hvm/hvm_op.h +++ b/xen/include/public/hvm/hvm_op.h @@ -83,6 +83,13 @@ DEFINE_XEN_GUEST_HANDLE(xen_hvm_set_pci_link_route_t); /* Flushes all VCPU TLBs: @arg must be NULL. */ #define HVMOP_flush_tlbs 5 +/* + * hvmmem_type_t should not be defined when generating the corresponding + * compat header. This will ensure that the improperly named HVMMEM_(*) + * values are defined only once. + */ +#ifndef XEN_GENERATING_COMPAT_HEADERS + typedef enum { HVMMEM_ram_rw, /* Normal read/write guest RAM */ HVMMEM_ram_ro, /* Read-only; writes are discarded */ @@ -102,6 +109,8 @@ typedef enum { to HVMMEM_ram_rw. */ } hvmmem_type_t; +#endif /* XEN_GENERATING_COMPAT_HEADERS */ + /* Hint from PV drivers for pagetable destruction. */ #define HVMOP_pagetable_dying 9 struct xen_hvm_pagetable_dying { @@ -237,6 +246,20 @@ struct xen_hvm_altp2m_set_mem_access { typedef struct xen_hvm_altp2m_set_mem_access xen_hvm_altp2m_set_mem_access_t; DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_set_mem_access_t); +struct xen_hvm_altp2m_set_mem_access_multi { + /* view */ + uint16_t view; + uint16_t pad; + /* Number of pages */ + uint32_t nr; + /* Used for continuation purposes */ + uint64_t opaque; + /* List of pfns to set access for */ + XEN_GUEST_HANDLE(const_uint64) pfn_list; + /* Corresponding list of access settings for pfn_list */ + XEN_GUEST_HANDLE(const_uint8) access_list; +}; + struct xen_hvm_altp2m_change_gfn { /* view */ uint16_t view; @@ -268,15 +291,18 @@ struct xen_hvm_altp2m_op { #define HVMOP_altp2m_set_mem_access 7 /* Change a p2m entry to have a different gfn->mfn mapping */ #define HVMOP_altp2m_change_gfn 8 +/* Set access for an array of pages */ +#define HVMOP_altp2m_set_mem_access_multi 9 domid_t domain; uint16_t pad1; uint32_t pad2; union { - struct xen_hvm_altp2m_domain_state domain_state; - struct xen_hvm_altp2m_vcpu_enable_notify enable_notify; - struct xen_hvm_altp2m_view view; - struct xen_hvm_altp2m_set_mem_access set_mem_access; - struct xen_hvm_altp2m_change_gfn change_gfn; + struct xen_hvm_altp2m_domain_state domain_state; + struct xen_hvm_altp2m_vcpu_enable_notify enable_notify; + struct xen_hvm_altp2m_view view; + struct xen_hvm_altp2m_set_mem_access set_mem_access; + struct xen_hvm_altp2m_change_gfn change_gfn; + struct xen_hvm_altp2m_set_mem_access_multi set_mem_access_multi; uint8_t pad[64]; } u; }; diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index 4346cbe..e3fb0c1 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -71,6 +71,7 @@ ? dm_op_set_pci_intx_level hvm/dm_op.h ? dm_op_set_pci_link_route hvm/dm_op.h ? dm_op_track_dirty_vram hvm/dm_op.h +! hvm_altp2m_set_mem_access_multi hvm/hvm_op.h ? vcpu_hvm_context hvm/hvm_vcpu.h ? vcpu_hvm_x86_32 hvm/hvm_vcpu.h ? vcpu_hvm_x86_64 hvm/hvm_vcpu.h