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=-6.5 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 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 87EAFC282DD for ; Fri, 10 Jan 2020 14:55:40 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 3B24A2072E for ; Fri, 10 Jan 2020 14:55:40 +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="BvjzlCAV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B24A2072E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id E7DCD4B162; Fri, 10 Jan 2020 09:55:39 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@redhat.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WiE706DaJfjG; Fri, 10 Jan 2020 09:55:38 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id BB2494B14B; Fri, 10 Jan 2020 09:55:38 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id E07894B170 for ; Fri, 10 Jan 2020 09:55:36 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nORrwAZSao+m for ; Fri, 10 Jan 2020 09:55:35 -0500 (EST) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mm01.cs.columbia.edu (Postfix) with ESMTP id F2B704B0CF for ; Fri, 10 Jan 2020 09:55:34 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578668134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zF7fowIzQfdh49LNbLzBDFVCiRf9n/Gerf/OzX8S1GQ=; b=BvjzlCAVd7IkjGHvlp0qLwRmHmCYO/dKNDS9VKh+kgAV8keb0FirOc061+P7k86LLQ90qv 4HAuPp/xHsTkA9DkDR4WccB2sE40tzwDvEjSiujNCMTKM/zB0lq0xbed2Qzq6GuURtptp1 CO0fdKG3QPvFdr/ElvgRovvdU8QoCiQ= 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-26-wpRgzfHKM1yF0u2giuJ9zg-1; Fri, 10 Jan 2020 09:55:33 -0500 X-MC-Unique: wpRgzfHKM1yF0u2giuJ9zg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 092E11083E84; Fri, 10 Jan 2020 14:55:32 +0000 (UTC) Received: from laptop.redhat.com (ovpn-117-108.ams2.redhat.com [10.36.117.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 22B837C3EB; Fri, 10 Jan 2020 14:55:28 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, maz@kernel.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org Subject: [kvm-unit-tests PATCH v2 15/16] arm/arm64: ITS: migration tests Date: Fri, 10 Jan 2020 15:54:11 +0100 Message-Id: <20200110145412.14937-16-eric.auger@redhat.com> In-Reply-To: <20200110145412.14937-1-eric.auger@redhat.com> References: <20200110145412.14937-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Cc: andre.przywara@arm.com, thuth@redhat.com X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu This test maps LPIs (populates the device table, the collection table, interrupt translation tables, configuration table), migrates and make sure the translation is correct on the destination. Signed-off-by: Eric Auger --- arm/gic.c | 55 +++++++++++++++++++++++++++++++++++++--- arm/unittests.cfg | 7 +++++ lib/arm/asm/gic-v3-its.h | 2 ++ lib/arm/gic-v3-its.c | 22 ++++++++++++++++ 4 files changed, 82 insertions(+), 4 deletions(-) diff --git a/arm/gic.c b/arm/gic.c index 7f701a1..bf4b5ba 100644 --- a/arm/gic.c +++ b/arm/gic.c @@ -641,13 +641,19 @@ static int its_prerequisites(int nb_cpus) return 0; } -static void test_its_trigger(void) +/* + * Setup the configuration for those mappings: + * dev_id=2 event=20 -> vcpu 3, intid=8195 + * dev_id=7 event=255 -> vcpu 2, intid=8196 + * LPIs ready to hit + */ +static int its_setup1(void) { struct its_collection *col3, *col2; struct its_device *dev2, *dev7; if (its_prerequisites(4)) - return; + return -1; dev2 = its_create_device(2 /* dev id */, 8 /* nb_ites */); dev7 = its_create_device(7 /* dev id */, 8 /* nb_ites */); @@ -661,8 +667,6 @@ static void test_its_trigger(void) its_send_invall(col2); its_send_invall(col3); - report_prefix_push("int"); - its_send_mapd(dev2, true); its_send_mapd(dev7, true); @@ -673,6 +677,23 @@ static void test_its_trigger(void) 20 /* event id */, col3); its_send_mapti(dev7, 8196 /* lpi id */, 255 /* event id */, col2); + return 0; +} + +static void test_its_trigger(void) +{ + struct its_collection *col3, *col2; + struct its_device *dev2, *dev7; + + if (its_setup1()) + return; + + col3 = its_get_collection(3); + col2 = its_get_collection(2); + dev2 = its_get_device(2); + dev7 = its_get_device(7); + + report_prefix_push("int"); lpi_stats_expect(3, 8195); its_send_int(dev2, 20); @@ -721,6 +742,28 @@ static void test_its_trigger(void) check_lpi_stats(); } +static void test_its_migration(void) +{ + struct its_device *dev2, *dev7; + + if (its_setup1()) + return; + + dev2 = its_get_device(2); + dev7 = its_get_device(7); + + puts("Now migrate the VM, then press a key to continue...\n"); + (void)getchar(); + report(true, "Migration complete"); + + lpi_stats_expect(3, 8195); + its_send_int(dev2, 20); + check_lpi_stats(); + + lpi_stats_expect(2, 8196); + its_send_int(dev7, 255); + check_lpi_stats(); +} int main(int argc, char **argv) { @@ -756,6 +799,10 @@ int main(int argc, char **argv) report_prefix_push(argv[1]); test_its_trigger(); report_prefix_pop(); + } else if (!strcmp(argv[1], "its-migration")) { + report_prefix_push(argv[1]); + test_its_migration(); + 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 80a1d27..29e2efc 100644 --- a/arm/unittests.cfg +++ b/arm/unittests.cfg @@ -140,6 +140,13 @@ smp = $MAX_SMP extra_params = -machine gic-version=3 -append 'its-trigger' groups = its +[its-migration] +file = gic.flat +smp = $MAX_SMP +accel = kvm +extra_params = -machine gic-version=3 -append 'its-migration' +groups = its migration + # Test PSCI emulation [psci] file = psci.flat diff --git a/lib/arm/asm/gic-v3-its.h b/lib/arm/asm/gic-v3-its.h index 7d6f8fd..7838a11 100644 --- a/lib/arm/asm/gic-v3-its.h +++ b/lib/arm/asm/gic-v3-its.h @@ -166,6 +166,8 @@ extern void its_send_invall(struct its_collection *col); extern void its_send_movi(struct its_device *dev, struct its_collection *col, u32 id); extern void its_send_sync(struct its_collection *col); +extern struct its_device *its_get_device(u32 id); +extern struct its_collection *its_get_collection(u32 id); #define ITS_FLAGS_CMDQ_NEEDS_FLUSHING (1ULL << 0) #define ITS_FLAGS_WORKAROUND_CAVIUM_22375 (1ULL << 1) diff --git a/lib/arm/gic-v3-its.c b/lib/arm/gic-v3-its.c index 88c08ee..315aedb 100644 --- a/lib/arm/gic-v3-its.c +++ b/lib/arm/gic-v3-its.c @@ -303,3 +303,25 @@ struct its_collection *its_create_collection(u32 col_id, u32 pe) its_data.nr_collections++; return new; } + +struct its_device *its_get_device(u32 id) +{ + int i; + + for (i = 0; i < GITS_MAX_DEVICES; i++) { + if (its_data.devices[i].device_id == id) + return &its_data.devices[i]; + } + return NULL; +} + +struct its_collection *its_get_collection(u32 id) +{ + int i; + + for (i = 0; i < GITS_MAX_COLLECTIONS; i++) { + if (its_data.collections[i].col_id == id) + return &its_data.collections[i]; + } + return NULL; +} -- 2.20.1 _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm