* [OSSTEST PATCH 27/62] ts-host-install: Break out $persistent_net_rules
From: Ian Jackson @ 2019-04-10 14:23 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson
In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com>
We're going to want to reuse this value.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
ts-host-install | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/ts-host-install b/ts-host-install
index 8ea81e24..f80a151c 100755
--- a/ts-host-install
+++ b/ts-host-install
@@ -195,6 +195,9 @@ sub setup_netboot_firstboot($) {
system_checked @cmd;
}
+ my $persistent_net_rules =
+ "$initrd_overlay.d/etc/udev/rules.d/70-persistent-net.rules";
+
my $ipappend = 2;
my $wantphysif= get_host_property($ho,'interface force','auto');
logm("Forcing interface $wantphysif");
@@ -206,7 +209,7 @@ sub setup_netboot_firstboot($) {
# ip(8) moved to /sbin in Jessie
my $ipcmd = $ho->{Suite} =~ m/wheezy/ ? "/bin/ip" : "/sbin/ip";
file_simple_write_contents
- ("$initrd_overlay.d/etc/udev/rules.d/70-persistent-net.rules",
+ ($persistent_net_rules,
$ho->{Flags}{'force-mac-address'} ? <<END : <<END);
SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", KERNEL=="$wantphysif", RUN += "$ipcmd link set $wantphysif address $ho->{Ether}"
END
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [OSSTEST PATCH 26/62] persistent-net: Add overlay in installer >= stretch
From: Ian Jackson @ 2019-04-10 14:23 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson
In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com>
We are going to need this in the installer so that the interface names
from the installer environment are captured so that they can be the
same on the host.
This prepares the ground for turning off net.ifnames. The actual
rules are gated on net.ifnames so right now there is no change.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
ts-host-install | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/ts-host-install b/ts-host-install
index 9ab3de62..8ea81e24 100755
--- a/ts-host-install
+++ b/ts-host-install
@@ -188,6 +188,13 @@ sub setup_netboot_firstboot($) {
system qw(rm -rf --),"$initrd_overlay.d";
mkdir "$initrd_overlay.d" or die "$initrd_overlay.d: $!";
+ if ($ho->{Suite} !~ m/wheezy|jessie/) {
+ my @cmd = (qw(cp -dR overlay-persistent-net/.),
+ "$initrd_overlay.d/.");
+ logm("using persistent-net-generator: @cmd");
+ system_checked @cmd;
+ }
+
my $ipappend = 2;
my $wantphysif= get_host_property($ho,'interface force','auto');
logm("Forcing interface $wantphysif");
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [OSSTEST PATCH 25/62] persistent-net: Add overlay on installed systems >= stretch
From: Ian Jackson @ 2019-04-10 14:23 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson
In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com>
This prepares the ground for turning off net.ifnames. The actual
rules are gated on net.ifnames so right now there is no change.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
Osstest/Debian.pm | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 414cd897..e246c012 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -798,6 +798,13 @@ sub debian_overlays ($$) {
};
my $suite = $ho->{Suite};
$maybe->('overlay');
+
+ # In stretch and later, net.ifnames=1, the fdo-style `predictable
+ # network device names', is the default; but it is anything but
+ # predictable, so we disable it. Instead, we restore the
+ # 75-persistent-net-generator mechanism from jessie and earlier.
+ $maybe->("overlay-persistent-net") if $ho->{Suite} !~ m/wheezy|jessie/;
+
$maybe->("overlay-$suite");
$maybe->($c{OverlayLocal}, 'overlay-local.tar');
$maybe->("$c{OverlayLocal}-$suite", 'overlay-local-$suite.tar');
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [OSSTEST PATCH 23/62] contents_make_cpio: Make files owned by root
From: Ian Jackson @ 2019-04-10 14:23 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson
In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com>
This function is called to generate overlays for use, mainly, by the
initramfs.
We are going to use it to ship udev rules. Annoyingly, udev hates
files which aren't owned by root - it simply ignores them.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
Osstest/TestSupport.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 1f01ac6a..41f6f5f8 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1521,7 +1521,7 @@ sub contents_make_cpio ($$$) {
open STDIN, 'find ! -name "*~" ! -name "#*" -type f,l -print0 |'
or die $!;
open STDOUT, '>&', $fh or die $!;
- system "cpio -H$format -o --quiet -0 -R 1000:1000";
+ system "cpio -H$format -o --quiet -0 -R 0:0";
$? and die $?;
$!=0; close STDIN; die "$! $?" if $! or $?;
exit 0;
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [OSSTEST PATCH 02/62] power: Fix uninitialised variable warning
From: Ian Jackson @ 2019-04-10 14:23 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson
In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com>
In
power: Record approach used for power cycles in runvars
we introduced a reference to $r{$rv} which might be undef,
resulting in this:
Use of uninitialized value in concatenation (.) or string at Osstest/TestSupport.pm line 1069.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
Osstest/TestSupport.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 334cc2cb..d35a784b 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1023,7 +1023,7 @@ sub power_reboot_attempts ($$$;$$) {
logm("power: rebooted $ho->{Name} (using $approach->{Name})");
if (defined $record_runvar_tail) {
my $rv = "$ho->{Ident}_power_${record_runvar_tail}";
- my $newval = $r{$rv}.(!!length($r{$rv}) and ',')
+ my $newval = ($r{$rv} // '').(!!length($r{$rv}) and ',')
.$approach->{Name};
store_runvar($rv, $newval);
}
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [OSSTEST PATCH 20/62] ts-guests-nbd-mirror: use target_{get, put}file_root to transfter cfg
From: Ian Jackson @ 2019-04-10 14:23 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu
In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com>
From: Wei Liu <wei.liu2@citrix.com>
The original code used target_cmd_output_root which caused a trailing
new line to be deleted, which caused libvirt converter to fail.
It wasn't discovered until now because we appended too many "\n".
Use target_{get,put}file_root to do the job.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
ts-guests-nbd-mirror | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/ts-guests-nbd-mirror b/ts-guests-nbd-mirror
index 7ea31f7c..06903aaa 100755
--- a/ts-guests-nbd-mirror
+++ b/ts-guests-nbd-mirror
@@ -154,8 +154,11 @@ sub shuffleconfigs () {
my $gn= $gns[$i];
my $gho= $ghos[$i];
my $cfgpath= $r{ "$gho->{Guest}_cfgpath" };
- my $cfgdata= target_cmd_output_root($sho,"cat $cfgpath");
- target_putfilecontents_root_stash($cho,10,$cfgdata,$cfgpath);
+ my $file= $cfgpath;
+ $file=~ s,/,-,g;
+ $file= "$stash/".hostnamepath($cho)."--$file";
+ target_getfile_root($sho, 60, $cfgpath, $file);
+ target_putfile_root($cho, 60, $file, $cfgpath);
}
}
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [OSSTEST PATCH 17/62] stretch: Use chainloading when booting using GRUB on Arm64
From: Ian Jackson @ 2019-04-10 14:23 UTC (permalink / raw)
To: xen-devel; +Cc: Julien Grall, Wei Liu
In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com>
From: Julien Grall <julien.grall@arm.com>
The GRUB package in stretch is not able to boot Xen on Arm64.
Use chainloading as we did for jessie for the time being.
Note that a bug has been filled on Debian to integrate Xen
pactches for the next release (see [1]).
[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884770
Signed-off-by: Julien Grall <julien.grall@arm.com>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v4: Correct suite name capitalisation in commit message and comment.
---
Osstest/Debian.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 85b1890d..80b4cf37 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -435,10 +435,10 @@ sub setupboot_grub2 ($$$$) {
my $rmenu= '/boot/grub/grub.cfg';
my $kernkey= (defined $xenhopt ? 'KernDom0' : 'KernOnly');
- # Grub2 on Jessie/arm* doesn't do multiboot, so we must chainload.
+ # Grub2 on jessie/stretch ARM* doesn't do multiboot, so we must chainload.
my $need_uefi_chainload =
get_host_property($ho, "firmware", "") eq "uefi" &&
- $ho->{Suite} =~ m/jessie/ && $r{arch} =~ m/^arm/;
+ $ho->{Suite} =~ m/jessie|stretch/ && $r{arch} =~ m/^arm/;
my $parsemenu= sub {
my $f= bl_getmenu_open($ho, $rmenu, "$stash/$ho->{Name}--grub.cfg.1");
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [OSSTEST PATCH 13/62] Extend workaround `clk_ignore_unused' to stretch
From: Ian Jackson @ 2019-04-10 14:23 UTC (permalink / raw)
To: xen-devel; +Cc: Stefano Stabellini, Wei Liu, Julien Grall
In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com>
From: Wei Liu <wei.liu2@citrix.com>
This is https://bugs.xenproject.org/xen/bug/45
Without that parameter we lose uart output.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Julien Grall <julien.grall@linaro.org>
---
Osstest/Debian.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 82b5fb40..91bffdff 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -241,7 +241,7 @@ END
push @xenkopt, $xenkopt;
# http://bugs.xenproject.org/xen/bug/45
push @xenkopt, "clk_ignore_unused"
- if $ho->{Suite} =~ m/wheezy|jessie/;
+ if $ho->{Suite} =~ m/wheezy|jessie|stretch/;
$xenkopt = join ' ', @xenkopt;
logm("Dom0 Linux options: $xenkopt");
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [OSSTEST PATCH 15/62] ts-debian-di-install: use gho to pick d-i
From: Ian Jackson @ 2019-04-10 14:23 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu
In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com>
From: Wei Liu <wei.liu2@citrix.com>
The original code used ho which gave us the host suite, but we wanted
the guest suite.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
ts-debian-di-install | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ts-debian-di-install b/ts-debian-di-install
index 60079712..361a1710 100755
--- a/ts-debian-di-install
+++ b/ts-debian-di-install
@@ -152,8 +152,8 @@ sub setup_netboot($$$)
die if $r{ "$gho->{Guest}_netboot_kernel" }
|| $r{ "$gho->{Guest}_netboot_ramdisk" };
- my $di_path = $c{TftpPath}.'/'.$ho->{Tftp}{DiBase}.'/'.${arch}.'/'.
- debian_guest_di_version($ho).'-'.$ho->{Suite};
+ my $di_path = $c{TftpPath}.'/'.$gho->{Tftp}{DiBase}.'/'.${arch}.'/'.
+ debian_guest_di_version($gho).'-'.$gho->{Suite};
if (${arch} =~ m/amd64|i386/) {
$kernel = "$di_path/vmlinuz-xen";
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [OSSTEST PATCH 16/62] make-flight: guest should use jessie to test pvgrub
From: Ian Jackson @ 2019-04-10 14:23 UTC (permalink / raw)
To: xen-devel; +Cc: Juergen Gross, Wei Liu
In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com>
From: Wei Liu <wei.liu2@citrix.com>
stretch has 64bit feature enabled for ext4, which pvgrub can't cope.
We want to continue to test pvgrub, so specify jessie in the guest
suite field.
A consequence is that this test will test jessie forever. Eventually
jessie will rot so badly that this test fails and then we will no
longer be testing pvgrub1. Hopefully by then no-one will be using it.
CC: Juergen Gross <jgross@suse.com>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v4: Adjust commit message slightly.
---
make-flight | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/make-flight b/make-flight
index 93c82a21..2f875125 100755
--- a/make-flight
+++ b/make-flight
@@ -608,8 +608,8 @@ do_pvgrub_tests () {
job_create_test test-$xenarch$kern-$dom0arch-amd64-pvgrub \
test-debian-di xl $xenarch $dom0arch \
debian_arch=amd64 \
- debian_suite=$guestsuite \
- debian_di_version=$guest_di_version \
+ debian_suite=jessie \
+ debian_di_version=`getconfig_TftpDiVersion_suite jessie` \
debian_method=netboot \
debian_bootloader=pvgrub \
all_hostflags=$most_hostflags \
@@ -617,8 +617,8 @@ do_pvgrub_tests () {
job_create_test test-$xenarch$kern-$dom0arch-i386-pvgrub \
test-debian-di xl $xenarch $dom0arch \
debian_arch=i386 \
- debian_suite=$guestsuite \
- debian_di_version=$guest_di_version \
+ debian_suite=jessie \
+ debian_di_version=`getconfig_TftpDiVersion_suite jessie` \
debian_method=netboot \
debian_bootloader=pvgrub \
all_hostflags=$most_hostflags
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [OSSTEST PATCH 06/62] Debian.pm: use sysvinit-core instead of systemd
From: Ian Jackson @ 2019-04-10 14:23 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu
In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com>
From: Wei Liu <wei.liu2@citrix.com>
Install that packages for suites >wheezy, because they use systemd as
the default init.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
Osstest/Debian.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 59c60d40..82b5fb40 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -812,7 +812,7 @@ sub preseed_base ($$$;@) {
# Systemd doesn't honor osstest-confirm-booted service, which
# breaks ts-leak-check. Fall back to SysV init for now.
- if ( $suite =~ /jessie/ ) {
+ if ( $suite !~ /squeeze|wheezy/ ) {
preseed_hook_command($ho, 'late_command', $sfx, <<END)
in-target apt-get install -y sysvinit-core
END
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [OSSTEST PATCH 05/62] ts-xen-install: install some packages on stretch
From: Ian Jackson @ 2019-04-10 14:23 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu
In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com>
From: Wei Liu <wei.liu2@citrix.com>
The "route" command is now in that package.
libnl is needed when running xl.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v3: invert condition.
---
ts-xen-install | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ts-xen-install b/ts-xen-install
index 8de94ac2..80952857 100755
--- a/ts-xen-install
+++ b/ts-xen-install
@@ -52,6 +52,9 @@ sub packages () {
libsdl1.2debian libglib2.0-0 liblzma5
qemu-utils
netcat-openbsd));
+ if ($ho->{Suite} !~ m/squeeze|wheezy|jessie/) {
+ target_install_packages($ho, 'net-tools libnl-route-3-200');
+ }
if ($ho->{Suite} =~ m/jessie/) {
target_install_packages($ho, 'libnl-route-3-200');
}
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [OSSTEST PATCH 12/62] ts-guests-nbd-mirror: make it work with stretch
From: Ian Jackson @ 2019-04-10 14:23 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu
In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com>
From: Wei Liu <wei.liu2@citrix.com>
On the server side, only add oldstyle= and port= on wheezy and jessie.
stretch doesn't support or need those anymore.
On the client side, generate new style configuration file.
Reorder nbd-client setup a bit. Install it first, then write our own
configuration file, then start it. This stops dpkg asking what to
do regarding configuration files.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v3: invert some tests, rearrange client setup code.
v4: Fix commit message grammar.
---
ts-guests-nbd-mirror | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 43 insertions(+), 4 deletions(-)
diff --git a/ts-guests-nbd-mirror b/ts-guests-nbd-mirror
index ca8300db..7ea31f7c 100755
--- a/ts-guests-nbd-mirror
+++ b/ts-guests-nbd-mirror
@@ -60,15 +60,19 @@ sub configserver () {
[generic]
user = root
END
- $scfg .= <<END unless $sho->{Suite} =~ m/sarge|lenny|squeeze/;
+
+ $scfg .= <<END if $sho->{Suite} =~ m/wheezy|jessie/;
oldstyle = true
END
+
foreach my $v (@vols) {
$v->{Port}= unique_incrementing_runvar("${srvhost}_nextport",4000);
$v->{Path}= "/dev/$v->{Gho}{Vg}/$v->{Lv}";
$scfg.=<<END;
[export$v->{Ix}]
exportname = $v->{Path}
+END
+ $scfg.=<<END if $sho->{Suite} =~ m/wheezy|jessie/;
port = $v->{Port}
END
}
@@ -79,9 +83,7 @@ END
target_install_packages($sho, qw(nbd-server));
}
-sub configclient () {
- target_cmd_root($cho, "dpkg --purge nbd-client ||:");
-
+sub configclient_pre_stretch () {
my $mydaemon= '/root/nbd-client-async';
target_putfilecontents_root_stash($cho,10,<<'END',$mydaemon);
#!/bin/sh
@@ -107,7 +109,44 @@ NBD_PORT[$v->{Ix}]=$v->{Port}
END
}
target_putfilecontents_root_stash($cho,10,$ccfg,"/etc/nbd-client");
+}
+
+sub configclient_stretch_and_later () {
+ my $ccfg = <<END;
+# generated by $0
+END
+
+ foreach my $v (@vols) {
+ my $nbddev = "nbd$v->{Ix}";
+ $ccfg .= <<END;
+$nbddev $sho->{Name} export$v->{Ix}
+END
+ }
+
+ target_putfilecontents_root_stash($cho,10,$ccfg,"/etc/nbdtab");
+}
+
+sub configclient () {
+ target_cmd_root($cho, "dpkg --purge nbd-client ||:");
+
target_install_packages($cho, qw(nbd-client));
+
+ target_cmd_root($cho, "/etc/init.d/nbd-client stop ||:");
+
+ if ($cho->{Suite} =~ m/wheezy|jessie/) {
+ configclient_pre_stretch();
+ } else {
+ configclient_stretch_and_later();
+ foreach my $v (@vols) {
+ my $nbddev = "nbd$v->{Ix}";
+ target_cmd_root($cho, <<END);
+mkdir -p /dev/$v->{Gho}{Vg}
+if ! test -L $v->{Path}; then ln -s /dev/$nbddev $v->{Path}; fi
+END
+ }
+ }
+
+ target_cmd_root($cho, "/etc/init.d/nbd-client start");
}
sub shuffleconfigs () {
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [OSSTEST PATCH 11/62] ts-xen-build-prep: install e2fslibs-dev
From: Ian Jackson @ 2019-04-10 14:23 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu
In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com>
From: Wei Liu <wei.liu2@citrix.com>
The in-tree libfsimage ext2fs implementation can't handle 64bit
enabled ext4, which is the default in stretch.
Installing e2fslibs-dev causes libfsimage to pick up the packaged
ext2fs implementation.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
ts-xen-build-prep | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/ts-xen-build-prep b/ts-xen-build-prep
index ca5735a1..c38ab36d 100755
--- a/ts-xen-build-prep
+++ b/ts-xen-build-prep
@@ -226,6 +226,12 @@ sub prep () {
push(@packages, qw(texinfo autopoint libpciaccess-dev));
}
+ # The in-tree ext4 support in libfsimage can't cope with 64bit ext4 on
+ # 32bit build. Use the packaged library.
+ if ($ho->{Suite} !~ m/squeeze|wheezy|jessie/) {
+ push(@packages, qw(e2fslibs-dev));
+ }
+
target_install_packages($ho, @packages);
target_cmd_root($ho, "chmod -R a+r /usr/share/git-core/templates");
# workaround for Debian #595728
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [OSSTEST PATCH 10/62] ts-debian-fixup: append noresume
From: Ian Jackson @ 2019-04-10 14:23 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu
In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com>
From: Wei Liu <wei.liu2@citrix.com>
See code comment for explanation.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v4: Fix grammar error in comment.
---
ts-debian-fixup | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/ts-debian-fixup b/ts-debian-fixup
index 478dc2af..0e553d47 100755
--- a/ts-debian-fixup
+++ b/ts-debian-fixup
@@ -178,6 +178,16 @@ sub otherfixupcfg () {
$extra .= " iommu=soft";
}
+ # There might be stale entries in /etc/initramfs-tools/conf.d/resume which
+ # get stored in the initramfs. That introduces delay in guest booting which
+ # might cause tests to fail.
+ #
+ # This is particularly prominent in stretch when it tries to scan for the
+ # nonexistent device(s) for a long time. See also Debian bug #784810.
+ #
+ # Append noresume to fix the issue.
+ $extra .= " noresume";
+
if ($cfg =~ m/extra\s*=\s*['"](.*)['"]/) {
$cfg =~ s/extra\s*=\s*['"](.*)['"]/extra = '$1 $extra'/;
} else {
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [PATCH v2 1/1] cobalt: mode argument from open forwarded for O_TMPFILE
From: Norbert Lange @ 2019-04-10 14:25 UTC (permalink / raw)
To: xenomai
In-Reply-To: <20190410142518.12791-1-norbert.lange@andritz.com>
The optional mode argument (open is a vararg function),
was only be read and forwarded if the O_CREAT flag is set.
That is not complete, as O_TMPFILE will require this
argument aswell. Fixed in this commit, and a fallback definition
of O_TMPFILE is added, incase libcobalt is built against an
library lacking this macro.
Signed-off-by: Norbert Lange <norbert.lange@andritz.com>
---
lib/cobalt/rtdm.c | 10 ++++++++--
lib/cobalt/wrappers.c | 9 +++++++--
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/lib/cobalt/rtdm.c b/lib/cobalt/rtdm.c
index 6b8898e70..176210ddc 100644
--- a/lib/cobalt/rtdm.c
+++ b/lib/cobalt/rtdm.c
@@ -30,6 +30,12 @@
#include <asm/xenomai/syscall.h>
#include "internal.h"
+/* support for very old c libraries not supporting O_TMPFILE */
+#ifndef O_TMPFILE
+#define O_TMPFILE (020000000 | 0200000)
+#endif
+
+
static inline int set_errno(int ret)
{
if (ret >= 0)
@@ -65,7 +71,7 @@ COBALT_IMPL(int, open, (const char *path, int oflag, ...))
mode_t mode = 0;
va_list ap;
- if (oflag & O_CREAT) {
+ if ((oflag & O_CREAT) || (oflag & O_TMPFILE) == O_TMPFILE) {
va_start(ap, oflag);
mode = va_arg(ap, int);
va_end(ap);
@@ -79,7 +85,7 @@ COBALT_IMPL(int, open64, (const char *path, int oflag, ...))
mode_t mode = 0;
va_list ap;
- if (oflag & O_CREAT) {
+ if ((oflag & O_CREAT) || (oflag & O_TMPFILE) == O_TMPFILE) {
va_start(ap, oflag);
mode = va_arg(ap, int);
va_end(ap);
diff --git a/lib/cobalt/wrappers.c b/lib/cobalt/wrappers.c
index 20ad63a61..323f60b92 100644
--- a/lib/cobalt/wrappers.c
+++ b/lib/cobalt/wrappers.c
@@ -44,6 +44,11 @@
#include <malloc.h>
#include <boilerplate/compiler.h>
+/* support for very old c libraries not supporting O_TMPFILE */
+#ifndef O_TMPFILE
+#define O_TMPFILE (020000000 | 0200000)
+#endif
+
/* sched */
__weak
int __real_pthread_setschedparam(pthread_t thread,
@@ -174,7 +179,7 @@ int __real_open(const char *path, int oflag, ...)
mode_t mode = 0;
va_list ap;
- if (oflag & O_CREAT) {
+ if ((oflag & O_CREAT) || (oflag & O_TMPFILE) == O_TMPFILE) {
va_start(ap, oflag);
mode = va_arg(ap, mode_t);
va_end(ap);
@@ -190,7 +195,7 @@ int __real_open64(const char *path, int oflag, ...)
mode_t mode = 0;
va_list ap;
- if (oflag & O_CREAT) {
+ if ((oflag & O_CREAT) || (oflag & O_TMPFILE) == O_TMPFILE) {
va_start(ap, oflag);
mode = va_arg(ap, mode_t);
va_end(ap);
--
2.20.1
^ permalink raw reply related
* [OSSTEST PATCH 08/62] ts-host-install: don't use the new nic naming scheme
From: Ian Jackson @ 2019-04-10 14:23 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu
In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com>
From: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
ts-host-install | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/ts-host-install b/ts-host-install
index 292733ba..9ab3de62 100755
--- a/ts-host-install
+++ b/ts-host-install
@@ -244,6 +244,10 @@ END
# why this is repeated.
push @hocmdline, "console=$console" unless $console eq "NONE";
+ # Don't use "Predictable Network Interface Names"
+ # https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/
+ push @hocmdline, "net.ifnames=0" if $ho->{Suite} =~ m/stretch/;
+
push @hocmdline,
get_host_property($ho, "linux-boot-append $ho->{Suite}", ''),
get_host_property($ho, "linux-boot-append $ho->{Suite} $r{arch}", '');
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [OSSTEST PATCH 09/62] ts-debian-fixup: merge origin extra= to our own if necessary
From: Ian Jackson @ 2019-04-10 14:23 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu
In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com>
From: Wei Liu <wei.liu2@citrix.com>
The original extra= was not removed, so there were two extra= in the
resulting config file.
It wasn't a problem for xl because the second extra= took precedence.
However libvirt tests would only pick up the first extra= so they
worked by chance.
Fix this issue by merging the original. If there isn't already extra=
in $cfg, use our own.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v3: handle situation when no extra= is in $cfg
---
ts-debian-fixup | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/ts-debian-fixup b/ts-debian-fixup
index 3e5cdb97..478dc2af 100755
--- a/ts-debian-fixup
+++ b/ts-debian-fixup
@@ -178,7 +178,11 @@ sub otherfixupcfg () {
$extra .= " iommu=soft";
}
- $cfg .= "\nextra='$extra'\n";
+ if ($cfg =~ m/extra\s*=\s*['"](.*)['"]/) {
+ $cfg =~ s/extra\s*=\s*['"](.*)['"]/extra = '$1 $extra'/;
+ } else {
+ $cfg .= "extra = '$extra'\n";
+ }
};
sub writecfg () {
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [OSSTEST PATCH 03/62] ts-xen-build-prep: only install w3c-dtd-xhtml for suites <stretch
From: Ian Jackson @ 2019-04-10 14:23 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu
In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com>
From: Wei Liu <wei.liu2@citrix.com>
That package is not included in stretch.
That package was installed because the libvirt build needed it.
However libvirt builds fine without it in stretch.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
ts-xen-build-prep | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/ts-xen-build-prep b/ts-xen-build-prep
index 23bbbeb9..a15ab3df 100755
--- a/ts-xen-build-prep
+++ b/ts-xen-build-prep
@@ -206,11 +206,13 @@ sub prep () {
libglib2.0-dev liblzma-dev pkg-config
autoconf automake libtool xsltproc
libxml2-utils libxml2-dev
- libdevmapper-dev w3c-dtd-xhtml libxml-xpath-perl
- libelf-dev
+ libdevmapper-dev libxml-xpath-perl libelf-dev
ccache nasm checkpolicy ebtables
libgnutls28-dev);
+ if ($ho->{Suite} =~ m/squeeze|wheezy|jessie/) {
+ push(@packages, "w3c-dtd-xhtml");
+ }
if ($ho->{Suite} !~ m/squeeze|wheezy/) {
push(@packages, qw(ocaml-nox ocaml-findlib));
}
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* (no subject)
From: Norbert Lange @ 2019-04-10 14:25 UTC (permalink / raw)
To: xenomai
V2 now also fixes the wrappers.
Btw. wouldnt it be possible to just do away with the ugly vaargs?
I tested a few architectures (x86, arm mips, both 32 and 64 bit)
and the function call singature stays the same whether a
function has varagrs or a fixed amount of arguments.
The wrappers could then be oblivous to such wacky special cases.
Torvalds seems to have that opinion aswell:
https://lkml.org/lkml/2014/10/30/812
^ permalink raw reply
* [Bug 109692] deadlock occurs during GPU reset
From: bugzilla-daemon @ 2019-04-10 14:25 UTC (permalink / raw)
To: dri-devel
In-Reply-To: <bug-109692-502@http.bugs.freedesktop.org/>
[-- Attachment #1.1: Type: text/plain, Size: 478 bytes --]
https://bugs.freedesktop.org/show_bug.cgi?id=109692
--- Comment #31 from Andrey Grodzovsky <andrey.grodzovsky@amd.com> ---
(In reply to mikhail.v.gavrilov from comment #30)
> Created attachment 143908 [details]
> dmesg without patches
>
> Without patches backtrace are looks like initial deadlock backtrace.
OK, seems the patches somehow break display engine reset. Let me look into it.
--
You are receiving this mail because:
You are the assignee for the bug.
[-- Attachment #1.2: Type: text/html, Size: 1517 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply
* [OSSTEST PATCH 01/62] gitignore: ignore vim swap file
From: Ian Jackson @ 2019-04-10 14:23 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu
In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com>
From: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 425506b6..f7e5b77f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
*~
*.bak
+*.swp
tmp
*.tmp
bisection.ps
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [OSSTEST PATCH 00/62] Update to Debian stable (stretch)
From: Ian Jackson @ 2019-04-10 14:23 UTC (permalink / raw)
To: xen-devel; +Cc: committers, Ian Jackson
This, finally, is the series to update osstest to Debian stretch.
This is very urgent because Debian have been removing parts of jessie
from their servers, in a rather unhelpful and not entirely controlled
manner. Consequently, currently osstest is not reliable with jessie.
I am going to push this series to osstest pretest immediately without
waiting for acks/reviews/etc. I expect it to trip two regressions in
the osstest push gate, which I will force push.
One effect of this series is to put into service the two ThunderX
arm64 machines, rochester[01], which are supportable in stretch but
not jessie.
There seem to be a number of outstanding problems which I decided were
not blockers:
* test-amd64-amd64-xl-qcow2 fails because the xvd driver fails to
freeze during the Linux guest suspend. This seems to be a real bug
of some kind and needs investigation.
* I experienced difficulties with the 4 Arndale devboards: high
probability guest start failures. For now I have marked those
nodes as unsuitable for use with stretch, which will, effectively,
take them out of service - and leave us with a lack of armhf
capacity. It is possible that this problem is due to the
ifupdown-hotplug issue, now addressed, so I plan to retest.
* The serial output from the new rochester arm64 machines is missing
some of the grub bootloader messages (and this is detected by one
of the examine jobs). I may need help from someone familiar with
these machines' hardware/firmware.
* stretch did not appear to work properly on joubertin[01] and
merlot[01] (x86 boxes). I have marked them to be not used with
stretch. They will need to be retested and the problems
investigated (if indeed the problems still remain after other fixes
which are now in this series).
* I have two bug reports / patches to go upstream to Debian: a boot
ordering bug with ifupdown and udev, and a bug in fishdescriptor.
There are a couple of occurrences in this series of changes which
break things followed by patches to fix them up. I have not bothered
squashing/reorganising those.
Ian Jackson (41):
power: Fix uninitialised variable warning
Debian: Fix http:// url for bugs.xenproject.org
contents_make_cpio: Include symlinks
contents_make_cpio: Make files owned by root
overlay-persistent-net: Copy from jessie
persistent-net: Add overlay on installed systems >= stretch
persistent-net: Add overlay in installer >= stretch
ts-host-install: Break out $persistent_net_rules
ts-host-install: Unconditionally mkdir -p /etc/udev/rules.d
ts-host-install: Put canary in 70-persistent-net.rules
persistent-net: Include initramfs script to copy to target
persistent-net: Set net.ifnames=0 in di_installcmdline_core
ts-kernel-build: Enable some additional drivers for Thunder-X
TestSupport: Move `stashed files' and `next_unique_name' earlier
TestSupport: Move `target_somefile_getleaf' earlier
TestSupport: target_somefile_leaf rename and change a variable
TestSupport: Provide target_getfile_root_stash
ts-guests-nbd-mirror: Use target_getfile_root_stash
preseed_base: chmod ssh host private keys to placate sshd
preseed_base: break out debian_overlays_fixup_cmd
ts-debian-fixup: Use debian_overlays_fixup_cmd
preseed_hook_command: allow specifying di keys other than preseed/*
preseed_hook_installscript: Use partman/early_command, not preseed/
Debian: preseed_hook_installscript: New $atonce option
Debian: partman scripts: Run right away too
Debian: set partman-lvm/device_remove_lvm_span
Debian: Add reference to bug numbers for erase-other-disks
dm restrict audit: actually install right package for fishdescriptor
Debian: Move preseed_backports_packages earlier
dm restrict audit: actually install fishdescriptor in host
dm restrict audit: always install (some) chiark-scripts
target_install_packages: Consistently use qw(...) rather than '...'
ts-xen-install: Install libpciaccess0
ts-debian-hvm-install: Honour linux_boot_append target var
make-flight: shadow test: Disable kpti in guests
platforms: Pass suite to get_arch_platforms
platforms: Honour suite in get_arch_platforms
dm restrict, fishdescriptor: Update to a fixed chiark-scripts
Debian: Fix /lib/udev/ifupdown-hotplug to not run if / is ro
Debian: Fix /lib/udev/ifupdown-hotplug in guests from debootstrap
production-config-cambridge: Provide TftpDiVersion_stretch
Julien Grall (2):
stretch: Use chainloading when booting using GRUB on Arm64
ts-xen-build: Enable ITS driver in Xen
Wei Liu (19):
gitignore: ignore vim swap file
ts-xen-build-prep: only install w3c-dtd-xhtml for suites <Stretch
ts-xen-build-prep: install packages for suites >jessie
ts-xen-install: install some packages on stretch
Debian.pm: use sysvinit-core instead of systemd
ts-leak-check: suppress systemd-shim, which leaks in stretch
ts-host-install: don't use the new nic naming scheme
ts-debian-fixup: merge origin extra= to our own if necessary
ts-debian-fixup: append noresume
ts-xen-build-prep: install e2fslibs-dev
ts-guests-nbd-mirror: make it work with stretch
Extend workaround `clk_ignore_unused' to stretch
adjust how to skip bootloader installation for arm32, in Stretch
ts-debian-di-install: use gho to pick d-i
make-flight: guest should use jessie to test pvgrub
Drop rumprun tests
ts-guests-nbd-mirror: use target_{get,put}file_root to transfter cfg
ts-kernel-build: disable host1x, which doesn't build
Switch to Debian Stretch
.gitignore | 1 +
Osstest.pm | 2 +-
Osstest/Debian.pm | 205 ++++++++++++++-------
Osstest/HostDB/Executive.pm | 10 +-
Osstest/HostDB/Static.pm | 4 +-
Osstest/RumpRun.pm | 68 -------
Osstest/TestSupport.pm | 115 ++++++------
Osstest/Toolstack/rumprun.pm | 33 ----
allow.all | 1 -
allow.rumprun | 1 -
ap-common | 7 -
ap-fetch-version | 4 -
ap-fetch-version-old | 5 -
ap-print-url | 3 -
ap-push | 5 -
cr-daily-branch | 9 -
cri-common | 1 -
cri-getplatforms | 2 +-
crontab | 4 +-
daily-cron-email-real--rumpuserxen | 4 -
daily-cron-email-real-bisectcomplete--rumpuserxen | 4 -
make-flight | 48 +----
mfi-common | 37 ----
overlay-persistent-net/etc/init.d/udev-finish | 22 +++
.../etc/udev/rule_generator.functions | 113 ++++++++++++
.../etc/udev/rules.d/73-usb-net-by-mac.rules | 0
.../etc/udev/rules.d/75-net-description.rules | 0
.../udev/rules.d/75-persistent-net-generator.rules | 143 ++++++++++++++
overlay-persistent-net/etc/udev/udev-finish | 9 +
overlay-persistent-net/etc/udev/write_net_rules | 152 +++++++++++++++
.../lib/udev/rule_generator.functions | 1 +
overlay-persistent-net/lib/udev/udev-finish | 1 +
overlay-persistent-net/lib/udev/write_net_rules | 1 +
production-config | 3 +
production-config-cambridge | 1 +
sg-run-job | 26 ---
ts-debian-di-install | 4 +-
ts-debian-fixup | 23 ++-
ts-debian-hvm-install | 3 +
ts-guests-nbd-mirror | 51 ++++-
ts-host-install | 23 ++-
ts-kernel-build | 14 ++
ts-leak-check | 1 +
ts-rumprun-bake | 88 ---------
ts-rumprun-build | 103 -----------
ts-rumprun-demo-build | 67 -------
ts-rumprun-demo-setup | 54 ------
ts-rumprun-demo-xenstorels | 113 ------------
ts-rumprun-test-prep | 37 ----
ts-xen-build | 4 +
ts-xen-build-prep | 16 +-
ts-xen-install | 12 +-
52 files changed, 803 insertions(+), 855 deletions(-)
delete mode 100644 Osstest/RumpRun.pm
delete mode 100644 Osstest/Toolstack/rumprun.pm
delete mode 100644 allow.rumprun
delete mode 100644 daily-cron-email-real--rumpuserxen
delete mode 100644 daily-cron-email-real-bisectcomplete--rumpuserxen
create mode 100755 overlay-persistent-net/etc/init.d/udev-finish
create mode 100644 overlay-persistent-net/etc/udev/rule_generator.functions
create mode 100644 overlay-persistent-net/etc/udev/rules.d/73-usb-net-by-mac.rules
create mode 100644 overlay-persistent-net/etc/udev/rules.d/75-net-description.rules
create mode 100644 overlay-persistent-net/etc/udev/rules.d/75-persistent-net-generator.rules
create mode 100755 overlay-persistent-net/etc/udev/udev-finish
create mode 100755 overlay-persistent-net/etc/udev/write_net_rules
create mode 120000 overlay-persistent-net/lib/udev/rule_generator.functions
create mode 120000 overlay-persistent-net/lib/udev/udev-finish
create mode 120000 overlay-persistent-net/lib/udev/write_net_rules
delete mode 100755 ts-rumprun-bake
delete mode 100755 ts-rumprun-build
delete mode 100755 ts-rumprun-demo-build
delete mode 100755 ts-rumprun-demo-setup
delete mode 100755 ts-rumprun-demo-xenstorels
delete mode 100755 ts-rumprun-test-prep
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply
* [PATCH 4/6] btrfs: Pass 0 for bio_offset to btrfs_wq_submit_bio
From: Nikolay Borisov @ 2019-04-10 14:24 UTC (permalink / raw)
To: linux-btrfs; +Cc: Nikolay Borisov
In-Reply-To: <20190410142443.6470-1-nborisov@suse.com>
Buffered writeback always calls btrfs_csum_one_bio with the last 2
arguments being 0 irrespective of what the bio_offset has been passed
to btrfs_submit_bio_start. Make this apparent by explicitly passing 0
for bio_offset when calling btrfs_wq_submit_bio from
btrfs_submit_bio_hook. This will allow for further simplifications down
the line. No functional changes.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
fs/btrfs/inode.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 07cf7050c99f..6e5f1afa7407 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1991,8 +1991,7 @@ static blk_status_t btrfs_submit_bio_hook(struct inode *inode, struct bio *bio,
goto mapit;
/* we're doing a write, do the async checksumming */
ret = btrfs_wq_submit_bio(fs_info, bio, mirror_num, bio_flags,
- bio_offset, inode,
- btrfs_submit_bio_start);
+ 0, inode, btrfs_submit_bio_start);
goto out;
} else if (!skip_sum) {
ret = btrfs_csum_one_bio(inode, bio, 0, 0);
--
2.17.1
^ permalink raw reply related
* [PATCH 6/6] btrfs: Remove bio_offset argument from submit_bio_hook
From: Nikolay Borisov @ 2019-04-10 14:24 UTC (permalink / raw)
To: linux-btrfs; +Cc: Nikolay Borisov
In-Reply-To: <20190410142443.6470-1-nborisov@suse.com>
None of the implementers of the submit_bio_hook use the bio_offset
parameter, simply remove it. No functional changes.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
fs/btrfs/disk-io.c | 4 ++--
fs/btrfs/extent_io.c | 6 ++----
fs/btrfs/extent_io.h | 3 +--
fs/btrfs/inode.c | 5 +++--
4 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index ee9e03b8aae3..0a7897adc58f 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -885,8 +885,8 @@ static int check_async_write(struct btrfs_inode *bi)
}
static blk_status_t btree_submit_bio_hook(struct inode *inode, struct bio *bio,
- int mirror_num, unsigned long bio_flags,
- u64 bio_offset)
+ int mirror_num,
+ unsigned long bio_flags)
{
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
int async = check_async_write(BTRFS_I(inode));
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 048d6c6fe7b9..61191156ee2b 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -152,16 +152,14 @@ static int __must_check submit_one_bio(struct bio *bio, int mirror_num,
struct bio_vec *bvec = bio_last_bvec_all(bio);
struct bio_vec bv;
struct extent_io_tree *tree = bio->bi_private;
- u64 start;
mp_bvec_last_segment(bvec, &bv);
- start = page_offset(bv.bv_page) + bv.bv_offset;
bio->bi_private = NULL;
if (tree->ops)
ret = tree->ops->submit_bio_hook(tree->private_data, bio,
- mirror_num, bio_flags, start);
+ mirror_num, bio_flags);
else
btrfsic_submit_bio(bio);
@@ -2546,7 +2544,7 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset,
read_mode, failrec->this_mirror, failrec->in_validation);
status = tree->ops->submit_bio_hook(tree->private_data, bio, failrec->this_mirror,
- failrec->bio_flags, 0);
+ failrec->bio_flags);
if (status) {
free_io_failure(failure_tree, tree, failrec);
bio_put(bio);
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 37240e03c4e3..aa18a16a6ed7 100644
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -105,8 +105,7 @@ struct extent_io_ops {
* pointer will be called unconditionally.
*/
blk_status_t (*submit_bio_hook)(struct inode *inode, struct bio *bio,
- int mirror_num, unsigned long bio_flags,
- u64 bio_offset);
+ int mirror_num, unsigned long bio_flags);
int (*readpage_end_io_hook)(struct btrfs_io_bio *io_bio, u64 phy_offset,
struct page *page, u64 start, u64 end,
int mirror);
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 6e5f1afa7407..476111d44021 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1954,8 +1954,9 @@ static blk_status_t btrfs_submit_bio_start(void *private_data, struct bio *bio,
* c-3) otherwise: async submit
*/
static blk_status_t btrfs_submit_bio_hook(struct inode *inode, struct bio *bio,
- int mirror_num, unsigned long bio_flags,
- u64 bio_offset)
+ int mirror_num,
+ unsigned long bio_flags)
+
{
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
struct btrfs_root *root = BTRFS_I(inode)->root;
--
2.17.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.