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