From patchwork Fri Apr 21 13:15:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jennifer Herbert X-Patchwork-Id: 9692813 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 11E076038E for ; Fri, 21 Apr 2017 13:18:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03DF1277D9 for ; Fri, 21 Apr 2017 13:18:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ECAC428623; Fri, 21 Apr 2017 13:18:20 +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 9559228627 for ; Fri, 21 Apr 2017 13:18:20 +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-0002w7-T2; Fri, 21 Apr 2017 13:16:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d1YPp-0002vX-Dt for xen-devel@lists.xen.org; Fri, 21 Apr 2017 13:16:01 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 3F/F4-01992-0160AF85; Fri, 21 Apr 2017 13:16:00 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpjkeJIrShJLcpLzFFi42JxWrohUleA7Ve EwZojPBZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8a5j9vZCnbJVjQ2fGBuYLwv2sXIySEh4C9x 699GJhCbTUBZonfia2YQW0RAXeJ0x0XWLkYuDmaBs4wSHy59ZQdJCAtkSpxdu48NxGYRUJU4P esmWAOvgLfEoc0HmSCGykmcP/4TLM4p4CNxfuNLRhBbCKjmTO9JdghbQ6L/4H1WiF5BiZMzn7 CA2MwCEhIHX7xgnsDIOwtJahaS1AJGplWMGsWpRWWpRbqGZnpJRZnpGSW5iZk5uoYGpnq5qcX FiempOYlJxXrJ+bmbGIHhwwAEOxjPn/Y8xCjJwaQkyhvy+2eEEF9SfkplRmJxRnxRaU5q8SFG GQ4OJQnerSy/IoQEi1LTUyvSMnOAgQyTluDgURLh5WEFSvMWFyTmFmemQ6ROMSpKifM2gPQJg CQySvPg2mDRc4lRVkqYlxHoECGegtSi3MwSVPlXjOIcjErCvAUgU3gy80rgpr8CWswEtPis3w +QxSWJCCmpBkZlmRkhfyKkru/VqE2/xnXlZ/uB2TvbtN/KzjpxX6Eo7h5Tf0lX/p6LISfe5oS /TkuyX7/22sz26QGxDz2iK9el7zluOkXp45tNC16JWyhfzT01qye2OIaLKSFOalGLK4vqPDej F9ELjPouLRAy17p9jEG+7cn3/pUb80IU+G4fi7jA8Myg+7oSS3FGoqEWc1FxIgBdcwBPmQIAA A== X-Env-Sender: prvs=277b21c2f=jennifer.herbert@citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1492780558!58173413!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.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40458 invoked from network); 21 Apr 2017 13:15:59 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-206.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="420277595" From: To: Xen-devel Date: Fri, 21 Apr 2017 13:15:43 +0000 Message-ID: <1492780545-22401-3-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 3/5] hvm/dmop: Implement copy_{to, from}_guest_buf() in terms of raw accessors 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 This also allows the usual cases to be simplified, by omitting an unnecessary buf parameters, and because the macros can appropriately size the object. Signed-off-by: Andrew Cooper Signed-off-by: Jennifer Herbert --- CC: Paul Durrant CC: Andrew Cooper CC: Jan Beulich CC: Julien Grall --- This patch is now seperate from the patch that changes behavour. This also has macros that take the object and not a pointer to it, as this was considered a potential trap. As to prevent symatics confusing people, its is more explicitly a macro, via capping them. --- xen/arch/x86/hvm/dm.c | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/hvm/dm.c b/xen/arch/x86/hvm/dm.c index 63aa46c..f29a290 100644 --- a/xen/arch/x86/hvm/dm.c +++ b/xen/arch/x86/hvm/dm.c @@ -32,38 +32,47 @@ struct dmop_args { struct xen_dm_op_buf buf[2]; }; -static bool copy_buf_from_guest(const xen_dm_op_buf_t bufs[], - unsigned int nr_bufs, void *dst, - unsigned int idx, size_t dst_size) +static bool _raw_copy_from_guest_buf(void *dst, + const struct dmop_args *args, + unsigned int buf_idx, + size_t dst_bytes) { size_t buf_bytes; - if ( idx >= nr_bufs ) + if ( buf_idx >= args->nr_bufs ) return false; - buf_bytes = bufs[idx].size; - if ( dst_size > buf_bytes ) + buf_bytes = args->buf[buf_idx].size; + + if ( dst_bytes > buf_bytes ) return false; - return !copy_from_guest(dst, bufs[idx].h, buf_bytes); + return !copy_from_guest(dst, args->buf[buf_idx].h, buf_bytes); } -static bool copy_buf_to_guest(const xen_dm_op_buf_t bufs[], - unsigned int nr_bufs, unsigned int idx, - const void *src, size_t src_size) +static bool _raw_copy_to_guest_buf(const struct dmop_args *args, + unsigned int buf_idx, + const void *src, size_t src_bytes) { size_t buf_bytes; - if ( idx >= nr_bufs ) + if ( buf_idx >= args->nr_bufs ) return false; - buf_bytes = bufs[idx].size; - if ( src_size > buf_bytes ) + buf_bytes = args->buf[buf_idx].size; + + if ( src_bytes > buf_bytes ) return false; - return !copy_to_guest(bufs[idx].h, src, buf_bytes); + return !copy_to_guest(args->buf[buf_idx].h, src, buf_bytes); } +#define COPY_FROM_GUEST_BUF(dst, args, buf_idx) \ + _raw_copy_from_guest_buf(&dst, args, buf_idx, sizeof(dst)) + +#define COPY_TO_GUEST_BUF(args, buf_idx, src) \ + _raw_copy_to_guest_buf(args, buf_idx, &src, sizeof(src)) + static int track_dirty_vram(struct domain *d, xen_pfn_t first_pfn, unsigned int nr, const struct xen_dm_op_buf *buf) { @@ -314,7 +323,7 @@ static int dm_op(const struct dmop_args *op_args) if ( rc ) goto out; - if ( !copy_buf_from_guest(&op_args->buf[0], op_args->nr_bufs, &op, 0, sizeof(op)) ) + if ( !COPY_FROM_GUEST_BUF(op, op_args, 0) ); { rc = -EFAULT; goto out; @@ -570,8 +579,8 @@ static int dm_op(const struct dmop_args *op_args) } if ( (!rc || rc == -ERESTART) && - !const_op && - !copy_buf_to_guest(&op_args->buf[0], op_args->nr_bufs, 0, &op, sizeof(op)) ) + !const_op && !COPY_TO_GUEST_BUF(op_args, 0, op) ) + rc = -EFAULT; out: