From patchwork Tue Apr 25 13:52:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9698237 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 864EF603F6 for ; Tue, 25 Apr 2017 13:54:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70225285F0 for ; Tue, 25 Apr 2017 13:54:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6515328618; Tue, 25 Apr 2017 13:54:54 +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 26DF1285EE for ; Tue, 25 Apr 2017 13:54:54 +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 1d30tO-0007K5-F4; Tue, 25 Apr 2017 13:52:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d30tN-0007JX-FG for xen-devel@lists.xenproject.org; Tue, 25 Apr 2017 13:52:33 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id F1/0E-02202-0A45FF85; Tue, 25 Apr 2017 13:52:32 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmkeJIrShJLcpLzFFi42JxWrohUndByP8 IgyeNQhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aCd7dYC1o5KxYvm8HSwLiTvYuRk0NCwF+i feYSJhCbTUBZ4mdnLxuILSKgJ9F04DkjiM0skCfxeFUrWFxYIERiybwrQDYHB4uAqsTCC74gY V4Bc4kvb/8wQoyUl9jVdpEVxOYUsJDY232fGcQWAqr51bqODcJWkOiYfowJoldQ4uTMJywQqy QkDr54wTyBkXcWktQsJKkFjEyrGNWLU4vKUot0jfSSijLTM0pyEzNzdA0NjPVyU4uLE9NTcxK TivWS83M3MQIDp56BgXEH46lm50OMkhxMSqK89ZP/RQjxJeWnVGYkFmfEF5XmpBYfYpTh4FCS 4G0N/h8hJFiUmp5akZaZAwxhmLQEB4+SCO/qIKA0b3FBYm5xZjpE6hSjopQ4rxlInwBIIqM0D 64NFjeXGGWlhHkZGRgYhHgKUotyM0tQ5V8xinMwKgnzZoJM4cnMK4Gb/gpoMRPQ4qn2f0AWly QipKQaGC3ZegXvLamZ/nkBj/K6qY98U+zsZyzaq/27+KruC8e3kZd+9bspTb7i2DshafM8+8S 7q10EeyVmS1R33g2ayfjUvssrnvl3Udp/f97/mqsSvNlValtbbR85rzN16ROPWSJ19LnN0ZuC q5nOH/ukcbP3kunk1jCjK5ueCy2t/CTmzBFy52K+gxJLcUaioRZzUXEiAOFp8M6WAgAA X-Env-Sender: prvs=28164199e=wei.liu2@citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1493128350!96621726!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 27466 invoked from network); 25 Apr 2017 13:52:31 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-10.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 25 Apr 2017 13:52:31 -0000 X-IronPort-AV: E=Sophos;i="5.37,249,1488844800"; d="scan'208";a="420887130" From: Wei Liu To: Xen-devel Date: Tue, 25 Apr 2017 14:52:04 +0100 Message-ID: <20170425135211.4696-4-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170425135211.4696-1-wei.liu2@citrix.com> References: <20170425135211.4696-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH for-next v2 03/10] x86/domain: make release_compact_l4 NULL tolerant 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 Push the check in caller down to that function so that it becomes idempotent. No functional change. Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper --- Cc: Jan Beulich Cc: Andrew Cooper --- xen/arch/x86/domain.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 1f76d034a7..b3d65b1f82 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -338,7 +338,8 @@ static int setup_compat_l4(struct vcpu *v) static void release_compat_l4(struct vcpu *v) { - free_domheap_page(pagetable_get_page(v->arch.guest_table)); + if ( !pagetable_is_null(v->arch.guest_table) ) + free_domheap_page(pagetable_get_page(v->arch.guest_table)); v->arch.guest_table = pagetable_null(); v->arch.guest_table_user = pagetable_null(); } @@ -379,9 +380,7 @@ int switch_compat(struct domain *d) for_each_vcpu( d, v ) { free_compat_arg_xlat(v); - - if ( !pagetable_is_null(v->arch.guest_table) ) - release_compat_l4(v); + release_compat_l4(v); } return rc;