From nobody Wed Oct 23 00:26:41 2024 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=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1729026854; cv=none; d=zohomail.com; s=zohoarc; b=VNw12QqV7NRzciyGHNi1suX+7XQsLCerqeALL0pP7BUhqzbQVlAkxrU2OcVeUMLmZfsEW4kODZL5dnzDPpU/swYpXqQiE0LxbhNjBVwrpGvaGL7NVWcqsaAARza/DLd9i2gQHXUT8TeVQ+rXYxLdNmSdJVDJKliTt1KW7q1UCk0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729026854; h=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=TFzKnbC2JSfiB0g4nK3R8z9haD//HGbPomOqiUV9RnQ=; b=fOgZve/22MBRz1j4C8JLyNO3doO3tEOtmyVnEapm4jTcPgLyaGazjGGY8YN92/mAIayVUTOhl+IXRL1dzBcWHLoSMh0GP3RPtN7kB/b1haOuQ6bwXG3cXRt7GygpgVigIW2tMYIjJzTJEUFaoc9dJTAOUN5wGWrMyJcb2BegCUY= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 172902685446532.272534110505944; Tue, 15 Oct 2024 14:14:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t0oro-0003w5-RI; Tue, 15 Oct 2024 17:14:08 -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 1t0orm-0003qC-T9; Tue, 15 Oct 2024 17:14:07 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t0orl-0000Oq-6N; Tue, 15 Oct 2024 17:14:06 -0400 Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49FKoA5Z009316; Tue, 15 Oct 2024 21:13:55 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 429ysbr28m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Oct 2024 21:13:54 +0000 (GMT) Received: from m0353725.ppops.net (m0353725.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 49FLDshk021385; Tue, 15 Oct 2024 21:13:54 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 429ysbr28g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Oct 2024 21:13:54 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 49FIGGME007025; Tue, 15 Oct 2024 21:13:53 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4284xk5v97-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Oct 2024 21:13:53 +0000 Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 49FLDn0N47055276 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Oct 2024 21:13:49 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6C33F2004E; Tue, 15 Oct 2024 21:13:49 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4F40A20043; Tue, 15 Oct 2024 21:13:47 +0000 (GMT) Received: from gfwr518.rchland.ibm.com (unknown [9.10.239.106]) by smtpav03.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 15 Oct 2024 21:13:47 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=TFzKnbC2JSfiB0g4n K3R8z9haD//HGbPomOqiUV9RnQ=; b=rtCtiR4pO0EqOEiqXn6pHAwyJfV1mOrOj N4OWuwJvOoDolkCcyEa+Tlsjar4eHu9I1QRjfqWAro5H5drzI6LXqaeTwM8RiZgu /MRvfJ27890bmH2BBNdeb2Q0yLf1GoGfpi4VutNK+n8vnrIxdHUfXvFZyLVl7SMM JPSkhCHKBNfzJK5S0nSMG1PimJqmuVv2lThd7hM54hWDynIgsW2aje9S1vilBJon PIkpIDJN+p9qm/KoU+OcittzwO6DQ1ixCTiwaFIHPVL4Lzfbb2+X+n4r8IugPegS b6nAXU/oR0A/zkQtr7antbpRmgrbYSagqgIQKFRgzVNLaZSHMRqkA== From: Michael Kowal To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, clg@kaod.org, fbarrat@linux.ibm.com, npiggin@gmail.com, milesg@linux.ibm.com, danielhb413@gmail.com, david@gibson.dropbear.id.au, harshpb@linux.ibm.com, thuth@redhat.com, lvivier@redhat.com, pbonzini@redhat.com Subject: [PATCH 05/14] ppc/xive2: Process group backlog when pushing an OS context Date: Tue, 15 Oct 2024 16:13:20 -0500 Message-Id: <20241015211329.21113-6-kowal@linux.ibm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241015211329.21113-1-kowal@linux.ibm.com> References: <20241015211329.21113-1-kowal@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: tHgJkyr18nrX0BBy7wgtw1sjqLchUR1R X-Proofpoint-ORIG-GUID: sZCKeqafwrLpzcm_RdMGlRQmskKKFPDJ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-15_01,2024-10-11_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 impostorscore=0 malwarescore=0 mlxlogscore=806 clxscore=1015 spamscore=0 lowpriorityscore=0 phishscore=0 bulkscore=0 adultscore=0 priorityscore=1501 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2410150140 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=148.163.158.5; envelope-from=kowal@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=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 @ibm.com) X-ZM-MESSAGEID: 1729026856135116600 Content-Type: text/plain; charset="utf-8" From: Frederic Barrat When pushing an OS context, we were already checking if there was a pending interrupt in the IPB and sending a notification if needed. We also need to check if there is a pending group interrupt stored in the NVG table. To avoid useless backlog scans, we only scan if the NVP belongs to a group. Signed-off-by: Frederic Barrat Signed-off-by: Michael Kowal --- hw/intc/xive2.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 97 insertions(+), 3 deletions(-) diff --git a/hw/intc/xive2.c b/hw/intc/xive2.c index a6dc6d553f..7130892482 100644 --- a/hw/intc/xive2.c +++ b/hw/intc/xive2.c @@ -279,6 +279,85 @@ static void xive2_end_enqueue(Xive2End *end, uint32_t = data) end->w1 =3D xive_set_field32(END2_W1_PAGE_OFF, end->w1, qindex); } =20 +/* + * Scan the group chain and return the highest priority and group + * level of pending group interrupts. + */ +static uint8_t xive2_presenter_backlog_check(XivePresenter *xptr, + uint8_t nvp_blk, uint32_t nvp= _idx, + uint8_t first_group, + uint8_t *out_level) +{ + Xive2Router *xrtr =3D XIVE2_ROUTER(xptr); + uint32_t nvgc_idx, mask; + uint32_t current_level, count; + uint8_t prio; + Xive2Nvgc nvgc; + + for (prio =3D 0; prio <=3D XIVE_PRIORITY_MAX; prio++) { + current_level =3D first_group & 0xF; + + while (current_level) { + mask =3D (1 << current_level) - 1; + nvgc_idx =3D nvp_idx & ~mask; + nvgc_idx |=3D mask >> 1; + qemu_log("fxb %s checking backlog for prio %d group idx %x\n", + __func__, prio, nvgc_idx); + + if (xive2_router_get_nvgc(xrtr, false, nvp_blk, nvgc_idx, &nvg= c)) { + qemu_log_mask(LOG_GUEST_ERROR, "XIVE: No NVG %x/%x\n", + nvp_blk, nvgc_idx); + return 0xFF; + } + if (!xive2_nvgc_is_valid(&nvgc)) { + qemu_log_mask(LOG_GUEST_ERROR, "XIVE: Invalid NVG %x/%x\n", + nvp_blk, nvgc_idx); + return 0xFF; + } + + count =3D xive2_nvgc_get_backlog(&nvgc, prio); + if (count) { + *out_level =3D current_level; + return prio; + } + current_level =3D xive_get_field32(NVGC2_W0_PGONEXT, nvgc.w0) = & 0xF; + } + } + return 0xFF; +} + +static void xive2_presenter_backlog_decr(XivePresenter *xptr, + uint8_t nvp_blk, uint32_t nvp_idx, + uint8_t group_prio, + uint8_t group_level) +{ + Xive2Router *xrtr =3D XIVE2_ROUTER(xptr); + uint32_t nvgc_idx, mask, count; + Xive2Nvgc nvgc; + + group_level &=3D 0xF; + mask =3D (1 << group_level) - 1; + nvgc_idx =3D nvp_idx & ~mask; + nvgc_idx |=3D mask >> 1; + + if (xive2_router_get_nvgc(xrtr, false, nvp_blk, nvgc_idx, &nvgc)) { + qemu_log_mask(LOG_GUEST_ERROR, "XIVE: No NVG %x/%x\n", + nvp_blk, nvgc_idx); + return; + } + if (!xive2_nvgc_is_valid(&nvgc)) { + qemu_log_mask(LOG_GUEST_ERROR, "XIVE: Invalid NVG %x/%x\n", + nvp_blk, nvgc_idx); + return; + } + count =3D xive2_nvgc_get_backlog(&nvgc, group_prio); + if (!count) { + return; + } + xive2_nvgc_set_backlog(&nvgc, group_prio, count - 1); + xive2_router_write_nvgc(xrtr, false, nvp_blk, nvgc_idx, &nvgc); +} + /* * XIVE Thread Interrupt Management Area (TIMA) - Gen2 mode * @@ -588,8 +667,9 @@ static void xive2_tctx_need_resend(Xive2Router *xrtr, X= iveTCTX *tctx, uint8_t nvp_blk, uint32_t nvp_idx, bool do_restore) { - uint8_t ipb, backlog_level; - uint8_t backlog_prio; + XivePresenter *xptr =3D XIVE_PRESENTER(xrtr); + uint8_t ipb, backlog_level, group_level, first_group; + uint8_t backlog_prio, group_prio; uint8_t *regs =3D &tctx->regs[TM_QW1_OS]; Xive2Nvp nvp; =20 @@ -624,8 +704,22 @@ static void xive2_tctx_need_resend(Xive2Router *xrtr, = XiveTCTX *tctx, backlog_prio =3D xive_ipb_to_pipr(ipb); backlog_level =3D 0; =20 + first_group =3D xive_get_field32(NVP2_W0_PGOFIRST, nvp.w0); + if (first_group && regs[TM_LSMFB] < backlog_prio) { + group_prio =3D xive2_presenter_backlog_check(xptr, nvp_blk, nvp_id= x, + first_group, &group_lev= el); + regs[TM_LSMFB] =3D group_prio; + if (regs[TM_LGS] && group_prio < backlog_prio) { + /* VP can take a group interrupt */ + xive2_presenter_backlog_decr(xptr, nvp_blk, nvp_idx, + group_prio, group_level); + backlog_prio =3D group_prio; + backlog_level =3D group_level; + } + } + /* - * Compute the PIPR based on the restored state. + * Compute the PIPR based on the restored state. * It will raise the External interrupt signal if needed. */ xive_tctx_pipr_update(tctx, TM_QW1_OS, backlog_prio, backlog_level); --=20 2.43.0