From nobody Sat Nov 15 11:12:29 2025 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1753116167; cv=none; d=zohomail.com; s=zohoarc; b=EiFc2Ym49QSyYFEy1gzxnbSZtl5vgknwMvyncXCbwuxNKTJO8wsQ2ccrJZzc9wyVezQ7r0JxytO8tiDa4ZMBZ074Zld0lhhIipHrdxQP6onf7uJA9cuKhfAwrk3qmo/OmGU1EmFR8zLvJoPLbJUqw6mysjPlcUT2h1e3D1AFCko= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753116167; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=51nGWzogTVcmJa/tKMAynV/Y5esDhRuxUtEpzYN+gsc=; b=nw42f62S4b1QW4b4o7Hc32ducPg7puRQqzLnWmulIX7ciLeIAoBNE7i/l6H2psgjEL28C5RwPOgLaZfhWpW88TlkKH5eQ4dOBsL20XtZbW9PY/kjt8JdWXJ8UBt+BNcJMyxb73N7M8u9OySeYp72nqQYJFiw8oOXozvxsW+x9Uw= 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1753116167112663.2387962187273; Mon, 21 Jul 2025 09:42:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1udtLM-0004CZ-7T; Mon, 21 Jul 2025 12:26:24 -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 1udtJW-0007I8-Sq for qemu-devel@nongnu.org; Mon, 21 Jul 2025 12:24:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1udtJT-0001jF-Kz for qemu-devel@nongnu.org; Mon, 21 Jul 2025 12:24:30 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-654-9LMg1I0cO-ainuxnE6RB2g-1; Mon, 21 Jul 2025 12:24:21 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 85D711956089; Mon, 21 Jul 2025 16:24:20 +0000 (UTC) Received: from corto.redhat.com (unknown [10.45.224.19]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 234B2195608D; Mon, 21 Jul 2025 16:24:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1753115067; 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=51nGWzogTVcmJa/tKMAynV/Y5esDhRuxUtEpzYN+gsc=; b=in0PmlvkOhfSCN/yUESzADnlXy1zhJzecf3kwXjfX4ECCZ6zBssaTBDrYxAeY+gytn2mVh UTn3IEgndqmzexPnCD6ItDdQ0riruSDOrstmTiFX8GNmz8/Z0YLvxV4MI5WlTZNUP25UcH sEtgrQLDs9NG8+1nuhC8XVe4s3IrgoA= X-MC-Unique: 9LMg1I0cO-ainuxnE6RB2g-1 X-Mimecast-MFC-AGG-ID: 9LMg1I0cO-ainuxnE6RB2g_1753115060 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , Daniel Henrique Barboza , Glenn Miles , Michael Kowal , Gautam Menghani , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PULL 36/50] ppc/xive2: split tctx presentation processing from set CPPR Date: Mon, 21 Jul 2025 18:22:19 +0200 Message-ID: <20250721162233.686837-37-clg@redhat.com> In-Reply-To: <20250721162233.686837-1-clg@redhat.com> References: <20250721162233.686837-1-clg@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.926, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1753116169683116601 From: Nicholas Piggin The second part of the set CPPR operation is to process (or re-present) any pending interrupts after CPPR is adjusted. Split this presentation processing out into a standalone function that can be used in other places. Signed-off-by: Nicholas Piggin Reviewed-by: Glenn Miles Reviewed-by: Michael Kowal Tested-by: Gautam Menghani Link: https://lore.kernel.org/qemu-devel/20250512031100.439842-37-npiggin@g= mail.com Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xive2.c | 137 +++++++++++++++++++++++++++--------------------- 1 file changed, 76 insertions(+), 61 deletions(-) diff --git a/hw/intc/xive2.c b/hw/intc/xive2.c index 0ee50a6bca48..c7356c5b2fd8 100644 --- a/hw/intc/xive2.c +++ b/hw/intc/xive2.c @@ -1098,66 +1098,19 @@ void xive2_tm_ack_os_el(XivePresenter *xptr, XiveTC= TX *tctx, xive2_tctx_accept_el(xptr, tctx, TM_QW1_OS, TM_QW1_OS); } =20 -/* NOTE: CPPR only exists for TM_QW1_OS and TM_QW3_HV_PHYS */ -static void xive2_tctx_set_cppr(XiveTCTX *tctx, uint8_t ring, uint8_t cppr) +/* Re-calculate and present pending interrupts */ +static void xive2_tctx_process_pending(XiveTCTX *tctx, uint8_t sig_ring) { - uint8_t *sig_regs =3D &tctx->regs[ring]; + uint8_t *sig_regs =3D &tctx->regs[sig_ring]; Xive2Router *xrtr =3D XIVE2_ROUTER(tctx->xptr); - uint8_t old_cppr, backlog_prio, first_group, group_level; + uint8_t backlog_prio, first_group, group_level; uint8_t pipr_min, lsmfb_min, ring_min; + uint8_t cppr =3D sig_regs[TM_CPPR]; bool group_enabled; - uint8_t nvp_blk; - uint32_t nvp_idx; Xive2Nvp nvp; int rc; - uint8_t nsr =3D sig_regs[TM_NSR]; - - g_assert(ring =3D=3D TM_QW1_OS || ring =3D=3D TM_QW3_HV_PHYS); - - g_assert(tctx->regs[TM_QW2_HV_POOL + TM_NSR] =3D=3D 0); - g_assert(tctx->regs[TM_QW2_HV_POOL + TM_PIPR] =3D=3D 0); - g_assert(tctx->regs[TM_QW2_HV_POOL + TM_CPPR] =3D=3D 0); - - /* XXX: should show pool IPB for PHYS ring */ - trace_xive_tctx_set_cppr(tctx->cs->cpu_index, ring, - sig_regs[TM_IPB], sig_regs[TM_PIPR], - cppr, nsr); - - if (cppr > XIVE_PRIORITY_MAX) { - cppr =3D 0xff; - } - - old_cppr =3D sig_regs[TM_CPPR]; - sig_regs[TM_CPPR] =3D cppr; - - /* Handle increased CPPR priority (lower value) */ - if (cppr < old_cppr) { - if (cppr <=3D sig_regs[TM_PIPR]) { - /* CPPR lowered below PIPR, must un-present interrupt */ - if (xive_nsr_indicates_exception(ring, nsr)) { - if (xive_nsr_indicates_group_exception(ring, nsr)) { - /* redistribute precluded active grp interrupt */ - xive2_redistribute(xrtr, tctx, - xive_nsr_exception_ring(ring, nsr)); - return; - } - } =20 - /* interrupt is VP directed, pending in IPB */ - xive_tctx_pipr_set(tctx, ring, cppr, 0); - return; - } else { - /* CPPR was lowered, but still above PIPR. No action needed. */ - return; - } - } - - /* CPPR didn't change, nothing needs to be done */ - if (cppr =3D=3D old_cppr) { - return; - } - - /* CPPR priority decreased (higher value) */ + g_assert(sig_ring =3D=3D TM_QW3_HV_PHYS || sig_ring =3D=3D TM_QW1_OS); =20 /* * Recompute the PIPR based on local pending interrupts. It will @@ -1167,11 +1120,11 @@ again: pipr_min =3D xive_ipb_to_pipr(sig_regs[TM_IPB]); group_enabled =3D !!sig_regs[TM_LGS]; lsmfb_min =3D group_enabled ? sig_regs[TM_LSMFB] : 0xff; - ring_min =3D ring; + ring_min =3D sig_ring; group_level =3D 0; =20 /* PHYS updates also depend on POOL values */ - if (ring =3D=3D TM_QW3_HV_PHYS) { + if (sig_ring =3D=3D TM_QW3_HV_PHYS) { uint8_t *pool_regs =3D &tctx->regs[TM_QW2_HV_POOL]; =20 /* POOL values only matter if POOL ctx is valid */ @@ -1201,20 +1154,25 @@ again: } } =20 - rc =3D xive2_tctx_get_nvp_indexes(tctx, ring_min, &nvp_blk, &nvp_idx); - if (rc) { - qemu_log_mask(LOG_GUEST_ERROR, "XIVE: set CPPR on invalid context\= n"); - return; - } - if (group_enabled && lsmfb_min < cppr && lsmfb_min < pipr_min) { + + uint8_t nvp_blk; + uint32_t nvp_idx; + /* * Thread has seen a group interrupt with a higher priority * than the new cppr or pending local interrupt. Check the * backlog */ + rc =3D xive2_tctx_get_nvp_indexes(tctx, ring_min, &nvp_blk, &nvp_i= dx); + if (rc) { + qemu_log_mask(LOG_GUEST_ERROR, "XIVE: set CPPR on invalid " + "context\n"); + return; + } + if (xive2_router_get_nvp(xrtr, nvp_blk, nvp_idx, &nvp)) { qemu_log_mask(LOG_GUEST_ERROR, "XIVE: No NVP %x/%x\n", nvp_blk, nvp_idx); @@ -1260,6 +1218,63 @@ again: xive_tctx_pipr_set(tctx, ring_min, pipr_min, group_level); } =20 +/* NOTE: CPPR only exists for TM_QW1_OS and TM_QW3_HV_PHYS */ +static void xive2_tctx_set_cppr(XiveTCTX *tctx, uint8_t sig_ring, uint8_t = cppr) +{ + uint8_t *sig_regs =3D &tctx->regs[sig_ring]; + Xive2Router *xrtr =3D XIVE2_ROUTER(tctx->xptr); + uint8_t old_cppr; + uint8_t nsr =3D sig_regs[TM_NSR]; + + g_assert(sig_ring =3D=3D TM_QW1_OS || sig_ring =3D=3D TM_QW3_HV_PHYS); + + g_assert(tctx->regs[TM_QW2_HV_POOL + TM_NSR] =3D=3D 0); + g_assert(tctx->regs[TM_QW2_HV_POOL + TM_PIPR] =3D=3D 0); + g_assert(tctx->regs[TM_QW2_HV_POOL + TM_CPPR] =3D=3D 0); + + /* XXX: should show pool IPB for PHYS ring */ + trace_xive_tctx_set_cppr(tctx->cs->cpu_index, sig_ring, + sig_regs[TM_IPB], sig_regs[TM_PIPR], + cppr, nsr); + + if (cppr > XIVE_PRIORITY_MAX) { + cppr =3D 0xff; + } + + old_cppr =3D sig_regs[TM_CPPR]; + sig_regs[TM_CPPR] =3D cppr; + + /* Handle increased CPPR priority (lower value) */ + if (cppr < old_cppr) { + if (cppr <=3D sig_regs[TM_PIPR]) { + /* CPPR lowered below PIPR, must un-present interrupt */ + if (xive_nsr_indicates_exception(sig_ring, nsr)) { + if (xive_nsr_indicates_group_exception(sig_ring, nsr)) { + /* redistribute precluded active grp interrupt */ + xive2_redistribute(xrtr, tctx, + xive_nsr_exception_ring(sig_ring, n= sr)); + return; + } + } + + /* interrupt is VP directed, pending in IPB */ + xive_tctx_pipr_set(tctx, sig_ring, cppr, 0); + return; + } else { + /* CPPR was lowered, but still above PIPR. No action needed. */ + return; + } + } + + /* CPPR didn't change, nothing needs to be done */ + if (cppr =3D=3D old_cppr) { + return; + } + + /* CPPR priority decreased (higher value) */ + xive2_tctx_process_pending(tctx, sig_ring); +} + void xive2_tm_set_hv_cppr(XivePresenter *xptr, XiveTCTX *tctx, hwaddr offset, uint64_t value, unsigned size) { --=20 2.50.1