From patchwork Mon Jul 27 12:23:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 247170 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp4755344ilg; Mon, 27 Jul 2020 05:26:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxeB3B6vqpH8XAUo04kU3Tj5Y85RfifZd2MnMJcoNA3nujpxvx2yXlqABjkV/WxMA6aax5c X-Received: by 2002:a5b:102:: with SMTP id 2mr33899621ybx.335.1595852808887; Mon, 27 Jul 2020 05:26:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595852808; cv=none; d=google.com; s=arc-20160816; b=mfcjvTL+kynfnRWxZfqfASaHnQWYHAqYA5kaW4VcRZcDp6M2FMpb451fBjyBXJxort Qpo9L1dsLAjYwkQl444nw3n+UoO15qXuahoy5+CVtAaY90VZCGzlyR/+6oXWnI7NbyT/ ouJFduHRAVfCtU4F6C7DweAU/3TdvuZqHIsWsPTKUmpyZUua68nUX2OrPln4bWEE8mji XjAwUzUwKE22xyMnn+spokWOqqSBiwqh8t/cSHgF9FBqcuR9/UFe5kq68CLMnB72dsX0 NY3T0Db3AZUhMrpduOzRvyDpGLLkUJWvVngyyYlzoZWxsJiTVwpsbtoJV+E37HLP5XhW cDWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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=PRLfK+qPAC6gSDd74XPBGh+NxN06ki9WKWBJWChAWs0=; b=VDUtq2PQUA6VjPiJhuFgRglQtAKHqfpTPd3Ja5uIangTBC53Ye0v84+j07Sx43Wjn+ wEwK0C1bpcAaH/2FXhV+j6YJKpU06dYHW8NrkRyAnSRE9+VcQ7Vce6DbHLPuXMAAtF6/ 9HxJol11s0XwSioyQpc/Aim9dIQVtwwBZuGxQY2uGvBkHC8x7xcuQI+H4PNsQC2YWzPg K4N3MxbawqMRpy9QGSLo4mDDJ4MJVchfGkgjSSooSWg+A68XwU6mVMgQJYzVtlJKpXmB nAbZ8+g9fmrxTjht7ghK/JocHZvYL8qWYkIcSiP9kAkC0F6ClvbIOkm8SAyuuNDsLdIn LUUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=z5fcyUrL; 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=fail (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 v7si9359998ybl.243.2020.07.27.05.26.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Jul 2020 05:26:48 -0700 (PDT) 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=fail header.i=@linaro.org header.s=google header.b=z5fcyUrL; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k02DQ-0002Bj-Cf for patch@linaro.org; Mon, 27 Jul 2020 08:26:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k02Ar-00070I-Hx for qemu-devel@nongnu.org; Mon, 27 Jul 2020 08:24:09 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:40279) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k02Ap-0006Qg-SC for qemu-devel@nongnu.org; Mon, 27 Jul 2020 08:24:09 -0400 Received: by mail-wr1-x436.google.com with SMTP id l2so4115583wrc.7 for ; Mon, 27 Jul 2020 05:24:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PRLfK+qPAC6gSDd74XPBGh+NxN06ki9WKWBJWChAWs0=; b=z5fcyUrLACUZTWdlc4vMHpSStzN3FIcdIAMod3h5V4Cmtcd2iPCVN7uM+OedNYAGya qiERAyWYLM+eb9Wa/6W6jMX1oLUf2+WUCy22QYtvsPH3TFQhCvbrEQHzUO7v11thLVNL eMcnVSuwfL+b9QYwM6rsTXZ/GrFf12EYH59dFChKwiPomKV1CxVCJG+HqXq/E5E77s1x ydQ8SKofD97L//1aJKrmFyHG0u6x1dvnZr11PdviM71FC4DRVf8wFiDEmn3KRVrKQ6u5 Oo7QwwpzzmU1oGiwHEfZY0vK+3G4rj7fycOZQcdaLrj7rPQjloqPX81U36wvtRh/Ikh8 9V6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PRLfK+qPAC6gSDd74XPBGh+NxN06ki9WKWBJWChAWs0=; b=S467ZN5fWB0QmeX4xMR2oaD64uU+GZM+SsAk85b5k1NXqejQWA6jQgbLYaRqVBiUq9 ba2B504I07mK6U6AZ5pHegF3v5r+gC8r8vrXsY418o1YFiIJCIDLt6DD4izxwkfW5tIE vO+lhKGzTZvzJN0RdMLMtY4nQ4ZWCe+KjWLWWokmYJ5dIvrJklLZcW3z1fg8bZslfZ8L I5WQCoZGPT0tUGGe+UVNHZDotw0ApNXhdtPt1T6474txsBe9P9JmeBEQ7RBCH+9jkclc AroH5TnQUS5KXmiZ/KQvXMlWEIBXtSeOJLCsm2dkHHNCrpr5rRF3v/OdnUOyr7iQv80v gNwQ== X-Gm-Message-State: AOAM532pBYfZFcLOdFsWUdEAAXY94HjB8E/vKh0XC9RW5dlerlWcm7wh R7ZyodLCgcqmtKTNhcuDxNHLEg== X-Received: by 2002:a5d:658a:: with SMTP id q10mr19243983wru.1.1595852646497; Mon, 27 Jul 2020 05:24:06 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 128sm1890066wmz.43.2020.07.27.05.23.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2020 05:24:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EA0F61FF92; Mon, 27 Jul 2020 13:23:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 06/16] accel/tcg: better handle memory constrained systems Date: Mon, 27 Jul 2020 13:23:47 +0100 Message-Id: <20200727122357.31263-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200727122357.31263-1-alex.bennee@linaro.org> References: <20200727122357.31263-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: , Cc: Robert Foley , Richard Henderson , qemu-devel@nongnu.org, Christian Ehrhardt , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" It turns out there are some 64 bit systems that have relatively low amounts of physical memory available to them (typically CI system). Even with swapping available a 1GB translation buffer that fills up can put the machine under increased memory pressure. Detect these low memory situations and reduce tb_size appropriately. Fixes: 600e17b2615 ("accel/tcg: increase default code gen buffer size for 64 bit") Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Robert Foley Cc: BALATON Zoltan Cc: Christian Ehrhardt Message-Id: <20200724064509.331-7-alex.bennee@linaro.org> -- 2.20.1 Tested-by: Christian Ehrhardt Reviewed-by: Christian Ehrhardt Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Robert Foley <robert.foley@linaro.org>
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 2afa46bd2b1..2d83013633b 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -976,7 +976,12 @@ static inline size_t size_code_gen_buffer(size_t tb_size) { /* Size the buffer. */ if (tb_size == 0) { - tb_size = DEFAULT_CODE_GEN_BUFFER_SIZE; + size_t phys_mem = qemu_get_host_physmem(); + if (phys_mem == 0) { + tb_size = DEFAULT_CODE_GEN_BUFFER_SIZE; + } else { + tb_size = MIN(DEFAULT_CODE_GEN_BUFFER_SIZE, phys_mem / 8); + } } if (tb_size < MIN_CODE_GEN_BUFFER_SIZE) { tb_size = MIN_CODE_GEN_BUFFER_SIZE;