From: David Gibson <david@gibson.dropbear.id.au>
To: qemu-devel@nongnu.org, brijesh.singh@amd.com,
frankja@linux.ibm.com, dgilbert@redhat.com, pair@us.ibm.com
Cc: Eduardo Habkost <ehabkost@redhat.com>,
kvm@vger.kernel.org, "Michael S. Tsirkin" <mst@redhat.com>,
cohuck@redhat.com, mdroth@linux.vnet.ibm.com,
qemu-ppc@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <rth@twiddle.net>,
David Gibson <david@gibson.dropbear.id.au>
Subject: [RFC v2 04/18] target/i386: sev: Embed SEVState in SevGuestState
Date: Thu, 21 May 2020 13:42:50 +1000 [thread overview]
Message-ID: <20200521034304.340040-5-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20200521034304.340040-1-david@gibson.dropbear.id.au>
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 <david@gibson.dropbear.id.au>
---
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 @@
typedef struct SevGuestState SevGuestState;
+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;
+ /* 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;
-};
-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;
};
-typedef struct SEVState SEVState;
-
#define DEFAULT_GUEST_POLICY 0x1 /* disable debug */
#define DEFAULT_SEV_DEVICE "/dev/sev"
@@ -506,12 +509,12 @@ sev_read_file_base64(const char *filename, guchar **data, gsize *len)
}
static int
-sev_launch_start(SEVState *s)
+sev_launch_start(SevGuestState *sev)
{
+ SEVState *s = &sev->state;
gsize sz;
int ret = 1;
int fw_error, rc;
- SevGuestState *sev = s->sev_info;
struct kvm_sev_launch_start *start;
guchar *session = NULL, *dh_cert = NULL;
@@ -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 = {};
- sev_state = s = g_new0(SEVState, 1);
- s->sev_info = lookup_sev_guest_info(id);
- if (!s->sev_info) {
+ sev = lookup_sev_guest_info(id);
+ if (!sev) {
error_report("%s: '%s' is not a valid '%s' object",
__func__, id, TYPE_SEV_GUEST);
goto err;
}
+ sev_state = s = &sev->state;
s->state = SEV_STATE_UNINIT;
host_cpuid(0x8000001F, 0, NULL, &ebx, NULL, NULL);
host_cbitpos = ebx & 0x3f;
- s->cbitpos = object_property_get_int(OBJECT(s->sev_info), "cbitpos", NULL);
+ s->cbitpos = object_property_get_int(OBJECT(sev), "cbitpos", NULL);
if (host_cbitpos != s->cbitpos) {
error_report("%s: cbitpos check failed, host '%d' requested '%d'",
__func__, host_cbitpos, s->cbitpos);
goto err;
}
- s->reduced_phys_bits = object_property_get_int(OBJECT(s->sev_info),
+ s->reduced_phys_bits = 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 >=1,"
@@ -723,7 +727,7 @@ sev_guest_init(const char *id)
s->me_mask = ~(1UL << s->cbitpos);
- devname = object_property_get_str(OBJECT(s->sev_info), "sev-device", NULL);
+ devname = object_property_get_str(OBJECT(sev), "sev-device", NULL);
s->sev_fd = 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;
}
- ret = sev_launch_start(s);
+ ret = sev_launch_start(sev);
if (ret) {
error_report("%s: failed to create encryption context", __func__);
goto err;
--
2.26.2
next prev parent reply other threads:[~2020-05-21 3:46 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-21 3:42 [RFC v2 00/18] Refactor configuration of guest memory protection David Gibson
2020-05-21 3:42 ` [RFC v2 01/18] target/i386: sev: Remove unused QSevGuestInfoClass David Gibson
2020-05-29 9:01 ` Philippe Mathieu-Daudé
2020-06-02 3:04 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 02/18] target/i386: sev: Move local structure definitions into .c file David Gibson
2020-05-29 9:03 ` Philippe Mathieu-Daudé
2020-06-02 3:05 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 03/18] target/i386: sev: Rename QSevGuestInfo David Gibson
2020-05-29 9:05 ` Philippe Mathieu-Daudé
2020-06-02 3:06 ` Richard Henderson
2020-05-21 3:42 ` David Gibson [this message]
2020-05-29 9:09 ` [RFC v2 04/18] target/i386: sev: Embed SEVState in SevGuestState Philippe Mathieu-Daudé
2020-06-04 3:15 ` David Gibson
2020-06-02 3:07 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 05/18] target/i386: sev: Partial cleanup to sev_state global David Gibson
2020-06-02 3:08 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 06/18] target/i386: sev: Remove redundant cbitpos and reduced_phys_bits fields David Gibson
2020-05-29 9:11 ` Philippe Mathieu-Daudé
2020-06-02 3:09 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 07/18] target/i386: sev: Remove redundant policy field David Gibson
2020-06-02 3:13 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 08/18] target/i386: sev: Remove redundant handle field David Gibson
2020-06-02 3:16 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 09/18] target/i386: sev: Unify SEVState and SevGuestState David Gibson
2020-05-29 9:13 ` Philippe Mathieu-Daudé
2020-06-02 3:18 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 10/18] guest memory protection: Add guest memory protection interface David Gibson
2020-05-25 10:27 ` Greg Kurz
2020-06-03 10:09 ` David Gibson
2020-06-02 1:44 ` Richard Henderson
2020-06-03 10:09 ` David Gibson
2020-05-21 3:42 ` [RFC v2 11/18] guest memory protection: Handle memory encrption via interface David Gibson
2020-05-25 10:26 ` Greg Kurz
2020-06-04 3:27 ` David Gibson
2020-06-02 3:21 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 12/18] guest memory protection: Perform KVM init " David Gibson
2020-06-02 3:39 ` Richard Henderson
2020-06-02 3:45 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 13/18] guest memory protection: Move side effect out of machine_set_memory_encryption() David Gibson
2020-06-02 3:41 ` Richard Henderson
2020-05-21 3:43 ` [RFC v2 14/18] guest memory protection: Rework the "memory-encryption" property David Gibson
2020-06-02 3:54 ` Richard Henderson
2020-06-04 5:56 ` David Gibson
2020-06-04 6:19 ` Thomas Huth
2020-06-04 6:25 ` David Gibson
2020-05-21 3:43 ` [RFC v2 15/18] guest memory protection: Decouple kvm_memcrypt_*() helpers from KVM David Gibson
2020-06-02 4:13 ` Richard Henderson
2020-06-03 10:18 ` David Gibson
2020-05-21 3:43 ` [RFC v2 16/18] guest memory protection: Add Error ** to GuestMemoryProtection::kvm_init David Gibson
2020-05-29 9:16 ` Philippe Mathieu-Daudé
2020-06-02 4:15 ` Richard Henderson
2020-05-21 3:43 ` [RFC v2 17/18] spapr: Added PEF based guest memory protection David Gibson
2020-05-25 11:14 ` Greg Kurz
2020-05-29 7:59 ` Ram Pai
2020-06-04 3:46 ` David Gibson
2020-05-21 3:43 ` [RFC v2 18/18] guest memory protection: Alter virtio default properties for protected guests David Gibson
2020-06-05 10:45 ` Cornelia Huck
2020-06-05 16:04 ` Halil Pasic
2020-06-06 20:21 ` Michael S. Tsirkin
2020-06-07 3:07 ` David Gibson
2020-06-09 10:16 ` Cornelia Huck
2020-06-09 15:40 ` Halil Pasic
2020-06-09 15:57 ` Cornelia Huck
2020-06-09 16:01 ` Michael S. Tsirkin
2020-06-10 4:45 ` David Gibson
2020-06-10 4:39 ` David Gibson
2020-06-10 8:48 ` Cornelia Huck
2020-06-10 10:07 ` David Gibson
2020-06-10 13:21 ` Halil Pasic
2020-05-29 22:19 ` [RFC v2 00/18] Refactor configuration of guest memory protection Sean Christopherson
2020-06-01 9:16 ` Dr. David Alan Gilbert
2020-06-04 3:11 ` David Gibson
2020-06-04 16:20 ` Sean Christopherson
2020-06-04 3:05 ` David Gibson
2020-06-04 4:39 ` Thiago Jung Bauermann
2020-06-04 6:21 ` David Gibson
2020-06-04 21:54 ` Thiago Jung Bauermann
2020-06-04 22:47 ` Paolo Bonzini
2020-06-04 23:30 ` Thiago Jung Bauermann
2020-06-04 23:41 ` Paolo Bonzini
2020-06-05 20:01 ` Thiago Jung Bauermann
2020-06-06 8:24 ` David Gibson
2020-06-08 15:10 ` Thiago Jung Bauermann
2020-06-04 6:44 ` David Gibson
2020-06-04 9:08 ` Greg Kurz
2020-06-06 8:45 ` David Gibson
2020-06-05 10:55 ` Cornelia Huck
2020-06-06 8:44 ` David Gibson
2020-06-09 10:11 ` Halil Pasic
2020-06-10 4:36 ` David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200521034304.340040-5-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=brijesh.singh@amd.com \
--cc=cohuck@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=mdroth@linux.vnet.ibm.com \
--cc=mst@redhat.com \
--cc=pair@us.ibm.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).