From nobody Sun May 5 01:37:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576155017; cv=none; d=zohomail.com; s=zohoarc; b=kKJwFnG38Tlz7ROxcBKJ5mtOhbYilqe88P2czlWAMfK7o+87hkdbzQ09RlxEGgNARberbqR/wxhKicfWpotoeWWy24RRpAU0cP8UTPoJ0mJqP6+l8qWx92vSbXqIH9j6aILEZarl4zuamV0uqj/WQEiYUtUJTP/iVO4tY3/cr1k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576155017; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=quY/CuROmNruxW1DGcY5ylIdglxJ30C+FEQEjGEZBzw=; b=l3kELbrfae/eCeXMmRf3QMwuMjxFd4mKLRS3eMXPvjV+Kjz5PXuMxvIshj1ULg8s1lHbYumgxDMk+UHbwUxvXG7u7ZCIOQWdaz+8HlDVOdXa7zQefI4nt5zL4MkxF1ka5sn9XinW19gsCtH/EDurVqH6Ip9QrVEWnMGD6tLJB1k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576155017735736.5246614133248; Thu, 12 Dec 2019 04:50:17 -0800 (PST) Received: from localhost ([::1]:58770 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNv6-0007ZY-9C for importer@patchew.org; Thu, 12 Dec 2019 07:50:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36980) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNtj-0006AM-RS for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:48:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNth-0005jX-D6 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:48:50 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:23332 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ifNth-0005iL-9p for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:48:49 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-181-lwoQqSMtP7C664reThka4w-1; Thu, 12 Dec 2019 07:48:47 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 05AE0DB68; Thu, 12 Dec 2019 12:48:46 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09D7510013A1; Thu, 12 Dec 2019 12:48:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576154928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=quY/CuROmNruxW1DGcY5ylIdglxJ30C+FEQEjGEZBzw=; b=Khky0empvgjLiHPuFL0ImlMJlAropC8ZAlca1h3P41sEp+X+49WAhqbix3sLnZZFaLg2OC Ywiw0aa/UVgcxSfNBDozTusHMpyrRI3vXLthMgy9I10bASVSTTBute5srvNtkW5HpAPw06 KITpNYZwDT1bO789D/TpsVGU5y4mndc= From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH 1/2] numa: remove not needed check Date: Thu, 12 Dec 2019 13:48:55 +0100 Message-Id: <1576154936-178362-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1576154936-178362-1-git-send-email-imammedo@redhat.com> References: <1576154936-178362-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: lwoQqSMtP7C664reThka4w-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Tao Xu , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Currently parse_numa_node() is always called from already numa enabled context. Drop unnecessary check if numa is supported. Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost --- hw/core/numa.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/core/numa.c b/hw/core/numa.c index e3332a9..19f082d 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -83,10 +83,6 @@ static void parse_numa_node(MachineState *ms, NumaNodeOp= tions *node, return; } =20 - if (!mc->cpu_index_to_instance_props || !mc->get_default_cpu_node_id) { - error_setg(errp, "NUMA is not supported by this machine-type"); - return; - } for (cpus =3D node->cpus; cpus; cpus =3D cpus->next) { CpuInstanceProperties props; if (cpus->value >=3D max_cpus) { @@ -178,9 +174,8 @@ void parse_numa_distance(MachineState *ms, NumaDistOpti= ons *dist, Error **errp) void set_numa_options(MachineState *ms, NumaOptions *object, Error **errp) { Error *err =3D NULL; - MachineClass *mc =3D MACHINE_GET_CLASS(ms); =20 - if (!mc->numa_mem_supported) { + if (!ms->numa_state) { error_setg(errp, "NUMA is not supported by this machine-type"); goto end; } --=20 2.7.4 From nobody Sun May 5 01:37:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576155093; cv=none; d=zohomail.com; s=zohoarc; b=IB2oHrYd8qhEv2S9kdmJVssoIWeoCYzBU8RBjyLKC+Lv89k3nWmaHyF7LyCVbEofYuJzahnK4BJdOVtF7slbl0X3poV4bQeDIZG1MvKxs8OGjFriebBKAkLgy43wLfNsYcfbrCZBBs4JGxF7JNwiIt507jPpFCRpQwzq7vqIh10= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576155093; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=e3eBk9H3wmrRYV94a1hWXPBU9DHclXPvjVNKrXohu3g=; b=NwKlJOnmzUHfBws828RonBwVQVXGAYk3mFXwIqM0bOvm8GeK2IChgLj9to7jpbCCxe9lscHm99zxEytP8KyodRJeE6Wo1kpb4QjNEzEOjI1HRMKamBNuJ7yLkufYzXuU8dkIN2Z/7JKrXiExqjhCFAk0psZvQW0rqbdxg/7/2gg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576155093171316.007288233857; Thu, 12 Dec 2019 04:51:33 -0800 (PST) Received: from localhost ([::1]:58812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNwK-0000xF-0W for importer@patchew.org; Thu, 12 Dec 2019 07:51:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37821) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNtm-0006Au-Pu for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:48:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNtl-0005ry-OW for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:48:54 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:53669 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ifNtl-0005qx-Jq for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:48:53 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-31-Xs1KILyFN56-Kb0m_Vc_dQ-1; Thu, 12 Dec 2019 07:48:49 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1BA7F107ACC4; Thu, 12 Dec 2019 12:48:48 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E91710013A1; Thu, 12 Dec 2019 12:48:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576154933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=e3eBk9H3wmrRYV94a1hWXPBU9DHclXPvjVNKrXohu3g=; b=TgxAmmwCe5jLHP6xzcWAPoYlQ5GChduaRnfHaJzWOCViXOiKIrd+eh7ednU6kHGAO5KDic EW1VagCdfztZGOpFTnWsv7/13wmFC+yWgqBUF7TNNKUkYE0l1hJSZQGC4pg/+aSJeD7um4 qEwtvvKrXK4bFhP88uBgKp9+yk2BHQs= From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH 2/2] numa: properly check if numa is supported Date: Thu, 12 Dec 2019 13:48:56 +0100 Message-Id: <1576154936-178362-3-git-send-email-imammedo@redhat.com> In-Reply-To: <1576154936-178362-1-git-send-email-imammedo@redhat.com> References: <1576154936-178362-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: Xs1KILyFN56-Kb0m_Vc_dQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Peter Maydell , Radoslaw Biernacki , Eduardo Habkost , Tao Xu , qemu-stable@nongnu.org, Leif Lindholm , qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Commit aa57020774b, by mistake used MachineClass::numa_mem_supported to check if NUMA is supported by machine and also as unrelated change set it to true for sbsa-ref board. Luckily change didn't break machines that support NUMA, as the field is set to true for them. But the field is not intended for checking if NUMA is supported and will be flipped to false within this release for new machine types. Fix it: - by using previously used condition !mc->cpu_index_to_instance_props || !mc->get_default_cpu_node_id the first time and then use MachineState::numa_state down the road to check if NUMA is supported - dropping stray sbsa-ref chunk Fixes: aa57020774b690a22be72453b8e91c9b5a68c516 Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost --- CC: Radoslaw Biernacki CC: Peter Maydell CC: Leif Lindholm CC: qemu-arm@nongnu.org CC: qemu-stable@nongnu.org hw/arm/sbsa-ref.c | 1 - hw/core/machine.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 27046cc..c6261d4 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -791,7 +791,6 @@ static void sbsa_ref_class_init(ObjectClass *oc, void *= data) mc->possible_cpu_arch_ids =3D sbsa_ref_possible_cpu_arch_ids; mc->cpu_index_to_instance_props =3D sbsa_ref_cpu_index_to_props; mc->get_default_cpu_node_id =3D sbsa_ref_get_default_cpu_node_id; - mc->numa_mem_supported =3D true; } =20 static const TypeInfo sbsa_ref_info =3D { diff --git a/hw/core/machine.c b/hw/core/machine.c index 1689ad3..aa63231 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -958,7 +958,7 @@ static void machine_initfn(Object *obj) NULL); } =20 - if (mc->numa_mem_supported) { + if (mc->cpu_index_to_instance_props && mc->get_default_cpu_node_id) { ms->numa_state =3D g_new0(NumaState, 1); } =20 @@ -1102,7 +1102,7 @@ void machine_run_board_init(MachineState *machine) { MachineClass *machine_class =3D MACHINE_GET_CLASS(machine); =20 - if (machine_class->numa_mem_supported) { + if (machine->numa_state) { numa_complete_configuration(machine); if (machine->numa_state->num_nodes) { machine_numa_finish_cpu_init(machine); --=20 2.7.4