From nobody Tue Feb 10 15:46:46 2026 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1591253004; cv=none; d=zohomail.com; s=zohoarc; b=GHcGzoTbm9fvvBzkzkmYMAkRGbKnwSsZi/YVJOkvIFaIXicpNcfsW8c6Alsx7iHN61wDuqSgyLtogRcz7EsN+T59la0+zORjchEzSJ9kvgegOVgLqJykOuxDbr7bbM2S+OQxV7Zv+6RFctK35F1dTGFW9MhU3Y1v0u4qTKtEwPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591253004; 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=g5PrnvLXWbfPJ1inOdhDlwKg4LdB5JQRZXk0AlTaGnQ=; b=dICIKk/KVLuTTgiSHeVtxC1W9dTD3ACrjpctJoO9Xia8bkBYggjyfj0pIrDAD55ulIrv9gFG2kYrfvjpcnc1FdnPVuFWsKPAxfChUm47qIjWZ+c9Otkcw/QrNqRJCVENC8EqJlYLunEYrmpeDwMnqyVP7iqilKG2TbdCN3oD4bw= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591253004840838.0212246240076; Wed, 3 Jun 2020 23:43:24 -0700 (PDT) Received: from localhost ([::1]:57020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jgjb1-0006NO-Ni for importer@patchew.org; Thu, 04 Jun 2020 02:43:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jgjaD-0004yJ-Pa for qemu-devel@nongnu.org; Thu, 04 Jun 2020 02:42:33 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:45963) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jgjaB-0000mp-GQ for qemu-devel@nongnu.org; Thu, 04 Jun 2020 02:42:33 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 49cx6C3x7Pz9sTG; Thu, 4 Jun 2020 16:42:27 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1591252947; bh=FTQ7m07v8BgK5bUbT3s95D7yiqpW26UZ7gLCPq5T3cE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fSHI6dowy1vZ5HgJ2QyUL2dmuIuYY4wabE4Pboo2LlWo7MDaqalZSV0SM3OR5EDvN UZkXidm9G7lmDVEQYWx2E/DvXAPr4ib/8FWiZTvmP2URX6zqML7Z+nn2B4vjsexQEb /LDmLxKggVyii1b6s5uTJPPcHOmAitjzFqK/m8TU= From: David Gibson To: rth@twiddle.net, pbonzini@redhat.com, ekabkost@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 4/9] target/i386: sev: Embed SEVState in SevGuestState Date: Thu, 4 Jun 2020 16:42:14 +1000 Message-Id: <20200604064219.436242-5-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200604064219.436242-1-david@gibson.dropbear.id.au> References: <20200604064219.436242-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: brijesh.singh@amd.com, Eduardo Habkost , Richard Henderson , dgilbert@redhat.com, philmd@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) Currently SevGuestState contains only configuration information. For runtime state another non-QOM struct SEVState is allocated separately. Simplify things by instead embedding the SEVState structure in SevGuestState. Signed-off-by: David Gibson Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/sev.c | 54 +++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/target/i386/sev.c b/target/i386/sev.c index b6ed719fb5..b4ab9720d6 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -35,6 +35,22 @@ =20 typedef struct SevGuestState SevGuestState; =20 +struct SEVState { + uint8_t api_major; + uint8_t api_minor; + uint8_t build_id; + uint32_t policy; + uint64_t me_mask; + uint32_t cbitpos; + uint32_t reduced_phys_bits; + uint32_t handle; + int sev_fd; + SevState state; + gchar *measurement; +}; + +typedef struct SEVState SEVState; + /** * SevGuestState: * @@ -48,6 +64,7 @@ typedef struct SevGuestState SevGuestState; struct SevGuestState { Object parent_obj; =20 + /* configuration parameters */ char *sev_device; uint32_t policy; uint32_t handle; @@ -55,25 +72,11 @@ struct SevGuestState { char *session_file; uint32_t cbitpos; uint32_t reduced_phys_bits; -}; =20 -struct SEVState { - SevGuestState *sev_info; - uint8_t api_major; - uint8_t api_minor; - uint8_t build_id; - uint32_t policy; - uint64_t me_mask; - uint32_t cbitpos; - uint32_t reduced_phys_bits; - uint32_t handle; - int sev_fd; - SevState state; - gchar *measurement; + /* runtime state */ + SEVState state; }; =20 -typedef struct SEVState SEVState; - #define DEFAULT_GUEST_POLICY 0x1 /* disable debug */ #define DEFAULT_SEV_DEVICE "/dev/sev" =20 @@ -506,12 +509,12 @@ sev_read_file_base64(const char *filename, guchar **d= ata, gsize *len) } =20 static int -sev_launch_start(SEVState *s) +sev_launch_start(SevGuestState *sev) { + SEVState *s =3D &sev->state; gsize sz; int ret =3D 1; int fw_error, rc; - SevGuestState *sev =3D s->sev_info; struct kvm_sev_launch_start *start; guchar *session =3D NULL, *dh_cert =3D NULL; =20 @@ -686,6 +689,7 @@ sev_vm_state_change(void *opaque, int running, RunState= state) void * sev_guest_init(const char *id) { + SevGuestState *sev; SEVState *s; char *devname; int ret, fw_error; @@ -693,27 +697,27 @@ sev_guest_init(const char *id) uint32_t host_cbitpos; struct sev_user_data_status status =3D {}; =20 - sev_state =3D s =3D g_new0(SEVState, 1); - s->sev_info =3D lookup_sev_guest_info(id); - if (!s->sev_info) { + sev =3D lookup_sev_guest_info(id); + if (!sev) { error_report("%s: '%s' is not a valid '%s' object", __func__, id, TYPE_SEV_GUEST); goto err; } =20 + sev_state =3D s =3D &sev->state; s->state =3D SEV_STATE_UNINIT; =20 host_cpuid(0x8000001F, 0, NULL, &ebx, NULL, NULL); host_cbitpos =3D ebx & 0x3f; =20 - s->cbitpos =3D object_property_get_int(OBJECT(s->sev_info), "cbitpos",= NULL); + s->cbitpos =3D object_property_get_int(OBJECT(sev), "cbitpos", NULL); if (host_cbitpos !=3D s->cbitpos) { error_report("%s: cbitpos check failed, host '%d' requested '%d'", __func__, host_cbitpos, s->cbitpos); goto err; } =20 - s->reduced_phys_bits =3D object_property_get_int(OBJECT(s->sev_info), + s->reduced_phys_bits =3D object_property_get_int(OBJECT(sev), "reduced-phys-bits", NULL); if (s->reduced_phys_bits < 1) { error_report("%s: reduced_phys_bits check failed, it should be >= =3D1," @@ -723,7 +727,7 @@ sev_guest_init(const char *id) =20 s->me_mask =3D ~(1UL << s->cbitpos); =20 - devname =3D object_property_get_str(OBJECT(s->sev_info), "sev-device",= NULL); + devname =3D object_property_get_str(OBJECT(sev), "sev-device", NULL); s->sev_fd =3D open(devname, O_RDWR); if (s->sev_fd < 0) { error_report("%s: Failed to open %s '%s'", __func__, @@ -754,7 +758,7 @@ sev_guest_init(const char *id) goto err; } =20 - ret =3D sev_launch_start(s); + ret =3D sev_launch_start(sev); if (ret) { error_report("%s: failed to create encryption context", __func__); goto err; --=20 2.26.2