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=-18.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 2D0FDC5519F for ; Fri, 27 Nov 2020 17:07:20 +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 AA20D20857 for ; Fri, 27 Nov 2020 17:07:19 +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="NpNBbIXY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AA20D20857 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]:56152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kihDK-00014W-Nf for qemu-devel@archiver.kernel.org; Fri, 27 Nov 2020 12:07:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kih93-0006PV-0q for qemu-devel@nongnu.org; Fri, 27 Nov 2020 12:02:54 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39191) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kih8z-0007Vg-9O for qemu-devel@nongnu.org; Fri, 27 Nov 2020 12:02:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606496567; 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=JYXhL2TVPZe6HJTwX71Kh4KzzN9VpVkKjx6XuuAFJSA=; b=NpNBbIXYpBVuvA4Ub61IrXcSx9I4IdF9If2m+51V8XNBlGWza0cnhipJNvbTb7Yah9au9y qhD1gB6lYyT32fh6iQiwjEEzUIgVDt0uGRUmL0NeQ+ilSaGg/gZrXZT/VD69g3g4Nv4sWp cNED053NiaFBl/r5rovbfeSH2ofxVmY= 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-145-HXPXwEC1NIubI4F9v9hnGQ-1; Fri, 27 Nov 2020 12:02:43 -0500 X-MC-Unique: HXPXwEC1NIubI4F9v9hnGQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8C46680F041; Fri, 27 Nov 2020 17:02:42 +0000 (UTC) Received: from gondolin (ovpn-113-65.ams2.redhat.com [10.36.113.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id D7AC15D9D3; Fri, 27 Nov 2020 17:02:37 +0000 (UTC) Date: Fri, 27 Nov 2020 18:02:35 +0100 From: Cornelia Huck To: Wainer dos Santos Moschetta Subject: Re: [PATCH v2] tests/acceptance: add a test for devices on s390x Message-ID: <20201127180235.6be7a316.cohuck@redhat.com> In-Reply-To: <1c17f8b0-509c-33b1-273e-c7e00e2bb284@redhat.com> References: <20201126130158.1471985-1-cohuck@redhat.com> <1c17f8b0-509c-33b1-273e-c7e00e2bb284@redhat.com> Organization: Red Hat GmbH MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=cohuck@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Thomas Huth , qemu-devel@nongnu.org, Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, Cleber Rosa , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, 27 Nov 2020 14:00:16 -0300 Wainer dos Santos Moschetta wrote: > Hi, > > On 11/26/20 10:01 AM, Cornelia Huck wrote: > > This adds a very basic test for checking that we present devices > > in a way that Linux can consume: boot with both virtio-net-ccw and > > virtio-net-pci attached and then verify that Linux is able to see > > and detect these devices. > > > > Signed-off-by: Cornelia Huck > > --- > > RFC->v2: > > - use a newer kernel that uses the uid in zpci address generation > > - add a zpci device to specify a uid > > - increase timeout > > - tweak naming > > - add a MAINTAINERS entry > > --- > > MAINTAINERS | 1 + > > tests/acceptance/machine_s390_ccw_virtio.py | 70 +++++++++++++++++++++ > > 2 files changed, 71 insertions(+) > > create mode 100644 tests/acceptance/machine_s390_ccw_virtio.py > > > > diff --git a/MAINTAINERS b/MAINTAINERS > > index 68bc160f41bc..cc1c7c2ffed8 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -1426,6 +1426,7 @@ F: include/hw/s390x/ > > F: hw/watchdog/wdt_diag288.c > > F: include/hw/watchdog/wdt_diag288.h > > F: default-configs/s390x-softmmu.mak > > +F: tests/acceptance/machine_s390_ccw_virtio.py > > T: git https://github.com/cohuck/qemu.git s390-next > > T: git https://github.com/borntraeger/qemu.git s390-next > > L: qemu-s390x@nongnu.org > > diff --git a/tests/acceptance/machine_s390_ccw_virtio.py b/tests/acceptance/machine_s390_ccw_virtio.py > > new file mode 100644 > > index 000000000000..1f56be776c5f > > --- /dev/null > > +++ b/tests/acceptance/machine_s390_ccw_virtio.py > > @@ -0,0 +1,70 @@ > > +# Functional test that boots an s390x Linux guest with ccw and PCI devices > > +# attached and checks whether the devices are recognized by Linux > > +# > > +# Copyright (c) 2020 Red Hat, Inc. > > +# > > +# Author: > > +# Cornelia Huck > > +# > > +# This work is licensed under the terms of the GNU GPL, version 2 or > > +# later. See the COPYING file in the top-level directory. > > + > > + > > +import os > > + > > > Unused import. Will remove. > > > > +from avocado_qemu import Test > > +from avocado_qemu import exec_command_and_wait_for_pattern > > +from avocado_qemu import wait_for_console_pattern > > + > > +class S390CCWVirtioMachine(Test): > > + KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' > > + > > + def wait_for_console_pattern(self, success_message, vm=None): > > + wait_for_console_pattern(self, success_message, > > + failure_message='Kernel panic - not syncing', > > + vm=vm) > > + > > + timeout = 120 > > + > > + def test_s390x_devices(self): > > + > > + """ > > + :avocado: tags=arch:s390x > > + :avocado: tags=machine:s390-ccw-virtio > > + """ > > + > > + kernel_url = ('https://snapshot.debian.org/archive/debian/' > > + '20201126T092837Z/dists/buster/main/installer-s390x/' > > + '20190702+deb10u6/images/generic/kernel.debian') > > + kernel_hash = '5821fbee57d6220a067a8b967d24595621aa1eb6' > > + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) > > + > > + initrd_url = ('https://snapshot.debian.org/archive/debian/' > > + '20201126T092837Z/dists/buster/main/installer-s390x/' > > + '20190702+deb10u6/images/generic/initrd.debian') > > + initrd_hash = '81ba09c97bef46e8f4660ac25b4ac0a5be3a94d6' > > + initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash) > > + > > + self.vm.set_console() > > + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + > > + 'console=sclp0 root=/dev/ram0 BOOT_DEBUG=3') > > + self.vm.add_args('-nographic', > > + '-kernel', kernel_path, > > + '-initrd', initrd_path, > > + '-append', kernel_command_line, > > + '-device', 'virtio-net-ccw,devno=fe.1.1111', > > + '-device', 'zpci,uid=5,target=zzz', > > + '-device', 'virtio-net-pci,id=zzz') > > + self.vm.launch() > > + > > + shell_ready = "sh: can't access tty; job control turned off" > > + self.wait_for_console_pattern(shell_ready) > > + # first debug shell is too early, we need to wait for device detection > > + exec_command_and_wait_for_pattern(self, 'exit', shell_ready) > > + > > + ccw_bus_id="0.1.1111" > > + pci_bus_id="0005:00:00.0" > > + exec_command_and_wait_for_pattern(self, 'ls /sys/bus/ccw/devices/', > > + ccw_bus_id) > > + exec_command_and_wait_for_pattern(self, 'ls /sys/bus/pci/devices/', > > + pci_bus_id) > > > I tested this test case on GitLab. It passed on the > acceptance-system-centos job > (https://gitlab.com/wainersm/qemu/-/jobs/877308808) and the pipeline as > a whole passed (https://gitlab.com/wainersm/qemu/-/pipelines/222277683). Oh, I should have mentioned that I ran it on gitlab as well :) > > So once the unused import is removed: > > Reviewed-by: Wainer dos Santos Moschetta Thanks! > >