From patchwork Wed Oct 4 20:34:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Fanelli X-Patchwork-Id: 1843643 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=WGUr5xtb; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S160v41XYz1yq7 for ; Thu, 5 Oct 2023 07:36:31 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qo8aA-0004Oc-Tb; Wed, 04 Oct 2023 16:34:58 -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 1qo8a8-0004NZ-M0 for qemu-devel@nongnu.org; Wed, 04 Oct 2023 16:34:56 -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 1qo8a6-000210-C4 for qemu-devel@nongnu.org; Wed, 04 Oct 2023 16:34:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696451692; 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=RZGghBsZ/+2yO6dunrL73Gvrph7Y/ZHFPp8x2q2HGss=; b=WGUr5xtbXjdN5GOhb9H+c6JadWIbuz2tP43jAdIsbH9NRtHmcSbe4aEQ7Zwb2LrfarshEx qbuAU2oDQWcJkNKNW99nwoo0XLwbRsSORheenKzL1Dg+bBXqAu4ELyjWR35PsVPMD9DiG5 rt7FCu62dk72zLrSc6y+paBy7sUBe+k= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-564-O4L-Ue4hMS-DSeNIJYAiJQ-1; Wed, 04 Oct 2023 16:34:51 -0400 X-MC-Unique: O4L-Ue4hMS-DSeNIJYAiJQ-1 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-65afb9c405aso1876916d6.0 for ; Wed, 04 Oct 2023 13:34:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696451690; x=1697056490; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RZGghBsZ/+2yO6dunrL73Gvrph7Y/ZHFPp8x2q2HGss=; b=HL8l7bmd2HDzOKRikHpQyJh2x8rNr8pdiNN04EzZ6Kjh5Ysl145sToexfFjKn0JfUj IkBstb383sxNDXlPyrIKPbdYd7vpBCR02C7Ffpo6uFXVQe0LGSrq8CZnJoZFzXl6ajWI sad9e/Q1P+kQ2QNg9p4japxrYRfqHijpVlz3KEb6AA+v5UfQ1TJe7So+iuVYODAJEOY9 s8NzgfsmO1rEPsAdjJVRjVuYVPzrdcNNfT4XOakS3ThheKENzV1M965zS71M27CBjBlT Xrk4t+LgT9ubuCddXscDAQlOu/FV7uZAbEZKn7I8re7sgHSXVzW6S7DnmxAy0h76OIuF Q0Zg== X-Gm-Message-State: AOJu0YyC3tGh4xLpIVP2ojEt6PP+D9kRWCzB4tQcBO+KSXMz6mBHlcnm tTecuxm+tfFLu6RGVqr2azBgccL5LuKyUTNdQC5bLS7aO2/JdWoRnl1PyRc+2tS2fCocUd9kFpp 3OJHgrwJtcq6M0+L2fKnSNAmr/9LwTfsda8NOUKn36NOLuoUdocvYfyiunv9tXPF73R9ffQQ2EG Icsw== X-Received: by 2002:a05:6214:4a4c:b0:658:24e2:f237 with SMTP id ph12-20020a0562144a4c00b0065824e2f237mr3167193qvb.31.1696451690010; Wed, 04 Oct 2023 13:34:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEh0qU58vvmSqGQBsOsklwB8p6J1N7xPxlkjr1pLVKvHSR/msZmD7Z4dbUk99kWAiF9uMvU0Q== X-Received: by 2002:a05:6214:4a4c:b0:658:24e2:f237 with SMTP id ph12-20020a0562144a4c00b0065824e2f237mr3167172qvb.31.1696451689558; Wed, 04 Oct 2023 13:34:49 -0700 (PDT) Received: from fedora.redhat.com ([2600:4040:7c46:e800:32a2:d966:1af4:8863]) by smtp.gmail.com with ESMTPSA id i19-20020a0cf393000000b00632209f7157sm1561387qvk.143.2023.10.04.13.34.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 13:34:48 -0700 (PDT) From: Tyler Fanelli To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mtosatti@redhat.com, stefanha@redhat.com, philmd@linaro.org, berrange@redhat.com, marcandre.lureau@gmail.com, Tyler Fanelli Subject: [RFC PATCH v2 7/9] i386/sev: Replace LAUNCH_SECRET ioctl with sev library equivalent Date: Wed, 4 Oct 2023 16:34:16 -0400 Message-Id: <20231004203418.56508-8-tfanelli@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231004203418.56508-1-tfanelli@redhat.com> References: <20231004203418.56508-1-tfanelli@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=tfanelli@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The LAUNCH_SECRET API can inject a secret into the VM once the measurement has been retrieved. If this API ioctl call fails, fw_error will be set accordingly. Signed-off-by: Tyler Fanelli --- target/i386/sev.c | 105 ++++++++++++++++------------------------------ target/i386/sev.h | 2 - 2 files changed, 36 insertions(+), 71 deletions(-) diff --git a/target/i386/sev.c b/target/i386/sev.c index 3e2a3e07a7..38a90d4f00 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -983,88 +983,44 @@ sev_encrypt_flash(uint8_t *ptr, uint64_t len, Error **errp) return 0; } -int sev_inject_launch_secret(const char *packet_hdr, const char *secret, - uint64_t gpa, Error **errp) -{ - struct kvm_sev_launch_secret input; - g_autofree guchar *data = NULL, *hdr = NULL; - int error, ret = 1; - void *hva; - gsize hdr_sz = 0, data_sz = 0; - MemoryRegion *mr = NULL; - - if (!sev_guest) { - error_setg(errp, "SEV not enabled for guest"); - return 1; - } - - /* secret can be injected only in this state */ - if (!sev_check_state(sev_guest, SEV_STATE_LAUNCH_SECRET)) { - error_setg(errp, "SEV: Not in correct state. (LSECRET) %x", - sev_guest->state); - return 1; - } - - hdr = g_base64_decode(packet_hdr, &hdr_sz); - if (!hdr || !hdr_sz) { - error_setg(errp, "SEV: Failed to decode sequence header"); - return 1; - } - - data = g_base64_decode(secret, &data_sz); - if (!data || !data_sz) { - error_setg(errp, "SEV: Failed to decode data"); - return 1; - } - - hva = gpa2hva(&mr, gpa, data_sz, errp); - if (!hva) { - error_prepend(errp, "SEV: Failed to calculate guest address: "); - return 1; - } - - input.hdr_uaddr = (uint64_t)(unsigned long)hdr; - input.hdr_len = hdr_sz; - - input.trans_uaddr = (uint64_t)(unsigned long)data; - input.trans_len = data_sz; - - input.guest_uaddr = (uint64_t)(unsigned long)hva; - input.guest_len = data_sz; - - trace_kvm_sev_launch_secret(gpa, input.guest_uaddr, - input.trans_uaddr, input.trans_len); - - ret = sev_ioctl(sev_guest->sev_fd, KVM_SEV_LAUNCH_SECRET, - &input, &error); - if (ret) { - error_setg(errp, "SEV: failed to inject secret ret=%d fw_error=%d '%s'", - ret, error, fw_error_to_str(error)); - return ret; - } - - return 0; -} - #define SEV_SECRET_GUID "4c2eb361-7d9b-4cc3-8081-127c90d3d294" struct sev_secret_area { uint32_t base; uint32_t size; }; -void qmp_sev_inject_launch_secret(const char *packet_hdr, - const char *secret, +void qmp_sev_inject_launch_secret(const char *hdr_b64, + const char *secret_b64, bool has_gpa, uint64_t gpa, Error **errp) { + int ret, fw_error = 0; + g_autofree guchar *hdr = NULL, *secret = NULL; + uint8_t *data = NULL; + KVMState *s = kvm_state; + gsize hdr_sz = 0, secret_sz = 0; + MemoryRegion *mr = NULL; + void *hva; + struct sev_secret_area *area = NULL; + if (!sev_enabled()) { error_setg(errp, "SEV not enabled for guest"); return; } - if (!has_gpa) { - uint8_t *data; - struct sev_secret_area *area; + hdr = g_base64_decode(hdr_b64, &hdr_sz); + if (!hdr || !hdr_sz) { + error_setg(errp, "SEV: Failed to decode sequence header"); + return; + } + + secret = g_base64_decode(secret_b64, &secret_sz); + if (!secret || !secret_sz) { + error_setg(errp, "SEV: Failed to decode secret"); + return; + } + + if (!has_gpa) { if (!pc_system_ovmf_table_find(SEV_SECRET_GUID, &data, NULL)) { error_setg(errp, "SEV: no secret area found in OVMF," " gpa must be specified."); @@ -1074,7 +1030,18 @@ void qmp_sev_inject_launch_secret(const char *packet_hdr, gpa = area->base; } - sev_inject_launch_secret(packet_hdr, secret, gpa, errp); + hva = gpa2hva(&mr, gpa, secret_sz, errp); + if (!hva) { + error_prepend(errp, "SEV: Failed to calculate guest address: "); + return; + } + + ret = sev_inject_launch_secret(s->vmfd, hdr, secret, secret_sz, + hva, &fw_error); + if (ret < 0) { + error_setg(errp, "%s: LAUNCH_SECRET ret=%d fw_error=%d '%s'", __func__, + ret, fw_error, fw_error_to_str(fw_error)); + } } static int diff --git a/target/i386/sev.h b/target/i386/sev.h index acb181358e..f1af28eca0 100644 --- a/target/i386/sev.h +++ b/target/i386/sev.h @@ -53,8 +53,6 @@ uint32_t sev_get_reduced_phys_bits(void); bool sev_add_kernel_loader_hashes(SevKernelLoaderContext *ctx, Error **errp); int sev_encrypt_flash(uint8_t *ptr, uint64_t len, Error **errp); -int sev_inject_launch_secret(const char *hdr, const char *secret, - uint64_t gpa, Error **errp); int sev_es_save_reset_vector(void *flash_ptr, uint64_t flash_size); void sev_es_set_reset_vector(CPUState *cpu);