From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5648644E055 for ; Fri, 29 May 2026 18:36:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780079807; cv=none; b=rvyjegw8lSdmQV5OyQDM/AjPX1VUY2jP2dUvUFk5+xhWAbkEhxNUOeRbgoEVBWIdpI9gZfkM1nCvnvJvbETcuEfn/o10bKRzZo8uM6MjtMN8K6JmcPiU3wr/O5U65KiTj/c/Mwn4Mthwdhn8o4SDmX2UoOskZcjrOf0aQFODZuM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780079807; c=relaxed/simple; bh=DW2PUzvZkPeDxrXgPu51jPm/Jji/jDPOTkA5AbO8VMs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F+cIRvKKCZX6SuG2dLcaRxaWv4jLJz8szcYtWfJ1dMQMRVhKc99EzIoz8/fhhhNwnpteJgUWwwxM/kHhvGeOHGooY/vIs/Oa46nn+b/aGNuFRuEyiMVEuejxsIQ6nsr5nk27jtdIgtRk5afzkivqvPmiPY755aRpGVEa1c4vpp4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=TNxGZ/Me; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=axP4LoCi; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="TNxGZ/Me"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="axP4LoCi" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780079803; 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=RYkh8jiq7SEyEfVyi04hmQY3u+cvHZraHKSEMFmK1TQ=; b=TNxGZ/MeCOu6jDdL/iXYEfRyFGfnulqZOz1TmOOBD/47kRAXCmH8WOOsQclHrTxdVXaZC5 i+nP0I2BJbV8Td1F73trI7cDa34zIF3tMvYPvNb3VIU/7wXCgW2PQvl2lVIYZkHVH8Eylt Ni94YxU43iV7p65n9jj5ZkOgS9h09ms= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-634-2QjQYlWdPte6eCpPLN07uQ-1; Fri, 29 May 2026 14:36:39 -0400 X-MC-Unique: 2QjQYlWdPte6eCpPLN07uQ-1 X-Mimecast-MFC-AGG-ID: 2QjQYlWdPte6eCpPLN07uQ_1780079798 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-48fd33b4921so91978835e9.2 for ; Fri, 29 May 2026 11:36:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1780079798; x=1780684598; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RYkh8jiq7SEyEfVyi04hmQY3u+cvHZraHKSEMFmK1TQ=; b=axP4LoCifqBoHeS36wfwxevGyK0R4eL6iHCZRh9F0iyeibQBAE6F09u4Go0/NviPfT x55aAtwKMOlh5A5HXGXzqMrUw4tArfu3JaO9aVdWKtou13vADQvDhN3tKjOhChLZnXGZ I0WexmIA4cS7U10n3X2Q0XIYZZk5qNdHRXlAjJj3FDL+ztjc0uuRh1gI2Izh2Q2g29SH yiz5PbDZdOpJZ28su7DLiWlRWe+QsBM9igfdlE0W4vV3kQfpKpuuVedu3kkbyGDHssrE k+33yQvpSo1Q/6za2NkjG4kBXnmAzbjagUSA4Vn5DOPA0pdKkAt4YBXQKyy4tg4M+20J 0djg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780079798; x=1780684598; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=RYkh8jiq7SEyEfVyi04hmQY3u+cvHZraHKSEMFmK1TQ=; b=EA4sVMoEyMv+4B7HJANsecIXAK1tS6HT1K7BjIjysiWXrMLKBXN4e5/MxICAEJFwmK pIuJ3vxvzSzK954RiIqXrAKOYsdSrVb0CApqiOFfIQ+RFyqR7e/tAiTtU+lASYag5VRN rsoYKlLn03jnoslvQK4CC4RROb6JaO98V4FI3siT+fWfysyNVKGIvhYai/tQF0T4rGEa gp5p9uMPEr3JlYaYKCuGQiYeqxGgsAZOG0Gowiku1oAJFxtj400/WgG7maxcMUGiIzY1 7W0zZIjxm5nG2JGa63TxhZ3T1cIaf1ac/7sHzGxw5mSL86dJqEpnoWqLxtKObWpxMCAT oAxA== X-Gm-Message-State: AOJu0YzWYgi4QD99Qd162hsLcCXvSHrfYL9reFGlwolnLYhplXxk63RL dJwTE1dpWyFiE3WucQhzHXq/rvk/0i3Qx3v1A4DYfUHCocwjDKDDW1RFAhit0QzYHGnO4FcToqD K5Ndpoy/1dsqb90YOB8dm4SyYSYJesqe2bX9mLvYTM7oaGIy4UUaYMaHEarq5Fy6slgpIsFfnJW fQWm4o9SXIEXGHBy3Yig8+7g0dUQHRcH4A4YGtEoC7kPPA6fVq0Q== X-Gm-Gg: Acq92OFC5KVDQtwHC/DyIb+mKCcGSKLGlptWU1MnQOUHgPFV2xljq++j3PBT6Jza5Xa 6uwZPLxyFOOoZPmAv1kUP5Clsj+WEfpAYEun84WVLZw+IrFXJhulUAv0OvfEWQAMVki0iCYxifG K7qz83oAn1VRNoxBGCqQN/McCcnaeOmA3w0jpKMol3xd+dKdtdADWc+mcPrVlai8aiP1R64/ryG zn9OwAprxOYPWJjPIWyswVAUfik4HIqcPs2MfUjBHDvszSSzmIERD/SzmftWBrFp3on8AqG6DCx w6GYvr3yRGDpwqgglgNv3XNQzYgxi7TCBd4vXGNvk10bJUcGJ21VbpNZKuQpFfsvLycp/Wm3oaq MfTbCW1GQ6QiOCTJdbedZ+axDEPUWbAFuwKMxtVBEXJlE3cR3ZSdIi4I6mdKKrVKKwAqgr04LpS mCLuwWS1R7ZbV+RfqqUhOUnJBtQoF+eC8kwvLXQw== X-Received: by 2002:a05:600c:818c:b0:490:48df:2793 with SMTP id 5b1f17b1804b1-490a296df9amr12285385e9.26.1780079798522; Fri, 29 May 2026 11:36:38 -0700 (PDT) X-Received: by 2002:a05:600c:818c:b0:490:48df:2793 with SMTP id 5b1f17b1804b1-490a296df9amr12284925e9.26.1780079797965; Fri, 29 May 2026 11:36:37 -0700 (PDT) Received: from [192.168.10.48] ([151.49.251.208]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45ef3587072sm5633245f8f.34.2026.05.29.11.36.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2026 11:36:34 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: seanjc@google.com, Tom Lendacky , Michael Roth , stable@vger.kernel.org Subject: [PATCH 17/24] KVM: SEV: Unmap and unpin the GHCB as needed on vCPU free Date: Fri, 29 May 2026 20:35:42 +0200 Message-ID: <20260529183549.1104619-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260529183549.1104619-1-pbonzini@redhat.com> References: <20260529183549.1104619-1-pbonzini@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Sean Christopherson Unmap and unpin the GHCB as needed when freeing a vCPU. If the VM is destroyed after mapping+pinning the GHCB on #VMGEXIT, without re-running the vCPU, KVM will effectively leak the GHCB and any mappings created for the GHCB. Fixes: 291bd20d5d88 ("KVM: SVM: Add initial support for a VMGEXIT VMEXIT") Cc: stable@vger.kernel.org Tested-by: Michael Roth Reviewed-by: Tom Lendacky Reviewed-by: Michael Roth Signed-off-by: Sean Christopherson Message-ID: <20260501202250.2115252-18-seanjc@google.com> Signed-off-by: Paolo Bonzini --- arch/x86/kvm/svm/sev.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 11d46600cbdc..6c6a6d663e29 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -3552,6 +3552,20 @@ static int sev_es_validate_vmgexit(struct vcpu_svm *svm) return 1; } +static void __sev_es_unmap_ghcb(struct vcpu_svm *svm) +{ + if (svm->sev_es.ghcb_sa_free) { + kvfree(svm->sev_es.ghcb_sa); + svm->sev_es.ghcb_sa = NULL; + svm->sev_es.ghcb_sa_free = false; + } + + if (svm->sev_es.ghcb) { + kvm_vcpu_unmap(&svm->vcpu, &svm->sev_es.ghcb_map); + svm->sev_es.ghcb = NULL; + } +} + void sev_es_unmap_ghcb(struct vcpu_svm *svm) { /* Clear any indication that the vCPU is in a type of AP Reset Hold */ @@ -3570,18 +3584,11 @@ void sev_es_unmap_ghcb(struct vcpu_svm *svm) svm->sev_es.ghcb_sa_sync = false; } - if (svm->sev_es.ghcb_sa_free) { - kvfree(svm->sev_es.ghcb_sa); - svm->sev_es.ghcb_sa = NULL; - svm->sev_es.ghcb_sa_free = false; - } - trace_kvm_vmgexit_exit(svm->vcpu.vcpu_id, svm->sev_es.ghcb); sev_es_sync_to_ghcb(svm); - kvm_vcpu_unmap(&svm->vcpu, &svm->sev_es.ghcb_map); - svm->sev_es.ghcb = NULL; + __sev_es_unmap_ghcb(svm); } void sev_free_vcpu(struct kvm_vcpu *vcpu) @@ -3611,8 +3618,7 @@ void sev_free_vcpu(struct kvm_vcpu *vcpu) __free_page(virt_to_page(svm->sev_es.vmsa)); skip_vmsa_free: - if (svm->sev_es.ghcb_sa_free) - kvfree(svm->sev_es.ghcb_sa); + __sev_es_unmap_ghcb(svm); } int pre_sev_run(struct vcpu_svm *svm, int cpu) -- 2.54.0