From patchwork Sat Jul 9 04:16:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corneliu ZUZU X-Patchwork-Id: 9221981 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 3160360467 for ; Sat, 9 Jul 2016 04:19:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21695285BC for ; Sat, 9 Jul 2016 04:19:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 126F1285F7; Sat, 9 Jul 2016 04:19:47 +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 93AF2285BC for ; Sat, 9 Jul 2016 04:19:46 +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 1bLjhv-0001tC-GN; Sat, 09 Jul 2016 04:17:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bLjhu-0001sp-7e for xen-devel@lists.xen.org; Sat, 09 Jul 2016 04:17:34 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id AB/89-01903-DDA70875; Sat, 09 Jul 2016 04:17:33 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNIsWRWlGSWpSXmKPExsUSfTxjoe6dqoZ wg6V/TS2WfFzM4sDocXT3b6YAxijWzLyk/IoE1oxfRyczF/zjrthx6SF7A+Mvji5GTg4hAXeJ L1/vsnUxcgHZaxglVi/czAzhnGSU6Dx6kRmiyk3i5qr/TBCJdYwSM+fuZARJsAloS5w7dI8Jx BYRkJa49vkyI0gRs8BSRonZX16ygySEBeIkmhb9B7NZBFQlTq3eywpi8wq4SOz/eARoAweHhI CcxIIL6SBhTgFXiXNvX7NCLHaRuLFvEth8CYEciZXPZrFDlEtJ/G9VAlklIdDNIjHjxmNGiBo ZiUcTb7JNYBRawMiwilG9OLWoLLVI10gvqSgzPaMkNzEzR9fQwFgvN7W4ODE9NScxqVgvOT93 EyMwEOsZGBh3MJ5qdj7EKMnBpCTKe8G2IVyILyk/pTIjsTgjvqg0J7X4EKMMB4eSBK9SJVBOs Cg1PbUiLTMHGBMwaQkOHiURXiuQNG9xQWJucWY6ROoUo6KUOK8ESEIAJJFRmgfXBovDS4yyUs K8jAwMDEI8BalFuZklqPKvGMU5GJWEeWtApvBk5pXATX8FtJgJaLFBQD3I4pJEhJRUA2PNFft NlX4NFZLVjxgOLQryv5lj9tQ8cIH4dVZutTz/cOML7jypykGn98gIsJoqGu0pNf+U3LXl25ZV v/wK5reWRPp8nrpkc+Q+vb/R3yqllOw22dSwRmdO/3opLv6q1EJbmeKrpkJ7W0p+HD0XO+vMZ oUJ981PngoLrjmZq16aY8VyQEJXTYmlOCPRUIu5qDgRALZBaMe+AgAA X-Env-Sender: czuzu@bitdefender.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1468037852!49597030!1 X-Originating-IP: [91.199.104.161] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32982 invoked from network); 9 Jul 2016 04:17:32 -0000 Received: from mx01.bbu.dsd.mx.bitdefender.com (HELO mx01.bbu.dsd.mx.bitdefender.com) (91.199.104.161) by server-2.tower-31.messagelabs.com with DHE-RSA-AES128-GCM-SHA256 encrypted SMTP; 9 Jul 2016 04:17:32 -0000 Received: (qmail 11935 invoked from network); 9 Jul 2016 07:17:32 +0300 Received: from unknown (HELO mx-sr.buh.bitdefender.com) (10.17.80.103) by mx01.bbu.dsd.mx.bitdefender.com with AES256-GCM-SHA384 encrypted SMTP; 9 Jul 2016 07:17:32 +0300 Received: from smtp03.buh.bitdefender.org (unknown [10.17.80.77]) by mx-sr.buh.bitdefender.com (Postfix) with ESMTP id 5FA8D7FBEA for ; Sat, 9 Jul 2016 07:17:31 +0300 (EEST) Received: (qmail 4453 invoked from network); 9 Jul 2016 07:17:31 +0300 Received: from 188-24-34-246.rdsnet.ro (HELO localhost.localdomain) (czuzu@bitdefender.com@188.24.34.246) by smtp03.buh.bitdefender.org with SMTP; 9 Jul 2016 07:17:31 +0300 From: Corneliu ZUZU To: xen-devel@lists.xen.org Date: Sat, 9 Jul 2016 07:16:34 +0300 Message-Id: <1468037794-6753-1-git-send-email-czuzu@bitdefender.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1468037509-6428-1-git-send-email-czuzu@bitdefender.com> References: <1468037509-6428-1-git-send-email-czuzu@bitdefender.com> X-BitDefender-Scanner: Clean, Agent: BitDefender qmail 3.1.6 on smtp03.buh.bitdefender.org, sigver: 7.66242 X-BitDefender-Spam: No (0) X-BitDefender-SpamStamp: Build: [Engines: 2.15.6.911, Dats: 425852, Stamp: 3], Multi: [Enabled, t: (0.000008, 0.001921)], BW: [Enabled, t: (0.000011,0.000001)], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, t: (0.002253), Flags: 85D2ED72; NN_NO_CONTENT_TYPE; NN_NO_LINK_NMD; NN_LEGIT_BITDEFENDER; NN_LEGIT_S_SQARE_BRACKETS; NN_LEGIT_MAILING_LIST_TO], SGN: [Enabled, t: (0.008468)], URL: [Enabled, t: (0.000005)], RTDA: [Enabled, t: (0.025471), Hit: No, Details: v2.3.10; Id: 2m1ghic.1aml0sh1c.u9dr], total: 0(775) X-BitDefender-CF-Stamp: none Cc: Andrew Cooper , Tamas K Lengyel , Jan Beulich , Razvan Cojocaru Subject: [Xen-devel] [PATCH 07/16] x86/vm-event: fix: call cleanup when init fails, to free partial allocs 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From vm_event_init_domain(d), call vm_event_cleanup_domain(d) if per-vcpu allocations failed -at some point- to cleanup partial allocations, if any were done along the way. Also minor adjustments: add unlikely in if's and add some comments. Signed-off-by: Corneliu ZUZU --- xen/arch/x86/vm_event.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/vm_event.c b/xen/arch/x86/vm_event.c index 6e19df8..22c63ea 100644 --- a/xen/arch/x86/vm_event.c +++ b/xen/arch/x86/vm_event.c @@ -23,20 +23,29 @@ /* Implicitly serialized by the domctl lock. */ int vm_event_init_domain(struct domain *d) { + int rc = 0; struct vcpu *v; + /* Per-vcpu initializations. */ for_each_vcpu ( d, v ) { - if ( v->arch.vm_event ) + if ( unlikely(v->arch.vm_event) ) continue; v->arch.vm_event = xzalloc(struct arch_vm_event); - - if ( !v->arch.vm_event ) - return -ENOMEM; + if ( unlikely(!v->arch.vm_event) ) + { + rc = -ENOMEM; + goto err; + } } - return 0; +err: + if ( unlikely(rc) ) + /* On fail cleanup whatever resources have been partially allocated. */ + vm_event_cleanup_domain(d); + + return rc; } /* @@ -47,6 +56,7 @@ void vm_event_cleanup_domain(struct domain *d) { struct vcpu *v; + /* Per-vcpu uninitializations. */ for_each_vcpu ( d, v ) { xfree(v->arch.vm_event);