From patchwork Thu Aug 4 12:52:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 655792 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3s4qfh1hC5z9sD5 for ; Thu, 4 Aug 2016 22:55:24 +1000 (AEST) Received: from localhost ([::1]:39631 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVIBG-0001GX-8b for incoming@patchwork.ozlabs.org; Thu, 04 Aug 2016 08:55:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVI9i-0007yV-Fk for qemu-devel@nongnu.org; Thu, 04 Aug 2016 08:53:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bVI9h-0004wQ-Fn for qemu-devel@nongnu.org; Thu, 04 Aug 2016 08:53:46 -0400 Received: from mx01.kamp.de ([82.141.2.16]:55030) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVI9h-0004vn-5l for qemu-devel@nongnu.org; Thu, 04 Aug 2016 08:53:45 -0400 Received: (qmail 1106 invoked by uid 89); 4 Aug 2016 12:53:14 -0000 Received: from [195.62.97.28] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.99.2/22025. avast: 1.2.2/16080301. spamassassin: 3.4.1. Clear:RC:1(195.62.97.28):. Processed in 0.24704 secs); 04 Aug 2016 12:53:14 -0000 Received: from smtp.kamp.de (HELO submission.kamp.de) ([195.62.97.28]) by mx01.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted); 4 Aug 2016 12:53:11 -0000 X-GL_Whitelist: yes Received: (qmail 15344 invoked from network); 4 Aug 2016 12:52:56 -0000 Received: from lieven-pc.kamp-intra.net (HELO lieven-pc) (relay@kamp.de@::ffff:172.21.12.60) by submission.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted) ESMTPA; 4 Aug 2016 12:52:56 -0000 Received: by lieven-pc (Postfix, from userid 1000) id 3A41322274; Thu, 4 Aug 2016 14:52:51 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Thu, 4 Aug 2016 14:52:44 +0200 Message-Id: <1470315167-16481-4-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1470315167-16481-1-git-send-email-pl@kamp.de> References: <1470315167-16481-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 82.141.2.16 Subject: [Qemu-devel] [RESEND PATCH V5 3/6] coroutine-ucontext: use helper for allocating stack memory X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, mst@redhat.com, armbru@redhat.com, Peter Lieven , dgilbert@redhat.com, mreitz@redhat.com, pbonzini@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Peter Lieven Reviewed-by: Paolo Bonzini Reviewed-by: Richard Henderson --- util/coroutine-ucontext.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/util/coroutine-ucontext.c b/util/coroutine-ucontext.c index 31254ab..b7dea8c 100644 --- a/util/coroutine-ucontext.c +++ b/util/coroutine-ucontext.c @@ -82,7 +82,6 @@ static void coroutine_trampoline(int i0, int i1) Coroutine *qemu_coroutine_new(void) { - const size_t stack_size = COROUTINE_STACK_SIZE; CoroutineUContext *co; ucontext_t old_uc, uc; sigjmp_buf old_env; @@ -101,17 +100,17 @@ Coroutine *qemu_coroutine_new(void) } co = g_malloc0(sizeof(*co)); - co->stack = g_malloc(stack_size); + co->stack = qemu_alloc_stack(COROUTINE_STACK_SIZE); co->base.entry_arg = &old_env; /* stash away our jmp_buf */ uc.uc_link = &old_uc; uc.uc_stack.ss_sp = co->stack; - uc.uc_stack.ss_size = stack_size; + uc.uc_stack.ss_size = COROUTINE_STACK_SIZE; uc.uc_stack.ss_flags = 0; #ifdef CONFIG_VALGRIND_H co->valgrind_stack_id = - VALGRIND_STACK_REGISTER(co->stack, co->stack + stack_size); + VALGRIND_STACK_REGISTER(co->stack, co->stack + COROUTINE_STACK_SIZE); #endif arg.p = co; @@ -149,7 +148,7 @@ void qemu_coroutine_delete(Coroutine *co_) valgrind_stack_deregister(co); #endif - g_free(co->stack); + qemu_free_stack(co->stack, COROUTINE_STACK_SIZE); g_free(co); }