From patchwork Tue Aug 15 12:30:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9901725 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 EEC7160230 for ; Tue, 15 Aug 2017 12:33:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E1B7928553 for ; Tue, 15 Aug 2017 12:33:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D6A9C28848; Tue, 15 Aug 2017 12:33: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 812A828553 for ; Tue, 15 Aug 2017 12:33: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 1dhazw-0003bR-VJ; Tue, 15 Aug 2017 12:31: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 1dhazv-0003ZY-8G for xen-devel@lists.xen.org; Tue, 15 Aug 2017 12:31:03 +0000 Received: from [85.158.143.35] by server-10.bemta-6.messagelabs.com id E1/18-18185-789E2995; Tue, 15 Aug 2017 12:31:03 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRWlGSWpSXmKPExsXitHRDpG7by0m RBr3bFC2WfFzM4sDocXT3b6YAxijWzLyk/IoE1oz/R48xFxwVqPhxbAFbA+MFni5GTg4JAX+J m3dXsYHYbAL6ErtffGICsUUE1CVOd1xk7WLk4mAWeMIoMXFRO0sXIweHsICDxO19JSA1LAKqE nuenQEL8wp4Svx5owExUk7i/PGfzCA2p4CXRNv5PnYQWwio5OGd84wQtprEtf5LYHFeAUGJkz OfsIDYzAISEgdfvGCewMg7C0lqFpLUAkamVYwaxalFZalFukYmeklFmekZJbmJmTm6hgZmerm pxcWJ6ak5iUnFesn5uZsYgaHDAAQ7GPd9jDzEKMnBpCTKu+jspEghvqT8lMqMxOKM+KLSnNTi Q4wyHBxKErzmL4BygkWp6akVaZk5wCCGSUtw8CiJ8MaCpHmLCxJzizPTIVKnGHU5Xk34/41Ji CUvPy9VSpxXHqRIAKQoozQPbgQsoi4xykoJ8zICHSXEU5BalJtZgir/ilGcg1FJmFcRZApPZl 4J3KZXQEcwAR1xpR3siJJEhJRUAyP3u9ee+x4mHWF/NleIQ/Wm0IzE4OWbt/xn15giymfKVcl /rnneoYd2Bxh+iARsv6q+SGaCQHX1NgMWX51vP4S+bVcRU31T6Pr8uDuHwkXxfvWup9mneU4q 8mw3df2QOSU54pXoFp7LF3ytbEtVhcVzv7JeXxDrsSjtpNqqqD6pxy8808wnPlViKc5INNRiL ipOBABvk3XEowIAAA== X-Env-Sender: prvs=3930249d3=Andrew.Cooper3@citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1502800258!54947549!3 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.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43647 invoked from network); 15 Aug 2017 12:31:02 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-6.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 15 Aug 2017 12:31:02 -0000 X-IronPort-AV: E=Sophos;i="5.41,377,1498521600"; d="scan'208";a="435534965" From: Andrew Cooper To: Xen-devel Date: Tue, 15 Aug 2017 13:30:30 +0100 Message-ID: <1502800232-26670-5-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1502800232-26670-1-git-send-email-andrew.cooper3@citrix.com> References: <1502800232-26670-1-git-send-email-andrew.cooper3@citrix.com> MIME-Version: 1.0 Cc: Stefano Stabellini , Wei Liu , George Dunlap , Andrew Cooper , Tim Deegan , Jan Beulich Subject: [Xen-devel] [PATCH 4/6] common/gnttab: gnttab_setup_table() cleanup 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 Drop pointless debugging messages, and reduce variable scope. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: George Dunlap CC: Jan Beulich CC: Stefano Stabellini CC: Tim Deegan CC: Wei Liu --- xen/common/grant_table.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 31b010d..6ed86f5 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1647,20 +1647,17 @@ static long gnttab_setup_table( XEN_GUEST_HANDLE_PARAM(gnttab_setup_table_t) uop, unsigned int count) { + struct vcpu *curr = current; struct gnttab_setup_table op; struct domain *d = NULL; struct grant_table *gt; - int i; - xen_pfn_t gmfn; + unsigned int i; if ( count != 1 ) return -EINVAL; - if ( unlikely(copy_from_guest(&op, uop, 1) != 0) ) - { - gdprintk(XENLOG_INFO, "Fault while reading gnttab_setup_table_t.\n"); + if ( unlikely(copy_from_guest(&op, uop, 1)) ) return -EFAULT; - } if ( unlikely(op.nr_frames > max_grant_frames) ) { @@ -1677,12 +1674,11 @@ gnttab_setup_table( d = rcu_lock_domain_by_any_id(op.dom); if ( d == NULL ) { - gdprintk(XENLOG_INFO, "Bad domid %d.\n", op.dom); op.status = GNTST_bad_domain; goto out; } - if ( xsm_grant_setup(XSM_TARGET, current->domain, d) ) + if ( xsm_grant_setup(XSM_TARGET, curr->domain, d) ) { op.status = GNTST_permission_denied; goto out; @@ -1709,9 +1705,11 @@ gnttab_setup_table( op.status = GNTST_okay; for ( i = 0; i < op.nr_frames; i++ ) { - gmfn = gnttab_shared_gmfn(d, gt, i); + xen_pfn_t gmfn = gnttab_shared_gmfn(d, gt, i); + /* Grant tables cannot be shared */ BUG_ON(SHARED_M2P(gmfn)); + if ( __copy_to_guest_offset(op.frame_list, i, &gmfn, 1) ) op.status = GNTST_bad_virt_addr; }