From patchwork Thu Jan 18 12:50:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 763621 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e5d:0:b0:337:62d3:c6d5 with SMTP id j29csp762350wrz; Thu, 18 Jan 2024 04:52:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IFutcy6kJzYXg0KxetB5vy0XUQsIYQLnRJsUTPUS5Pb7pnmq8WLy4x2vJcCfz3L2MLk/m2c X-Received: by 2002:a05:6808:e83:b0:3bd:4ba6:a6ee with SMTP id k3-20020a0568080e8300b003bd4ba6a6eemr877034oil.69.1705582364162; Thu, 18 Jan 2024 04:52:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705582364; cv=none; d=google.com; s=arc-20160816; b=PauBzIs23Bm3GiNbOZ/FUege2ecIecFh/uh1b8feMGRtMGP6QQM20eYvtQDNNgnF43 89C7nxEalCSwCG4KxWwW9i0qUoWzE1eHIu61Su0MoMy5td8cgivyI3Q230KxNlwiggzm 8yy6AWkM/JhmGAKo85B5vcYCSuQcZ8Upgt2Y3iLER+GlCnc+C5b10f4YQBk5Grt2ze0h nOQWPQ3H1qTZXGYYNIReS15eiUwq9kg2c6WfUKxYgeuGW7Y/Hno1k837EmZirti6C8nj clH9q6SqxJYIWKRa/ZTGFJQGegteU9qLpMcW/aTZMNJNfpwyoTPaJeIpmXhNoyqU8rb3 2E9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=yHrhigfIM5svUxfDGLSmOw8ci2ezkHG+TI8EQ66zZXM=; fh=KckLiZPjyDy5VnAu2WKMFRAnOPvpSIEl9L+7AqKa8nY=; b=cq3pttEJEvKa+gmYIqHKo1PAEQGpOKgaNn4HlH6V+nVMCjuWRZwLVxYBbpDRV2xZ5u tjjHZSWwY6bTM7W/r7gyHBaCCPZMeWC3btlKjlFBXY9908p9yOVy6FXc+hnj5u/vBJ06 zQl64pc0Sd21U28SMZDadKt4FGTILXMXR+Efgy6NwjfixN4TWIK+5Je4mGWp2koWMA/m MZWJH379Gm9+CnaEZwf5Jbz1yPgz+5VtPcJFtiZYkgtVO1lCnsqycPmI7u58xxr7/Q83 mArZGkKMKJtJJAHeXttmdNrAJtRaH58IzIFUcb3S4cBBrwCLos9da6TgzrsbwLL4sPcL LOXw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b14-20020a05620a088e00b007830acd06eesi13539754qka.574.2024.01.18.04.52.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Jan 2024 04:52:44 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQRrb-0003pg-1v; Thu, 18 Jan 2024 07:51:19 -0500 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 1rQRrX-0003mv-KM; Thu, 18 Jan 2024 07:51:15 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQRrW-0000Wd-1V; Thu, 18 Jan 2024 07:51:15 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 6A7B9452CC; Thu, 18 Jan 2024 15:51:27 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 2AE59668C0; Thu, 18 Jan 2024 15:50:57 +0300 (MSK) Received: (nullmailer pid 2502746 invoked by uid 1000); Thu, 18 Jan 2024 12:50:56 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , Richard Henderson , Miguel Luis , Michael Tokarev Subject: [Stable-8.1.5 07/11] hw/intc/arm_gicv3_cpuif: handle LPIs in in the list registers Date: Thu, 18 Jan 2024 15:50:45 +0300 Message-Id: <20240118125056.2502687-7-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell The hypervisor can deliver (virtual) LPIs to a guest by setting up a list register to have an intid which is an LPI. The GIC has to treat these a little differently to standard interrupt IDs, because LPIs have no Active state, and so the guest will only EOI them, it will not also deactivate them. So icv_eoir_write() must do two things: * if the LPI ID is not in any list register, we drop the priority but do not increment the EOI count * if the LPI ID is in a list register, we immediately deactivate it, regardless of the split-drop-and-deactivate control This can be seen in the VirtualWriteEOIR0() and VirtualWriteEOIR1() pseudocode in the GICv3 architecture specification. Without this fix, potentially a hypervisor guest might stall because LPIs get stuck in a bogus Active+Pending state. Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Tested-by: Miguel Luis (cherry picked from commit 82a65e3188abebb509510b391726711606aca642) Signed-off-by: Michael Tokarev diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c index d07b13eb27..05dcfc4bc3 100644 --- a/hw/intc/arm_gicv3_cpuif.c +++ b/hw/intc/arm_gicv3_cpuif.c @@ -1434,16 +1434,25 @@ static void icv_eoir_write(CPUARMState *env, const ARMCPRegInfo *ri, idx = icv_find_active(cs, irq); if (idx < 0) { - /* No valid list register corresponding to EOI ID */ - icv_increment_eoicount(cs); + /* + * No valid list register corresponding to EOI ID; if this is a vLPI + * not in the list regs then do nothing; otherwise increment EOI count + */ + if (irq < GICV3_LPI_INTID_START) { + icv_increment_eoicount(cs); + } } else { uint64_t lr = cs->ich_lr_el2[idx]; int thisgrp = (lr & ICH_LR_EL2_GROUP) ? GICV3_G1NS : GICV3_G0; int lr_gprio = ich_lr_prio(lr) & icv_gprio_mask(cs, grp); if (thisgrp == grp && lr_gprio == dropprio) { - if (!icv_eoi_split(env, cs)) { - /* Priority drop and deactivate not split: deactivate irq now */ + if (!icv_eoi_split(env, cs) || irq >= GICV3_LPI_INTID_START) { + /* + * Priority drop and deactivate not split: deactivate irq now. + * LPIs always get their active state cleared immediately + * because no separate deactivate is expected. + */ icv_deactivate_irq(cs, idx); } } From patchwork Thu Jan 18 12:50:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 763620 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e5d:0:b0:337:62d3:c6d5 with SMTP id j29csp762153wrz; Thu, 18 Jan 2024 04:52:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IEJcKBTfSmYrdY8Z3zf1kqXKT7K42BWW8PruOwTmCna+tHIurEvsekpDYqrrVzrKzUmP+wH X-Received: by 2002:a05:622a:1a09:b0:429:bb77:39a6 with SMTP id f9-20020a05622a1a0900b00429bb7739a6mr825505qtb.94.1705582335531; Thu, 18 Jan 2024 04:52:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705582335; cv=none; d=google.com; s=arc-20160816; b=g45n7Qv1wlUrgJkBeJLQTQiZRbJKczlX4LTu5u/suaak4iT02x9q3SE84CJWWi93Ji hwOz3dG2ehsCdipJbEnCpzlebLL4nTysi/tLeKiFtQ5NgUWulXWVKOvIqJmTSMZLSroj 0vdRq+bo3zjXZqf1u2XCKqf01W3OmHHfJZkX/2Why2ctsJIaH/IQdeoDFx3IYpv4xeLh iwSaiQvuZGTQhvgSYIuNc7qRND7+lFbQhYD3zxnrSOKe7lypUuc2A/26zA2+w5MOSlJs tDaZBjnx3Vm5SV5FHNvDqobiyDPT3kN1Q/3f/ioXCZhf3e5NNHbdOvMEIuz6qWXptxIb RaZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=uRRGoHXtjnzunwFR8i0wFcw6dVyLBFeeNJGynMetXsU=; fh=P+uclDfnEQXtQLYd5QNmI0Xb7d2sY0kEtBiQza0DiKo=; b=aMp2YLLrU9LyWzvHs7yPK3WQNnE9zqxssBEn7BkPKWudAonwPVhTQxbWn4VlXYU3rj +m/TAUnlneEhHVmH9iOV2pupZq89XpBmPBWLmAlNXFgZWinw03oLyDEXfKvcXFnT0Ii0 DLt6dPptTIiKDZ32M/pvYBOtHRVsdtcLYKoLJmgQPgdTBrBAJ2fW8u7Zi4lyVHZ0hq/c vVaku7VeRjRgN/Hb7snSf7FIiITC1Qt3H+109hPXtLuEUTLcLq500hr/khHzFT0/9K/P WPVfpuzVp382MFpG7JH5kp9URlRl9/wT5FfeJekw6GEO8et9WQBzdlpQ6fI0FprxIrp2 kXDQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b8-20020ac85bc8000000b00429c9994b49si13225768qtb.90.2024.01.18.04.52.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Jan 2024 04:52:15 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQRs2-0004LO-Qu; Thu, 18 Jan 2024 07:51:46 -0500 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 1rQRry-0004CD-0X; Thu, 18 Jan 2024 07:51:42 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQRrw-0000f0-4B; Thu, 18 Jan 2024 07:51:41 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id BCFA5452D0; Thu, 18 Jan 2024 15:51:27 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 7B2D8668C4; Thu, 18 Jan 2024 15:50:57 +0300 (MSK) Received: (nullmailer pid 2502758 invoked by uid 1000); Thu, 18 Jan 2024 12:50:56 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Michael Tokarev Subject: [Stable-8.1.5 11/11] .gitlab-ci.d/buildtest.yml: Work around htags bug when environment is large Date: Thu, 18 Jan 2024 15:50:49 +0300 Message-Id: <20240118125056.2502687-11-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell Sometimes the CI "pages" job fails with a message like this from htags: $ htags -anT --tree-view=filetree -m qemu_init -t "Welcome to the QEMU sourcecode" htags: Negative exec line limit = -371 This is due to a bug in hflags where if the environment is too large it falls over: https://lists.gnu.org/archive/html/bug-global/2024-01/msg00000.html This happens to us because GitLab CI puts the commit message of the commit under test into the CI_COMMIT_MESSAGE and/or CI_COMMIT_TAG_MESSAGE environment variables, so the job will fail if the commit happens to have a verbose commit message. Work around the htags bug by unsetting these variables while running htags. Cc: qemu-stable@nongnu.org Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2080 Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20240111125543.1573473-1-peter.maydell@linaro.org> Signed-off-by: Thomas Huth (cherry picked from commit 52a21689cd829c1cc931b59b5ee5bdb10dd578c1) Signed-off-by: Michael Tokarev diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 77dc83a6be..994d1e9149 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -584,7 +584,10 @@ pages: - mkdir -p public # HTML-ised source tree - make gtags - - htags -anT --tree-view=filetree -m qemu_init + # We unset variables to work around a bug in some htags versions + # which causes it to fail when the environment is large + - CI_COMMIT_MESSAGE= CI_COMMIT_TAG_MESSAGE= htags + -anT --tree-view=filetree -m qemu_init -t "Welcome to the QEMU sourcecode" - mv HTML public/src # Project documentation