From patchwork Mon Dec 14 14:02:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 343514 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp3032207jai; Mon, 14 Dec 2020 06:15:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJxKZtmBYysj3e87K4X66R3ZQUpuGXLf8Gb+0KLplfnboY1mAUDGvlbBk8wcE0F95gT3XE6T X-Received: by 2002:a25:ab31:: with SMTP id u46mr35487857ybi.179.1607955344893; Mon, 14 Dec 2020 06:15:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607955344; cv=none; d=google.com; s=arc-20160816; b=yEp09k8H4kJmuBnEhKnu9U3bpf36AAT2XiHXeWuQ8GvzkQRNj5fux5d5oap73Z6sE7 4LdCV7MXJUibN4yd/x+uBo8Exwz7LbDG5qb9UOMd+OP3dajq39NHKicNuzKWWAGUpCIy fHdJaV7j4tkiwINAzJ8rDC9Ng+pDOxWl1qzJBGSOMXmD4SPxr+xC19TtzK95DJaqHCox ujxGV/06yUw+KL0Q2xqfWNGh7ShVqgiZitgMv9bfC+2yk0DbUiR0o4Mw1C7wyPrzB5q1 dUUsK4KQbhJX758bWAi3g2VzaA70WBDCCCKQTgBx9c/mfOTu1oJK6yEa47ShKi5np0wk yrFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=8YnkrBigavL+C33hr6dUiCjy8qumFXs3cayqbgFA/m8=; b=jpMuLY2k18jfigta8jguesWyX8HES2dGzCoGVQ65W43LrlKcHRR0dGNJGS/1XDlzrN omwIH/lNY0dD1onv/4JuTfAszl212hyAqnYRkZieJ73dXSXHYOgW5zBYtaTga3tPyLZs ksDEJ7plf/ZduRh6OAbXyjp9QLTUiCIxVG3lGF1GqdCaUln3Zw+LcZ0L5+3P3vonM+J9 RHk1NuZLJJUtxGXB/vD7hFycZOVjYCRUd3b65LyqLKJKsh89Wsd4aJcTcAHGiuAukjVV 2prB6CqiHMZSTzKwwgnzwhCRwwlI/deoN27Xp9LARhd4yl+UbsGHTKTFcWKo3dMG7npn rVUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CT+yeYsn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d19si18670594ybm.154.2020.12.14.06.15.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Dec 2020 06:15:44 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CT+yeYsn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1koodc-0007GN-Bn for patch@linaro.org; Mon, 14 Dec 2020 09:15:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36342) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kooS8-0001kk-0U for qemu-devel@nongnu.org; Mon, 14 Dec 2020 09:03:52 -0500 Received: from mail-oi1-x242.google.com ([2607:f8b0:4864:20::242]:35831) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kooS4-0003wu-JM for qemu-devel@nongnu.org; Mon, 14 Dec 2020 09:03:51 -0500 Received: by mail-oi1-x242.google.com with SMTP id s2so19254654oij.2 for ; Mon, 14 Dec 2020 06:03:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=8YnkrBigavL+C33hr6dUiCjy8qumFXs3cayqbgFA/m8=; b=CT+yeYsnvginptyE3WVoVo0SHwqFa5whSBzHw86hEMbC6c02hUKxrQVR6942Rkv+F8 mkOCEf+zWLQjE+wOmCV+s4qLZrnKC/y+JTdD8j2RHTE2JnxT1RGWFeWmDdKzW/kX3zj9 OaDRbIpMa7YWLorgkRAOg/0B171aSuuXDkeARKHTU6Iqt7pbXn9zrhbJGq/rlb7P4S+Z II2msth3+unFt5XXu4YDhBPe6hfp5TaeNgVosK+BeXA/MX6HzFeuqxZSy2OzCZ9lDyxA yWu2hHmAG2Ah/3dE2YIhsj8mrZJBd+AJsx7l3ApVJlEeGGbC+eHVSitgO9/K6vw7MYx2 FNZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8YnkrBigavL+C33hr6dUiCjy8qumFXs3cayqbgFA/m8=; b=OV47ODbKfBQdmM/vaOf5fNR/hvrvNZqTa2+ZT1SfD00mWSo6a+xl7bdHZRpR2GXd26 kt1Tz2Ed2T6cEuQ2sCk62J8V0B4Qm553XENWdTL26eY2wnrTySTNPx6722SoKlch0Mg7 GOQGUqOw+j87uvGHJLS00Wk0lZMjlhoJhqJvRWlRxfG7vNMjBxZHCxTduKg+JeW+txCw MeUAOYXgJvkWGGhoCwul1/4epjrY8DO+leKfZP/kuvp+Ec4BbXQhS2mXKNMkM5L1pH0R Ej/EkUjk0eHpTUWEKTXOI8xEgl82RtM1h1eE4TIp8FYEhyy30/aqxBWECh7T2PbrRf5F R7aQ== X-Gm-Message-State: AOAM531qsdHoQhNL04SpAYq9OMeperU3R1Pks3I8EMwpZ4GpL9C8NQ7X lFGSBitx+BOPSWp2wysL+G0BmxQasUvAma3i X-Received: by 2002:aca:4fd6:: with SMTP id d205mr17790207oib.34.1607954625529; Mon, 14 Dec 2020 06:03:45 -0800 (PST) Received: from localhost.localdomain (fixed-187-189-51-144.totalplay.net. [187.189.51.144]) by smtp.gmail.com with ESMTPSA id t24sm3940146oou.4.2020.12.14.06.03.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Dec 2020 06:03:44 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 16/43] tcg: Use Error with alloc_code_gen_buffer Date: Mon, 14 Dec 2020 08:02:47 -0600 Message-Id: <20201214140314.18544-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201214140314.18544-1-richard.henderson@linaro.org> References: <20201214140314.18544-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::242; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x242.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Report better error messages than just "could not allocate". Let alloc_code_gen_buffer set ctx->code_gen_buffer_size and ctx->code_gen_buffer, and simply return bool. Signed-off-by: Richard Henderson --- accel/tcg/translate-all.c | 60 ++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 26 deletions(-) -- 2.25.1 Reviewed-by: Joelle van Dyne diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 7b85ddacd2..2824b3e387 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -59,6 +59,7 @@ #include "sysemu/cpus.h" #include "sysemu/cpu-timers.h" #include "sysemu/tcg.h" +#include "qapi/error.h" /* #define DEBUG_TB_INVALIDATE */ /* #define DEBUG_TB_FLUSH */ @@ -963,7 +964,7 @@ static void page_lock_pair(PageDesc **ret_p1, tb_page_addr_t phys1, (DEFAULT_CODE_GEN_BUFFER_SIZE_1 < MAX_CODE_GEN_BUFFER_SIZE \ ? DEFAULT_CODE_GEN_BUFFER_SIZE_1 : MAX_CODE_GEN_BUFFER_SIZE) -static inline size_t size_code_gen_buffer(size_t tb_size) +static size_t size_code_gen_buffer(size_t tb_size) { /* Size the buffer. */ if (tb_size == 0) { @@ -1014,7 +1015,7 @@ static inline void *split_cross_256mb(void *buf1, size_t size1) static uint8_t static_code_gen_buffer[DEFAULT_CODE_GEN_BUFFER_SIZE] __attribute__((aligned(CODE_GEN_ALIGN))); -static inline void *alloc_code_gen_buffer(void) +static bool alloc_code_gen_buffer(size_t tb_size, Error **errp) { void *buf = static_code_gen_buffer; void *end = static_code_gen_buffer + sizeof(static_code_gen_buffer); @@ -1027,9 +1028,8 @@ static inline void *alloc_code_gen_buffer(void) size = end - buf; /* Honor a command-line option limiting the size of the buffer. */ - if (size > tcg_ctx->code_gen_buffer_size) { - size = QEMU_ALIGN_DOWN(tcg_ctx->code_gen_buffer_size, - qemu_real_host_page_size); + if (size > tb_size) { + size = QEMU_ALIGN_DOWN(tb_size, qemu_real_host_page_size); } tcg_ctx->code_gen_buffer_size = size; @@ -1041,31 +1041,43 @@ static inline void *alloc_code_gen_buffer(void) #endif if (qemu_mprotect_rwx(buf, size)) { - abort(); + error_setg_errno(errp, errno, "mprotect of jit buffer"); + return false; } qemu_madvise(buf, size, QEMU_MADV_HUGEPAGE); - return buf; + tcg_ctx->code_gen_buffer = buf; + return true; } #elif defined(_WIN32) -static inline void *alloc_code_gen_buffer(void) +static bool alloc_code_gen_buffer(size_t size, Error **errp) { - size_t size = tcg_ctx->code_gen_buffer_size; - return VirtualAlloc(NULL, size, MEM_RESERVE | MEM_COMMIT, - PAGE_EXECUTE_READWRITE); + void *buf = VirtualAlloc(NULL, size, MEM_RESERVE | MEM_COMMIT, + PAGE_EXECUTE_READWRITE); + if (buf == NULL) { + error_setg_win32(errp, GetLastError(), + "allocate %zu bytes for jit buffer", size); + return false; + } + + tcg_ctx->code_gen_buffer = buf; + tcg_ctx->code_gen_buffer_size = size; + return true; } #else -static inline void *alloc_code_gen_buffer(void) +static bool alloc_code_gen_buffer(size_t size, Error **errp) { int prot = PROT_WRITE | PROT_READ | PROT_EXEC; int flags = MAP_PRIVATE | MAP_ANONYMOUS; - size_t size = tcg_ctx->code_gen_buffer_size; void *buf; buf = mmap(NULL, size, prot, flags, -1, 0); if (buf == MAP_FAILED) { - return NULL; + error_setg_errno(errp, errno, + "allocate %zu bytes for jit buffer", size); + return false; } + tcg_ctx->code_gen_buffer_size = size; #ifdef __mips__ if (cross_256mb(buf, size)) { @@ -1104,20 +1116,11 @@ static inline void *alloc_code_gen_buffer(void) /* Request large pages for the buffer. */ qemu_madvise(buf, size, QEMU_MADV_HUGEPAGE); - return buf; + tcg_ctx->code_gen_buffer = buf; + return true; } #endif /* USE_STATIC_CODE_GEN_BUFFER, WIN32, POSIX */ -static inline void code_gen_alloc(size_t tb_size) -{ - tcg_ctx->code_gen_buffer_size = size_code_gen_buffer(tb_size); - tcg_ctx->code_gen_buffer = alloc_code_gen_buffer(); - if (tcg_ctx->code_gen_buffer == NULL) { - fprintf(stderr, "Could not allocate dynamic translator buffer\n"); - exit(1); - } -} - static bool tb_cmp(const void *ap, const void *bp) { const TranslationBlock *a = ap; @@ -1144,11 +1147,16 @@ static void tb_htable_init(void) size. */ void tcg_exec_init(unsigned long tb_size) { + bool ok; + tcg_allowed = true; cpu_gen_init(); page_init(); tb_htable_init(); - code_gen_alloc(tb_size); + + ok = alloc_code_gen_buffer(size_code_gen_buffer(tb_size), &error_fatal); + assert(ok); + #if defined(CONFIG_SOFTMMU) /* There's no guest base to take into account, so go ahead and initialize the prologue now. */