From mboxrd@z Thu Jan 1 00:00:00 1970 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 A593BC77B7C for ; Fri, 12 May 2023 08:04:42 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxNkt-0005fb-A4; Fri, 12 May 2023 04:03:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pxNkq-0005f4-GE; Fri, 12 May 2023 04:03:56 -0400 Received: from mga06b.intel.com ([134.134.136.31] helo=mga06.intel.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pxNko-0003vG-NH; Fri, 12 May 2023 04:03:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683878634; x=1715414634; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=KO68+Xa0lCBQv+ttvmjlezsUr3IJPNxgBDkYU2UY3nM=; b=SO5wFuemdG0BuiV91ZgTmiFisKwbTx9ZzkhpnSXQdHN+vHoz1etgVpyp u0FHUbGF634jD8QT9q7yv+fRaEUxPVkGvtjo7WmNEesk2vdjWow7ykJ9v yd1RCI24TdwQhrZ8HOxXmd4TeP0v1eqJNafgZRekGq9KhFu1NuuLPXJqp ocJSoA0xPzaAz026qM1N0GwJy0wIvWP2ucoSmUMhWG06fYLyAMsWMTH4e y9afzbvSRJDK182wcjvXsdn79okF2YrIpxBpo6hLVmqg5jQeiPgoT1dQN gZM5ZE2Oi+2Q9Y0Vg0Yu0KUT3i5cq+93KQpXShOkfrwCP9kw6z100fzj7 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10707"; a="414100573" X-IronPort-AV: E=Sophos;i="5.99,269,1677571200"; d="scan'208";a="414100573" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 May 2023 01:03:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10707"; a="700083863" X-IronPort-AV: E=Sophos;i="5.99,269,1677571200"; d="scan'208";a="700083863" Received: from yin-optiplex-7090.sh.intel.com ([10.239.160.32]) by orsmga002.jf.intel.com with ESMTP; 12 May 2023 01:03:49 -0700 From: Yin Wang To: qemu-devel@nongnu.org Cc: Yin Wang , LIU Zhiwei , Weiwei Li , Palmer Dabbelt , Alistair Francis , Bin Meng , Daniel Henrique Barboza , qemu-riscv@nongnu.org (open list:RISC-V TCG CPUs) Subject: [PATCH v3] hw/riscv: qemu crash when NUMA nodes exceed available CPUs Date: Fri, 12 May 2023 16:03:46 +0800 Message-Id: <20230512080346.1272337-1-yin.wang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=134.134.136.31; envelope-from=yin.wang@intel.com; helo=mga06.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org Command "qemu-system-riscv64 -machine virt -m 2G -smp 1 -numa node,mem=1G -numa node,mem=1G" would trigger this problem.Backtrace with: #0 0x0000555555b5b1a4 in riscv_numa_get_default_cpu_node_id at ../hw/riscv/numa.c:211 #1 0x00005555558ce510 in machine_numa_finish_cpu_init at ../hw/core/machine.c:1230 #2 0x00005555558ce9d3 in machine_run_board_init at ../hw/core/machine.c:1346 #3 0x0000555555aaedc3 in qemu_init_board at ../softmmu/vl.c:2513 #4 0x0000555555aaf064 in qmp_x_exit_preconfig at ../softmmu/vl.c:2609 #5 0x0000555555ab1916 in qemu_init at ../softmmu/vl.c:3617 #6 0x000055555585463b in main at ../softmmu/main.c:47 This commit fixes the issue by adding parameter checks. Reviewed-by: LIU Zhiwei Reviewed-by: Weiwei Li Signed-off-by: Yin Wang --- hw/riscv/numa.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/riscv/numa.c b/hw/riscv/numa.c index 4720102561..a1bb312cd0 100644 --- a/hw/riscv/numa.c +++ b/hw/riscv/numa.c @@ -207,6 +207,12 @@ int64_t riscv_numa_get_default_cpu_node_id(const MachineState *ms, int idx) { int64_t nidx = 0; + if (ms->numa_state->num_nodes > ms->smp.cpus) { + error_report("Number of CPUs used by NUMA nodes (%d)" + " cannot exceed the number of available CPUs (%d).", + ms->numa_state->num_nodes, ms->smp.max_cpus); + exit(EXIT_FAILURE); + } if (ms->numa_state->num_nodes) { nidx = idx / (ms->smp.cpus / ms->numa_state->num_nodes); if (ms->numa_state->num_nodes <= nidx) { -- 2.34.1