From patchwork Mon Jul 11 09:07:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 9223079 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 592FF60760 for ; Mon, 11 Jul 2016 09:13:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 487E42793B for ; Mon, 11 Jul 2016 09:13:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3B3A827BF9; Mon, 11 Jul 2016 09:13:21 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CEFF82793B for ; Mon, 11 Jul 2016 09:13:20 +0000 (UTC) Received: from localhost ([::1]:59083 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMXHD-0001cS-KE for patchwork-qemu-devel@patchwork.kernel.org; Mon, 11 Jul 2016 05:13:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49535) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMXCT-0004Zu-3d for qemu-devel@nongnu.org; Mon, 11 Jul 2016 05:08:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMXCO-0003Dx-QC for qemu-devel@nongnu.org; Mon, 11 Jul 2016 05:08:23 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:39828 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMXCO-0003Dl-GW for qemu-devel@nongnu.org; Mon, 11 Jul 2016 05:08:20 -0400 Received: (qmail 31907 invoked by uid 89); 11 Jul 2016 09:08:16 -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/21882. hbedv: 8.3.40.44/7.12.99.34. avast: 1.2.2/16071100. spamassassin: 3.4.1. Clear:RC:1(195.62.97.28):. Processed in 0.384005 secs); 11 Jul 2016 09:08:16 -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); 11 Jul 2016 09:08:13 -0000 X-GL_Whitelist: yes Received: (qmail 28586 invoked from network); 11 Jul 2016 09:08:12 -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; 11 Jul 2016 09:08:12 -0000 Received: by lieven-pc (Postfix, from userid 1000) id C6E1A205D3; Mon, 11 Jul 2016 11:08:06 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Mon, 11 Jul 2016 11:07:57 +0200 Message-Id: <1468228082-7492-2-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468228082-7492-1-git-send-email-pl@kamp.de> References: <1468228082-7492-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: 2a02:248:0:51::16 Subject: [Qemu-devel] [PATCH V4 1/6] oslib-posix: add helpers for stack alloc and free 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP the allocated stack will be adjusted to the minimum supported stack size by the OS and rounded up to be a multiple of the system pagesize. Additionally an architecture dependent guard page is added to the stack to catch stack overflows. Signed-off-by: Peter Lieven Reviewed-by: Richard Henderson --- include/sysemu/os-posix.h | 23 +++++++++++++++++++++++ util/oslib-posix.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/include/sysemu/os-posix.h b/include/sysemu/os-posix.h index 9c7dfdf..7630665 100644 --- a/include/sysemu/os-posix.h +++ b/include/sysemu/os-posix.h @@ -60,4 +60,27 @@ int qemu_utimens(const char *path, const qemu_timespec *times); bool is_daemonized(void); +/** + * qemu_alloc_stack: + * @sz: size of required stack in bytes + * + * Allocate memory that can be used as a stack, for instance for + * coroutines. If the memory cannot be allocated, this function + * will abort (like g_malloc()). + * + * The allocated stack must be freed with qemu_free_stack(). + * + * Returns: pointer to (the lowest address of) the stack memory. + */ +void *qemu_alloc_stack(size_t sz); + +/** + * qemu_free_stack: + * @stack: stack to free + * @sz: size of stack in bytes + * + * Free a stack allocated via qemu_alloc_stack(). + */ +void qemu_free_stack(void *stack, size_t sz); + #endif diff --git a/util/oslib-posix.c b/util/oslib-posix.c index e2e1d4d..9e7bc65 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -497,3 +497,47 @@ pid_t qemu_fork(Error **errp) } return pid; } + +static size_t adjust_stack_size(size_t sz) +{ + /* avoid stacks smaller than _SC_THREAD_STACK_MIN */ + sz = MAX(sz, sysconf(_SC_THREAD_STACK_MIN)); + /* adjust stack size to a multiple of the page size */ + sz = ROUND_UP(sz, getpagesize()); + return sz; +} + +void *qemu_alloc_stack(size_t sz) +{ + void *ptr, *guardpage; + size_t pagesz = getpagesize(); + sz = adjust_stack_size(sz); + + ptr = mmap(NULL, sz, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + if (ptr == MAP_FAILED) { + abort(); + } + +#if defined(HOST_IA64) + /* separate register stack */ + guardpage = ptr + (((sz - pagesz) / 2) & ~pagesz); +#elif defined(HOST_HPPA) + /* stack grows up */ + guardpage = ptr + sz - pagesz; +#else + /* stack grows down */ + guardpage = ptr; +#endif + if (mprotect(guardpage, pagesz, PROT_NONE) != 0) { + abort(); + } + + return ptr; +} + +void qemu_free_stack(void *stack, size_t sz) +{ + sz = adjust_stack_size(sz); + munmap(stack, sz); +}