From nobody Sat Apr 11 21:51:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1773148968; cv=none; d=zohomail.com; s=zohoarc; b=E/epWUeXYXHB74/0u/kUMDNnhnPkBO/q3VJrrTdkSnO1BR4oql7DpzpKMrA75rTObXGwNtKbxHvYu6ZuNpjjuwS+AGjThLFIiF+hbeVL6c+mYCmvQuoKoyRN1Fj/yUeFUnVp6fTazGXBOpdJNMfY1Zc3rrPHheMDA1aTvu7fKBs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773148968; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ky5o/xVx4bApMfBKfTqTU1xt2VCFg4tZ5G+RNDJxoJ8=; b=ij+yEpXUEODCH9r6C333qjMbNskwWS7V2L/rfTe47Zj3f8S+ROVXi1MGJ7Z6eFTwclZbj5z3HWOPp0WN66DskuKMouARWpAbBzZFt7sT9/ep4crR6LtriFq6PCnbLA1gabiWP+8gDLbeKbebgl45HeDF/+MBzmTdV5/r5jM2OHc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773148968723853.3489666281728; Tue, 10 Mar 2026 06:22:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzx2I-0008A8-1p; Tue, 10 Mar 2026 09:22:10 -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 1vzx2F-000897-F3 for qemu-devel@nongnu.org; Tue, 10 Mar 2026 09:22:07 -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 1vzx2D-0006VJ-R9 for qemu-devel@nongnu.org; Tue, 10 Mar 2026 09:22:07 -0400 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-696-mgfye2-fMTSCbheSipR3Kw-1; Tue, 10 Mar 2026 09:22:01 -0400 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6BFB118002D6; Tue, 10 Mar 2026 13:22:00 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.45.225.19]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CFEDB1955D87; Tue, 10 Mar 2026 13:21:59 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0FECA1801A8F; Tue, 10 Mar 2026 14:21:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773148925; 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=ky5o/xVx4bApMfBKfTqTU1xt2VCFg4tZ5G+RNDJxoJ8=; b=Fvrvjpx2F29accEgMV2ocilZwgS72b4YHShHIEi0cxtyX7VFtlRaZrkBkymwA5QR+urZuK KKUYQBLSz12eeKoUfYeIBZ3TK3Fetfdn0OyM3sZjraWuTsBD3XXfWzfz2BRpsEW2zd3569 RDJ3b2DQRphfhpRswRiQ+k4CCzeBFpo= X-MC-Unique: mgfye2-fMTSCbheSipR3Kw-1 X-Mimecast-MFC-AGG-ID: mgfye2-fMTSCbheSipR3Kw_1773148920 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, Pierrick Bouvier , Stefano Garzarella , Zhao Liu , Gerd Hoffmann , Paolo Bonzini , Ani Sinha , Marcelo Tosatti , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kashyap Chamarthy Subject: [PULL 3/3] i386/sev/igvm: do not reset guest policy if IGVM does not set it Date: Tue, 10 Mar 2026 14:21:54 +0100 Message-ID: <20260310132154.2783257-4-kraxel@redhat.com> In-Reply-To: <20260310132154.2783257-1-kraxel@redhat.com> References: <20260310132154.2783257-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1773148971712154100 Content-Type: text/plain; charset="utf-8" From: Ani Sinha The guest policy is set either through command-line or through IGVM. If non= e of the above applies, default guest policy applies. However, if IGVM does not = set the guest policy, currently the policy gets set to 0 regardless of whether = it was previously set to default value or command line. This change fixes this= by checking if IGVM indeed has set a policy value. If not, do not reset existi= ng value. This avoids guest crashes such as the following during reset when the IGVM has not explicitly set any guest policies: qemu-system-x86_64: sev_snp_launch_start: SNP_LAUNCH_START ret=3D-22 fw_err= or=3D0 '' qemu-system-x86_64: sev_common_kvm_init: failed to create encryption context qemu-system-x86_64: unable to rebuild guest: Operation not permitted(-1) Reported-by: Gerd Hoffmann Signed-off-by: Ani Sinha Message-ID: <20260310094450.35861-3-anisinha@redhat.com> Signed-off-by: Gerd Hoffmann --- target/i386/sev.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/target/i386/sev.c b/target/i386/sev.c index 549e6241769b..cddffe0da8dd 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -2760,7 +2760,11 @@ static int cgs_set_guest_policy(ConfidentialGuestPol= icyType policy_type, id_auth->author_key[0] ? 1 : 0; finish->id_block_en =3D 1; } - sev_snp_guest->kvm_start_conf.policy =3D policy; + + /* do not reset existing policy if policy was not set in IGVM */ + if (policy !=3D 0) { + sev_snp_guest->kvm_start_conf.policy =3D policy; + } } else { SevGuestState *sev_guest =3D SEV_GUEST(MACHINE(qdev_get_machine())= ->cgs); /* Only the policy flags are supported for SEV and SEV-ES */ @@ -2769,7 +2773,11 @@ static int cgs_set_guest_policy(ConfidentialGuestPol= icyType policy_type, "but SEV-SNP is not enabled", __func__); return -1; } - sev_guest->policy =3D policy; + + /* do not reset existing policy if policy was not set in IGVM */ + if (policy !=3D 0) { + sev_guest->policy =3D policy; + } } return 0; } --=20 2.53.0