From mboxrd@z Thu Jan 1 00:00:00 1970 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=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 440B1C43331 for ; Fri, 3 Apr 2020 08:24:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (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 0E63020721 for ; Fri, 3 Apr 2020 08:24:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Vqiw/iFe" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0E63020721 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKHdB-0002cX-7r for qemu-devel@archiver.kernel.org; Fri, 03 Apr 2020 04:24:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45355) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKHcQ-00025Z-51 for qemu-devel@nongnu.org; Fri, 03 Apr 2020 04:24:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jKHcO-0006wT-S8 for qemu-devel@nongnu.org; Fri, 03 Apr 2020 04:24:01 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:30900 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jKHcO-0006vq-OS for qemu-devel@nongnu.org; Fri, 03 Apr 2020 04:24:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585902239; 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=NTncJUoNdeKHAO92tzeCBJ8GvfQ7t10bHlzh4JiTrfM=; b=Vqiw/iFewuoDzv5J5SjgNqxPlp0mSf4WUtSCVdZZg3WacQz4ol+rFbTZekx9zjdVNy3TY9 N1WO/GObPrFb5ubKkDmKWP6QqRRxA4V60mYkkVKjh1Ml3udbAjGC5fRZLGg1T+tALWmIin xQVEI6osV/2QhH5x9XsEx7pG6S809Gs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-152-o0skrVGVN0GWSitMPoWZCA-1; Fri, 03 Apr 2020 04:23:55 -0400 X-MC-Unique: o0skrVGVN0GWSitMPoWZCA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2A5DD8017CE; Fri, 3 Apr 2020 08:23:54 +0000 (UTC) Received: from [10.36.112.58] (ovpn-112-58.ams2.redhat.com [10.36.112.58]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E75C05C1D6; Fri, 3 Apr 2020 08:23:50 +0000 (UTC) Subject: Re: [PATCH kvm-unit-tests] fixup! arm/arm64: ITS: pending table migration test To: Andrew Jones References: <20200402145227.20109-1-eric.auger@redhat.com> <20200402180148.490026-1-drjones@redhat.com> <20200403073754.6q6njhh25s2zutic@kamzik.brq.redhat.com> From: Auger Eric Message-ID: <84973989-d751-2f33-8de5-c83b0f71065d@redhat.com> Date: Fri, 3 Apr 2020 10:23:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20200403073754.6q6njhh25s2zutic@kamzik.brq.redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, thuth@redhat.com, kvm@vger.kernel.org, maz@kernel.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org, andre.przywara@arm.com, yuzenghui@huawei.com, alexandru.elisei@arm.com, kvmarm@lists.cs.columbia.edu, eric.auger.pro@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Drew, On 4/3/20 9:37 AM, Andrew Jones wrote: > On Fri, Apr 03, 2020 at 07:07:10AM +0200, Auger Eric wrote: >> Hi Drew, >> >> On 4/2/20 8:01 PM, Andrew Jones wrote: >>> [ Without the fix this test would hang, as timeouts don't work with >>> the migration scripts (yet). Use errata to skip instead of hang. ] >>> Signed-off-by: Andrew Jones >>> --- >>> arm/gic.c | 18 ++++++++++++++++-- >>> errata.txt | 1 + >>> 2 files changed, 17 insertions(+), 2 deletions(-) >>> >>> diff --git a/arm/gic.c b/arm/gic.c >>> index ddf0f9d09b14..c0781f8c2c80 100644 >>> --- a/arm/gic.c >>> +++ b/arm/gic.c >>> @@ -12,6 +12,7 @@ >>> * This work is licensed under the terms of the GNU LGPL, version 2. >>> */ >>> #include >>> +#include >>> #include >>> #include >>> #include >>> @@ -812,13 +813,23 @@ static void test_its_migration(void) >>> check_lpi_stats("dev7/eventid=255 triggers LPI 8196 on PE #2 after migration"); >>> } >>> >>> +#define ERRATA_UNMAPPED_COLLECTIONS "ERRATA_8c58be34494b" >>> + >>> static void test_migrate_unmapped_collection(void) >>> { >>> - struct its_collection *col; >>> - struct its_device *dev2, *dev7; >>> + struct its_collection *col = NULL; >>> + struct its_device *dev2 = NULL, *dev7 = NULL; >>> + bool test_skipped = false; >>> int pe0 = 0; >>> u8 config; >>> >>> + if (!errata(ERRATA_UNMAPPED_COLLECTIONS)) { >>> + report_skip("Skipping test, as this test hangs without the fix. " >>> + "Set %s=y to enable.", ERRATA_UNMAPPED_COLLECTIONS); >>> + test_skipped = true; >>> + goto do_migrate; >> out of curiosity why do you still do the migration and not directly return. > > That won't work for the same reason the migration failure doesn't work. > The problem is with the migration scripts not completing when a migration > test doesn't successfully migrate. I plan to fix that when I get a bit of > time, and when I do, I'll post a patch removing this errata as well, as > it will no longer be needed to avoid test hangs. Anybody testing on a > kernel without the kernel fix after the migration scripts are fixed will > just get an appropriate FAIL instead. OK Got it Thanks Eric > > Thanks, > drew > >> >> Besides, what caused the migration to fail without 8c58be34494b is >> bypassed so: >> >> Reviewed-by: Eric Auger >> Tested-by: Eric Auger >> >> Thank you for the fixup >> >> Eric >> >>> + } >>> + >>> if (its_setup1()) >>> return; >>> >>> @@ -830,9 +841,12 @@ static void test_migrate_unmapped_collection(void) >>> its_send_mapti(dev2, 8192, 0, col); >>> gicv3_lpi_set_config(8192, LPI_PROP_DEFAULT); >>> >>> +do_migrate: >>> puts("Now migrate the VM, then press a key to continue...\n"); >>> (void)getchar(); >>> report_info("Migration complete"); >>> + if (test_skipped) >>> + return; >>> >>> /* on the destination, map the collection */ >>> its_send_mapc(col, true); >>> diff --git a/errata.txt b/errata.txt >>> index 7d6abc2a7bf6..b66afaa9c079 100644 >>> --- a/errata.txt >>> +++ b/errata.txt >>> @@ -5,4 +5,5 @@ >>> 9e3f7a296940 : 4.9 : arm64: KVM: pmu: Fix AArch32 cycle counter access >>> 7b6b46311a85 : 4.11 : KVM: arm/arm64: Emulate the EL1 phys timer registers >>> 6c7a5dce22b3 : 4.12 : KVM: arm/arm64: fix races in kvm_psci_vcpu_on >>> +8c58be34494b : 5.6 : KVM: arm/arm64: vgic-its: Fix restoration of unmapped collections >>> #---------------:-------------------------------:--------------------------------------------------- >>> >> >> >