From patchwork Wed Apr 28 10:18:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 12228487 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7964C433B4 for ; Wed, 28 Apr 2021 10:21:47 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4667961107 for ; Wed, 28 Apr 2021 10:21:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4667961107 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=OeGhtVPkMRB8vRTjSYE/B2rVR414iN0B052Mrt3NLPk=; b=GURlO77KbNz373dbD/tDIaYlC fG9zPRqzE42mGcQqbcOyGkLTSA9qhxa896aqY6to3MUqYz+L8u3SttQtkF35XfgC4StYShjkbWXOX ThRsucc7n8mUDFgwriKT/ff/hPvymxeVSPcvNntObq2ER9IICL9QM7jkSA5me0r45k6fSrS7pFwAi Lx5oiYNrFu/cbPMo+qFrZEO2BEmza4N0D19s1O/WWVMBxInxussnrNTunXYD0+iuuUzfw/8Lb/lrk faBuIzTfD7Xgt+r8a38K8z+8sAPUZiAp3ARUQBxl7HzUvTS8cnApbTz8Q2GwQBBDlh1Iukp+jDIt9 /mIP8aYmg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lbhIG-003H3g-Nh; Wed, 28 Apr 2021 10:19:44 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbhHT-003H0d-1V for linux-arm-kernel@desiato.infradead.org; Wed, 28 Apr 2021 10:18:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:Content-ID:Content-Description; bh=W/65gl/q8IPHxxfmkIEqzGwlIffS1aBvU9xDbEnZyHM=; b=vxwSDx5A00xoupB1W6WRICilDJ XJQv0es7yZpZpAH9svw65StWPeo+rEiFgO99F9kEReMXTmQBYvG8pOS+nJwRjt8CHsSwPI0dbcj8P FZgpvcBROTN7eBFLdU7OfXqWtZdD6Tw+nkQg9rB5eIIjEB1EIgwtW8ym5LB3Ims20cxNiCV/NuBqL SAFtEV/4Zdpx4C+COHabZZtSCc/8mFu3NsV/0zEFjdkUyDnoTDKmysrkTkhgKofBOj5Jn9tsCmRJ7 sHwmLygyuRoFxp32bNzPLaRdvuaeFmPQA7pAtmn7X4otzAFplYk6AU+AYrd0doKg0O0tKclV9MaWi l8ynE/Pg==; Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbhHQ-00HLzN-Dm for linux-arm-kernel@lists.infradead.org; Wed, 28 Apr 2021 10:18:53 +0000 Received: by mail-wm1-x332.google.com with SMTP id g65so4306727wmg.2 for ; Wed, 28 Apr 2021 03:18:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W/65gl/q8IPHxxfmkIEqzGwlIffS1aBvU9xDbEnZyHM=; b=SSrrTtwZJ02Zr0JA6NRj0GmP0uyFPOUSFabhokoV6Sy5GNCyllTC4VWQMLE81igmUe Wh0Vi6utYveAA/fpekiI7G8ty768Nqo3K2LOp81FzggyzgrXoRp1v5KCSAMdAMjCuyuX r9IM1GiXmva9cV/s22qi9+5GmGGbvx5LX8EDykKoW42J+NlR2k9rKWnZXSzadxTkzeUd 8J/bswhnJIBlc10SW99J5bPaBrR8JUigyAKh1GY1S03X1swxtLM4p+pB0ZXIwfxYh19v CSzoeIhOjW5U/V0rLWA1tjAH0VlGLBK6V5mrPM0R1DcsKn2suEmABcoaH6S5DiU8qNgM REDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W/65gl/q8IPHxxfmkIEqzGwlIffS1aBvU9xDbEnZyHM=; b=lxKXglgUqWiAOBw5McVaymMMy7/L5wJ5wA3HkYaRlmV9FQOBwZU275dvAlTSnFSuH8 JK4zO93niDP6v/PcDiIZ4VDYPAoMGdZl+BkU/gVqXc6uVGJ5YeipKoqC5Yipiggbv30J 4OOhA7FDdSZ09fpt5B5upQ53JWqsn/J5YCyEFrY+9CnQuCxSJcnK9K/Brxs6GCLRP6Q/ 5M8tIP9g84PySdXNHLufKOIrOVHFiUhHJCPRZQNmbhllXdlEzVbEPC6EV/VvRGOtDYSx nsBD1VvwIeS+M9/qJJYWgrhb5HBHHR/3wG5AnjYi4gEVjLd0swpMA0U6Kp6T9UG/Cabp WWRw== X-Gm-Message-State: AOAM530QNydP28OzRrdI56KspOVP7M0pgcvoq6UkvVGCx1DZ9Gt2GVVU +jhDG+UAkDbgDb1Ud17aiMiZXsvqawN28A== X-Google-Smtp-Source: ABdhPJxRO3MjPBAuuf7/5yeRHIOMTjCLbzPgeFWy3MG9Ge5F6gbUkBS3K7ic1Vpc5z70bIjpSShKyA== X-Received: by 2002:a7b:cd85:: with SMTP id y5mr3586309wmj.93.1619605129193; Wed, 28 Apr 2021 03:18:49 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b14sm7950544wrf.75.2021.04.28.03.18.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Apr 2021 03:18:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 27D401FF87; Wed, 28 Apr 2021 11:18:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: kvm@vger.kernel.org Cc: shashi.mallela@linaro.org, alexandru.elisei@arm.com, eric.auger@redhat.com, qemu-arm@nongnu.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@arm.com, maz@kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [kvm-unit-tests PATCH v1 1/4] arm64: split its-trigger test into KVM and TCG variants Date: Wed, 28 Apr 2021 11:18:41 +0100 Message-Id: <20210428101844.22656-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210428101844.22656-1-alex.bennee@linaro.org> References: <20210428101844.22656-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210428_031852_487880_45F290FE X-CRM114-Status: GOOD ( 17.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org A few of the its-trigger tests rely on IMPDEF behaviour where caches aren't flushed before invall events. However TCG emulation doesn't model any invall behaviour and as we can't probe for it we need to be told. Split the test into a KVM and TCG variant and skip the invall tests when under TCG. Signed-off-by: Alex Bennée Cc: Shashi Mallela --- arm/gic.c | 60 +++++++++++++++++++++++++++-------------------- arm/unittests.cfg | 11 ++++++++- 2 files changed, 45 insertions(+), 26 deletions(-) diff --git a/arm/gic.c b/arm/gic.c index 98135ef..96a329d 100644 --- a/arm/gic.c +++ b/arm/gic.c @@ -36,6 +36,7 @@ static struct gic *gic; static int acked[NR_CPUS], spurious[NR_CPUS]; static int irq_sender[NR_CPUS], irq_number[NR_CPUS]; static cpumask_t ready; +static bool under_tcg; static void nr_cpu_check(int nr) { @@ -734,32 +735,38 @@ static void test_its_trigger(void) /* * re-enable the LPI but willingly do not call invall * so the change in config is not taken into account. - * The LPI should not hit + * The LPI should not hit. This does however depend on + * implementation defined behaviour - under QEMU TCG emulation + * it can quite correctly process the event directly. */ - gicv3_lpi_set_config(8195, LPI_PROP_DEFAULT); - stats_reset(); - cpumask_clear(&mask); - its_send_int(dev2, 20); - wait_for_interrupts(&mask); - report(check_acked(&mask, -1, -1), - "dev2/eventid=20 still does not trigger any LPI"); - - /* Now call the invall and check the LPI hits */ - stats_reset(); - cpumask_clear(&mask); - cpumask_set_cpu(3, &mask); - its_send_invall(col3); - wait_for_interrupts(&mask); - report(check_acked(&mask, 0, 8195), - "dev2/eventid=20 pending LPI is received"); - - stats_reset(); - cpumask_clear(&mask); - cpumask_set_cpu(3, &mask); - its_send_int(dev2, 20); - wait_for_interrupts(&mask); - report(check_acked(&mask, 0, 8195), - "dev2/eventid=20 now triggers an LPI"); + if (under_tcg) { + report_skip("checking LPI triggers without invall"); + } else { + gicv3_lpi_set_config(8195, LPI_PROP_DEFAULT); + stats_reset(); + cpumask_clear(&mask); + its_send_int(dev2, 20); + wait_for_interrupts(&mask); + report(check_acked(&mask, -1, -1), + "dev2/eventid=20 still does not trigger any LPI"); + + /* Now call the invall and check the LPI hits */ + stats_reset(); + cpumask_clear(&mask); + cpumask_set_cpu(3, &mask); + its_send_invall(col3); + wait_for_interrupts(&mask); + report(check_acked(&mask, 0, 8195), + "dev2/eventid=20 pending LPI is received"); + + stats_reset(); + cpumask_clear(&mask); + cpumask_set_cpu(3, &mask); + its_send_int(dev2, 20); + wait_for_interrupts(&mask); + report(check_acked(&mask, 0, 8195), + "dev2/eventid=20 now triggers an LPI"); + } report_prefix_pop(); @@ -981,6 +988,9 @@ int main(int argc, char **argv) if (argc < 2) report_abort("no test specified"); + if (argc == 3 && strcmp(argv[2], "tcg") == 0) + under_tcg = true; + if (strcmp(argv[1], "ipi") == 0) { report_prefix_push(argv[1]); nr_cpu_check(2); diff --git a/arm/unittests.cfg b/arm/unittests.cfg index f776b66..c72dc34 100644 --- a/arm/unittests.cfg +++ b/arm/unittests.cfg @@ -184,13 +184,22 @@ extra_params = -machine gic-version=3 -append 'its-introspection' groups = its arch = arm64 -[its-trigger] +[its-trigger-kvm] file = gic.flat smp = $MAX_SMP +accel = kvm extra_params = -machine gic-version=3 -append 'its-trigger' groups = its arch = arm64 +[its-trigger-tcg] +file = gic.flat +smp = $MAX_SMP +accel = tcg +extra_params = -machine gic-version=3 -append 'its-trigger tcg' +groups = its +arch = arm64 + [its-migration] file = gic.flat smp = $MAX_SMP From patchwork Wed Apr 28 10:18:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 12228483 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71A0DC433B4 for ; Wed, 28 Apr 2021 10:21:33 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D407360FE3 for ; Wed, 28 Apr 2021 10:21:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D407360FE3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=6hjbwOujlRcAl7WcT/WbJz3qYAlBp/Fpy9eXgalemVY=; b=aYhTAemLNi2WereEUd83JvTdx PhQCQI0uL+ejFkrAdtL2E3mDqCl8Sr3zOK2Sl3S6MNFw0VbVksH3krtZWwdGtnalE+DZfleA6vOen wah0HdEYsbHs94ZobAVQpkArtzNJ3UHB3O5HzCgPlbRbSLaUPVk8VFiO5PE8dq0Wf+mivflsOB99i +VaPgJhvHrocVbvqB+b3BIIm96Up5tc1oxngBfSF+CmazGHBs3H5V4t7ODA/eYrG7FUCu3Ie48h4K mzZLCa5lzbnbEhy9lwVZaG+gKZFPH43/SVC7HNncAKTOhz7ty4CI5N9ktpgpJLLVDHmFTMd8z8DCY QdnwUGR+g==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lbhI0-003H2N-SP; Wed, 28 Apr 2021 10:19:29 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbhHR-003H0Z-3Q for linux-arm-kernel@desiato.infradead.org; Wed, 28 Apr 2021 10:18:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:Content-ID:Content-Description; bh=JIGl3K3qE3k2BXQSfM80xkGe4hRnH3OA6tpOjjNrd3E=; b=h8q01o8F1W7JvAq1dG69hFxLif vWXXzfnC5JAv82peTCOEF/+EFl4ggkix04RcbMP2BGryZccpXWR977KSi9ftWKjTbeE8Qu9LQH9hd Xp8iBj21EqT/GXIb45QFmGMnUjdEkjCpzh/0Xn8nMbYswQy/YI0UgMXghhIZNI31CsOImBUrzEKCO laO6I+43dngiworulRJ78XuZNwE6EhwlFRY96T7xzeSnhSiVwUCxIJ9x1W8UYAI8GlsyFd7zfZwYg wOf0SugG17Dfkcn4v+3x/TM3G8HN9pKsvVkE02fhJP+LP0keGl4o2/j9Z9j9GosO3AfYOp18XArjS HveGwB3w==; Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbhHO-00HLyn-Lt for linux-arm-kernel@lists.infradead.org; Wed, 28 Apr 2021 10:18:51 +0000 Received: by mail-wr1-x430.google.com with SMTP id n2so9266586wrm.0 for ; Wed, 28 Apr 2021 03:18:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JIGl3K3qE3k2BXQSfM80xkGe4hRnH3OA6tpOjjNrd3E=; b=Tocu2ZsTcx7VJN6+MVikFztL2wEkgN20wGnOqWs/UwSTwQ8IT1wNoZoLCbL1uytn3f qCa6ykXIJ39hLu4V+KCW1lOlOmcToymqvCX7t0lR3o87WapMMqa8pTdRKzo+7J5B3GdX cdiIdktldMin4hXEw4px5yAX0xr90WWmxO8smtcZti/I1/LApf837ST2k6Au1cXg6Z5y ZmqDDGg96rXNe6zD9MZlfwQRtM+smRh0A5U6Y4j93mTVpC8y5NGpu6NsLMBfYp2NIj7k 1sGEevKSlWBdzR0UJhugw5fzOXmVcF5hl8CdGbdCsoEuHBke8NPjMo+982KpfVcXN8mH 6ylw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JIGl3K3qE3k2BXQSfM80xkGe4hRnH3OA6tpOjjNrd3E=; b=LmzsCAKVXUdwey2qYxxZkHYgc395rahDMqZG2XQGqG+spmKREOi4jgfn/bbACiNbVN OnMLpwWNA6IzUmdk58oEFsDNFNTYH1R22k/7/co6dmSiqEDB3w+FDj5UDt/o9M7StXlB zT5tOaSX2g8iIPqF+7bcCK8GWNRoKEsMP5D0/gHZe8+X59hlHsI1GTb/5lhgb8sdBHzt cH4nqRtygHR5M441/I5lLfr7C85K0YsOyXR4bU/iJHaFwp0/bBIJXZqLnIBJU7jMSXTo vXBRC0uI71GTg97Ntg9TiBc3klmu+pwAr8J7nuYKiaORLQL2Mms/Q44Go/1E/WE+AXBv 2jzg== X-Gm-Message-State: AOAM530Rsmw7SdjVvkkk16GguunQolC+Lg1J2BdKoVzKmTSr+ZvajEbk 4ZWngBpowQK9l9XXL4w2JavLgw== X-Google-Smtp-Source: ABdhPJzY9oNGXhOxLJCihSwIGFeQ6N62MW7ZFy5SInbOGtC3xunUNEQ7q6CYNQ8xm6AW5+ASciIkSA== X-Received: by 2002:adf:fdcd:: with SMTP id i13mr34506297wrs.185.1619605126850; Wed, 28 Apr 2021 03:18:46 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s83sm3294855wms.16.2021.04.28.03.18.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Apr 2021 03:18:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 343B41FF8C; Wed, 28 Apr 2021 11:18:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: kvm@vger.kernel.org Cc: shashi.mallela@linaro.org, alexandru.elisei@arm.com, eric.auger@redhat.com, qemu-arm@nongnu.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@arm.com, maz@kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [kvm-unit-tests PATCH v1 2/4] scripts/arch-run: don't use deprecated server/nowait options Date: Wed, 28 Apr 2021 11:18:42 +0100 Message-Id: <20210428101844.22656-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210428101844.22656-1-alex.bennee@linaro.org> References: <20210428101844.22656-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210428_031850_735091_97FE953D X-CRM114-Status: GOOD ( 11.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The very fact that QEMU drops the deprecation warning while running is enough to confuse the its-migration test into failing. The boolean options server and wait have accepted the long form options for a long time. Signed-off-by: Alex Bennée --- scripts/arch-run.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/arch-run.bash b/scripts/arch-run.bash index 5997e38..70693f2 100644 --- a/scripts/arch-run.bash +++ b/scripts/arch-run.bash @@ -122,14 +122,14 @@ run_migration () trap 'kill 0; exit 2' INT TERM trap 'rm -f ${migout1} ${migsock} ${qmp1} ${qmp2} ${fifo}' RETURN EXIT - eval "$@" -chardev socket,id=mon1,path=${qmp1},server,nowait \ + eval "$@" -chardev socket,id=mon1,path=${qmp1},server=on,wait=off \ -mon chardev=mon1,mode=control | tee ${migout1} & # We have to use cat to open the named FIFO, because named FIFO's, unlike # pipes, will block on open() until the other end is also opened, and that # totally breaks QEMU... mkfifo ${fifo} - eval "$@" -chardev socket,id=mon2,path=${qmp2},server,nowait \ + eval "$@" -chardev socket,id=mon2,path=${qmp2},server=on,wait=off \ -mon chardev=mon2,mode=control -incoming unix:${migsock} < <(cat ${fifo}) & incoming_pid=`jobs -l %+ | awk '{print$2}'` From patchwork Wed Apr 28 10:18:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 12228481 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8DE81C43460 for ; Wed, 28 Apr 2021 10:21:31 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F1C5C613B1 for ; Wed, 28 Apr 2021 10:21:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F1C5C613B1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=bchWQ0BldJww/+XoRIs5szMkjHRjU35Hk4mr2GHqFjM=; b=TDHmB8A4DSBXDX+laCA+wiEKa tEA5M1ATKhTOZ9xKYdQaVhmDYtOI62cBbSBJi7i4fNdWAL4v87fHNXd7LHrPXouXREk+PNgZU8wPv y2HVKFS9nGGRrHjb+e66eEIgKxkzKNLATyhRswVMywDeQBczGnTx83oTw6aFzDQZ3nnAWkdwKZ1Qk U7JZ+WWdenCQ4SHT/SeMWbu5tqpW2hkeE5vuPmSacuRU0gcfJVY8laaNAqlYcD9/isBikmmfYoSWU s8Ntk5kfWwoadtgKROLshpiBCiCRAGQ0YZbnJ8y9qR0xeBfpzGb0GBfLHWCSJ1SzNRJ+VRu9thKaA BTgAfeTTw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lbhHb-003H1M-Py; Wed, 28 Apr 2021 10:19:04 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbhHS-003H0a-0p for linux-arm-kernel@desiato.infradead.org; Wed, 28 Apr 2021 10:18:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:Content-ID:Content-Description; bh=h0nQnWfRsJ4H9fZ4V8oB0e3t3FwopAIx7BelND6opc4=; b=GJu80X0znbPiMBApewoTSgHT6/ bJINKZ+fH/R1KhLFvl+NCq7dlfMPY8g046YWPM71HetHYeIpJRZUbu6xR6S5FRk9bwEc4VV3IweZ8 9JJLNFJIGMwqf/IddMRdDXe2j2/yP6QW/Uw6h4W+ZcgUu6vEtgIqT1GofnWqg+MasN1G3ZPHn2EGF nQqN3pXyt9ea/7gstdO8Ot2i4cP7uqwvqeqTKwS543Xh7xG7jwb+IFFRI2gbe7uUEh0l0vOMj0TVf wQIe+lTk6hVy8h5+yLH5XQLFFY/BCD9hoy2Bpz+LqKPvotrTIbYUBoliUv5JKHL+3DILmQ2zDMo4N Wycnztdg==; Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbhHP-00HLyr-5N for linux-arm-kernel@lists.infradead.org; Wed, 28 Apr 2021 10:18:52 +0000 Received: by mail-wr1-x42b.google.com with SMTP id z6so1150975wrm.4 for ; Wed, 28 Apr 2021 03:18:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h0nQnWfRsJ4H9fZ4V8oB0e3t3FwopAIx7BelND6opc4=; b=bXzFmQP1exjyRE4ikU7o5JEDc/TxB2cHiu9Lh59XBAJr+A3q4lARBvXmVMzRNrMj5L vjQJBVkXOC65HWb6w/qD1dmG8PVFdbanqJ2laZYgQq13ex4X9vXw+PPX/Zb7R3PrC+Ad R5Awbdh6Ev+31y58S3A+X3ushs8Rd1m6WW8Sgw4QMJc0hPQ5X+ky1FvjHRFvWutikyqN FmckXdM8YadSOzFWOHXv/ch+cwdB0Ghq5vu7RrFMAYpRW3zkAHvZLuRPyOVSZWtnTYrU J1mHfdZGgz+Sq1mGKTs8nq3/sqUOHcrxOS9ChhVQKsS+WoN9knT9GVVSSRh6Rianlb7V ipTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h0nQnWfRsJ4H9fZ4V8oB0e3t3FwopAIx7BelND6opc4=; b=NA+IQexHTTSyb0voDNQ5t1teig3U421ngPY1JZzhfcRqCPIvtQBYKcVQt867VEwtf4 YXekGNX188KHLIcjzxjHDWfmTUR/cYq6FkmCkGwvMj7Muqp1djqxxETU9SgDGSgLHc58 Lao5IXpfZg1PbRnscL7qB3zEFJBHXjP5mOzm9sogqx9Jm451P9TTC9ys28rrmVJFbD7M t09ZaRYbtJrsXzeuC0rIceBR8Wd7TivbKEga/06dJxZbjdVkwAT6id/1VnS/TdI2uo0t kumvtTaryUWRrfJKKThuhTVBlgNfaz+vso2Rke3snjsZocct0rAXpdu2n6rVdwdKzckn McTQ== X-Gm-Message-State: AOAM533IoV/fXDkARo1I4mpt8QikMGcRzSerGTkWpuogHZ5SUI15MWMU 7bsFGW8vRYecbLJTWG8/R5I48Q== X-Google-Smtp-Source: ABdhPJyF87c/fp1iN0zpxYpXE/1Gh0VymotpoSflP0pBM80ElDhXfzZRhRVKwFGRvGOg2YP67jblyQ== X-Received: by 2002:a05:6000:1564:: with SMTP id 4mr35151201wrz.197.1619605128646; Wed, 28 Apr 2021 03:18:48 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g5sm7632844wrq.30.2021.04.28.03.18.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Apr 2021 03:18:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 410151FF8F; Wed, 28 Apr 2021 11:18:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: kvm@vger.kernel.org Cc: shashi.mallela@linaro.org, alexandru.elisei@arm.com, eric.auger@redhat.com, qemu-arm@nongnu.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@arm.com, maz@kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [kvm-unit-tests PATCH v1 3/4] arm64: enable its-migration tests for TCG Date: Wed, 28 Apr 2021 11:18:43 +0100 Message-Id: <20210428101844.22656-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210428101844.22656-1-alex.bennee@linaro.org> References: <20210428101844.22656-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210428_031851_222779_CADFE04D X-CRM114-Status: GOOD ( 10.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org With the support for TCG emulated GIC we can also test these now. You need to call run_tests.sh with -a to trigger the its-migrate-unmapped-collection test which obviously doesn't need the KVM errata to run in TCG system emulation mode. Signed-off-by: Alex Bennée --- arm/unittests.cfg | 3 --- 1 file changed, 3 deletions(-) diff --git a/arm/unittests.cfg b/arm/unittests.cfg index c72dc34..d4dbc8b 100644 --- a/arm/unittests.cfg +++ b/arm/unittests.cfg @@ -203,7 +203,6 @@ arch = arm64 [its-migration] file = gic.flat smp = $MAX_SMP -accel = kvm extra_params = -machine gic-version=3 -append 'its-migration' groups = its migration arch = arm64 @@ -211,7 +210,6 @@ arch = arm64 [its-pending-migration] file = gic.flat smp = $MAX_SMP -accel = kvm extra_params = -machine gic-version=3 -append 'its-pending-migration' groups = its migration arch = arm64 @@ -219,7 +217,6 @@ arch = arm64 [its-migrate-unmapped-collection] file = gic.flat smp = $MAX_SMP -accel = kvm extra_params = -machine gic-version=3 -append 'its-migrate-unmapped-collection' groups = its migration arch = arm64 From patchwork Wed Apr 28 10:18:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 12228485 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6C24C433ED for ; Wed, 28 Apr 2021 10:21:43 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2C3CB613F8 for ; Wed, 28 Apr 2021 10:21:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2C3CB613F8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kOdzefVfRgXGrOYI6stkPVxRG31x+fv4aT4F0ABIJM0=; b=Ss24wIZn4t5M7vpnTITxKJe/B UlWpUErDiEl+FvJGnTmQRxRS5OXrmznyuGtC64XyK/Qgn3c/1sZQn8VD38+ckRmqHxua/XUBMJ685 Dn1HQHGh9h7K742oe43urb73ANz/OF54zuHRCti4ZRtNQVpNYary1jFgO/hpDBpI+B3vHd3WWSWyB lcXekiYLr6fkoAL6e+N0If58DlvAC1SKNl6433WduupxNGFeE/S3VIkm59csb0Z4CrjYmTBEBXs00 15EAO3h0J1e5DW651aQW1xyXT9XRF/TfnJ4+wLjvwESSTI/pCrXOEJUy/sTP8uXgK0FVy5etDYzoA xLVKYAQhQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lbhIU-003H5b-DX; Wed, 28 Apr 2021 10:19:58 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbhHT-003H0g-8p for linux-arm-kernel@desiato.infradead.org; Wed, 28 Apr 2021 10:18:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:Content-ID:Content-Description; bh=oZnOV6h4qE9XN8eV45ogIXJuOiGbasz5bo3bp014tJU=; b=u//TeUtP4eq6gZQSxJtHHzFDph e5KLB98JL8Sw9BZGh8wqH+4cRY7b6Z7rryH8xTd4ohyX0yTReFhaiwGJL5flwTzj/t+mVniMUo7ZJ 3QXFfa+LHK0AFhUM42mki267QTJswuDzScnty1tc5FkBMGOewQAd8cmdSGXlPjOEDs9T5+mov/7PS XYp5bvvZvRpVKmN7K2jOWm5dvsT1oehF9dizsINUZkGDd7BW4DNt/+SEr/OBaOgtYuyw0qOvtDwjr wITlKqRyx5Rm8ZKUBNH7TzM4CfTWuH7CxC+PxoLAOEOlbBNxh+QgUCDwWHYrDgS/40V99VjvO0iQK uli6s9Jg==; Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbhHQ-00HM05-JW for linux-arm-kernel@lists.infradead.org; Wed, 28 Apr 2021 10:18:54 +0000 Received: by mail-wr1-x42e.google.com with SMTP id x7so62384856wrw.10 for ; Wed, 28 Apr 2021 03:18:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oZnOV6h4qE9XN8eV45ogIXJuOiGbasz5bo3bp014tJU=; b=ANukVHXncbLdbgHdhFWXicL6oAdfFtCcf2YirwriVA4no99pPgstEO2RBPIjibx6g8 nlffMe5pHxW6pOhzQoEmoo/n+D4hKxlvyGOY7k+NC3PlSWu5Jb4CY8BANgzKFMZqavfU roWKWKJGmaCbeAun1KO/Luh2ACBlD7nxDsp0vFvUeCj+iDoPZir35+uMZzC1Cp2sr4Lu VVN0vSbiol6mSi5ECjnJjcXI4+hSUIkgBUI6ay7IUnvinESDf1WTMc8u1938koOC85Gy x99mUjPVIg6Xste2niTYJqDR5SNkeOpLFtOE6U8z8c8zJuW1KL7geU/8NzMdg+WB77n8 gLoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oZnOV6h4qE9XN8eV45ogIXJuOiGbasz5bo3bp014tJU=; b=WhWyT7lO8APUDHJEiZcxt57bB0in0Qk5JsWtpHEMqmSY5EwqiXDBSS+f+AIKMCKNNE fwKynfRGXscaOAKAz+nB06EmU7IXlTrVTJ9Dc2APdG5V6eQzzZ6hN90P7VzM0sY/Rh1T GyI283G1ywoLEJ3U/3OQHA4aPxJ2w4inBicoKVrpE1jn2RUu4T5FGHVDTf8gVv+BjLcr 7emMmoHKYQuFCheEJoWtvdItpgpo874cF+QvH1DZ92CXRSLgYE1aLPW5SxjA4E/4t6up 1yL/gHdx6T8Mr616DBunX6aoJyEcT8QfCrxqq5N3xaOYUa0C85BFBNRJDmgv73vuChjy IG5Q== X-Gm-Message-State: AOAM532JxUbFEBybjcNw+0AVzjLMibs6ME971xlGKXTlI06vBfqyOMjf nH01ALr6nc6D7s58Bc9YQZjQSw== X-Google-Smtp-Source: ABdhPJx4lXogaQ0G+Fi1V4EswMRVo+Z1RplrLBVXheFEI7EdeYbid5vv/TMhgbDmRt2wHswrTJ4YPg== X-Received: by 2002:adf:dd52:: with SMTP id u18mr2611724wrm.32.1619605131119; Wed, 28 Apr 2021 03:18:51 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u2sm5734412wmc.22.2021.04.28.03.18.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Apr 2021 03:18:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4D0661FF90; Wed, 28 Apr 2021 11:18:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: kvm@vger.kernel.org Cc: shashi.mallela@linaro.org, alexandru.elisei@arm.com, eric.auger@redhat.com, qemu-arm@nongnu.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@arm.com, maz@kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [kvm-unit-tests PATCH v1 4/4] arm64: split its-migrate-unmapped-collection into KVM and TCG variants Date: Wed, 28 Apr 2021 11:18:44 +0100 Message-Id: <20210428101844.22656-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210428101844.22656-1-alex.bennee@linaro.org> References: <20210428101844.22656-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210428_031852_668431_BCECED4F X-CRM114-Status: GOOD ( 14.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When running the test in TCG we are basically running on bare metal so don't rely on having a particular kernel errata applied. You might wonder why we handle this with a totally new test name instead of adjusting the append as we have before? Well the run_migration shell script uses eval "$@" which unwraps the -append leading to any second parameter being split and leaving QEMU very confused and the test hanging. This seemed simpler than re-writing all the test running logic in something sane ;-) Signed-off-by: Alex Bennée Cc: Shashi Mallela --- arm/gic.c | 7 ++++++- arm/unittests.cfg | 11 ++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/arm/gic.c b/arm/gic.c index 96a329d..3bc7477 100644 --- a/arm/gic.c +++ b/arm/gic.c @@ -843,7 +843,7 @@ static void test_migrate_unmapped_collection(void) goto do_migrate; } - if (!errata(ERRATA_UNMAPPED_COLLECTIONS)) { + if (!errata(ERRATA_UNMAPPED_COLLECTIONS) && !under_tcg) { report_skip("Skipping test, as this test hangs without the fix. " "Set %s=y to enable.", ERRATA_UNMAPPED_COLLECTIONS); test_skipped = true; @@ -1017,6 +1017,11 @@ int main(int argc, char **argv) report_prefix_push(argv[1]); test_migrate_unmapped_collection(); report_prefix_pop(); + } else if (!strcmp(argv[1], "its-migrate-unmapped-collection-tcg")) { + under_tcg = true; + report_prefix_push(argv[1]); + test_migrate_unmapped_collection(); + report_prefix_pop(); } else if (strcmp(argv[1], "its-introspection") == 0) { report_prefix_push(argv[1]); test_its_introspection(); diff --git a/arm/unittests.cfg b/arm/unittests.cfg index d4dbc8b..e8f2e74 100644 --- a/arm/unittests.cfg +++ b/arm/unittests.cfg @@ -214,13 +214,22 @@ extra_params = -machine gic-version=3 -append 'its-pending-migration' groups = its migration arch = arm64 -[its-migrate-unmapped-collection] +[its-migrate-unmapped-collection-kvm] file = gic.flat smp = $MAX_SMP +accel = kvm extra_params = -machine gic-version=3 -append 'its-migrate-unmapped-collection' groups = its migration arch = arm64 +[its-migrate-unmapped-collection-tcg] +file = gic.flat +smp = $MAX_SMP +accel = tcg +extra_params = -machine gic-version=3 -append 'its-migrate-unmapped-collection-tcg' +groups = its migration +arch = arm64 + # Test PSCI emulation [psci] file = psci.flat