[OSSTEST,v3,1/2] examine: detect IOMMU availability and add it as a hostflag
diff mbox series

Message ID 20200311105216.3284-1-roger.pau@citrix.com
State New, archived
Headers show
Series
  • [OSSTEST,v3,1/2] examine: detect IOMMU availability and add it as a hostflag
Related show

Commit Message

Roger Pau Monne March 11, 2020, 10:52 a.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é <roger.pau@citrix.com>
---
Changes since v2:
 - Allow flags to be removed.
 - Fix set_flag addition to HostBD/Static.pm.
---
 Osstest/HostDB/Executive.pm | 34 ++++++++++++++++++++++++++++++++++
 Osstest/HostDB/Static.pm    | 12 ++++++++++++
 Osstest/TestSupport.pm      | 21 ++++++++++++++++++++-
 sg-run-job                  |  1 +
 ts-examine-hostprops-save   | 27 ++++++++++++++++++---------
 ts-examine-iommu            | 31 +++++++++++++++++++++++++++++++
 6 files changed, 116 insertions(+), 10 deletions(-)
 create mode 100755 ts-examine-iommu

Comments

Ian Jackson March 11, 2020, 12:54 p.m. UTC | #1
Roger Pau Monne writes ("[PATCH OSSTEST v3 1/2] 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.

I regret to have to say that you seem to have overlooked my emailed
review comments on v2.  Did you receive them ?
  Subject: Re: [PATCH OSSTEST v2 1/2] examine: detect IOMMU availability and add it as a hostflag
  Date: Tue, 10 Mar 2020 15:51:34 +0000
  Message-ID: <24167.46982.390819.472400@mariner.uk.xensource.com>

Please could you find that mail and address my comments.

(As you do that, please make sure that you combine set_flag and
remove_flag into one function which takes a boolean parameter.  I
already asked for the boolean parameter in v2.)

(There was also a reply to v2 2/2.  I haven't looked at v3 2/2 to see
if you addressed those comments.)

Sorry,
Ian.

Patch
diff mbox series

diff --git a/Osstest/HostDB/Executive.pm b/Osstest/HostDB/Executive.pm
index 7ffca6c4..e7dd2a21 100644
--- a/Osstest/HostDB/Executive.pm
+++ b/Osstest/HostDB/Executive.pm
@@ -90,6 +90,40 @@  END
     return $flags;
 }
 
+sub set_flag($$$) {
+    my ($hd, $ho, $flag) = @_;
+    my $rmq = $dbh_tests->prepare(<<END);
+        DELETE FROM hostflags WHERE hostname=? AND hostflag=?
+END
+    my $addq = $dbh_tests->prepare(<<END);
+        INSERT INTO hostflags (hostname,hostflag) VALUES (?,?)
+END
+    my $blessing = intended_blessing();
+
+    die "Attempting to modify host flags with intended blessing $blessing != real"
+        if $blessing ne "real";
+
+    db_retry($dbh_tests, [qw(resources)], sub {
+        $rmq->execute($ho->{Name}, $flag);
+        $addq->execute($ho->{Name}, $flag);
+    });
+}
+
+sub remove_flag($$$) {
+    my ($hd, $ho, $flag) = @_;
+    my $rmq = $dbh_tests->prepare(<<END);
+        DELETE FROM hostflags WHERE hostname=? AND hostflag=?
+END
+    my $blessing = intended_blessing();
+
+    die "Attempting to modify host flags with intended blessing $blessing != real"
+        if $blessing ne "real";
+
+    db_retry($dbh_tests, [qw(resources)], sub {
+        $rmq->execute($ho->{Name}, $flag);
+    });
+}
+
 sub get_arch_platforms ($$$) {
     my ($hd, $blessing, $arch, $suite) = @_;
 
diff --git a/Osstest/HostDB/Static.pm b/Osstest/HostDB/Static.pm
index 0c6be3ee..d19795b0 100644
--- a/Osstest/HostDB/Static.pm
+++ b/Osstest/HostDB/Static.pm
@@ -72,6 +72,18 @@  sub get_flags ($$) { #method
     return $flags;
 }
 
+sub set_flag($$$) {
+    my ($hd, $ho, $flag) = @_;
+
+    die "Cannot set flags in standalone mode for $ho->{Name} $flag\n";
+}
+
+sub remove_flag($$$) {
+    my ($hd, $ho, $flag) = @_;
+
+    die "Cannot remove flags in standalone mode for $ho->{Name} $flag\n";
+}
+
 sub get_arch_platforms ($$$) {
     my ($hd, $blessing, $arch, $suite) = @_;
 
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index f49ed529..8e69e116 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -85,8 +85,9 @@  BEGIN {
                       hostnamepath hostnamepath_list set_runtime_hostflag
                       power_state power_cycle power_reboot_attempts
                       serial_fetch_logs set_host_property
+                      set_host_flag remove_host_flag
                       propname_massage propname_check
-                      hostprop_putative_record
+                      hostprop_putative_record hostflag_putative_record
          
                       get_stashed open_unique_stashfile compress_stashed
                       dir_identify_vcs
@@ -1411,6 +1412,24 @@  sub hostprop_putative_record ($$$) {
     store_runvar("hostprop/$ho->{Ident}/$prop", $val);
 }
 
+sub set_host_flag ($$) {
+    my ($ho,$flag) = @_;
+
+    $mhostdb->set_flag($ho, $flag);
+}
+
+sub remove_host_flag ($$) {
+    my ($ho,$flag) = @_;
+
+    $mhostdb->remove_flag($ho, $flag);
+}
+
+sub hostflag_putative_record ($$$) {
+    my ($ho, $prop, $set) = @_;
+
+    store_runvar("hostflag/$ho->{Ident}/$prop", !!$set);
+}
+
 sub get_target_property ($$;$);
 sub get_target_property ($$;$) {
     my ($ho, $prop, $defval) = @_;
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-hostprops-save b/ts-examine-hostprops-save
index 55d23392..1cb17c09 100755
--- a/ts-examine-hostprops-save
+++ b/ts-examine-hostprops-save
@@ -27,20 +27,29 @@  tsreadconfig();
 
 our $blessing = intended_blessing();
 
-logm("setting host properties");
+logm("setting host properties and flags");
 
 # NB: in order to aid debug only attempt to save the host props on flights
 # with intended real blessing, for the rest just do a dry run.
 our $dry_run = $blessing ne "real";
-logm("not saving host props with intended blessing $blessing != real")
+logm("not saving host props/flags with intended blessing $blessing != real")
     if $dry_run;
 
 foreach my $k (sort keys %r) {
-    next unless $k =~ m/^hostprop\/([^\/]*)\/([^\/]*)$/;
-    my $ho = selecthost($1);
-    my $prop = $2;
-
-    logm("recording for $ho->{Name} $prop=$r{$k}");
-
-    set_host_property($ho, $prop, $r{$k}) if !$dry_run;
+    next unless $k =~ m/^host(prop|flag)\/([^\/]*)\/([^\/]*)$/;
+    my $type = $1;
+    my $ho = selecthost($2);
+    my $prop = $3;
+
+    if ($type == "flag") {
+        logm("recording flag $prop for $ho->{Name}");
+        if ($r{$k} && !$dry_run) {
+            set_host_flag($ho, $prop);
+        } elsif (!$dry_run) {
+            remove_host_flag($ho, $prop);
+        }
+    } else {
+        logm("recording prop for $ho->{Name} $prop=$r{$k}");
+        set_host_property($ho, $prop, $r{$k}) if !$dry_run;
+    }
 }
diff --git a/ts-examine-iommu b/ts-examine-iommu
new file mode 100755
index 00000000..39f2ca0a
--- /dev/null
+++ b/ts-examine-iommu
@@ -0,0 +1,31 @@ 
+#!/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 $has_iommu = !target_cmd_root_status($ho, 'xl info|grep directio', 10);
+logm("$ho->{Ident} iommu: $has_iommu");
+hostflag_putative_record($ho, "iommu", $has_iommu);