From nobody Sun May 19 12:00:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1662654093; cv=none; d=zohomail.com; s=zohoarc; b=lCznrnKW0av+b81kb9lMrpiJsuAw7+nQiwwaxy7bQGZdA+ijqLLOIRP4i9wGTTpqa5PegF1Bcol5dQ8i3gwOGUHARTZS8VUiDLybrROTPW3rBoUGzwIjqO2oJv0RYlqdaTe3gniy5rDIGY6qPzfcz5EkWwqqU9+FnApXA7mAolQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662654093; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=rYivBCd425ckUTxymH2fOULLCz+ZVDlcjGwjqv6ag5I=; b=Vs+OkAJID0zKiWEgWMoXG0SdxKcOhwTg7Z+E0QWUYBvVvAOfAt6f+ERJkEZRZ0QqmYckjnOxbBv/zUumyd1hD7SdlEVAHdmU29B8D4/LodqKmdeGFcX1Fmo+WkGAtB31mDudFZDgKOzFZEwQDfyUI4IvcaDb9ivn1JCDLnRBKrs= ARC-Authentication-Results: i=1; mx.zohomail.com; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1662654093058417.99137954654736; Thu, 8 Sep 2022 09:21:33 -0700 (PDT) Received: from localhost ([::1]:40192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWKHS-0006Il-NK for importer@patchew.org; Thu, 08 Sep 2022 12:21:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59432) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWK1o-0001yv-LZ; Thu, 08 Sep 2022 12:05:21 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:2694) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWK1j-0004ig-Pq; Thu, 08 Sep 2022 12:05:18 -0400 Received: from fraeml744-chm.china.huawei.com (unknown [172.18.147.226]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4MNkPH01KWz688pj; Fri, 9 Sep 2022 00:00:51 +0800 (CST) Received: from lhrpeml500005.china.huawei.com (7.191.163.240) by fraeml744-chm.china.huawei.com (10.206.15.225) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 8 Sep 2022 18:04:58 +0200 Received: from A2006125610.china.huawei.com (10.48.154.32) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 8 Sep 2022 17:04:53 +0100 To: , CC: , , , , , , Subject: [PATCH v2] fw_cfg: Don't set callback_opaque NULL in fw_cfg_modify_bytes_read() Date: Thu, 8 Sep 2022 17:03:54 +0100 Message-ID: <20220908160354.2023-1-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.48.154.32] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To lhrpeml500005.china.huawei.com (7.191.163.240) X-CFilter-Loop: Reflected 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; Received-SPF: pass client-ip=185.176.79.56; envelope-from=shameerali.kolothum.thodi@huawei.com; helo=frasgout.his.huawei.com X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) AC_FROM_MANY_DOTS=2.999, BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Shameer Kolothum From: Shameer Kolothum via X-ZM-MESSAGEID: 1662654094928100001 On arm/virt platform, Chen Xiang reported a Guest crash while attempting the below steps, 1. Launch the Guest with nvdimm=3Don 2. Hot-add a NVDIMM dev 3. Reboot 4. Guest boots fine. 5. Reboot again. 6. Guest boot fails. QEMU_EFI reports the below error: ProcessCmdAddPointer: invalid pointer value in "etc/acpi/tables" OnRootBridgesConnected: InstallAcpiTables: Protocol Error Debugging shows that on first reboot(after hot adding NVDIMM), Qemu updates the etc/table-loader len, qemu_ram_resize() =C2=A0 fw_cfg_modify_file() =C2=A0 =C2=A0 =C2=A0fw_cfg_modify_bytes_read() And in fw_cfg_modify_bytes_read() we set the "callback_opaque" for the key entry to NULL. Because=C2=A0of this, on the second reboot, virt_acpi_build_update() is called with a NULL "build_state" and returns without updating the ACPI tables. This seems to be upsetting the firmware. To fix this, don't change the callback_opaque in fw_cfg_modify_bytes_read(). Fixes: bdbb5b1706d165 ("fw_cfg: add fw_cfg_machine_reset function") Reported-by: chenxiang Acked-by: Igor Mammedov Acked-by: Gerd Hoffmann Signed-off-by: Shameer Kolothum --- v1 --> v2 -Added Fixes tag as pointed out by Igor -Added Ack-by tags v1: https://lore.kernel.org/all/20220825161842.841-1-shameerali.kolothum.thodi= @huawei.com/ --- hw/nvram/fw_cfg.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index d605f3f45a..dfe8404c01 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -728,7 +728,6 @@ static void *fw_cfg_modify_bytes_read(FWCfgState *s, ui= nt16_t key, ptr =3D s->entries[arch][key].data; s->entries[arch][key].data =3D data; s->entries[arch][key].len =3D len; - s->entries[arch][key].callback_opaque =3D NULL; s->entries[arch][key].allow_write =3D false; =20 return ptr; --=20 2.17.1