From patchwork Fri Mar 21 12:35:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 14025351 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 425FCC36007 for ; Fri, 21 Mar 2025 12:38:13 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvbbr-0001nP-An; Fri, 21 Mar 2025 08:36:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tvbbp-0001lc-El for qemu-devel@nongnu.org; Fri, 21 Mar 2025 08:36:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tvbbm-0008Ll-UC for qemu-devel@nongnu.org; Fri, 21 Mar 2025 08:36:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742560577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cmsnRTYjFDi8QQkG86GhfsJrElJa8F24edkMG+njGLk=; b=ag/b8vOnSLF9zfEXshAqIn9VDrQfFdFNGFhc626em5xxVSGM6k3TdVy8E3/2ILISVa8TmK j0S5U+D7U7GTsyZXRR3+qVOfBJcObY4jffkL2lqDIBpKyCkB9Yl3Ry8oPo87cjocz1sJ99 OYh4w9TAR9Ca9SgLWHZk68tVUD5PV+U= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-528-uA5SCFGKPIS7Ayc1RSaA-A-1; Fri, 21 Mar 2025 08:36:12 -0400 X-MC-Unique: uA5SCFGKPIS7Ayc1RSaA-A-1 X-Mimecast-MFC-AGG-ID: uA5SCFGKPIS7Ayc1RSaA-A_1742560570 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 760BB1933B40; Fri, 21 Mar 2025 12:36:09 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.45.224.38]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5012F1828A83; Fri, 21 Mar 2025 12:36:07 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id EA8B61800387; Fri, 21 Mar 2025 13:36:04 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Kashyap Chamarthy , Weiwei Li , Bibo Mao , Jiaxun Yang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , Palmer Dabbelt , qemu-riscv@nongnu.org, Gerd Hoffmann , Alistair Francis , Liu Zhiwei , Song Gao , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Krempa Subject: [PULL 1/6] hw/uefi: flush variable store to disk in post load Date: Fri, 21 Mar 2025 13:35:59 +0100 Message-ID: <20250321123604.2126923-2-kraxel@redhat.com> In-Reply-To: <20250321123604.2126923-1-kraxel@redhat.com> References: <20250321123604.2126923-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.332, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Make live migration more robust. Commit 4c0cfc72b31a ("pflash_cfi01: write flash contents to bdrv on incoming migration") elaborates in detail on the motivation. Cc: Peter Krempa Reviewed-by: Peter Krempa Signed-off-by: Gerd Hoffmann Message-ID: <20250319141159.1461621-2-kraxel@redhat.com> --- hw/uefi/var-service-core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/uefi/var-service-core.c b/hw/uefi/var-service-core.c index 8ed8378ab991..4836a0cb8116 100644 --- a/hw/uefi/var-service-core.c +++ b/hw/uefi/var-service-core.c @@ -29,6 +29,7 @@ static int uefi_vars_post_load(void *opaque, int version_id) uefi_vars_state *uv = opaque; uefi_vars_update_storage(uv); + uefi_vars_json_save(uv); uv->buffer = g_malloc(uv->buf_size); return 0; } From patchwork Fri Mar 21 12:36:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 14025352 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9B8F0C36000 for ; Fri, 21 Mar 2025 12:38:59 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvbby-0001sZ-HX; Fri, 21 Mar 2025 08:36:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tvbbx-0001ro-42 for qemu-devel@nongnu.org; Fri, 21 Mar 2025 08:36:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tvbbv-0008O9-J0 for qemu-devel@nongnu.org; Fri, 21 Mar 2025 08:36:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742560586; 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=I5png6mRhUjk0lWJHeFGNHtdk7qrk3Iy9ijmwQrlhyA=; b=Lv7K9kJwoGRjVTRpV6Glm7nEf+qJAySHEk0kshg/KfO/g6N0Ektxg/1f13bYSTCRHTnlyL og4dKsPXsciafN43ljaq7Cqrj+fNV5CCPoCakG38S1+364jHuoxrV2AoHNKxaHojZtIC0+ UDoVIR/QpTdLF8CPZreQsRWnRXDhpYs= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-479-3ZarA2LfOlS6pJPSJTzLuQ-1; Fri, 21 Mar 2025 08:36:14 -0400 X-MC-Unique: 3ZarA2LfOlS6pJPSJTzLuQ-1 X-Mimecast-MFC-AGG-ID: 3ZarA2LfOlS6pJPSJTzLuQ_1742560573 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A7CA4190308B; Fri, 21 Mar 2025 12:36:12 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.45.224.38]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A34E11955BFE; Fri, 21 Mar 2025 12:36:11 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 07E83180038E; Fri, 21 Mar 2025 13:36:05 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Kashyap Chamarthy , Weiwei Li , Bibo Mao , Jiaxun Yang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , Palmer Dabbelt , qemu-riscv@nongnu.org, Gerd Hoffmann , Alistair Francis , Liu Zhiwei , Song Gao , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PULL 2/6] hw/uefi: fix error handling in uefi_vars_json_save Date: Fri, 21 Mar 2025 13:36:00 +0100 Message-ID: <20250321123604.2126923-3-kraxel@redhat.com> In-Reply-To: <20250321123604.2126923-1-kraxel@redhat.com> References: <20250321123604.2126923-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 Received-SPF: pass client-ip=170.10.129.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.332, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Catch lseek errors. Return on errors. Use autoptr for the GString to simplify cleanup. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Gerd Hoffmann Message-ID: <20250319141159.1461621-3-kraxel@redhat.com> --- hw/uefi/var-service-json.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/hw/uefi/var-service-json.c b/hw/uefi/var-service-json.c index 761082c11fc1..f1c20a6b8c1e 100644 --- a/hw/uefi/var-service-json.c +++ b/hw/uefi/var-service-json.c @@ -178,7 +178,7 @@ void uefi_vars_json_init(uefi_vars_state *uv, Error **errp) void uefi_vars_json_save(uefi_vars_state *uv) { - GString *gstr; + g_autoptr(GString) gstr = NULL; int rc; if (uv->jsonfd == -1) { @@ -187,18 +187,25 @@ void uefi_vars_json_save(uefi_vars_state *uv) gstr = uefi_vars_to_json(uv); - lseek(uv->jsonfd, 0, SEEK_SET); + rc = lseek(uv->jsonfd, 0, SEEK_SET); + if (rc < 0) { + warn_report("%s: lseek error", __func__); + return; + } + rc = ftruncate(uv->jsonfd, 0); if (rc != 0) { warn_report("%s: ftruncate error", __func__); + return; } + rc = write(uv->jsonfd, gstr->str, gstr->len); if (rc != gstr->len) { warn_report("%s: write error", __func__); + return; } + fsync(uv->jsonfd); - - g_string_free(gstr, true); } void uefi_vars_json_load(uefi_vars_state *uv, Error **errp) From patchwork Fri Mar 21 12:36:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 14025347 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5CCCEC36000 for ; Fri, 21 Mar 2025 12:37:08 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvbbv-0001qR-V8; Fri, 21 Mar 2025 08:36:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tvbbt-0001pB-Ay for qemu-devel@nongnu.org; Fri, 21 Mar 2025 08:36:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tvbbr-0008N6-Kc for qemu-devel@nongnu.org; Fri, 21 Mar 2025 08:36:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742560582; 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=eN0qMmN5dJtNXlvm7TICi8tl+uiLKwN3T0w4usf+RAs=; b=fQE4NBsmEULIA2Iztx55ZMX6lrxT0Uz3wCBEUyIUygceWe7/4s/qVUkwyCRE4Q4sMv6Gd8 JgmTf5JjVjZx54mFBzbfUZeiJjamldBOKDpRkRpjTyp+jW8dDShElW8+58+hF0fCZnrddm mFMXek1q7RWQimdfj0laeOjuqKbrK+Q= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-213-f49GC6CXNnm9bNGeNbfzUw-1; Fri, 21 Mar 2025 08:36:16 -0400 X-MC-Unique: f49GC6CXNnm9bNGeNbfzUw-1 X-Mimecast-MFC-AGG-ID: f49GC6CXNnm9bNGeNbfzUw_1742560574 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 66F5E180AF52; Fri, 21 Mar 2025 12:36:14 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.45.224.38]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D48E01828A98; Fri, 21 Mar 2025 12:36:11 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 16CB81800390; Fri, 21 Mar 2025 13:36:05 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Kashyap Chamarthy , Weiwei Li , Bibo Mao , Jiaxun Yang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , Palmer Dabbelt , qemu-riscv@nongnu.org, Gerd Hoffmann , Alistair Francis , Liu Zhiwei , Song Gao , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PULL 3/6] hw/uefi: fix error handling in uefi_vars_json_load Date: Fri, 21 Mar 2025 13:36:01 +0100 Message-ID: <20250321123604.2126923-4-kraxel@redhat.com> In-Reply-To: <20250321123604.2126923-1-kraxel@redhat.com> References: <20250321123604.2126923-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass client-ip=170.10.129.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.332, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Catch lseek errors. Return on read errors. Fixes: CID 1593154 Fixes: CID 1593157 Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Gerd Hoffmann Message-ID: <20250319141159.1461621-4-kraxel@redhat.com> --- hw/uefi/var-service-json.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/hw/uefi/var-service-json.c b/hw/uefi/var-service-json.c index f1c20a6b8c1e..ad3462cd1557 100644 --- a/hw/uefi/var-service-json.c +++ b/hw/uefi/var-service-json.c @@ -214,7 +214,7 @@ void uefi_vars_json_load(uefi_vars_state *uv, Error **errp) QObject *qobj; Visitor *v; char *str; - size_t len; + ssize_t len; int rc; if (uv->jsonfd == -1) { @@ -222,7 +222,12 @@ void uefi_vars_json_load(uefi_vars_state *uv, Error **errp) } len = lseek(uv->jsonfd, 0, SEEK_END); + if (len < 0) { + warn_report("%s: lseek error", __func__); + return; + } if (len == 0) { + /* empty file */ return; } @@ -231,6 +236,8 @@ void uefi_vars_json_load(uefi_vars_state *uv, Error **errp) rc = read(uv->jsonfd, str, len); if (rc != len) { warn_report("%s: read error", __func__); + g_free(str); + return; } str[len] = 0; From patchwork Fri Mar 21 12:36:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 14025348 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DB8FCC36007 for ; Fri, 21 Mar 2025 12:37:09 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvbbu-0001pm-7s; Fri, 21 Mar 2025 08:36:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tvbbs-0001oE-IK for qemu-devel@nongnu.org; Fri, 21 Mar 2025 08:36:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tvbbq-0008ML-Ho for qemu-devel@nongnu.org; Fri, 21 Mar 2025 08:36:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742560581; 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=YP3W3SSziRWWK3FyAofg3Yc/0xIn1O5FtN33E19E/V0=; b=Y0nZyIzJW/ze6UXnayVmSaz/584Yzg0dF9MHgy5rAv5qsnvwwc9HdPoDSSuG7Fyj345Hyd Dxf66dI2fifnxj7ffJ+H4yeolGbfN93bshwSbfsrshEt2VjR8p+2eyBiGjy8va6BFSo0rI X0MGRFdC/0F7X9NT7RSSG31oeh0K6xw= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-247-CIlqUPMSMIGPGBQGd2M3Tg-1; Fri, 21 Mar 2025 08:36:17 -0400 X-MC-Unique: CIlqUPMSMIGPGBQGd2M3Tg-1 X-Mimecast-MFC-AGG-ID: CIlqUPMSMIGPGBQGd2M3Tg_1742560576 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BC6271933B4F; Fri, 21 Mar 2025 12:36:15 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.45.224.38]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 413B9195609D; Fri, 21 Mar 2025 12:36:15 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 28AE81800607; Fri, 21 Mar 2025 13:36:05 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Kashyap Chamarthy , Weiwei Li , Bibo Mao , Jiaxun Yang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , Palmer Dabbelt , qemu-riscv@nongnu.org, Gerd Hoffmann , Alistair Francis , Liu Zhiwei , Song Gao , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PULL 4/6] hw/uefi-vars-sysbus: allow for riscv virt Date: Fri, 21 Mar 2025 13:36:02 +0100 Message-ID: <20250321123604.2126923-5-kraxel@redhat.com> In-Reply-To: <20250321123604.2126923-1-kraxel@redhat.com> References: <20250321123604.2126923-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass client-ip=170.10.129.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.332, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Allow the device being added to riscv virt VMs. Reviewed-by: Daniel Henrique Barboza Reviewed-by: Daniel P. Berrangé Signed-off-by: Gerd Hoffmann Message-ID: <20250319141159.1461621-5-kraxel@redhat.com> --- hw/riscv/virt.c | 2 ++ hw/uefi/Kconfig | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index dae46f4733cd..e517002fdfc7 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -57,6 +57,7 @@ #include "hw/acpi/aml-build.h" #include "qapi/qapi-visit-common.h" #include "hw/virtio/virtio-iommu.h" +#include "hw/uefi/var-service-api.h" /* KVM AIA only supports APLIC MSI. APLIC Wired is always emulated by QEMU. */ static bool virt_use_kvm_aia_aplic_imsic(RISCVVirtAIAType aia_type) @@ -1935,6 +1936,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) hc->plug = virt_machine_device_plug_cb; machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE); + machine_class_allow_dynamic_sysbus_dev(mc, TYPE_UEFI_VARS_SYSBUS); #ifdef CONFIG_TPM machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS); #endif diff --git a/hw/uefi/Kconfig b/hw/uefi/Kconfig index ca6c2bc46a96..f139008b632b 100644 --- a/hw/uefi/Kconfig +++ b/hw/uefi/Kconfig @@ -1,3 +1,3 @@ config UEFI_VARS bool - default y if X86_64 || AARCH64 + default y if X86_64 || AARCH64 || RISCV64 From patchwork Fri Mar 21 12:36:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 14025350 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E257AC36000 for ; Fri, 21 Mar 2025 12:37:48 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvbbx-0001rk-3y; Fri, 21 Mar 2025 08:36:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tvbbu-0001pq-Iv for qemu-devel@nongnu.org; Fri, 21 Mar 2025 08:36:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tvbbs-0008NM-UZ for qemu-devel@nongnu.org; Fri, 21 Mar 2025 08:36:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742560584; 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=y9+kbTvfIdmx0wX1y2B7qTJOI+nO+LcPh6NHT85VsFE=; b=Xiq1TeNybNfZc+tz7Qytm1TLutwFutktaiy+8gkOU79f3eOxOFjHRNwEc1or6v7bhP7vqL bxTafB6Myy1J4gmFfC/GJSgO5s02KYHtPzusuWyhrgF5xIN2uWCBz5SR1mPr1IHh68gQ0p hSrnpp1m2dpQoNnIXRtmJk6grNW9Eec= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-359-mDqv5EViP4a53ZHXuITt3Q-1; Fri, 21 Mar 2025 08:36:19 -0400 X-MC-Unique: mDqv5EViP4a53ZHXuITt3Q-1 X-Mimecast-MFC-AGG-ID: mDqv5EViP4a53ZHXuITt3Q_1742560577 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 195C51933B57; Fri, 21 Mar 2025 12:36:17 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.45.224.38]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9EF701954B38; Fri, 21 Mar 2025 12:36:16 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3A3641800608; Fri, 21 Mar 2025 13:36:05 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Kashyap Chamarthy , Weiwei Li , Bibo Mao , Jiaxun Yang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , Palmer Dabbelt , qemu-riscv@nongnu.org, Gerd Hoffmann , Alistair Francis , Liu Zhiwei , Song Gao , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PULL 5/6] hw/uefi-vars-sysbus: allow for loongarch virt Date: Fri, 21 Mar 2025 13:36:03 +0100 Message-ID: <20250321123604.2126923-6-kraxel@redhat.com> In-Reply-To: <20250321123604.2126923-1-kraxel@redhat.com> References: <20250321123604.2126923-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Received-SPF: pass client-ip=170.10.129.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.332, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Allow the device being added to loongarch virt VMs. Reviewed-by: Daniel P. Berrangé Signed-off-by: Gerd Hoffmann Message-ID: <20250319141159.1461621-6-kraxel@redhat.com> --- hw/loongarch/virt.c | 2 ++ hw/uefi/Kconfig | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index a5840ff96857..b6f5f6a3b546 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -38,6 +38,7 @@ #include "hw/mem/nvdimm.h" #include "hw/platform-bus.h" #include "hw/display/ramfb.h" +#include "hw/uefi/var-service-api.h" #include "hw/mem/pc-dimm.h" #include "system/tpm.h" #include "system/block-backend.h" @@ -1207,6 +1208,7 @@ static void virt_class_init(ObjectClass *oc, void *data) object_class_property_set_description(oc, "v-eiointc", "Enable Virt Extend I/O Interrupt Controller."); machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE); + machine_class_allow_dynamic_sysbus_dev(mc, TYPE_UEFI_VARS_SYSBUS); #ifdef CONFIG_TPM machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS); #endif diff --git a/hw/uefi/Kconfig b/hw/uefi/Kconfig index f139008b632b..046d55320e16 100644 --- a/hw/uefi/Kconfig +++ b/hw/uefi/Kconfig @@ -1,3 +1,3 @@ config UEFI_VARS bool - default y if X86_64 || AARCH64 || RISCV64 + default y if X86_64 || AARCH64 || RISCV64 || LOONGARCH64 From patchwork Fri Mar 21 12:36:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 14025349 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 867D4C36007 for ; Fri, 21 Mar 2025 12:37:21 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvbbz-0001tR-I1; Fri, 21 Mar 2025 08:36:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tvbbu-0001py-U4 for qemu-devel@nongnu.org; Fri, 21 Mar 2025 08:36:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tvbbt-0008Nc-DH for qemu-devel@nongnu.org; Fri, 21 Mar 2025 08:36:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742560584; 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=VRDSLwYwETArjgeOrFMmyM+30TOgKYOKUr0h0AFCGSM=; b=cTNwmm9it3R2yLQ6slRF1JtCMgfy0S/1XHJQ3O0w724Y/6YTihoz/RZIvYnV7iUxecKbTR wJyTHQ6NBaidZRALtKeb0B+X7c5N0Xl9QesMBmU1kOQ+vOhpuOY8HjpM80YsQp8S4Ct3Ng 0xqFo/YAJxFeDtylQ98SHMJuDfnT+Eg= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-694-nmyjx7c3PrmWmrFZ9oBHvQ-1; Fri, 21 Mar 2025 08:36:20 -0400 X-MC-Unique: nmyjx7c3PrmWmrFZ9oBHvQ-1 X-Mimecast-MFC-AGG-ID: nmyjx7c3PrmWmrFZ9oBHvQ_1742560578 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A7C3D196D2D8; Fri, 21 Mar 2025 12:36:18 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.45.224.38]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 386BF1801766; Fri, 21 Mar 2025 12:36:18 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 49E381800609; Fri, 21 Mar 2025 13:36:05 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Kashyap Chamarthy , Weiwei Li , Bibo Mao , Jiaxun Yang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , Palmer Dabbelt , qemu-riscv@nongnu.org, Gerd Hoffmann , Alistair Francis , Liu Zhiwei , Song Gao , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PULL 6/6] docs/firmware: add feature flag for host uefi variable store Date: Fri, 21 Mar 2025 13:36:04 +0100 Message-ID: <20250321123604.2126923-7-kraxel@redhat.com> In-Reply-To: <20250321123604.2126923-1-kraxel@redhat.com> References: <20250321123604.2126923-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.332, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Reviewed-by: Daniel P. Berrangé Signed-off-by: Gerd Hoffmann Message-ID: <20250319141159.1461621-7-kraxel@redhat.com> --- docs/interop/firmware.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/interop/firmware.json b/docs/interop/firmware.json index 57f55f6c5455..745d21d82232 100644 --- a/docs/interop/firmware.json +++ b/docs/interop/firmware.json @@ -214,13 +214,23 @@ # PL011 UART. @verbose-static is mutually exclusive # with @verbose-dynamic. # +# @host-uefi-vars: The firmware expects the host to provide an uefi +# variable store. qemu supports that via +# "uefi-vars-sysbus" (aarch64, riscv64, loongarch64) +# or "uefi-vars-x64" (x86_64) devices. The firmware +# will not use flash for nvram. When loading the +# firmware into flash the 'stateless' setup should be +# used. It is recommened to load the firmware into +# memory though. +# # Since: 3.0 ## { 'enum' : 'FirmwareFeature', 'data' : [ 'acpi-s3', 'acpi-s4', 'amd-sev', 'amd-sev-es', 'amd-sev-snp', 'intel-tdx', - 'enrolled-keys', 'requires-smm', 'secure-boot', + 'enrolled-keys', 'requires-smm', + 'secure-boot', 'host-uefi-vars', 'verbose-dynamic', 'verbose-static' ] } ##