From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
To: David Gibson <david@gibson.dropbear.id.au>
Cc: frankja@linux.ibm.com, qemu-devel@nongnu.org,
brijesh.singh@amd.com, kvm@vger.kernel.org, qemu-ppc@nongnu.org,
Richard Henderson <rth@twiddle.net>,
cohuck@redhat.com, Paolo Bonzini <pbonzini@redhat.com>,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
mdroth@linux.vnet.ibm.com
Subject: Re: [RFC 16/18] use errp for gmpo kvm_init
Date: Thu, 14 May 2020 18:09:46 +0100 [thread overview]
Message-ID: <20200514170808.GS2787@work-vm> (raw)
In-Reply-To: <20200514064120.449050-17-david@gibson.dropbear.id.au>
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
next prev parent reply other threads:[~2020-05-14 17:10 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-14 6:41 [RFC 00/18] Refactor configuration of guest memory protection David Gibson
2020-05-14 6:41 ` [RFC 01/18] target/i386: sev: Remove unused QSevGuestInfoClass David Gibson
2020-05-14 6:41 ` [RFC 02/18] target/i386: sev: Move local structure definitions into .c file David Gibson
2020-05-14 6:41 ` [RFC 03/18] target/i386: sev: Rename QSevGuestInfo David Gibson
2020-05-14 6:41 ` [RFC 04/18] target/i386: sev: Embed SEVState in SevGuestState David Gibson
2020-05-14 6:41 ` [RFC 05/18] target/i386: sev: Partial cleanup to sev_state global David Gibson
2020-05-14 6:41 ` [RFC 06/18] target/i386: sev: Remove redundant cbitpos and reduced_phys_bits fields David Gibson
2020-05-14 6:41 ` [RFC 07/18] target/i386: sev: Remove redundant policy field David Gibson
2020-05-14 6:41 ` [RFC 08/18] target/i386: sev: Remove redundant handle field David Gibson
2020-05-14 6:41 ` [RFC 09/18] target/i386: sev: Unify SEVState and SevGuestState David Gibson
2020-05-14 6:41 ` [RFC 10/18] guest memory protection: Add guest memory protection interface David Gibson
2020-05-14 6:41 ` [RFC 11/18] guest memory protection: Handle memory encrption via interface David Gibson
2020-05-14 6:41 ` [RFC 12/18] guest memory protection: Perform KVM init " David Gibson
2020-05-14 6:41 ` [RFC 13/18] guest memory protection: Move side effect out of machine_set_memory_encryption() David Gibson
2020-05-14 6:41 ` [RFC 14/18] guest memory protection: Rework the "memory-encryption" property David Gibson
2020-05-14 6:41 ` [RFC 15/18] guest memory protection: Decouple kvm_memcrypt_*() helpers from KVM David Gibson
2020-05-14 6:41 ` [RFC 16/18] use errp for gmpo kvm_init David Gibson
2020-05-14 17:09 ` Dr. David Alan Gilbert [this message]
2020-05-15 0:14 ` David Gibson
2020-05-15 0:20 ` David Gibson
2020-05-14 6:41 ` [RFC 17/18] spapr: Added PEF based guest memory protection David Gibson
2020-05-14 6:41 ` [RFC 18/18] guest memory protection: Alter virtio default properties for protected guests 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=20200514170808.GS2787@work-vm \
--to=dgilbert@redhat.com \
--cc=brijesh.singh@amd.com \
--cc=cohuck@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=ehabkost@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=marcel.apfelbaum@gmail.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=mst@redhat.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).