From nobody Thu May 15 09:02:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1527841144436937.1964604515621; Fri, 1 Jun 2018 01:19:04 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C4EF930C75AE; Fri, 1 Jun 2018 08:19:02 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 85C841001947; Fri, 1 Jun 2018 08:19:02 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2DD7A1809547; Fri, 1 Jun 2018 08:19:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w518Hpmd027149 for ; Fri, 1 Jun 2018 04:17:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id D03AB5D9C9; Fri, 1 Jun 2018 08:17:51 +0000 (UTC) Received: from mx1.redhat.com (ext-mx11.extmail.prod.ext.phx2.redhat.com [10.5.110.40]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C4DD05D9C6 for ; Fri, 1 Jun 2018 08:17:48 +0000 (UTC) Received: from mail-wr0-f181.google.com (mail-wr0-f181.google.com [209.85.128.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 209EE3007DFF for ; Fri, 1 Jun 2018 08:17:37 +0000 (UTC) Received: by mail-wr0-f181.google.com with SMTP id d2-v6so19983718wrm.10 for ; Fri, 01 Jun 2018 01:17:37 -0700 (PDT) Received: from filip.redhat.com ([213.175.37.12]) by smtp.googlemail.com with ESMTPSA id p3-v6sm22625281wrn.31.2018.06.01.01.17.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jun 2018 01:17:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=L7p9dOAx2UC+GNtMCaLOwFrgubQWVlbhYTuR1Am+DS8=; b=A8Ik3qJT4FNfbymqsI0FTkTpQlKXAik2M3P6upQyXs3OYlqhP/zPiN5+vVAWJyAwF5 oEI5qYoVP7lkmvA2lTPtKCdFk4G7lB8RqsYcnS/WT22i+trRHvh0wb5IgwQXqKJJu9rp AZzRpLLNJLoO6Pmb+jNqkmcSEKN02ddbNS1KipW2sMhYl1lySo292w9daevWn/vgpHsa dtV49/NbOktHXmX/EUXaISzUCDG47v1ydg5cvzP9s/YnDQEwJUdiB/SbSc1Yv+Wt7U6u yerrgVeMRFPp/rUn5jX8QR5aYHU8E3L+cETAzk8KVzcdtPeK+RUAUQ5QH2FjxUabqUky b1QQ== 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; bh=L7p9dOAx2UC+GNtMCaLOwFrgubQWVlbhYTuR1Am+DS8=; b=UFqzah21+iMPOtm7THIuBV+hfNuFTDMUpyg/doxpF4w0bYAB3Z5FONsEDNFR3IdpHT fdNAJ39XowBYYT5fIFRf7lrkEDRAadu5PnOi0bfNXDuw/Aq6HWMtruZypW6wuMnVKIKn 7xChfv12+qz3lD0NXRxMrJVyOk2WSs98okCO9HVXej+YmTRiQkusUOUWQAjD4P2scwIZ 8a4XJvMWwdBKTXPyNvOdg+PUizOpoe2RfIMeJvgKKb7AtJdRCoyBG4/Y+osHTc/e+dyw gKxWq4lrE/7Wp3K3Q8gwiiXqvG5UewblVL/4BM3meFkTrBvaaaVBPCPHG+PwDOVFu3GZ DN+A== X-Gm-Message-State: ALKqPwcS9yMdBSlrM9q432619D9oC2Zlkniwx8d2t3Y5vTekxquqbGu7 LwP7q9DscrYQQs4Ydnsk6sJ+eg== X-Google-Smtp-Source: ADUXVKLPWreQS4WNB/c+gPBuZRggR1Y1j1EJF/n3kgwpAlIRPjHBau8l+wWlnW6GQPbfQt8jpT7F8Q== X-Received: by 2002:adf:9125:: with SMTP id j34-v6mr8332990wrj.156.1527841055431; Fri, 01 Jun 2018 01:17:35 -0700 (PDT) From: Filip Alac To: libvir-list@redhat.com Date: Fri, 1 Jun 2018 10:15:58 +0200 Message-Id: <20180601081600.15390-2-filipalac@gmail.com> In-Reply-To: <20180601081600.15390-1-filipalac@gmail.com> References: <20180601081600.15390-1-filipalac@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 01 Jun 2018 08:17:37 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 01 Jun 2018 08:17:37 +0000 (UTC) for IP:'209.85.128.181' DOMAIN:'mail-wr0-f181.google.com' HELO:'mail-wr0-f181.google.com' FROM:'filipalac@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.396 (DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, NML_ADSP_CUSTOM_MED, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_PASS, T_DKIM_INVALID) 209.85.128.181 mail-wr0-f181.google.com 209.85.128.181 mail-wr0-f181.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.40 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Filip Alac Subject: [libvirt] [PATCH v4 1/3] qemu: hostdev: Move parts of qemuHostdevHostSupportsPassthroughVFIO() into separate function X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Fri, 01 Jun 2018 08:19:03 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Filip Alac Reviewed-by: Stefan Berger --- src/libvirt_private.syms | 1 + src/qemu/qemu_hostdev.c | 29 ++++------------------------- src/util/virutil.c | 28 ++++++++++++++++++++++++++++ src/util/virutil.h | 2 ++ 4 files changed, 35 insertions(+), 25 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 6001635916..dacaf9d94b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3073,6 +3073,7 @@ virGetUserName; virGetUserRuntimeDirectory; virGetUserShell; virHexToBin; +virHostHasIOMMU; virIndexToDiskName; virIsDevMapperDevice; virIsSUID; diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 955b5df1a3..25e2dcf868 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -23,7 +23,6 @@ =20 #include =20 -#include #include #include #include @@ -124,33 +123,13 @@ qemuHostdevUpdateActiveDomainDevices(virQEMUDriverPtr= driver, bool qemuHostdevHostSupportsPassthroughVFIO(void) { - DIR *iommuDir =3D NULL; - struct dirent *iommuGroup =3D NULL; - bool ret =3D false; - int direrr; - - /* condition 1 - /sys/kernel/iommu_groups/ contains entries */ - if (virDirOpenQuiet(&iommuDir, "/sys/kernel/iommu_groups/") < 0) - goto cleanup; - - while ((direrr =3D virDirRead(iommuDir, &iommuGroup, NULL)) > 0) { - /* assume we found a group */ - break; - } - - if (direrr < 0 || !iommuGroup) - goto cleanup; - /* okay, iommu is on and recognizes groups */ + if (!virHostHasIOMMU()) + return false; =20 - /* condition 2 - /dev/vfio/vfio exists */ if (!virFileExists("/dev/vfio/vfio")) - goto cleanup; - - ret =3D true; + return false; =20 - cleanup: - VIR_DIR_CLOSE(iommuDir); - return ret; + return true; } =20 =20 diff --git a/src/util/virutil.c b/src/util/virutil.c index bb4474acd5..7edcda0ee7 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -2090,3 +2090,31 @@ virMemoryMaxValue(bool capped) else return LLONG_MAX; } + +bool +virHostHasIOMMU(void) +{ + DIR *iommuDir =3D NULL; + struct dirent *iommuGroup =3D NULL; + bool ret =3D false; + int direrr; + + /* condition 1 - /sys/kernel/iommu_groups/ contains entries */ + if (virDirOpenQuiet(&iommuDir, "/sys/kernel/iommu_groups/") < 0) + goto cleanup; + + while ((direrr =3D virDirRead(iommuDir, &iommuGroup, NULL)) > 0) { + /* assume we found a group */ + break; + } + + if (direrr < 0 || !iommuGroup) + goto cleanup; + /* okay, iommu is on and recognizes groups */ + + ret =3D true; + + cleanup: + VIR_DIR_CLOSE(iommuDir); + return ret; +} diff --git a/src/util/virutil.h b/src/util/virutil.h index be0f6b0ea8..1ba9635bd9 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -216,6 +216,8 @@ unsigned long long virMemoryLimitTruncate(unsigned long= long value); bool virMemoryLimitIsSet(unsigned long long value); unsigned long long virMemoryMaxValue(bool ulong) ATTRIBUTE_NOINLINE; =20 +bool virHostHasIOMMU(void); + /** * VIR_ASSIGN_IS_OVERFLOW: * @rvalue: value that is checked (evaluated twice) --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list