From patchwork Tue Mar 10 13:46:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 11429495 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3F758139A for ; Tue, 10 Mar 2020 13:48:38 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 1A6EB20637 for ; Tue, 10 Mar 2020 13:48:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="IxCZDAbi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1A6EB20637 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jBfEO-0005HB-GC; Tue, 10 Mar 2020 13:47:36 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jBfEN-0005H3-7Y for xen-devel@lists.xenproject.org; Tue, 10 Mar 2020 13:47:35 +0000 X-Inumbo-ID: af9708e6-62d5-11ea-b34e-bc764e2007e4 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id af9708e6-62d5-11ea-b34e-bc764e2007e4; Tue, 10 Mar 2020 13:47:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1583848050; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=FCaxH2PTLoNdrNL7wXe7EP6cgpn9mkVcaeWr7nWVUaU=; b=IxCZDAbiuRMgVkpt4PWEZJplEa2Hf6YPwSvdgAXmDVk+TyNPtj9tkJY1 B4TO+f9rAUiVQ90WbD7unvwbX6fWEQ9hxId/X0BUfHMF1oktnR/4in0Mb AFeY5SczJmBCuAnO4fm2yee/9d21o058LTM3Au/BQD6FEm/OwNWTMC4vC k=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=roger.pau@citrix.com; spf=Pass smtp.mailfrom=roger.pau@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa4.hc3370-68.iphmx.com: no sender authenticity information available from domain of roger.pau@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa4.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa4.hc3370-68.iphmx.com: domain of roger.pau@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa4.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa4.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa4.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: sINX0O3fZoxjVYHnMVIK+b3/DPZpDc4VW6CJdk+mZLdDKCw/OsIlShMf7Iefs8+andNsNZSdoT UizHaYc19Zd+22piZOHVYhQs+ZO3Ha0S70qHEPnA7Shs3Tc2g6U84IGGHeXoYHW6bSAXogjObA Fk5fh8YrO5I5YmP3lXwJQaxm6ybU/fUzh8cTyCBDzsiS5fuIO0WdAru9W4LeEcXpwQcq8VJssR 0VNGfafFyX74wXVu7036CjHk6xDY59UsjOzwElv8XuDA7nt5dlYqRxnq/ETB2JTCla403kGvmb 3Y0= X-SBRS: 2.7 X-MesageID: 14323079 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,537,1574139600"; d="scan'208";a="14323079" From: Roger Pau Monne To: Date: Tue, 10 Mar 2020 14:46:34 +0100 Message-ID: <20200310134635.99810-1-roger.pau@citrix.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH OSSTEST v2 1/2] examine: detect IOMMU availability and add it as a hostflag X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: ian.jackson@eu.citrix.com, Roger Pau Monne Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Introduce a new test to check for iommu availability and add it as a hostflag if found. Signed-off-by: Roger Pau Monné --- Osstest/HostDB/Executive.pm | 19 +++++++++++++++++++ Osstest/HostDB/Static.pm | 6 ++++++ Osstest/TestSupport.pm | 16 ++++++++++++++-- sg-run-job | 1 + ts-examine-hostprops-save | 23 ++++++++++++++--------- ts-examine-iommu | 31 +++++++++++++++++++++++++++++++ 6 files changed, 85 insertions(+), 11 deletions(-) create mode 100755 ts-examine-iommu diff --git a/Osstest/HostDB/Executive.pm b/Osstest/HostDB/Executive.pm index 7ffca6c4..8bedbdff 100644 --- a/Osstest/HostDB/Executive.pm +++ b/Osstest/HostDB/Executive.pm @@ -90,6 +90,25 @@ END return $flags; } +sub set_flag($$$) { + my ($hd, $ho, $flag) = @_; + my $rmq = $dbh_tests->prepare(<prepare(<execute($ho->{Name}, $flag); + $addq->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..8ac39cf5 100644 --- a/Osstest/HostDB/Static.pm +++ b/Osstest/HostDB/Static.pm @@ -72,6 +72,12 @@ sub get_flags ($$) { #method return $flags; } +sub set_property($$$) { + my ($hd, $ho, $flag) = @_; + + die "Cannot set 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..0291dbd8 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -84,9 +84,9 @@ BEGIN { get_target_property get_host_native_linux_console hostnamepath hostnamepath_list set_runtime_hostflag power_state power_cycle power_reboot_attempts - serial_fetch_logs set_host_property + serial_fetch_logs set_host_property set_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 +1411,18 @@ sub hostprop_putative_record ($$$) { store_runvar("hostprop/$ho->{Ident}/$prop", $val); } +sub set_host_flag ($$) { + my ($ho,$flag) = @_; + + $mhostdb->set_flag($ho, $flag); +} + +sub hostflag_putative_record ($$) { + my ($ho, $prop) = @_; + + store_runvar("hostflag/$ho->{Ident}/$prop", ""); +} + 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..502c2db2 100755 --- a/ts-examine-hostprops-save +++ b/ts-examine-hostprops-save @@ -27,20 +27,25 @@ 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}"); + set_host_flag($ho, $prop) if !$dry_run; + } 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..ae91d4d2 --- /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 . + +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") if $has_iommu;