From nobody Fri Dec 19 17:15:24 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1662057258; cv=none; d=zohomail.com; s=zohoarc; b=jCc3Y1eOmNQq4aZkeUulSdkbP0sdd1xB1DbsVHIP8JwmLEOCO2q6bVqmy6q8NjCZ/BWuav3hvVRSHkhQJ3M8/cpvJHALf99UF7XIgxBgVN/mlkkl/9OX1etPG5E8+MctiqgZsQWi57i9O7KdUEF7NZXBLfg/gBVWkDZh72RQdcM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662057258; 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=aBWn14KGMiURzBNmUtAaeeErmY9speVBwxUEMoijqO0=; b=MGnzg4OwJeaCMNkxHnWtObSndmRW3lGljqBDHd/STp9StMxTInL9tMNIR1S2NaE1Bsunko+EKNP++wtwPqNNaX51HFi3fQcdCfrP68UYCLf+JNiQblKXq6vwr0zZDQx1HkdnDQlPVrXdSDvXDqA+mtt1zWGggCGa48CvpLRQpVM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1662057258913560.2553480771926; Thu, 1 Sep 2022 11:34:18 -0700 (PDT) Received: from localhost ([::1]:56170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oTp17-0008Gd-Kr for importer@patchew.org; Thu, 01 Sep 2022 14:34:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTorx-0007bf-HE for qemu-devel@nongnu.org; Thu, 01 Sep 2022 14:24:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:42244) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTorp-0008GY-Bw for qemu-devel@nongnu.org; Thu, 01 Sep 2022 14:24:47 -0400 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-349-0rxhKXMANjehS6_Nu14uRQ-1; Thu, 01 Sep 2022 14:24:39 -0400 Received: by mail-ej1-f70.google.com with SMTP id sh44-20020a1709076eac00b00741a01e2aafso6059968ejc.22 for ; Thu, 01 Sep 2022 11:24:39 -0700 (PDT) Received: from goa-sendmail ([93.56.160.208]) by smtp.gmail.com with ESMTPSA id h25-20020a170906855900b0073a62f3b447sm8816989ejy.44.2022.09.01.11.24.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Sep 2022 11:24:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662056680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aBWn14KGMiURzBNmUtAaeeErmY9speVBwxUEMoijqO0=; b=L81XkMyosZxrvU0Hu4zOcybpAnUSn4A+ECJZ88wcVrUmUjID3/Pl+QEPMBBV664qsd44wC MYLWzrlsqSNLiInhFxljGEkGowiHgold/wBgIsPWcbnXsrM3YU9M8bKMinyeJmkzLx0qAO +0sPXxKqTSt0vkNzx+MchEJGM5RiZcg= X-MC-Unique: 0rxhKXMANjehS6_Nu14uRQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=aBWn14KGMiURzBNmUtAaeeErmY9speVBwxUEMoijqO0=; b=AhjoDmW/cjQhJn/OIgCDEJKG+OqlK2a8Qn8Sot73fcuNZzm7iHvKshXl3wLNE7yF83 jpQjOFXpeaKBSku19WH+7Db34t+GtH7TmlXsyb0sbQY5qtJpMivIl3unOHbhsm/XhTf+ eMyZtLYDBZCLkm59W9jaNCuAAF/8Sqy9KzGQsSSzB3HLfT7o8mvebAjTwZmXF8BLKCws eg66LlRwiXimSfLF2v9Tp5RkVnyb5kpdcVQPUIAvCwAiTdmflnHLT+744S6CCruLoJOy 0ZgFpxgCC/4CcysTYUY8rE26A40P3gDLZG51lmDoZVQLUE4VgqQm0vsFFxNS1D6Ww3R/ Nu/g== X-Gm-Message-State: ACgBeo2KRRJK+u4AGETNlvpYxi0A+ONX8WkX3V8rfHOGUB/qFsyZl8Sl FM3N2OsoE3sNpqjhaD22bzfqBf7364MRwoCn2lex60d9u1gQ+9Ep9SBO653Zo3TWf2UZP/0KMDC yXMm3YBV4ZvBHtSfQBLaRhltj+gQNNfebiw8n/ZfnSYmoOn3DR54FsinSAOkZLldhOio= X-Received: by 2002:a17:907:9814:b0:73d:8afe:6039 with SMTP id ji20-20020a170907981400b0073d8afe6039mr23989603ejc.566.1662056677824; Thu, 01 Sep 2022 11:24:37 -0700 (PDT) X-Google-Smtp-Source: AA6agR4tVDqPXTyY9wtoINwhkolSorZf21Zcz8pAPraULdjzSmDj0XigfAsVr/cKhdtCc8eMojz1PQ== X-Received: by 2002:a17:907:9814:b0:73d:8afe:6039 with SMTP id ji20-20020a170907981400b0073d8afe6039mr23989590ejc.566.1662056677546; Thu, 01 Sep 2022 11:24:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Vitaly Kuznetsov , Maxim Levitsky Subject: [PULL 04/39] i386: reset KVM nested state upon CPU reset Date: Thu, 1 Sep 2022 20:23:54 +0200 Message-Id: <20220901182429.93533-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220901182429.93533-1-pbonzini@redhat.com> References: <20220901182429.93533-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1662057259806100003 Content-Type: text/plain; charset="utf-8" From: Vitaly Kuznetsov Make sure env->nested_state is cleaned up when a vCPU is reset, it may be stale after an incoming migration, kvm_arch_put_registers() may end up failing or putting vCPU in a weird state. Reviewed-by: Maxim Levitsky Signed-off-by: Vitaly Kuznetsov Message-Id: <20220818150113.479917-2-vkuznets@redhat.com> Signed-off-by: Paolo Bonzini --- target/i386/kvm/kvm.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index f148a6d52f..4f8dacc1d4 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -1695,6 +1695,30 @@ static void kvm_init_xsave(CPUX86State *env) env->xsave_buf_len); } =20 +static void kvm_init_nested_state(CPUX86State *env) +{ + struct kvm_vmx_nested_state_hdr *vmx_hdr; + uint32_t size; + + if (!env->nested_state) { + return; + } + + size =3D env->nested_state->size; + + memset(env->nested_state, 0, size); + env->nested_state->size =3D size; + + if (cpu_has_vmx(env)) { + env->nested_state->format =3D KVM_STATE_NESTED_FORMAT_VMX; + vmx_hdr =3D &env->nested_state->hdr.vmx; + vmx_hdr->vmxon_pa =3D -1ull; + vmx_hdr->vmcs12_pa =3D -1ull; + } else if (cpu_has_svm(env)) { + env->nested_state->format =3D KVM_STATE_NESTED_FORMAT_SVM; + } +} + int kvm_arch_init_vcpu(CPUState *cs) { struct { @@ -2122,19 +2146,10 @@ int kvm_arch_init_vcpu(CPUState *cs) assert(max_nested_state_len >=3D offsetof(struct kvm_nested_state,= data)); =20 if (cpu_has_vmx(env) || cpu_has_svm(env)) { - struct kvm_vmx_nested_state_hdr *vmx_hdr; - env->nested_state =3D g_malloc0(max_nested_state_len); env->nested_state->size =3D max_nested_state_len; =20 - if (cpu_has_vmx(env)) { - env->nested_state->format =3D KVM_STATE_NESTED_FORMAT_VMX; - vmx_hdr =3D &env->nested_state->hdr.vmx; - vmx_hdr->vmxon_pa =3D -1ull; - vmx_hdr->vmcs12_pa =3D -1ull; - } else { - env->nested_state->format =3D KVM_STATE_NESTED_FORMAT_SVM; - } + kvm_init_nested_state(env); } } =20 @@ -2199,6 +2214,8 @@ void kvm_arch_reset_vcpu(X86CPU *cpu) /* enabled by default */ env->poll_control_msr =3D 1; =20 + kvm_init_nested_state(env); + sev_es_set_reset_vector(CPU(cpu)); } =20 --=20 2.37.2