From mboxrd@z Thu Jan 1 00:00:00 1970 From: Aravindh Puthiyaparambil Subject: [PATCH v3 2/5] tools/libxc: Make the mem_access APIs generic Date: Tue, 15 Apr 2014 17:25:23 -0700 Message-ID: <1397607926-15298-3-git-send-email-aravindp@cisco.com> References: <1397607926-15298-1-git-send-email-aravindp@cisco.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WaDfV-0004IM-Tb for xen-devel@lists.xenproject.org; Wed, 16 Apr 2014 00:25:38 +0000 In-Reply-To: <1397607926-15298-1-git-send-email-aravindp@cisco.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Ian Campbell , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org Add new xc_[sg]et_mem_access() APIs. Signed-off-by: Aravindh Puthiyaparambil Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell --- Changes from version 2 of the patch: 1. Move removal of xc_hvm_[sg]et_mem_access() APIs into a seperate patch. Changes from version 1 of the patch: 1. Remove unused "gfn" from the parameter list of xc_mem_access_resume(). 2. Use structure initialisation. 3. Write "access" back only in the case of do_memory_op returning success. 4. Fix formatting. Changes from the RFC version of the patch: 1. Remove xc_mem_access_memop() wrapper. 2. Remove xc_hvm_[sg]et_mem_access() APIs. diff --git a/tools/libxc/xc_mem_access.c b/tools/libxc/xc_mem_access.c index a50c145..f436e69 100644 --- a/tools/libxc/xc_mem_access.c +++ b/tools/libxc/xc_mem_access.c @@ -22,7 +22,7 @@ */ #include "xc_private.h" - +#include int xc_mem_access_enable(xc_interface *xch, domid_t domain_id, uint32_t *port) @@ -47,12 +47,54 @@ int xc_mem_access_disable(xc_interface *xch, domid_t domain_id) NULL); } -int xc_mem_access_resume(xc_interface *xch, domid_t domain_id, unsigned long gfn) +int xc_mem_access_resume(xc_interface *xch, domid_t domain_id) +{ + xen_mem_access_op_t mao = + { + .op = XENMEM_access_op_resume, + .domid = domain_id + }; + + return do_memory_op(xch, XENMEM_access_op, &mao, sizeof(mao)); +} + +int xc_set_mem_access(xc_interface *xch, + domid_t domain_id, + xenmem_access_t access, + uint64_t first_pfn, + uint32_t nr) { - return xc_mem_event_memop(xch, domain_id, - XENMEM_access_op_resume, - XENMEM_access_op, - gfn, NULL); + xen_mem_access_op_t mao = + { + .op = XENMEM_access_op_set_access, + .domid = domain_id, + .access = access, + .pfn = first_pfn, + .nr = nr + }; + + return do_memory_op(xch, XENMEM_access_op, &mao, sizeof(mao)); +} + +int xc_get_mem_access(xc_interface *xch, + domid_t domain_id, + uint64_t pfn, + xenmem_access_t *access) +{ + int rc; + xen_mem_access_op_t mao = + { + .op = XENMEM_access_op_get_access, + .domid = domain_id, + .pfn = pfn + }; + + rc = do_memory_op(xch, XENMEM_access_op, &mao, sizeof(mao)); + + if ( rc == 0 ) + *access = mao.access; + + return rc; } /* diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index e3a32f2..3513ddb 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -2059,8 +2059,22 @@ int xc_mem_paging_load(xc_interface *xch, domid_t domain_id, */ int xc_mem_access_enable(xc_interface *xch, domid_t domain_id, uint32_t *port); int xc_mem_access_disable(xc_interface *xch, domid_t domain_id); -int xc_mem_access_resume(xc_interface *xch, domid_t domain_id, - unsigned long gfn); +int xc_mem_access_resume(xc_interface *xch, domid_t domain_id); + +/* + * Set a range of memory to a specific access. + * Allowed types are XENMEM_access_default, XENMEM_access_n, any combination of + * XENMEM_access_ + (rwx), and XENMEM_access_rx2rw + */ +int xc_set_mem_access(xc_interface *xch, domid_t domain_id, + xenmem_access_t access, uint64_t first_pfn, + uint32_t nr); + +/* + * Gets the mem access for the given page (returned in access on success) + */ +int xc_get_mem_access(xc_interface *xch, domid_t domain_id, + uint64_t pfn, xenmem_access_t *access); /*** * Memory sharing operations. -- 1.8.3.2