From patchwork Tue Aug 15 12:30:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9901721 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 7247760230 for ; Tue, 15 Aug 2017 12:32:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 65316281B7 for ; Tue, 15 Aug 2017 12:32:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A10528846; Tue, 15 Aug 2017 12:32:49 +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 04899281B7 for ; Tue, 15 Aug 2017 12:32:49 +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 1dhazc-0003Tb-9X; Tue, 15 Aug 2017 12:30:44 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dhaza-0003SE-Iv for xen-devel@lists.xen.org; Tue, 15 Aug 2017 12:30:42 +0000 Received: from [193.109.254.147] by server-11.bemta-6.messagelabs.com id 3E/BA-03612-179E2995; Tue, 15 Aug 2017 12:30:41 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRWlGSWpSXmKPExsXitHSDvW7hy0m RBnO/KVss+biYxYHR4+ju30wBjFGsmXlJ+RUJrBmzzh9mKejnq9jf+4mpgXEadxcjJ4eEgL/E /ZvdTCA2m4C+xO4Xn8BsEQF1idMdF1m7GLk4mAWeMEpMXNTO0sXIwSEs4Caxu0UBpIZFQFXi+ 6aFLCA2r4CnxKzzL5khZspJnD/+E8zmFPCSaDvfxw5iCwHVPLxznhHCVpO41n+JHaJXUOLkzC dgc5gFJCQOvnjBPIGRdxaS1CwkqQWMTKsYNYpTi8pSi3SNDPSSijLTM0pyEzNzdA0NzPRyU4u LE9NTcxKTivWS83M3MQKDhwEIdjD+WhZwiFGSg0lJlHfR2UmRQnxJ+SmVGYnFGfFFpTmpxYcY ZTg4lCR41z0HygkWpaanVqRl5gDDGCYtwcGjJMJrDJLmLS5IzC3OTIdInWLU5Xg14f83JiGWv Py8VClxXvkXQEUCIEUZpXlwI2AxdYlRVkqYlxHoKCGegtSi3MwSVPlXjOIcjErCvIogU3gy80 rgNr0COoIJ6Igr7WBHlCQipKQaGI8dXJbw3+fp1J7/dcseftwgypt5SzjhzqEl9Yxqf9ZJcxh 4LHE7YNmhf+DK/0nZfV05TAV7Vb+perAps7Q+ul/zcdZcNwE7rcS22H/NWq+jW2PZrwQaTl00 JaYl4p9Zn0DhOW3vA3qX1Vd8nBcsx760JIeXjU2Aja+k7VHHjR3X1J02SR4VUmIpzkg01GIuK k4EAH4kuO2kAgAA X-Env-Sender: prvs=3930249d3=Andrew.Cooper3@citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1502800235!88680861!4 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.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24376 invoked from network); 15 Aug 2017 12:30:41 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-10.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 15 Aug 2017 12:30:41 -0000 X-IronPort-AV: E=Sophos;i="5.41,377,1498521600"; d="scan'208";a="443835793" From: Andrew Cooper To: Xen-devel Date: Tue, 15 Aug 2017 13:30:32 +0100 Message-ID: <1502800232-26670-7-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 6/6] common/gnttab: simplify gnttab_copy_lock_domain() 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 Remove the opencoded rcu_lock_domain_by_any_id(). Drop the PIN_FAIL()s and return GNTST_* values directly. 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 | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 615a8b4..38e470a 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2390,28 +2390,21 @@ struct gnttab_copy_buf { bool_t have_type; }; -static int gnttab_copy_lock_domain(domid_t domid, unsigned int gref_flag, +static int gnttab_copy_lock_domain(domid_t domid, bool is_gref, struct gnttab_copy_buf *buf) { - int rc; + /* Only DOMID_SELF may reference via frame. */ + if ( domid != DOMID_SELF && !is_gref ) + return GNTST_permission_denied; - if ( domid != DOMID_SELF && !gref_flag ) - PIN_FAIL(out, GNTST_permission_denied, - "only allow copy-by-mfn for DOMID_SELF.\n"); + buf->domain = rcu_lock_domain_by_any_id(domid); - if ( domid == DOMID_SELF ) - buf->domain = rcu_lock_current_domain(); - else - { - buf->domain = rcu_lock_domain_by_id(domid); - if ( buf->domain == NULL ) - PIN_FAIL(out, GNTST_bad_domain, "couldn't find %d\n", domid); - } + if ( buf->domain == NULL ) + return GNTST_bad_domain; buf->ptr.domid = domid; - rc = GNTST_okay; - out: - return rc; + + return GNTST_okay; } static void gnttab_copy_unlock_domains(struct gnttab_copy_buf *src,