Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 525EDC43334 for ; Fri, 8 Jul 2022 15:59:02 +0000 (UTC) Received: from localhost ([::1]:50980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9qNf-0001bH-Vl for qemu-devel@archiver.kernel.org; Fri, 08 Jul 2022 11:59:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9q0k-0006pD-18 for qemu-devel@nongnu.org; Fri, 08 Jul 2022 11:35:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:34374) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9q0f-0007NP-MX for qemu-devel@nongnu.org; Fri, 08 Jul 2022 11:35:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657294513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2gc0A0SOX6I56DIktrWv6fNsVPKmLMBNQ3gqlM6rS6o=; b=BYwyBz2qr8/H/NsQNoCg+5BIPgIkezUwqLyssifbYJAYl+nXCu0dIoKTZ8+f5WqIgWHj0K iexz4o2xfyuLPVPpvc9yEmWNjsjKHdyqzv6LDrZmitCzoKMgBNYIqAd76vm6ETbxqTZ/Wd WnegdjZy0viHNC12fegZ14S7V1I9ggY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-403-l_3FocuWPyqU6lQNCvZu_w-1; Fri, 08 Jul 2022 11:35:10 -0400 X-MC-Unique: l_3FocuWPyqU6lQNCvZu_w-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 84C0C18E004D; Fri, 8 Jul 2022 15:35:09 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1ACBC18EB5; Fri, 8 Jul 2022 15:35:09 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Cc: Hanna Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Daniel Berrange , Thomas Huth , Wainer dos Santos Moschetta , qemu-block@nongnu.org, Kevin Wolf , Beraldo Leal , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , John Snow Subject: [PATCH v4 08/12] tests/vm: add 1GB extra memory per core Date: Fri, 8 Jul 2022 11:34:59 -0400 Message-Id: <20220708153503.18864-9-jsnow@redhat.com> In-Reply-To: <20220708153503.18864-1-jsnow@redhat.com> References: <20220708153503.18864-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Received-SPF: pass client-ip=170.10.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" If you try to run a 16 or 32 threaded test, you're going to run out of memory very quickly with qom-test and a few others. Bump the memory limit to try to scale with larger-core machines. Granted, this means that a 16 core processor is going to ask for 16GB, but you *probably* meet that requirement if you have such a machine. 512MB per core didn't seem to be enough to avoid ENOMEM and SIGABRTs in the test cases in practice on a six core machine; so I bumped it up to 1GB which seemed to help. Add this magic in early to the configuration process so that the config file, if provided, can still override it. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrangé --- tests/vm/basevm.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index d7d0413df35..4fd9af10b7f 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -99,6 +99,11 @@ def __init__(self, args, config=None): self._source_path = args.source_path # Allow input config to override defaults. self._config = DEFAULT_CONFIG.copy() + + # 1GB per core, minimum of 4. This is only a default. + mem = max(4, args.jobs) + self._config['memory'] = f"{mem}G" + if config != None: self._config.update(config) self.validate_ssh_keys() -- 2.34.3