[OSSTEST,v5,4/5] examine: detect IOMMU availability and add it as a hostflag

Commit Message

Roger Pau Monné March 11, 2020, 5:20 p.m. UTC

Introduce a new test to check for iommu availability and add it as a
hostflag if found.

Signed-off-by: Roger Pau Monné <[e-mail]>
---
Changes since v4:
 - Split out code into separate patches.

Changes since v3:
 - Fail if `xl info` command fails.

Changes since v2:
 - Allow flags to be removed.
 - Fix set_flag addition to HostBD/Static.pm.
---
 sg-run-job       |  1 +
 ts-examine-iommu | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100755 ts-examine-iommu

Comments

Ian Jackson March 12, 2020, 11:02 a.m. UTC | #1

Roger Pau Monne writes ("[PATCH OSSTEST v5 4/5] examine: detect IOMMU availability and add it as a hostflag"):
> Introduce a new test to check for iommu availability and add it as a
> hostflag if found.
...
> +our $has_iommu = $info =~ /directio/;

I think this regexp is too lax.  For example, if the Xen command line
had something mentioning `directio' it would always say `yes'...

This appears in virt_caps, right ?  So I think you want

  +our $has_iommu = $info =~ /^virt_caps\s*:.*\sdirectio\s/m;

or some such.  (Untested.)

Sorry for only spotting this now.  Otherwise this LGTM.

Ian.

Ian Jackson March 12, 2020, 11:12 a.m. UTC | #2

Roger Pau Monne writes ("[PATCH OSSTEST v5 4/5] examine: detect IOMMU availability and add it as a hostflag"):
> Introduce a new test to check for iommu availability and add it as a
> hostflag if found.
> 
> Signed-off-by: Roger Pau Monné <[e-mail]>
> ---
> Changes since v4:
>  - Split out code into separate patches.
> 
> Changes since v3:
>  - Fail if `xl info` command fails.
> 
> Changes since v2:
>  - Allow flags to be removed.
>  - Fix set_flag addition to HostBD/Static.pm.
> ---
>  sg-run-job       |  1 +
>  ts-examine-iommu | 32 ++++++++++++++++++++++++++++++++
>  2 files changed, 33 insertions(+)
>  create mode 100755 ts-examine-iommu
> 
> diff --git a/sg-run-job b/sg-run-job
> index 7c58d4ba..f6bfdfd5 100755
> --- a/sg-run-job
> +++ b/sg-run-job
> @@ -679,6 +679,7 @@ proc examine-host-examine {install} {
>      if {$ok} {
>  	run-ts -.  =           ts-examine-serial-post + host
>  	run-ts .   =           ts-examine-logs-save   + host
> +	run-ts .   =           ts-examine-iommu       + host
>  	run-ts .   =           ts-examine-hostprops-save

Thanks.  I looked at your test flight and that caused me to notice
that this ts-examine-iommu is in the wrong place, at least logically
speaking.  Log capture should come last, just before -hostprops-save.

So can you swap -logs-save and -iommu please ?

Thanks,
Ian.

Patch

diff --git a/sg-run-job b/sg-run-job
index 7c58d4ba..f6bfdfd5 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -679,6 +679,7 @@  proc examine-host-examine {install} {
     if {$ok} {
 	run-ts -.  =           ts-examine-serial-post + host
 	run-ts .   =           ts-examine-logs-save   + host
+	run-ts .   =           ts-examine-iommu       + host
 	run-ts .   =           ts-examine-hostprops-save
     }
 }
diff --git a/ts-examine-iommu b/ts-examine-iommu
new file mode 100755
index 00000000..099d4be5
--- /dev/null
+++ b/ts-examine-iommu
@@ -0,0 +1,32 @@ 
+#!/usr/bin/perl -w
+# This is part of "osstest", an automated testing framework for Xen.
+# Copyright (C) 2009-2020 Citrix Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+use strict qw(vars);
+BEGIN { unshift @INC, qw(.); }
+use Osstest;
+use Osstest::TestSupport;
+
+tsreadconfig();
+
+our ($whhost) = @ARGV;
+$whhost ||= 'host';
+our $ho= selecthost($whhost);
+our $info = target_cmd_output_root($ho, 'xl info', 10);
+our $has_iommu = $info =~ /directio/;
+
+logm("$ho->{Ident} iommu: $has_iommu");
+hostflag_putative_record($ho, "iommu", $has_iommu);