diff mbox series

[RFC,16/18] use errp for gmpo kvm_init

Message ID 20200514064120.449050-17-david@gibson.dropbear.id.au (mailing list archive)
State New, archived
Headers show
Series Refactor configuration of guest memory protection | expand

Commit Message

David Gibson May 14, 2020, 6:41 a.m. UTC 
---
 accel/kvm/kvm-all.c                    |  4 +++-
 include/exec/guest-memory-protection.h |  2 +-
 target/i386/sev.c                      | 32 +++++++++++++-------------
 3 files changed, 20 insertions(+), 18 deletions(-)

Comments

Dr. David Alan Gilbert May 14, 2020, 5:09 p.m. UTC | #1 
Dave:
  You've got some screwy mail headers here, the qemu-devel@nongnu.-rg is
the best one anmd the pair@us.redhat.com is weird as well.

* David Gibson (david@gibson.dropbear.id.au) wrote:
> ---
>  accel/kvm/kvm-all.c                    |  4 +++-
>  include/exec/guest-memory-protection.h |  2 +-
>  target/i386/sev.c                      | 32 +++++++++++++-------------
>  3 files changed, 20 insertions(+), 18 deletions(-)
> 
> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
> index 5451728425..392ab02867 100644
> --- a/accel/kvm/kvm-all.c
> +++ b/accel/kvm/kvm-all.c
> @@ -2045,9 +2045,11 @@ static int kvm_init(MachineState *ms)
>      if (ms->gmpo) {
>          GuestMemoryProtectionClass *gmpc =
>              GUEST_MEMORY_PROTECTION_GET_CLASS(ms->gmpo);
> +        Error *local_err = NULL;
>  
> -        ret = gmpc->kvm_init(ms->gmpo);
> +        ret = gmpc->kvm_init(ms->gmpo, &local_err);
>          if (ret < 0) {
> +            error_report_err(local_err);
>              goto err;
>          }
>      }
> diff --git a/include/exec/guest-memory-protection.h b/include/exec/guest-memory-protection.h
> index 7d959b4910..2a88475136 100644
> --- a/include/exec/guest-memory-protection.h
> +++ b/include/exec/guest-memory-protection.h
> @@ -32,7 +32,7 @@ typedef struct GuestMemoryProtection GuestMemoryProtection;
>  typedef struct GuestMemoryProtectionClass {
>      InterfaceClass parent;
>  
> -    int (*kvm_init)(GuestMemoryProtection *);
> +    int (*kvm_init)(GuestMemoryProtection *, Error **);
>      int (*encrypt_data)(GuestMemoryProtection *, uint8_t *, uint64_t);
>  } GuestMemoryProtectionClass;
>  
> diff --git a/target/i386/sev.c b/target/i386/sev.c
> index 2051fae0c1..82f16b2f3b 100644
> --- a/target/i386/sev.c
> +++ b/target/i386/sev.c
> @@ -617,7 +617,7 @@ sev_vm_state_change(void *opaque, int running, RunState state)
>      }
>  }
>  
> -static int sev_kvm_init(GuestMemoryProtection *gmpo)
> +static int sev_kvm_init(GuestMemoryProtection *gmpo, Error **errp)
>  {
>      SevGuestState *sev = SEV_GUEST(gmpo);
>      char *devname;
> @@ -633,14 +633,14 @@ static int sev_kvm_init(GuestMemoryProtection *gmpo)
>      host_cbitpos = ebx & 0x3f;
>  
>      if (host_cbitpos != sev->cbitpos) {
> -        error_report("%s: cbitpos check failed, host '%d' requested '%d'",
> -                     __func__, host_cbitpos, sev->cbitpos);
> +        error_setg(errp, "%s: cbitpos check failed, host '%d' requested '%d'",
> +                   __func__, host_cbitpos, sev->cbitpos);
>          goto err;
>      }
>  
>      if (sev->reduced_phys_bits < 1) {
> -        error_report("%s: reduced_phys_bits check failed, it should be >=1,"
> -                     " requested '%d'", __func__, sev->reduced_phys_bits);
> +        error_setg(errp, "%s: reduced_phys_bits check failed, it should be >=1,"
> +                   " requested '%d'", __func__, sev->reduced_phys_bits);
>          goto err;
>      }
>  
> @@ -649,20 +649,20 @@ static int sev_kvm_init(GuestMemoryProtection *gmpo)
>      devname = object_property_get_str(OBJECT(sev), "sev-device", NULL);
>      sev->sev_fd = open(devname, O_RDWR);
>      if (sev->sev_fd < 0) {
> -        error_report("%s: Failed to open %s '%s'", __func__,
> -                     devname, strerror(errno));
> -    }
> -    g_free(devname);
> -    if (sev->sev_fd < 0) {
> +        g_free(devname);
> +        error_setg(errp, "%s: Failed to open %s '%s'", __func__,
> +                   devname, strerror(errno));
> +        g_free(devname);

You seem to have double free'd devname - would g_autofree work here?

other than that, looks OK to me.

Dave

>          goto err;
>      }
> +    g_free(devname);
>  
>      ret = sev_platform_ioctl(sev->sev_fd, SEV_PLATFORM_STATUS, &status,
>                               &fw_error);
>      if (ret) {
> -        error_report("%s: failed to get platform status ret=%d "
> -                     "fw_error='%d: %s'", __func__, ret, fw_error,
> -                     fw_error_to_str(fw_error));
> +        error_setg(errp, "%s: failed to get platform status ret=%d "
> +                   "fw_error='%d: %s'", __func__, ret, fw_error,
> +                   fw_error_to_str(fw_error));
>          goto err;
>      }
>      sev->build_id = status.build;
> @@ -672,14 +672,14 @@ static int sev_kvm_init(GuestMemoryProtection *gmpo)
>      trace_kvm_sev_init();
>      ret = sev_ioctl(sev->sev_fd, KVM_SEV_INIT, NULL, &fw_error);
>      if (ret) {
> -        error_report("%s: failed to initialize ret=%d fw_error=%d '%s'",
> -                     __func__, ret, fw_error, fw_error_to_str(fw_error));
> +        error_setg(errp, "%s: failed to initialize ret=%d fw_error=%d '%s'",
> +                   __func__, ret, fw_error, fw_error_to_str(fw_error));
>          goto err;
>      }
>  
>      ret = sev_launch_start(sev);
>      if (ret) {
> -        error_report("%s: failed to create encryption context", __func__);
> +        error_setg(errp, "%s: failed to create encryption context", __func__);
>          goto err;
>      }
>  
> -- 
> 2.26.2
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
David Gibson May 15, 2020, 12:14 a.m. UTC | #2 
On Thu, May 14, 2020 at 06:09:46PM +0100, Dr. David Alan Gilbert wrote:
> Dave:
>   You've got some screwy mail headers here, the qemu-devel@nongnu.-rg is
> the best one anmd the pair@us.redhat.com is weird as well.

Yeah, apparently I forgot how to type when I entered my git-publish
command line :/.

> 
> * David Gibson (david@gibson.dropbear.id.au) wrote:
> > ---
> >  accel/kvm/kvm-all.c                    |  4 +++-
> >  include/exec/guest-memory-protection.h |  2 +-
> >  target/i386/sev.c                      | 32 +++++++++++++-------------
> >  3 files changed, 20 insertions(+), 18 deletions(-)
> > 
> > diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
> > index 5451728425..392ab02867 100644
> > --- a/accel/kvm/kvm-all.c
> > +++ b/accel/kvm/kvm-all.c
> > @@ -2045,9 +2045,11 @@ static int kvm_init(MachineState *ms)
> >      if (ms->gmpo) {
> >          GuestMemoryProtectionClass *gmpc =
> >              GUEST_MEMORY_PROTECTION_GET_CLASS(ms->gmpo);
> > +        Error *local_err = NULL;
> >  
> > -        ret = gmpc->kvm_init(ms->gmpo);
> > +        ret = gmpc->kvm_init(ms->gmpo, &local_err);
> >          if (ret < 0) {
> > +            error_report_err(local_err);
> >              goto err;
> >          }
> >      }
> > diff --git a/include/exec/guest-memory-protection.h b/include/exec/guest-memory-protection.h
> > index 7d959b4910..2a88475136 100644
> > --- a/include/exec/guest-memory-protection.h
> > +++ b/include/exec/guest-memory-protection.h
> > @@ -32,7 +32,7 @@ typedef struct GuestMemoryProtection GuestMemoryProtection;
> >  typedef struct GuestMemoryProtectionClass {
> >      InterfaceClass parent;
> >  
> > -    int (*kvm_init)(GuestMemoryProtection *);
> > +    int (*kvm_init)(GuestMemoryProtection *, Error **);
> >      int (*encrypt_data)(GuestMemoryProtection *, uint8_t *, uint64_t);
> >  } GuestMemoryProtectionClass;
> >  
> > diff --git a/target/i386/sev.c b/target/i386/sev.c
> > index 2051fae0c1..82f16b2f3b 100644
> > --- a/target/i386/sev.c
> > +++ b/target/i386/sev.c
> > @@ -617,7 +617,7 @@ sev_vm_state_change(void *opaque, int running, RunState state)
> >      }
> >  }
> >  
> > -static int sev_kvm_init(GuestMemoryProtection *gmpo)
> > +static int sev_kvm_init(GuestMemoryProtection *gmpo, Error **errp)
> >  {
> >      SevGuestState *sev = SEV_GUEST(gmpo);
> >      char *devname;
> > @@ -633,14 +633,14 @@ static int sev_kvm_init(GuestMemoryProtection *gmpo)
> >      host_cbitpos = ebx & 0x3f;
> >  
> >      if (host_cbitpos != sev->cbitpos) {
> > -        error_report("%s: cbitpos check failed, host '%d' requested '%d'",
> > -                     __func__, host_cbitpos, sev->cbitpos);
> > +        error_setg(errp, "%s: cbitpos check failed, host '%d' requested '%d'",
> > +                   __func__, host_cbitpos, sev->cbitpos);
> >          goto err;
> >      }
> >  
> >      if (sev->reduced_phys_bits < 1) {
> > -        error_report("%s: reduced_phys_bits check failed, it should be >=1,"
> > -                     " requested '%d'", __func__, sev->reduced_phys_bits);
> > +        error_setg(errp, "%s: reduced_phys_bits check failed, it should be >=1,"
> > +                   " requested '%d'", __func__, sev->reduced_phys_bits);
> >          goto err;
> >      }
> >  
> > @@ -649,20 +649,20 @@ static int sev_kvm_init(GuestMemoryProtection *gmpo)
> >      devname = object_property_get_str(OBJECT(sev), "sev-device", NULL);
> >      sev->sev_fd = open(devname, O_RDWR);
> >      if (sev->sev_fd < 0) {
> > -        error_report("%s: Failed to open %s '%s'", __func__,
> > -                     devname, strerror(errno));
> > -    }
> > -    g_free(devname);
> > -    if (sev->sev_fd < 0) {
> > +        g_free(devname);
> > +        error_setg(errp, "%s: Failed to open %s '%s'", __func__,
> > +                   devname, strerror(errno));
> > +        g_free(devname);
> 
> You seem to have double free'd devname - would g_autofree work here?
> 
> other than that, looks OK to me.
> 
> Dave
> 
> >          goto err;
> >      }
> > +    g_free(devname);
> >  
> >      ret = sev_platform_ioctl(sev->sev_fd, SEV_PLATFORM_STATUS, &status,
> >                               &fw_error);
> >      if (ret) {
> > -        error_report("%s: failed to get platform status ret=%d "
> > -                     "fw_error='%d: %s'", __func__, ret, fw_error,
> > -                     fw_error_to_str(fw_error));
> > +        error_setg(errp, "%s: failed to get platform status ret=%d "
> > +                   "fw_error='%d: %s'", __func__, ret, fw_error,
> > +                   fw_error_to_str(fw_error));
> >          goto err;
> >      }
> >      sev->build_id = status.build;
> > @@ -672,14 +672,14 @@ static int sev_kvm_init(GuestMemoryProtection *gmpo)
> >      trace_kvm_sev_init();
> >      ret = sev_ioctl(sev->sev_fd, KVM_SEV_INIT, NULL, &fw_error);
> >      if (ret) {
> > -        error_report("%s: failed to initialize ret=%d fw_error=%d '%s'",
> > -                     __func__, ret, fw_error, fw_error_to_str(fw_error));
> > +        error_setg(errp, "%s: failed to initialize ret=%d fw_error=%d '%s'",
> > +                   __func__, ret, fw_error, fw_error_to_str(fw_error));
> >          goto err;
> >      }
> >  
> >      ret = sev_launch_start(sev);
> >      if (ret) {
> > -        error_report("%s: failed to create encryption context", __func__);
> > +        error_setg(errp, "%s: failed to create encryption context", __func__);
> >          goto err;
> >      }
> >
David Gibson May 15, 2020, 12:20 a.m. UTC | #3 
On Thu, May 14, 2020 at 06:09:46PM +0100, Dr. David Alan Gilbert wrote:
> * David Gibson (david@gibson.dropbear.id.au) wrote:
[snip]
> > @@ -649,20 +649,20 @@ static int sev_kvm_init(GuestMemoryProtection *gmpo)
> >      devname = object_property_get_str(OBJECT(sev), "sev-device", NULL);
> >      sev->sev_fd = open(devname, O_RDWR);
> >      if (sev->sev_fd < 0) {
> > -        error_report("%s: Failed to open %s '%s'", __func__,
> > -                     devname, strerror(errno));
> > -    }
> > -    g_free(devname);
> > -    if (sev->sev_fd < 0) {
> > +        g_free(devname);
> > +        error_setg(errp, "%s: Failed to open %s '%s'", __func__,
> > +                   devname, strerror(errno));
> > +        g_free(devname);
> 
> You seem to have double free'd devname - would g_autofree work here?

Oops, fixed.  I'm not really familiar with the g_autofree stuff as
yet, so, maybe?

I also entirely forgot to write a non-placeholder commit message for
this patch.  Oops.

> other than that, looks OK to me.



> 
> Dave
> 
> >          goto err;
> >      }
> > +    g_free(devname);
> >  
> >      ret = sev_platform_ioctl(sev->sev_fd, SEV_PLATFORM_STATUS, &status,
> >                               &fw_error);
> >      if (ret) {
> > -        error_report("%s: failed to get platform status ret=%d "
> > -                     "fw_error='%d: %s'", __func__, ret, fw_error,
> > -                     fw_error_to_str(fw_error));
> > +        error_setg(errp, "%s: failed to get platform status ret=%d "
> > +                   "fw_error='%d: %s'", __func__, ret, fw_error,
> > +                   fw_error_to_str(fw_error));
> >          goto err;
> >      }
> >      sev->build_id = status.build;
> > @@ -672,14 +672,14 @@ static int sev_kvm_init(GuestMemoryProtection *gmpo)
> >      trace_kvm_sev_init();
> >      ret = sev_ioctl(sev->sev_fd, KVM_SEV_INIT, NULL, &fw_error);
> >      if (ret) {
> > -        error_report("%s: failed to initialize ret=%d fw_error=%d '%s'",
> > -                     __func__, ret, fw_error, fw_error_to_str(fw_error));
> > +        error_setg(errp, "%s: failed to initialize ret=%d fw_error=%d '%s'",
> > +                   __func__, ret, fw_error, fw_error_to_str(fw_error));
> >          goto err;
> >      }
> >  
> >      ret = sev_launch_start(sev);
> >      if (ret) {
> > -        error_report("%s: failed to create encryption context", __func__);
> > +        error_setg(errp, "%s: failed to create encryption context", __func__);
> >          goto err;
> >      }
> >
diff mbox series

Patch

diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 5451728425..392ab02867 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -2045,9 +2045,11 @@  static int kvm_init(MachineState *ms)
     if (ms->gmpo) {
         GuestMemoryProtectionClass *gmpc =
             GUEST_MEMORY_PROTECTION_GET_CLASS(ms->gmpo);
+        Error *local_err = NULL;
 
-        ret = gmpc->kvm_init(ms->gmpo);
+        ret = gmpc->kvm_init(ms->gmpo, &local_err);
         if (ret < 0) {
+            error_report_err(local_err);
             goto err;
         }
     }
diff --git a/include/exec/guest-memory-protection.h b/include/exec/guest-memory-protection.h
index 7d959b4910..2a88475136 100644
--- a/include/exec/guest-memory-protection.h
+++ b/include/exec/guest-memory-protection.h
@@ -32,7 +32,7 @@  typedef struct GuestMemoryProtection GuestMemoryProtection;
 typedef struct GuestMemoryProtectionClass {
     InterfaceClass parent;
 
-    int (*kvm_init)(GuestMemoryProtection *);
+    int (*kvm_init)(GuestMemoryProtection *, Error **);
     int (*encrypt_data)(GuestMemoryProtection *, uint8_t *, uint64_t);
 } GuestMemoryProtectionClass;
 
diff --git a/target/i386/sev.c b/target/i386/sev.c
index 2051fae0c1..82f16b2f3b 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -617,7 +617,7 @@  sev_vm_state_change(void *opaque, int running, RunState state)
     }
 }
 
-static int sev_kvm_init(GuestMemoryProtection *gmpo)
+static int sev_kvm_init(GuestMemoryProtection *gmpo, Error **errp)
 {
     SevGuestState *sev = SEV_GUEST(gmpo);
     char *devname;
@@ -633,14 +633,14 @@  static int sev_kvm_init(GuestMemoryProtection *gmpo)
     host_cbitpos = ebx & 0x3f;
 
     if (host_cbitpos != sev->cbitpos) {
-        error_report("%s: cbitpos check failed, host '%d' requested '%d'",
-                     __func__, host_cbitpos, sev->cbitpos);
+        error_setg(errp, "%s: cbitpos check failed, host '%d' requested '%d'",
+                   __func__, host_cbitpos, sev->cbitpos);
         goto err;
     }
 
     if (sev->reduced_phys_bits < 1) {
-        error_report("%s: reduced_phys_bits check failed, it should be >=1,"
-                     " requested '%d'", __func__, sev->reduced_phys_bits);
+        error_setg(errp, "%s: reduced_phys_bits check failed, it should be >=1,"
+                   " requested '%d'", __func__, sev->reduced_phys_bits);
         goto err;
     }
 
@@ -649,20 +649,20 @@  static int sev_kvm_init(GuestMemoryProtection *gmpo)
     devname = object_property_get_str(OBJECT(sev), "sev-device", NULL);
     sev->sev_fd = open(devname, O_RDWR);
     if (sev->sev_fd < 0) {
-        error_report("%s: Failed to open %s '%s'", __func__,
-                     devname, strerror(errno));
-    }
-    g_free(devname);
-    if (sev->sev_fd < 0) {
+        g_free(devname);
+        error_setg(errp, "%s: Failed to open %s '%s'", __func__,
+                   devname, strerror(errno));
+        g_free(devname);
         goto err;
     }
+    g_free(devname);
 
     ret = sev_platform_ioctl(sev->sev_fd, SEV_PLATFORM_STATUS, &status,
                              &fw_error);
     if (ret) {
-        error_report("%s: failed to get platform status ret=%d "
-                     "fw_error='%d: %s'", __func__, ret, fw_error,
-                     fw_error_to_str(fw_error));
+        error_setg(errp, "%s: failed to get platform status ret=%d "
+                   "fw_error='%d: %s'", __func__, ret, fw_error,
+                   fw_error_to_str(fw_error));
         goto err;
     }
     sev->build_id = status.build;
@@ -672,14 +672,14 @@  static int sev_kvm_init(GuestMemoryProtection *gmpo)
     trace_kvm_sev_init();
     ret = sev_ioctl(sev->sev_fd, KVM_SEV_INIT, NULL, &fw_error);
     if (ret) {
-        error_report("%s: failed to initialize ret=%d fw_error=%d '%s'",
-                     __func__, ret, fw_error, fw_error_to_str(fw_error));
+        error_setg(errp, "%s: failed to initialize ret=%d fw_error=%d '%s'",
+                   __func__, ret, fw_error, fw_error_to_str(fw_error));
         goto err;
     }
 
     ret = sev_launch_start(sev);
     if (ret) {
-        error_report("%s: failed to create encryption context", __func__);
+        error_setg(errp, "%s: failed to create encryption context", __func__);
         goto err;
     }