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=-9.6 required=3.0 tests=BAYES_00,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 68DD3C2D0A3 for ; Tue, 3 Nov 2020 10:46:46 +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 B50FA20756 for ; Tue, 3 Nov 2020 10:46:45 +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="eazrfLRw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B50FA20756 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]:60188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZtps-0007pm-KP for qemu-devel@archiver.kernel.org; Tue, 03 Nov 2020 05:46:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53290) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZtod-0006nx-Vh for qemu-devel@nongnu.org; Tue, 03 Nov 2020 05:45:27 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29013) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kZtoc-00086P-6D for qemu-devel@nongnu.org; Tue, 03 Nov 2020 05:45:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604400325; 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=0ViQuycKFUnzUbFQn6zy0DfrjuCqIdByZmTydSbeN3c=; b=eazrfLRwbQKvqrlO5Mo505B+6cdvtx4FMyPaF/R+OZ9Kd0R5PK1Bg4HTbWPj0UQswBlDeC WvkSoi7RSTytyklTIDRFdkjonTU1/A+cUEMCrfp9/uks9Qrt/AkFXpZEKkVgTqr8fNseA0 2N2Zh9RjGaaH4cgELJf9gXvNCg37nVw= 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-296-Ntb8OfkhNd-AKVtFhavMZA-1; Tue, 03 Nov 2020 05:45:23 -0500 X-MC-Unique: Ntb8OfkhNd-AKVtFhavMZA-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 5725A1009E28; Tue, 3 Nov 2020 10:45:22 +0000 (UTC) Received: from gondolin (ovpn-114-68.ams2.redhat.com [10.36.114.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 082F575124; Tue, 3 Nov 2020 10:45:15 +0000 (UTC) Date: Tue, 3 Nov 2020 11:45:13 +0100 From: Cornelia Huck To: Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Subject: Re: [PULL v3 23/32] s390x/pci: Add routine to get the vfio dma available count Message-ID: <20201103114513.6909502c.cohuck@redhat.com> In-Reply-To: <85a0a8e1-1081-12c8-c37b-4a7e919b421a@redhat.com> References: <160426371498.24886.12193840637250368669.stgit@gimli.home> <160426454077.24886.1574050205264167707.stgit@gimli.home> <85a0a8e1-1081-12c8-c37b-4a7e919b421a@redhat.com> Organization: Red Hat GmbH MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=63.128.21.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 01:02:05 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H5=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 , Alex Williamson , Alex =?UTF-8?B?QmVubsOpZQ==?= , qemu-devel@nongnu.org, Matthew Rosato Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 3 Nov 2020 06:49:13 +0100 Philippe Mathieu-Daud=C3=A9 wrote: > Hi Matthew, >=20 > On 11/1/20 10:02 PM, Alex Williamson wrote: > > From: Matthew Rosato > >=20 > > Create new files for separating out vfio-specific work for s390 > > pci. Add the first such routine, which issues VFIO_IOMMU_GET_INFO > > ioctl to collect the current dma available count. > >=20 > > Signed-off-by: Matthew Rosato > > Reviewed-by: Cornelia Huck > > [aw: Fix non-Linux build with CONFIG_LINUX] > > Signed-off-by: Alex Williamson > > --- > > hw/s390x/meson.build | 1 + > > hw/s390x/s390-pci-vfio.c | 54 ++++++++++++++++++++++++++++++= ++++++++ > > include/hw/s390x/s390-pci-vfio.h | 24 +++++++++++++++++ > > 3 files changed, 79 insertions(+) > > create mode 100644 hw/s390x/s390-pci-vfio.c > > create mode 100644 include/hw/s390x/s390-pci-vfio.h > >=20 > > diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build > > index 948ceae7a7b3..f4663a835514 100644 > > --- a/hw/s390x/meson.build > > +++ b/hw/s390x/meson.build > > @@ -27,6 +27,7 @@ s390x_ss.add(when: 'CONFIG_KVM', if_true: files( > > )) > > s390x_ss.add(when: 'CONFIG_S390_CCW_VIRTIO', if_true: files('s390-virt= io-ccw.c')) > > s390x_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('3270-ccw.c')= ) > > +s390x_ss.add(when: 'CONFIG_LINUX', if_true: files('s390-pci-vfio.c')) I think we need s/CONFIG_LINUX/CONFIG_VFIO/ here. > > =20 > > virtio_ss =3D ss.source_set() > > virtio_ss.add(files('virtio-ccw.c')) > > diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c > > new file mode 100644 > > index 000000000000..cb3f4d98adf8 > > --- /dev/null > > +++ b/hw/s390x/s390-pci-vfio.c > > @@ -0,0 +1,54 @@ > > +/* > > + * s390 vfio-pci interfaces > > + * > > + * Copyright 2020 IBM Corp. > > + * Author(s): Matthew Rosato > > + * > > + * This work is licensed under the terms of the GNU GPL, version 2 or = (at > > + * your option) any later version. See the COPYING file in the top-lev= el > > + * directory. > > + */ > > + > > +#include > > + > > +#include "qemu/osdep.h" > > +#include "hw/s390x/s390-pci-vfio.h" > > +#include "hw/vfio/vfio-common.h" > > + > > +/* > > + * Get the current DMA available count from vfio. Returns true if vfi= o is > > + * limiting DMA requests, false otherwise. The current available coun= t read > > + * from vfio is returned in avail. > > + */ > > +bool s390_pci_update_dma_avail(int fd, unsigned int *avail) > > +{ > > + g_autofree struct vfio_iommu_type1_info *info; > > + uint32_t argsz; > > + > > + assert(avail); > > + > > + argsz =3D sizeof(struct vfio_iommu_type1_info); > > + info =3D g_malloc0(argsz); > > + > > + /* > > + * If the specified argsz is not large enough to contain all capab= ilities > > + * it will be updated upon return from the ioctl. Retry until we = have > > + * a big enough buffer to hold the entire capability chain. > > + */ > > +retry: > > + info->argsz =3D argsz; > > + > > + if (ioctl(fd, VFIO_IOMMU_GET_INFO, info)) { > > + return false; > > + } > > + > > + if (info->argsz > argsz) { > > + argsz =3D info->argsz; > > + info =3D g_realloc(info, argsz); > > + goto retry; > > + } > > + > > + /* If the capability exists, update with the current value */ > > + return vfio_get_info_dma_avail(info, avail); > > +} =20 >=20 > --without-default-devices configuration is broken, bisected > to this commit: Hm. Is this run in any of the CI tests? I did not even realize it existed :) >=20 > hw/s390x/s390-pci-vfio.c:52: undefined reference to > `vfio_get_info_dma_avail' >=20 > Can you have a look please? >=20 > Thanks. >=20