From nobody Mon Apr 29 13:27:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1575907350; cv=none; d=zohomail.com; s=zohoarc; b=DJe2GbBZWqohBdss2zcRlF7Z3nzUrKZc17UcyyqBg15gogElS65cjWYFftH4rClEY77SsBcc5yt4VFIMM3oKrjQtg1zs6+qnBHCs9/7issadeIWBmJqd7ZT0tU5wAg6+x3I+vpf8zvdc6MChXh7lViCSHRZXMFx6Gbfgm29BQOk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575907350; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oPzigFIqcCUh5krrSKfIhCM+yzaS0D+HYQ6KX/LSGxw=; b=SnmD4HGQzU3yRq5+x+flqBzC8Xl6tE+SI0/xtm/sM3/flJzxI9dqlgTYQxV5+yPZVC9eewR1WtA8M9m6bCZQvgzio5uk8G+khgyq6cnfmpYUPlCVglQVSeG/HaCtLRPWE4P/QaZk2ffadAmzznswD3EKhawhawU5cQ36Ue25IZ4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1575907350423552.1780173381497; Mon, 9 Dec 2019 08:02:30 -0800 (PST) Received: from localhost ([::1]:41936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ieLUS-0005J0-GX for importer@patchew.org; Mon, 09 Dec 2019 11:02:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57952) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ieLSg-00044r-Aa for qemu-devel@nongnu.org; Mon, 09 Dec 2019 11:00:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ieLSe-0002Et-Dg for qemu-devel@nongnu.org; Mon, 09 Dec 2019 11:00:38 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:25018 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ieLSe-0002DJ-8v for qemu-devel@nongnu.org; Mon, 09 Dec 2019 11:00:36 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-8-V2YI9EELNmSZ8EI9q11Tvw-1; Mon, 09 Dec 2019 11:00:24 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BFF3F802589; Mon, 9 Dec 2019 16:00:22 +0000 (UTC) Received: from blue.redhat.com (ovpn-116-171.phx2.redhat.com [10.3.116.171]) by smtp.corp.redhat.com (Postfix) with ESMTP id 192A55D6C5; Mon, 9 Dec 2019 16:00:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575907235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oPzigFIqcCUh5krrSKfIhCM+yzaS0D+HYQ6KX/LSGxw=; b=F8fkb1JnntbZq92L/Sn8AJUpKNOdKbeuccrVT8UIENjumhqtZtodOfikSuCLDfZ45fNKt1 0Xeie43lcYxKOgVSXf6RBCLelQyT/MbIsW5nO8hFfkQLVlMhO0UxJ+bbs/S4ma1mPk5EPV fBfmlKFTBOrnKpKcFx/tWX71LyG50Os= From: Eric Blake To: qemu-devel@nongnu.org Subject: [PULL 1/1] pseries: Update SLOF firmware image Date: Mon, 9 Dec 2019 10:00:15 -0600 Message-Id: <20191209160015.20253-2-eblake@redhat.com> In-Reply-To: <20191209160015.20253-1-eblake@redhat.com> References: <20191209160015.20253-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: V2YI9EELNmSZ8EI9q11Tvw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexey Kardashevskiy , peter.maydell@linaro.org, vsementsov@virtuozzo.com, jsnow@redhat.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Alexey Kardashevskiy This fixes PCI bridge regression. Alexey Kardashevskiy (3): ibm,client-architecture-support: Fix stack handling fdt: Fix updating the tree at H_CAS version: update to 20191209 Signed-off-by: Alexey Kardashevskiy Signed-off-by: David Gibson --- pc-bios/README | 2 +- pc-bios/slof.bin | Bin 928552 -> 931040 bytes roms/SLOF | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pc-bios/README b/pc-bios/README index 830645c51fbe..91218c69e9d6 100644 --- a/pc-bios/README +++ b/pc-bios/README @@ -17,7 +17,7 @@ - SLOF (Slimline Open Firmware) is a free IEEE 1275 Open Firmware implementation for certain IBM POWER hardware. The sources are at https://github.com/aik/SLOF, and the image currently in qemu is - built from git tag qemu-slof-20191022. + built from git tag qemu-slof-20191209. - sgabios (the Serial Graphics Adapter option ROM) provides a means for legacy x86 software to communicate with an attached serial console as diff --git a/pc-bios/slof.bin b/pc-bios/slof.bin index 0b93fe8c011fc352803dc24e3110b7f926493769..50fc9b1e1cb837809c38fed1e90= 99b262e8600f1 100644 GIT binary patch delta 5477 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 delta 3433 zcmbW3eQXow9mnsU^UGbF7$*TI7)Y<##tyoqj=3D{l~CczCOWK_+(j)AvHC2uB#4aW;f z=3DT}M^&0c($m-%RpS&4cW*>^$e|hVt+gIsgy1KUX{CdnkjeKA49+W*E+2gKLr^s80g96`<>VkMm;Oo)+G)W8m zr>6fqJy{m{egP%iBvQ;bzd;u`9_KwEd=3Dlq3i?DE9;Okq_bd0nu^SjH?Ihnj%io)gS z+%PeH30>TY&ZWt34xzo95s8uYub^r#MEQS zmoV??8#%hC`|aje+Y+d$g)_anIUzJvYs}O>%*juSXi}9qjh^Hkni}Wgo6Z%g(?e5RN_dPFiS1* zmkW0^q0uGW0pLE%Z@}MLC;S*T*>%EGV23a9_mfxF3qu>q67nOec(9FZo!%f1Q+QPkEXg6uf4q;=3D3God`Q=3D^OJ+n>b$GG%7s#g%e$$DG3FS z1%$P>7CItrGuxL?Ncua%i>pu~@Y1`TRrtk2f}gI*jYGnr5|oG#e^eNG1YL{a*hW*u z=3Dtu7e?`~=3DYdbwfGnY=3DSZ{-Zd#&b2KH zdwc2WpHQQ7*hXvoQ=3DHu5Qd2pH-xU=3D)s3{Utq>C1$F5->{B`38c`k+LgKq@G8Qmsq< zFc*2_iXn0lN9rV}OTEeXtbu=3DsV+H&c;~wzmOzQhMrSbP+YcIX=3DXKJAJJpW+a1O0q} zD?QN0V$SXN#sL;dhexU}cd6-|!#^ge)g6JFCh?upQ94i>yLUmxG-=3Dxaa9q`)HockE`M>pyAGVu_(20t(mlivV_AjzCkuHAJGI#{ z9MJfLfkQrskKtjBPZ@ZY@i>lae5R1w9gHV&TH|TD*WH~`$OrkCu%iL`gL!oGIRZI8 zCt^SFImoByGUN2efW~33$a{Al>WhL%+2CTok7$M{^UJ^~`~;_e(LqMT5S? z^elEiL|>m&rGaO2Jmo9Y%S5IJ4LZcreo|3`?q>RgL2qMvT+@%OJa}vJ0aptH*5m`y z1|1rK!dZh3jZpo%!=3DOVWpeuU4nB&&WFyP05MtaAt2lWn=3DXBm&+VaktPKUv6~m5j#> zIuwF}kY9IaoIa+f3_2V1`jSBp=3DKSFsgywl*<;0u^8Gr`#1)@xMV}BDJXdV*l`2^z~ zI70ccdGOcs8OFy9dXni=3D1|0^WgU%-ndYbM*Uo_~MoW9UOt%<|tW?Ly*7$%j?Ham~3 zC$X~Kb`**9ixBK<8LaqiBdFmNj{9x(=3Dwm-#qPA#Z8nSSfg=3DwrjY-^@Jr0_w_rtuWm de>w0HSa)_*X|d6(m?$kJ(| (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1575908366767313.4072027549398; Mon, 9 Dec 2019 08:19:26 -0800 (PST) Received: from localhost ([::1]:42186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ieLkr-0000dx-Al for importer@patchew.org; Mon, 09 Dec 2019 11:19:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60656) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ieLjp-000076-4t for qemu-devel@nongnu.org; Mon, 09 Dec 2019 11:18:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ieLjn-0005mR-HD for qemu-devel@nongnu.org; Mon, 09 Dec 2019 11:18:20 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:45429 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ieLjn-0005mF-DT for qemu-devel@nongnu.org; Mon, 09 Dec 2019 11:18:19 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-315-dQ4xN_jfO_inN6XfBoJBqw-1; Mon, 09 Dec 2019 11:16:14 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BA727802592; Mon, 9 Dec 2019 16:16:12 +0000 (UTC) Received: from blue.redhat.com (ovpn-116-171.phx2.redhat.com [10.3.116.171]) by smtp.corp.redhat.com (Postfix) with ESMTP id 98FAC46; Mon, 9 Dec 2019 16:16:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575908299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OYU2bFdV8HYp/Dkfz+XS+7aelHvN6sGn5+i1ejOekLo=; b=WZAlwbKsORpdENazYT8Ft1W5eGQ8k2ZEq2yWZ0dpdAILP+ahvHewSTCUM9e8Zd9+xfXf6I Xkpz54zO2fnKdXHagzwKEkOzfSNz7op4bFNTw3puDUa4axmqD8bshGyRBOP6yI4M/x0r6Q WSXfDvzPX42aASVxqlRiRmxCNf0cv64= From: Eric Blake To: qemu-devel@nongnu.org Subject: [PATCH for 4.2-rc5 1/1] block/qcow2-bitmap: fix crash bug in qcow2_co_remove_persistent_dirty_bitmap Date: Mon, 9 Dec 2019 10:16:07 -0600 Message-Id: <20191209161607.20894-1-eblake@redhat.com> In-Reply-To: <20191209160015.20253-1-eblake@redhat.com> References: <20191209160015.20253-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: dQ4xN_jfO_inN6XfBoJBqw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , peter.maydell@linaro.org, vsementsov@virtuozzo.com, "open list:qcow2" , Max Reitz , jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Here is double bug: First, return error but not set errp. This may lead to: qmp block-dirty-bitmap-remove may report success when actually failed block-dirty-bitmap-remove used in a transaction will crash, as qmp_transaction will think that it returned success and will call block_dirty_bitmap_remove_commit which will crash, as state->bitmap is NULL Second (like in anecdote), this case is not an error at all. As it is documented in the comment above bdrv_co_remove_persistent_dirty_bitmap definition, absence of bitmap is not an error, and similar case handled at start of qcow2_co_remove_persistent_dirty_bitmap, it returns 0 when there is no bitmaps at all. But when there are some bitmaps, but not the requested one, it return error with errp unset. Fix that. Trigger: 1. create persistent bitmap A 2. shutdown vm (bitmap A is synced) 3. start vm 4. create persistent bitmap B 5. remove bitmap B - it fails (and crashes if in transaction) Potential workaround (rather invasive to ask clients to implement it): 1. create persistent bitmap A 2. shutdown vm 3. start vm 4. create persistent bitmap B 5. remember, that we want to remove bitmap B after vm shutdown ... some other operations ... 6. vm shutdown 7. start vm in stopped mode, and remove all bitmaps marked for removing 8. stop vm Fixes: b56a1e31759b750 Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20191205193049.30666-1-vsementsov@virtuozzo.com> Reviewed-by: Eric Blake Reviewed-by: John Snow [eblake: commit message tweaks] Signed-off-by: Eric Blake --- block/qcow2-bitmap.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index 8abaf632fc7d..c6c8ebbe89d4 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -1469,8 +1469,10 @@ int coroutine_fn qcow2_co_remove_persistent_dirty_bi= tmap(BlockDriverState *bs, Qcow2BitmapList *bm_list; if (s->nb_bitmaps =3D=3D 0) { - /* Absence of the bitmap is not an error: see explanation above - * bdrv_remove_persistent_dirty_bitmap() definition. */ + /* + * Absence of the bitmap is not an error: see explanation above + * bdrv_co_remove_persistent_dirty_bitmap() definition. + */ return 0; } @@ -1485,7 +1487,8 @@ int coroutine_fn qcow2_co_remove_persistent_dirty_bit= map(BlockDriverState *bs, bm =3D find_bitmap_by_name(bm_list, name); if (bm =3D=3D NULL) { - ret =3D -EINVAL; + /* Absence of the bitmap is not an error, see above. */ + ret =3D 0; goto out; } --=20 2.21.0