From patchwork Wed Mar 11 16:00:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Roger Pau Monne X-Patchwork-Id: 11432053 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 265B914B4 for ; Wed, 11 Mar 2020 16:02:40 +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 F37AE206E7 for ; Wed, 11 Mar 2020 16:02:39 +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="Lk0inVvc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F37AE206E7 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 1jC3nN-0003tQ-Fs; Wed, 11 Mar 2020 16:01:21 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jC3nM-0003tK-OL for xen-devel@lists.xenproject.org; Wed, 11 Mar 2020 16:01:20 +0000 X-Inumbo-ID: 898dff7e-63b1-11ea-b005-12813bfff9fa Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 898dff7e-63b1-11ea-b005-12813bfff9fa; Wed, 11 Mar 2020 16:01:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1583942477; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=fddvphNVK3C3yyVk96RtN0eGx1+Dvq4tckd/Zs2tqL0=; b=Lk0inVvchUrCfMAABS9CU4qOqdzJOWzULB44Y9e/ibx09+e907rvGk4+ lISW6BNLcd1x0YiGqSejNLfArsIwj2g9nQGmN94a9AQf24IZriYUq9YqV sV6tb1Zs+e8EAhuSpzJjPKEjP/218SB7lXd5cg8G5lfc8QUAWEeIhTgjv c=; Authentication-Results: esa3.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 (esa3.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=esa3.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa3.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=esa3.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 (esa3.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=esa3.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: MeoXjyiJpX9QkyeEmcPwKDpczg+c/GPzvkMOIwJwTKr9pHOwHKOOmYt1K+IK5RUoeJ9bk+dmr/ +ltO7uoRCg/8ZT9crxrAwEsCFqT/RKYeo7oWwdz2uZTrShFKwDv0hohhD8tPCqe/q+JnXxoHAP uKAP82lzexAHvFpKiKm7csxYmoPz85QG87UZiohGvdeo7B0pCVIqw/0mliruLqE8JwWzc3tUKw MxTf+d8dn4i3v2/2kY4L1C257vz8cZjfXhrCPnb8o3bsfTqV5hB9QT8CuAWxW1H0kfy/vg55n2 ldM= X-SBRS: 2.7 X-MesageID: 13761928 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,541,1574139600"; d="scan'208";a="13761928" From: Roger Pau Monne To: Date: Wed, 11 Mar 2020 17:00:18 +0100 Message-ID: <20200311160021.6075-1-roger.pau@citrix.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH OSSTEST v4 1/3] host: introduce helpers to modify hostflags 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" Add a generic function to perform database changes related to a host and use it to implement set_property and and {set/remove}_flag. Signed-off-by: Roger Pau Monné --- Changes since v3: - Introduce modify_flag instead of {set/remove}_flag. - Introduce a generic modify_host helper. - Split from patch 1. --- Osstest/HostDB/Executive.pm | 33 ++++++++++++++++++++++++++++----- Osstest/HostDB/Static.pm | 7 +++++++ Osstest/TestSupport.pm | 21 ++++++++++++++++++++- 3 files changed, 55 insertions(+), 6 deletions(-) diff --git a/Osstest/HostDB/Executive.pm b/Osstest/HostDB/Executive.pm index 7ffca6c4..a6dc4462 100644 --- a/Osstest/HostDB/Executive.pm +++ b/Osstest/HostDB/Executive.pm @@ -51,6 +51,16 @@ END } } +sub modify_host ($$$) { + my ($hd, $ho, $query) = @_; + my $blessing = intended_blessing(); + + die "Attempting to modify host with intended blessing $blessing != real" + if $blessing ne "real"; + + db_retry($dbh_tests, [qw(resources)], $query); +} + sub set_property($$$$) { my ($hd, $ho, $prop, $val) = @_; my $rmq = $dbh_tests->prepare(<execute($ho->{Name}, $prop); if (length $val) { $addq->execute($ho->{Name}, $prop, $val); @@ -90,6 +96,23 @@ END return $flags; } +sub modify_flag ($$$$) { + my ($hd, $ho, $flag, $set) = @_; + my $rmq = $dbh_tests->prepare(<prepare(<execute($ho->{Name}, $flag); + if ($set) { + $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..d0669fb2 100644 --- a/Osstest/HostDB/Static.pm +++ b/Osstest/HostDB/Static.pm @@ -72,6 +72,13 @@ sub get_flags ($$) { #method return $flags; } +sub modify_flag ($$$$) { + my ($hd, $ho, $flag, $set) = @_; + + die + "Cannot modify flags in standalone mode for $ho->{Name} $flag set: $set\n"; +} + sub get_arch_platforms ($$$) { my ($hd, $blessing, $arch, $suite) = @_; diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index f49ed529..b80e89bc 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->modify_flag($ho, $flag, 1); +} + +sub remove_host_flag ($$) { + my ($ho,$flag) = @_; + + $mhostdb->modify_flag($ho, $flag, 0); +} + +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) = @_; From patchwork Wed Mar 11 16:00:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Roger Pau Monne X-Patchwork-Id: 11432049 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 4D42B14B4 for ; Wed, 11 Mar 2020 16:02:01 +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 25DE6206E7 for ; Wed, 11 Mar 2020 16:02:01 +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="gKetLIh4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 25DE6206E7 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 1jC3mo-0003pW-0G; Wed, 11 Mar 2020 16:00:46 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jC3mm-0003pR-RA for xen-devel@lists.xenproject.org; Wed, 11 Mar 2020 16:00:44 +0000 X-Inumbo-ID: 76249cea-63b1-11ea-b005-12813bfff9fa Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 76249cea-63b1-11ea-b005-12813bfff9fa; Wed, 11 Mar 2020 16:00:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1583942444; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VFjqLQm3BVmn2BsTB654WcAz4JV06XDC6+ckYZTxvZk=; b=gKetLIh4tBSsZTcABUHznBHa4R3h+Cko/4UC+9OV+aZMcP+YMMBb6wha 5PdDVKr1AQmdZR98SzAmMR2JejtfeLtwnOww1vNid9etiLUtT9Fl6iFzb BPyEXjINeCgxp5Utud9Ux6Rxs1lk/QSv6HYfsnpq4EKPckBVX3k0lMxYU I=; Authentication-Results: esa2.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 (esa2.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=esa2.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa2.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=esa2.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 (esa2.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=esa2.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: ZdSMAlfHxww/AkDXLUR/vLgMsJFt9J0sOxPF6jN0iQwYe/VPiNoShu5KX8UTZH7UoWsH6IgZhT Loc+b5HjA0f5hD46dTYpM6gOk/jgtDXOtNYjjU51xRmbhP0a/1MkEQngUWEw1arB3H8crbjMyM d55W3eKqEaWp8sIRwhNSU+eT2YwgBgqd6JD5TrAmtzJW5qlmtBGBWnou/BHQhQyA2j94n3uHT1 ujDcqq3E2PESFUqfdn/wXEo5aj9/N1QUltWsVj+6XjNfyRJMjWQi/JJjDWoiatGmOndPELkM9N akA= X-SBRS: 2.7 X-MesageID: 13786955 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,541,1574139600"; d="scan'208";a="13786955" From: Roger Pau Monne To: Date: Wed, 11 Mar 2020 17:00:19 +0100 Message-ID: <20200311160021.6075-2-roger.pau@citrix.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200311160021.6075-1-roger.pau@citrix.com> References: <20200311160021.6075-1-roger.pau@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH OSSTEST v4 2/3] 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é --- 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-hostprops-save | 28 +++++++++++++++++++--------- ts-examine-iommu | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 9 deletions(-) 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 } } diff --git a/ts-examine-hostprops-save b/ts-examine-hostprops-save index 55d23392..b1c8de6d 100755 --- a/ts-examine-hostprops-save +++ b/ts-examine-hostprops-save @@ -27,20 +27,30 @@ 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 eq "flag") { + if ($r{$k} && !$dry_run) { + logm("recording flag $prop for $ho->{Name}"); + set_host_flag($ho, $prop); + } elsif (!$dry_run) { + logm("removing flag $prop for $ho->{Name}"); + 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..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 . + +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); From patchwork Wed Mar 11 16:00:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Roger Pau Monne X-Patchwork-Id: 11432051 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 04F3D1392 for ; Wed, 11 Mar 2020 16:02:34 +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 D1CA5206E9 for ; Wed, 11 Mar 2020 16:02:33 +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="Hg1Lml/v" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D1CA5206E9 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 1jC3nS-0003un-PB; Wed, 11 Mar 2020 16:01:26 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jC3nR-0003uY-OS for xen-devel@lists.xenproject.org; Wed, 11 Mar 2020 16:01:25 +0000 X-Inumbo-ID: 898dff7f-63b1-11ea-b005-12813bfff9fa Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 898dff7f-63b1-11ea-b005-12813bfff9fa; Wed, 11 Mar 2020 16:01:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1583942477; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gXj3Sg58k1dbq4RYpSwPSqB6XQpy8HDs2UZyvePsqoI=; b=Hg1Lml/vMWKSciUHj3KCdRJJpja/67Be8TGg6J30twudluOqLO6mhJel Bq0D/JoBURc5NdxQ+W49di9NsnfSq8R6wCDACzPJbnpNENtbH94bK858z MW5MjYK/GskS6ehxVdhkb87zuY7gktYH43/GsNfuCxMZNBKPt3ZEv1g12 c=; Authentication-Results: esa3.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 (esa3.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=esa3.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa3.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=esa3.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 (esa3.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=esa3.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: fbxbYaBJAlRzSISA2K/E6fEFhJDWeiU8HGCMVkIBSz8nkhjhjbKolEHyfVnpYywr98KshL9hTk 7J/Nk3uwit4PfIAOFnF7pQXhN20f/BtGX1L/WxO5eaEkP9o45+rM1PDDtaoxi4ydXe3x8b69Z2 3iiS4HmoSEnHS4pGqKLMypJtgSul8+Bwcr4NMPXwzEGS+10eOMjA9oQqVXzm1sT1w9VvitHf+U kewvpjAnX9lOeegqHps4IsiC4H2k5fzUUxKdrj31bRpKuixl0bzdncyuGzoCpU3yYbrqaPcSWO 0vc= X-SBRS: 2.7 X-MesageID: 13761931 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,541,1574139600"; d="scan'208";a="13761931" From: Roger Pau Monne To: Date: Wed, 11 Mar 2020 17:00:20 +0100 Message-ID: <20200311160021.6075-3-roger.pau@citrix.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200311160021.6075-1-roger.pau@citrix.com> References: <20200311160021.6075-1-roger.pau@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH OSSTEST v4 3/3] make-flight: add dom0 PVH test 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" Add a dom0 PVH test, the test to be run is launching a PV guest (test-debian). Note the PVH dom0 tests are only enabled for Xen >= 4.13. The runvar difference is: +test-amd64-amd64-dom0pvh-xl-amd all_host_di_version 2020-02-10 +test-amd64-amd64-dom0pvh-xl-intel all_host_di_version 2020-02-10 +test-amd64-amd64-dom0pvh-xl-amd all_host_suite stretch +test-amd64-amd64-dom0pvh-xl-intel all_host_suite stretch +test-amd64-amd64-dom0pvh-xl-amd all_hostflags arch-amd64,arch-xen-amd64,suite-stretch,purpose-test,hvm-amd,iommu +test-amd64-amd64-dom0pvh-xl-intel all_hostflags arch-amd64,arch-xen-amd64,suite-stretch,purpose-test,hvm-intel,iommu +test-amd64-amd64-dom0pvh-xl-amd arch amd64 +test-amd64-amd64-dom0pvh-xl-intel arch amd64 +test-amd64-amd64-dom0pvh-xl-amd buildjob build-amd64 +test-amd64-amd64-dom0pvh-xl-intel buildjob build-amd64 +test-amd64-amd64-dom0pvh-xl-amd debian_arch amd64 +test-amd64-amd64-dom0pvh-xl-intel debian_arch amd64 +test-amd64-amd64-dom0pvh-xl-amd debian_kernkind pvops +test-amd64-amd64-dom0pvh-xl-intel debian_kernkind pvops +test-amd64-amd64-dom0pvh-xl-amd debian_suite stretch +test-amd64-amd64-dom0pvh-xl-intel debian_suite stretch +test-amd64-amd64-dom0pvh-xl-amd kernbuildjob build-amd64-pvops +test-amd64-amd64-dom0pvh-xl-intel kernbuildjob build-amd64-pvops +test-amd64-amd64-dom0pvh-xl-amd kernkind pvops +test-amd64-amd64-dom0pvh-xl-intel kernkind pvops +test-amd64-amd64-dom0pvh-xl-amd toolstack xl +test-amd64-amd64-dom0pvh-xl-intel toolstack xl +test-amd64-amd64-dom0pvh-xl-amd xen_boot_append dom0=pvh,verbose +test-amd64-amd64-dom0pvh-xl-intel xen_boot_append dom0=pvh,verbose Signed-off-by: Roger Pau Monné Reviewed-by: Ian Jackson --- Changes since v1: - Request hosts with iommu flag. --- make-flight | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/make-flight b/make-flight index b08431dc..48f164cc 100755 --- a/make-flight +++ b/make-flight @@ -753,6 +753,16 @@ test_matrix_do_one () { *) test_shim=y ;; esac + # PVH dom0 tests for versions >= 4.13 only + case "$xenbranch" in + xen-3.*-testing) test_dom0pvh=n ;; + xen-4.?-testing) test_dom0pvh=n ;; + xen-4.10-testing) test_dom0pvh=n ;; + xen-4.11-testing) test_dom0pvh=n ;; + xen-4.12-testing) test_dom0pvh=n ;; + *) test_dom0pvh=y ;; + esac + # xend PV guest test on x86 only if [ x$test_xend = xy -a \( $dom0arch = "i386" -o $dom0arch = "amd64" \) ]; then job_create_test test-$xenarch$kern-$dom0arch-pv test-debian xend \ @@ -861,6 +871,20 @@ test_matrix_do_one () { fi + if [ x$test_dom0pvh = xy -a $xenarch = amd64 -a $dom0arch = amd64 ]; then + + for cpuvendor in amd intel; do + + job_create_test test-$xenarch$kern-$dom0arch-dom0pvh-xl-$cpuvendor \ + test-debian xl $xenarch $dom0arch $debian_runvars \ + all_hostflags=$most_hostflags,hvm-$cpuvendor,iommu \ + xen_boot_append='dom0=pvh,verbose' + + done + + fi + + if [ x$test_shim = xy -a $xenarch = amd64 ]; then job_create_test test-$xenarch$kern-$dom0arch-xl-pvshim \