From nobody Tue Feb 10 00:59:51 2026 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 ARC-Seal: i=1; a=rsa-sha256; t=1576559128; cv=none; d=zohomail.com; s=zohoarc; b=LC4oNpBq4KZY31xxdLkczyGDSSrRIiWDAmwkJG1ha51X14gtnUliZofQXFFnA/ZLFEZ6rynyuOfF+Lw8soLJ968e78EaiHurPT6pXaLx3dmJgUXCFevnlPvttGk5AeEkG8mY97ntTUezuroS7fjH4tap48cyRAROsPxagKrbTnA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576559128; h=Content-Type: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=vKLUDQPk0h4QO/5mN/KRcHdGshCpyBgVsskfj/DDWQA=; b=fZ+O6/rBIxys/Rflj6zQ0VKz8TFc+cGZkADHn4peLktKb1Ua3FbupbBXOGH02vZAoKJQj+LFjeMAW1Baxnby8/tN7M84TlhQJ0P4IDBbYkkBb/qSpTFUiwUD1C6JyThuC2nF3HWACyp5FpkryRUwop3Ixu0Kqpk0fS5GS675tbQ= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576559128241310.3607260592149; Mon, 16 Dec 2019 21:05:28 -0800 (PST) Received: from localhost ([::1]:35392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ih530-00034q-R0 for importer@patchew.org; Tue, 17 Dec 2019 00:05:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34013) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ih4ia-0000LX-Fu for qemu-devel@nongnu.org; Mon, 16 Dec 2019 23:44:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ih4iZ-0005vz-8B for qemu-devel@nongnu.org; Mon, 16 Dec 2019 23:44:20 -0500 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:36987 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ih4iY-0005Zd-Tf; Mon, 16 Dec 2019 23:44:19 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 47cQWV3DSZz9sSl; Tue, 17 Dec 2019 15:43:32 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1576557814; bh=SF6fWedF+5KWjn9BhcYbOsSQqaIC10oX6/pQpr5822g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KhdT80b8J/NZIKjKnnWmeVf2v3Q4fjbt1LyhWBUUopSdAXiEMMXX5VxJOa//wkvtX 81g7wFGb9rrfN0868oz3lMe9dCzoVzmvyeRTffWEQ7sX1biomPfKh58njQBg/9xwyM 7JyhB0aRjcYzisV4lFbP+H6hIU3pEDAJ+zIDuP0Q= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 30/88] ppc/pnv: Loop on the threads of the chip to find a matching NVT Date: Tue, 17 Dec 2019 15:42:24 +1100 Message-Id: <20191217044322.351838-31-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191217044322.351838-1-david@gibson.dropbear.id.au> References: <20191217044322.351838-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 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: lvivier@redhat.com, aik@ozlabs.ru, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: C=C3=A9dric Le Goater CPU_FOREACH() loops on all the CPUs of the machine which is incorrect. Each XIVE Presenter should scan only the HW threads of the chip it belongs to. Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Greg Kurz Signed-off-by: C=C3=A9dric Le Goater Message-Id: <20191125065820.927-5-clg@kaod.org> Signed-off-by: David Gibson --- hw/intc/pnv_xive.c | 61 ++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c index 8055de89cf..9798bd9e72 100644 --- a/hw/intc/pnv_xive.c +++ b/hw/intc/pnv_xive.c @@ -377,34 +377,43 @@ static int pnv_xive_match_nvt(XivePresenter *xptr, ui= nt8_t format, bool cam_ignore, uint8_t priority, uint32_t logic_serv, XiveTCTXMatch *match) { - CPUState *cs; + PnvXive *xive =3D PNV_XIVE(xptr); + PnvChip *chip =3D xive->chip; int count =3D 0; - - CPU_FOREACH(cs) { - PowerPCCPU *cpu =3D POWERPC_CPU(cs); - XiveTCTX *tctx =3D XIVE_TCTX(pnv_cpu_state(cpu)->intc); - int ring; - - /* - * Check the thread context CAM lines and record matches. - */ - ring =3D xive_presenter_tctx_match(xptr, tctx, format, nvt_blk, nv= t_idx, - cam_ignore, logic_serv); - /* - * Save the context and follow on to catch duplicates, that we - * don't support yet. - */ - if (ring !=3D -1) { - if (match->tctx) { - qemu_log_mask(LOG_GUEST_ERROR, "XIVE: already found a " - "thread context NVT %x/%x\n", - nvt_blk, nvt_idx); - return -1; + int i, j; + + for (i =3D 0; i < chip->nr_cores; i++) { + PnvCore *pc =3D chip->cores[i]; + CPUCore *cc =3D CPU_CORE(pc); + + for (j =3D 0; j < cc->nr_threads; j++) { + PowerPCCPU *cpu =3D pc->threads[j]; + XiveTCTX *tctx; + int ring; + + tctx =3D XIVE_TCTX(pnv_cpu_state(cpu)->intc); + + /* + * Check the thread context CAM lines and record matches. + */ + ring =3D xive_presenter_tctx_match(xptr, tctx, format, nvt_blk, + nvt_idx, cam_ignore, logic_se= rv); + /* + * Save the context and follow on to catch duplicates, that we + * don't support yet. + */ + if (ring !=3D -1) { + if (match->tctx) { + qemu_log_mask(LOG_GUEST_ERROR, "XIVE: already found a " + "thread context NVT %x/%x\n", + nvt_blk, nvt_idx); + return -1; + } + + match->ring =3D ring; + match->tctx =3D tctx; + count++; } - - match->ring =3D ring; - match->tctx =3D tctx; - count++; } } =20 --=20 2.23.0