From 393296de19650e1400ca265914cfdeb313725363 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Fri, 5 Aug 2022 11:42:14 +0200 Subject: [PATCH 1/4] pc-bios/s390-ccw: Fix booting with logical block size < physical block size For accessing single blocks during boot, it's the logical block size that matters. (Physical block sizes are rather interesting e.g. for creating file systems with the correct alignment for speed reasons etc.). So the s390-ccw bios has to use the logical block size for calculating sector numbers during the boot phase, the "physical_block_exp" shift value must not be taken into account. This change fixes the boot process when the guest hast been installed on a disk where the logical block size differs from the physical one, e.g. if the guest has been installed like this: qemu-system-s390x -nographic -accel kvm -m 2G \ -drive if=none,id=d1,file=fedora.iso,format=raw,media=cdrom \ -device virtio-scsi -device scsi-cd,drive=d1 \ -drive if=none,id=d2,file=test.qcow2,format=qcow2 -device virtio-blk,drive=d2,physical_block_size=4096,logical_block_size=512 Linux correctly uses the logical block size of 512 for the installation, but the s390-ccw bios tries to boot from a disk with 4096 block size so far, as long as this patch has not been applied yet (well, it used to work by accident in the past due to the virtio_assume_scsi() hack that used to enforce 512 byte sectors on all virtio-block disks, but that hack has been well removed in commit 5447de2619050a0a4d to fix other scenarios). Fixes: 5447de2619 ("pc-bios/s390-ccw/virtio-blkdev: Remove virtio_assume_scsi()") Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=2112303 Message-Id: <20220805094214.285223-1-thuth@redhat.com> Reviewed-by: Cornelia Huck Reviewed-by: Eric Farman Signed-off-by: Thomas Huth --- pc-bios/s390-ccw/virtio-blkdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc-bios/s390-ccw/virtio-blkdev.c b/pc-bios/s390-ccw/virtio-blkdev.c index 8271c47296..794f99b42c 100644 --- a/pc-bios/s390-ccw/virtio-blkdev.c +++ b/pc-bios/s390-ccw/virtio-blkdev.c @@ -173,7 +173,7 @@ int virtio_get_block_size(void) switch (vdev->senseid.cu_model) { case VIRTIO_ID_BLOCK: - return vdev->config.blk.blk_size << vdev->config.blk.physical_block_exp; + return vdev->config.blk.blk_size; case VIRTIO_ID_SCSI: return vdev->scsi_block_size; } From c3dd58ba6e0123806ef45e447eeee881203cd6ec Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Sun, 7 Aug 2022 18:22:35 +0200 Subject: [PATCH 2/4] pc-bios/s390-ccw: Update the s390-ccw.img with the block size fix The new binary now gets the block size of virtio-blk devices right. Signed-off-by: Thomas Huth --- pc-bios/s390-ccw.img | Bin 42608 -> 42608 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/pc-bios/s390-ccw.img b/pc-bios/s390-ccw.img index 39f9680a0ef1c57f8a0bac9e12ff77ce15150d37..554fcbd1b7af8ea5f8f0d887fba98d52b7a8611d 100644 GIT binary patch delta 4206 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 My};%ROBOH!07`p& zU`l69nJmCOTYT#B-~T-hJY`@ISOX%}Dh~)SFxZuEKEynek+&8kB*1k*fq}tx^5hIw zRbf|<2>(YA$zTl@_ussLbtWVCy9k913?O04r;}aSzl)cG*nG2gvM^|aSyMrZ?Wau+ z;_zmiJ9!?5D&y42M>zb&oxrksjtU=kfmxa$b=LlqwK&xo^(F^#mN6-?O+Lk`F1!^a z&Ab1=)Bpefae@?C&7I7`rOo(zvH_PkW8q{EE_=qX$sJs&jBb1A`ss^55?n9xEs?Ft9ipd<1(|&U^9%9#_WT$=7()87n6LHq(K)4?1aki@@bstvHZ*b!^9)^VFb^re_FZsV2BxC+ya+t6=qrv1p zVR6POla~oAGYU;UC9ECZ7$ERr1IPr9-OIoHUk6fa3XV4ph(2Gi+***hyR#5T_avy(tR`nConVhnZ?8^lR0 zU|Fz}%tIz$lSt!i|G@#0ZOv^bt4LWhCQnX~(q)XD z+$S}W7vew-u$~W-b);*xw@qUB08S_@4|lRKXo8%=at9=DR1aofTmI$01&D7lWAYVg z)zrx#n|{cHMQ(%Hl3?~3FdG~ZASeI-|AQASz7{Ob4rYTB)elB6yBj3_{Wrq3W}3@? z|BnF6otPXaW6bC^d6G;fqv+&6GV+4Y!EVu7{sj^(CS{X#WF@utgGEJ`fB6p%ev=|F zpZBrDM+pX&*Zm(}FtD(H0h?Gmxj@#Jan0m?vXYFYlW)k%YKDUC2ZyBbPcU2h_4*G1 zkdQO=UH<#O1*kqS>60FGJc#qLqT6uAC&w5-(7CO;0!BY z3>_!mQ7~n6nk=NK$@q1$jp9m4aC%`p3es)#7-SyfelYvMK#(68Y8$RyhHzW;#gZBiI#24?*lNpTM$D!R$9+_C7EhlF|=?*$+VC2CKpBTcAY7 z4vx@oJ6^y4P{5!vd5)4fqweG@O7*T+!M5-%mt4blHn~buS1=i*>hF`~U;bSNdp3LW4$V}? zl*w{h&lxXFX4BS{1qabzxyK3%7#Jq(WMWW~5L#aHe+o#o{`JWL+SZJ{lY6wy8Rtzt zqHX9oZTS%fW00ADb}#p2VBX2XU;(Rc1!jT8!PTFMCYZevY)TfGy?FU<2FB&fA*H8& z!el!gWnQrB{t1ShI7{3Rz^LH{a><01m9Vai+$u#5ziyA>}{r~?D zxH!?(1Be&XpU%iQb#soP zFC$~r=3Pdsnd%>aO!~nJvR69*#Qy#t#MWd0v%xv*g)>M*^3q6pC))5f<_k0jrn;FcW31)MH*^@zRtqovyuN;^I&XK>t!J~B-ECEjQ+M1J@ z%sw(oPX1zMudE6Z|1Jk2pJzbw>+;|KJ{&M$V9?rmAb^2E#bcN8jE4W#wrUe#N29Zy5k=s_9cPG18-(@VAtYqWNxN~xvjVj~D$vrlq ziW)mv81f!J_^^XP1*GeX(@qu!H89H-PL^@e=3RE2 zjEtU>kJtw@s!f(~h-Tb0In73eNq*Jj9-9y*HR;J89Q-9egG~7(0Ww7mZ1yK15L;Pz za)je{Mv=(^PJx2AKx%&FFaPon9C@k>Cl@)XN_K)oKjwf`t4;;8(?D#c^vN5XR5QWJ z_oFXJL=_xWAKgK0B@eJl$K_xCuK@GIz7nSj~4%fI~Z2lJi4d{q!z zk~$&#{!BT3=<+06kR$M z1Q;GWfbzpm5eB8#??Ei~FQ9@9R@;Jl5}+pbP8Npdoh%GfK&E}VIr)pbI^)^NG9Jc^ z-ID`6^cBG={eQuxAO=lvc_6~zv^?7)0*xg%Q!X6J**J3BY``P^odt%E6fT?x`IQw5TIT?`^`@15M{ zSIszoGL!#K?yHUpA5MWpUtO4d%zq+xJDlG%IVr%AapmSE0id#GvQ5x*eow~@A2VPE zzjT`XD5#m60mgsvdvZZ=E%zQcfBWPg!MWlMaDFw&A=2Ou!i&<$H6f;qQIidlR5xD_ zv0`Lh^;qD;>&XWq3&iBjK+budvy+7ZTsl5ae=P9f4M<8z9$c6`2Spl0N@cQKcs2hs zn9^qt9}9eV2U02~2afw^i{Vo99t(VU50aWZFM^#r0WKarc|$}szbu?D@mS!)kI4y% z1wyjmZpzbJFsY|kC+~@@7Mu>}PkJoyk%?jAWP^x2FHvVmMCBm*vdpLD~e+9pTE6m$E)`R Date: Tue, 2 Aug 2022 13:36:06 +0300 Subject: [PATCH 3/4] tests/avocado: fix replay-linux test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Last line of the test is missing by accident. This patch fixes the script. Signed-off-by: Pavel Dovgalyuk Message-Id: <165943656662.362178.2086588841425038338.stgit@pasha-ThinkPad-X280> Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- tests/avocado/replay_linux.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/avocado/replay_linux.py b/tests/avocado/replay_linux.py index 40e4f6908e..e1f9981a34 100644 --- a/tests/avocado/replay_linux.py +++ b/tests/avocado/replay_linux.py @@ -189,3 +189,4 @@ class ReplayLinuxAarch64(ReplayLinux): self.run_rr(shift=3, args=(*self.get_common_args(), + "-machine", "virt,gic-version=3")) From 407634970dc5dba9330c360cfdc4e69e7aea3b37 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Tue, 2 Aug 2022 14:31:01 +0200 Subject: [PATCH 4/4] tests/qemu-iotests/264: Allow up to 5s for the BLOCK_JOB_CANCEL event to arrive It is possible to hit the assertTrue(delta_t < 2.0) on very loaded systems. Increase the value to 5.0 to ease the situation a little bit. Message-Id: <20220802123101.430757-1-thuth@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Thomas Huth --- tests/qemu-iotests/264 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/264 b/tests/qemu-iotests/264 index bc431d1a19..289381e315 100755 --- a/tests/qemu-iotests/264 +++ b/tests/qemu-iotests/264 @@ -101,7 +101,7 @@ class TestNbdReconnect(iotests.QMPTestCase): start_t = time.time() self.vm.event_wait('BLOCK_JOB_CANCELLED') delta_t = time.time() - start_t - self.assertTrue(delta_t < 2.0) + self.assertTrue(delta_t < 5.0) def test_mirror_cancel(self): # Mirror speed limit doesn't work well enough, it seems that mirror