From nobody Tue Feb 10 14:32:31 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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 ARC-Seal: i=1; a=rsa-sha256; t=1636441963; cv=none; d=zohomail.com; s=zohoarc; b=TCTST4n2nEYyCI6ZDdHb4zUyrOIk4BdhuwsVJShgfFReDdz/88lomm9J1nHmCvSrK/AMFO4QxoVsVuVxvXkVxOrpp09RBnHpTlHfr3D1oSGO5HPgL27iZHstGbp6Piu5mJJ3/Vg17x2z5OJzY9319xVIejffDr/GN4ladB2fbfE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636441963; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+XrjXMLI1dwUOwhjHw1bC0qTv6boNamsXU1qE5Lo9sw=; b=WLGQP7qKHVlaN50uQB9Ax7iYQimHKggJzcd4eiYa5kUtZHDFlSTViUhXCNvLIcwTDp/iMQ8gRIoW1YBZIr7w7Pq8ue2sp/crbCrnR1FA16EzC+xHZsLLe1JUFUqazPk/TTsw8w/G56XsiIfonWuR1Xuri6HDBONrFsbZwiLKgBc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1636441963814989.2174436218423; Mon, 8 Nov 2021 23:12:43 -0800 (PST) Received: from localhost ([::1]:41614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mkLJC-00026f-FI for importer@patchew.org; Tue, 09 Nov 2021 02:12:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mkK5L-0006U1-Uw; Tue, 09 Nov 2021 00:54:21 -0500 Received: from [2404:9400:2:0:216:3eff:fee2:21ea] (port=42747 helo=gandalf.ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mkK5K-0006z7-4R; Tue, 09 Nov 2021 00:54:19 -0500 Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4HpHDq0RH8z4xfX; Tue, 9 Nov 2021 16:52:11 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=201602; t=1636437131; bh=+XrjXMLI1dwUOwhjHw1bC0qTv6boNamsXU1qE5Lo9sw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C/gTF9mgTzM793lh+2ED1gqhcoREdmmvGkTU1dvK2n6QSEDIMAyxebW9mxZQTxjvj +2mnHLuEWpagafKlCX06kraigzXQGZGBvy7qmk+0ijgjpqtkKiFEio57Hlf5VEnAc6 KTqFoOCQOdYfL5xnf9DkjnQfdO5mUhz8yufp6Bzc= From: David Gibson To: peter.maydell@linaro.org, clg@kaod.org, danielhb413@gmail.com, groug@kaod.org Subject: [PULL 54/54] spapr_numa.c: FORM2 table handle nodes with no distance info Date: Tue, 9 Nov 2021 16:52:04 +1100 Message-Id: <20211109055204.230765-55-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211109055204.230765-1-david@gibson.dropbear.id.au> References: <20211109055204.230765-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2404:9400:2:0:216:3eff:fee2:21ea (failed) 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; Received-SPF: pass client-ip=2404:9400:2:0:216:3eff:fee2:21ea; envelope-from=dgibson@gandalf.ozlabs.org; helo=gandalf.ozlabs.org X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Nicholas Piggin , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gibson.dropbear.id.au) X-ZM-MESSAGEID: 1636441964970100001 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin A configuration that specifies multiple nodes without distance info results in the non-local points in the FORM2 matrix having a distance of 0. This causes Linux to complain "Invalid distance value range" because a node distance is smaller than the local distance. Fix this by building a simple local / remote fallback for points where distance information is missing. Signed-off-by: Nicholas Piggin Message-Id: <20211105135137.1584840-1-npiggin@gmail.com> Reviewed-by: Daniel Henrique Barboza Signed-off-by: David Gibson --- hw/ppc/spapr_numa.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c index 5822938448..56ab2a5fb6 100644 --- a/hw/ppc/spapr_numa.c +++ b/hw/ppc/spapr_numa.c @@ -546,12 +546,24 @@ static void spapr_numa_FORM2_write_rtas_tables(SpaprM= achineState *spapr, * NUMA nodes, but QEMU adds the default NUMA node without * adding the numa_info to retrieve distance info from. */ - if (src =3D=3D dst) { - distance_table[i++] =3D NUMA_DISTANCE_MIN; - continue; + distance_table[i] =3D numa_info[src].distance[dst]; + if (distance_table[i] =3D=3D 0) { + /* + * In case QEMU adds a default NUMA single node when the u= ser + * did not add any, or where the user did not supply dista= nces, + * the value will be 0 here. Populate the table with a fal= lback + * simple local / remote distance. + */ + if (src =3D=3D dst) { + distance_table[i] =3D NUMA_DISTANCE_MIN; + } else { + distance_table[i] =3D numa_info[src].distance[dst]; + if (distance_table[i] < NUMA_DISTANCE_MIN) { + distance_table[i] =3D NUMA_DISTANCE_DEFAULT; + } + } } - - distance_table[i++] =3D numa_info[src].distance[dst]; + i++; } } =20 --=20 2.33.1