From patchwork Fri Apr 21 13:15:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jennifer Herbert X-Patchwork-Id: 9692815 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 D49E760328 for ; Fri, 21 Apr 2017 13:18:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C633A277D9 for ; Fri, 21 Apr 2017 13:18:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB09628623; Fri, 21 Apr 2017 13:18:25 +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 64495277D9 for ; Fri, 21 Apr 2017 13:18:25 +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 1d1YPq-0002vv-MO; Fri, 21 Apr 2017 13:16:02 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d1YPo-0002vR-QE for xen-devel@lists.xen.org; Fri, 21 Apr 2017 13:16:00 +0000 Received: from [193.109.254.147] by server-2.bemta-6.messagelabs.com id A4/E8-03058-0160AF85; Fri, 21 Apr 2017 13:16:00 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmplkeJIrShJLcpLzFFi42JxWrrBXpef7Ve Ewb+jihZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8aV15tYC/7KVWx6N5GlgfGDaBcjJ4eEgL/E /1ObGUFsNgFlid6Jr5lBbBEBdYnTHRdZuxi5OJgFzjJKfLj0lR0kISwQJ7Hp3AwmEJtFQFXi1 OZ/YA28At4Sq/tms0EMlZM4f/wnWJxTwEfi/MaXYAuEgGrO9J5kh7A1JPoP3meF6BWUODnzCQ uIzSwgIXHwxQvmCYy8s5CkZiFJLWBkWsWoXpxaVJZapGuhl1SUmZ5RkpuYmaNraGCml5taXJy YnpqTmFSsl5yfu4kRGDwMQLCDcfZl/0OMkhxMSqK8Ib9/RgjxJeWnVGYkFmfEF5XmpBYfYpTh 4FCS4JVm/RUhJFiUmp5akZaZAwxjmLQEB4+SCO9UFqA0b3FBYm5xZjpE6hSjopQ472OQhABII qM0D64NFjuXGGWlhHkZgQ4R4ilILcrNLEGVf8UozsGoJMy7FmQKT2ZeCdz0V0CLmYAWn/X7Ab K4JBEhJdXAmC6wMn+B2qlLJ4sveC5Q/u+gVrSCO8yi+QKv4L3AfesEHky4lDtNqyNDbWbLrdM TWGZnrZv5OTv2Uad/sffPmOqwvoWLfi5gKn1ueGKVmNQqxQeiuzU93ZbVmh9cIlDMq3Bistcj 5qZr6+O7hRm+1te+zbwyJ/bwxSN3zZJdv/356po2ZefGCUosxRmJhlrMRcWJADocrtyYAgAA X-Env-Sender: prvs=277b21c2f=jennifer.herbert@citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1492780552!97548569!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40680 invoked from network); 21 Apr 2017 13:15:59 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 21 Apr 2017 13:15:59 -0000 X-IronPort-AV: E=Sophos;i="5.37,230,1488844800"; d="scan'208";a="429019968" From: To: Xen-devel Date: Fri, 21 Apr 2017 13:15:44 +0000 Message-ID: <1492780545-22401-4-git-send-email-jennifer.herbert@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1492780545-22401-1-git-send-email-jennifer.herbert@citrix.com> References: <1492780545-22401-1-git-send-email-jennifer.herbert@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Julien Grall , Paul Durrant , Jennifer Herbert , Jan Beulich Subject: [Xen-devel] [PATCH v7 for-4.9 4/5] hvm/dmop: Implement copy_{to, from}_guest_buf_offset() helpers 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 From: Andrew Cooper copy_{to,from}_guest_buf() are now implemented using an offset of 0. Signed-off-by: Andrew Cooper Signed-off-by: Jennifer Herbert Reviewed-by: Paul Durrant Reviewed-by: Jan Beulich --- CC: Paul Durrant CC: Andrew Cooper CC: Jan Beulich CC: Julien Grall --- No change. --- xen/arch/x86/hvm/dm.c | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/hvm/dm.c b/xen/arch/x86/hvm/dm.c index f29a290..196729a 100644 --- a/xen/arch/x86/hvm/dm.c +++ b/xen/arch/x86/hvm/dm.c @@ -32,10 +32,11 @@ struct dmop_args { struct xen_dm_op_buf buf[2]; }; -static bool _raw_copy_from_guest_buf(void *dst, - const struct dmop_args *args, - unsigned int buf_idx, - size_t dst_bytes) +static bool _raw_copy_from_guest_buf_offset(void *dst, + const struct dmop_args *args, + unsigned int buf_idx, + size_t offset_bytes, + size_t dst_bytes) { size_t buf_bytes; @@ -44,15 +45,19 @@ static bool _raw_copy_from_guest_buf(void *dst, buf_bytes = args->buf[buf_idx].size; - if ( dst_bytes > buf_bytes ) + if ( (offset_bytes + dst_bytes) < offset_bytes || + (offset_bytes + dst_bytes) > buf_bytes ) return false; - return !copy_from_guest(dst, args->buf[buf_idx].h, buf_bytes); + return !copy_from_guest_offset(dst, args->buf[buf_idx].h, + offset_bytes, dst_bytes); } -static bool _raw_copy_to_guest_buf(const struct dmop_args *args, - unsigned int buf_idx, - const void *src, size_t src_bytes) +static bool _raw_copy_to_guest_buf_offset(const struct dmop_args *args, + unsigned int buf_idx, + size_t offset_bytes, + const void *src, + size_t src_bytes) { size_t buf_bytes; @@ -61,17 +66,28 @@ static bool _raw_copy_to_guest_buf(const struct dmop_args *args, buf_bytes = args->buf[buf_idx].size; - if ( src_bytes > buf_bytes ) + + if ( (offset_bytes + src_bytes) < offset_bytes || + (offset_bytes + src_bytes) > buf_bytes ) return false; - return !copy_to_guest(args->buf[buf_idx].h, src, buf_bytes); + return !copy_to_guest_offset(args->buf[buf_idx].h, offset_bytes, + src, src_bytes); } -#define COPY_FROM_GUEST_BUF(dst, args, buf_idx) \ - _raw_copy_from_guest_buf(&dst, args, buf_idx, sizeof(dst)) +#define COPY_FROM_GUEST_BUF_OFFSET(dst, bufs, buf_idx, offset_bytes) \ + _raw_copy_from_guest_buf_offset(&dst, bufs, buf_idx, offset_bytes, \ + sizeof(dst)) + +#define COPY_TO_GUEST_BUF_OFFSET(bufs, buf_idx, offset_bytes, src) \ + _raw_copy_to_guest_buf_offset(bufs, buf_idx, offset_bytes, \ + src, sizeof(*(src))) + +#define COPY_FROM_GUEST_BUF(dst, bufs, buf_idx) \ + COPY_FROM_GUEST_BUF_OFFSET(dst, bufs, buf_idx, 0) -#define COPY_TO_GUEST_BUF(args, buf_idx, src) \ - _raw_copy_to_guest_buf(args, buf_idx, &src, sizeof(src)) +#define COPY_TO_GUEST_BUF(bufs, buf_idx, src) \ + copy_to_guest_buf_offset(bufs, buf_idx, 0, src) static int track_dirty_vram(struct domain *d, xen_pfn_t first_pfn, unsigned int nr, const struct xen_dm_op_buf *buf)