From patchwork Wed Feb 12 12:31:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 24541 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f72.google.com (mail-pb0-f72.google.com [209.85.160.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8BC4E20143 for ; Wed, 12 Feb 2014 12:33:39 +0000 (UTC) Received: by mail-pb0-f72.google.com with SMTP id up15sf19672486pbc.3 for ; Wed, 12 Feb 2014 04:33:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id :mime-version:cc:subject:precedence:list-id:list-unsubscribe :list-post:list-help:list-subscribe:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=EZV7RMn/7G+mddhNq8cHWU6nm7FHAciuWqmQDcvdZ+I=; b=Y+9ss6cxqGBZm+iY1bZb84Yo52NrhR+ymChhhXYECxKGgkDTYIhahXtyuzNjryfD2n DlxiMnRD6LewY/Zo589Urqw9VsuKNl6fk7x+LxQDkFz5sirQ2yWmuiK8g+hSZ3csjcWH qR/5PwQc+Dp06WZZbxTDjl9E+s18p2aYiI8tKnMJ7RMP0M80AtyziNAhYiPao3hhyjyM YPE7iC/q0f1ZEm4jVOE1wUxAwh0SKf8wsyQHtaSY+JW6XwLvRAvrRFhse/KTdDD/l2Ho Thx8Efrzg/QS6S7bQyBv1TD1yyDfxia8oAqylR27bfkHgWn+9spxMXoijF622wSGOnRl hWDw== X-Gm-Message-State: ALoCoQmu/9gyJsCstFrWx2EAaSrGtGvOsIjoxZ8P7jlRueHxoHnYhguXjcpzBvN83v1zd5TpXqIp X-Received: by 10.66.137.8 with SMTP id qe8mr605537pab.46.1392208417028; Wed, 12 Feb 2014 04:33:37 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.47.9 with SMTP id l9ls2915914qga.13.gmail; Wed, 12 Feb 2014 04:33:36 -0800 (PST) X-Received: by 10.52.107.35 with SMTP id gz3mr27509393vdb.8.1392208416860; Wed, 12 Feb 2014 04:33:36 -0800 (PST) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id tt2si7217187vdc.152.2014.02.12.04.33.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Feb 2014 04:33:36 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id c14so7347409vea.3 for ; Wed, 12 Feb 2014 04:33:36 -0800 (PST) X-Received: by 10.220.159.4 with SMTP id h4mr33280617vcx.1.1392208416738; Wed, 12 Feb 2014 04:33:36 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp32985vcz; Wed, 12 Feb 2014 04:33:36 -0800 (PST) X-Received: by 10.52.170.3 with SMTP id ai3mr839239vdc.35.1392208416076; Wed, 12 Feb 2014 04:33:36 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id f5si6721019vej.35.2014.02.12.04.33.35 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 12 Feb 2014 04:33:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDYyA-0004tR-Qm; Wed, 12 Feb 2014 12:31:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDYy9-0004tM-OI for xen-devel@lists.xen.org; Wed, 12 Feb 2014 12:31:14 +0000 Received: from [85.158.137.68:39074] by server-9.bemta-3.messagelabs.com id 9D/68-10184-1996BF25; Wed, 12 Feb 2014 12:31:13 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1392208270!1359363!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6983 invoked from network); 12 Feb 2014 12:31:12 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-15.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 12 Feb 2014 12:31:12 -0000 X-IronPort-AV: E=Sophos;i="4.95,832,1384300800"; d="scan'208";a="101891713" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 12 Feb 2014 12:31:10 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Wed, 12 Feb 2014 07:31:09 -0500 Received: from spare.cam.xci-test.com ([10.80.2.80] helo=kazak.uk.xensource.com.) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1WDYy5-0007EM-Ab; Wed, 12 Feb 2014 12:31:09 +0000 From: Ian Campbell To: Date: Wed, 12 Feb 2014 12:31:09 +0000 Message-ID: <1392208269-17122-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.8.5.2 MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST v2] Configure the Calxeda fabric on host boot X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: The fabric on the Calxeda midway boxes (marilith-* in osstest) does not learn mac address (at least not with the firmware we have, and with Calxeda folding this seems unlikely to get fixed). This means that guests do not get network connectivity unless their mac addresses explicitly registered with the fabric. Registrations can be done with the bridge(8) tool from the iproute2 package which unfortunately is only present in Jessie+ and not in Wheezy. So I have done my own backport and placed it in $images/wheezy-iproute2 and arranged for it to be installed along with the transitional iproute package (from the same source) which is needed to satisfy various dependencies. The registrations are ephemeral and need to be renewed on each reboot, so add the necessary commands to rc.local during ts-xen-install. This required leaking a certain amount of the implementation of select_ether. Unless we want to do the bodge on every ts-guest-start, reboot, migrate etc then this seems to be the best way. test-armhf-armhf-xl now gets past ts-guest-start and as far as the migration tests. Signed-off-by: Ian Campbell --- v2: hardcode 8 mac addresses and gate on equiv-marilith host flag simplify code to install iproute debs --- Osstest/CXFabric.pm | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++ Osstest/TestSupport.pm | 21 ++++++++----- ts-xen-install | 3 ++ 3 files changed, 101 insertions(+), 7 deletions(-) create mode 100644 Osstest/CXFabric.pm diff --git a/Osstest/CXFabric.pm b/Osstest/CXFabric.pm new file mode 100644 index 0000000..866aefe --- /dev/null +++ b/Osstest/CXFabric.pm @@ -0,0 +1,84 @@ +# This is part of "osstest", an automated testing framework for Xen. +# Copyright (C) 2014 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 . + +package Osstest::CXFabric; + +use strict; +use warnings; + +use Osstest; +use Osstest::TestSupport; + +BEGIN { + use Exporter (); + our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); + $VERSION = 1.00; + @ISA = qw(Exporter); + @EXPORT = qw( + setup_cxfabric + ); + %EXPORT_TAGS = ( ); + + @EXPORT_OK = qw(); +} + +sub setup_cxfabric($) +{ + my ($ho) = @_; + + # This is only needed on Calxeda boxes, which given that they have folded + # is unlikely to be anything other than exactly our marilith box. + return unless $ho->{Flags}{'equiv-marilith'}; + + my $nr = 8; + + my $prefix = ether_prefix($ho); + logm("Registering $nr MAC addresses with CX fabric using prefix $prefix"); + + if ( $ho->{Suite} =~ m/wheezy/ ) + { + # iproute2 is not in Wheezy nor wheezy-backports. Use our own backport. + my $images = "$c{Images}/wheezy-iproute2"; + my $ver = '3.12.0-1~xen70+1'; + my @debs = ("iproute_${ver}_all.deb", "iproute2_${ver}_armhf.deb"); + + target_putfile_root($ho, 10, "$images/$_", $_) foreach @debs; + target_cmd_root($ho, "dpkg -i @debs"); + } else { + target_install_packages($ho, qw(iproute2)); + } + + my $banner = '# osstest: register potential guest MACs with CX fabric'; + my $rclocal = "$banner\n"; + # Osstest::TestSupport::select_ether allocates sequentially from $prefix:00:01 + my $i = 0; + while ( $i++ < $nr ) { + $rclocal .= sprintf("bridge fdb add $prefix:%02x:%02x dev eth0\n", + $i >> 8, $i & 0xff); + } + + target_editfile_root($ho, '/etc/rc.local', sub { + my $had_banner = 0; + while (<::EI>) { + $had_banner = 1 if m/^$banner$/; + print ::EO $rclocal if m/^exit 0$/ && !$had_banner; + print ::EO; + } + }); + +} + +1; diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index a513540..98eb172 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -97,6 +97,8 @@ BEGIN { await_webspace_fetch_byleaf create_webfile file_link_contents get_timeout setup_pxeboot setup_pxeboot_local host_pxefile + + ether_prefix ); %EXPORT_TAGS = ( ); @@ -1245,6 +1247,17 @@ sub target_choose_vg ($$) { return $bestvg; } +sub ether_prefix($) { + my ($ho) = @_; + my $prefix = get_host_property($ho, 'gen-ether-prefix-base'); + $prefix =~ m/^(\w+:\w+):(\w+):(\w+)$/ or die "$prefix ?"; + my $lhs = $1; + my $pv = (hex($2)<<8) | (hex($3)); + $pv ^= $mjobdb->gen_ether_offset($ho,$flight); + $prefix = sprintf "%s:%02x:%02x", $lhs, ($pv>>8)&0xff, $pv&0xff; + return $prefix; +} + sub select_ether ($$) { my ($ho,$vn) = @_; # must be run outside transaction @@ -1252,13 +1265,7 @@ sub select_ether ($$) { return $ether if defined $ether; db_retry($flight,'running', $dbh_tests,[qw(flights)], sub { - my $prefix = get_host_property($ho, 'gen-ether-prefix-base'); - $prefix =~ m/^(\w+:\w+):(\w+):(\w+)$/ or die "$prefix ?"; - my $lhs = $1; - my $pv = (hex($2)<<8) | (hex($3)); - $pv ^= $mjobdb->gen_ether_offset($ho,$flight); - $prefix = sprintf "%s:%02x:%02x", $lhs, ($pv>>8)&0xff, $pv&0xff; - + my $prefix = ether_prefix($ho); my $glob_ether = $mjobdb->jobdb_db_glob('*_ether'); my $previous= $dbh_tests->selectrow_array(<