From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 45400566C6E; Wed, 30 Sep 2026 17:48:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790790490; cv=none; b=dcnGSuFdcA3veanPsaB2iUcumdUP9rhfkKnPeG+YSNq8725U60ZRS+L/ZIu2baioKaPNmqLqb80liLTd19O04CnIRLIbqdZTyoZZBrzvwPT+OUzBYFYpr/ZBk2kbnmEbB7FqyuHBuolS/cw3HqqYr/wp6U4IBvRSfk+M+RBEE18= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790790490; c=relaxed/simple; bh=NXHEOAMgfBtv+IhgIRC7Npi2euq0nsuc0fsGRqVkj+k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=vAB6ac0kY9tBuWyk/oe6h9YSs3ktkIysh5CCNfdVePpN+cIsaZORLQAac6zxJ5z8VNeVxNpWa5TM5N6t4/PbuU38WM/7qZoNoUizWx2wQzbct/Zz+GE1cqiyJctILJHfwk2hs3K4mIRz0gGGBlcccqICzHLYQpfN17BDPBFngHs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ddiOSjF3; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ddiOSjF3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0F971F000FF; Wed, 30 Sep 2026 17:48:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790790489; bh=zrbLlLDwrMVjE1d5zdOKNsfiHM5oytKkFO8PgVtEiPU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ddiOSjF386Ye7cxGKf/lE7vnUXku9kkXG477WKwudgnmABRDPvORtwUIMPcfcRdlc 1JBajPk9Z8EhNfwaUFgAYCSI7/D7cp0B/Tvy5HThx0GRf0XZOMzkFCgF7A4+O0pMwr XmOGPZGXjGCYYJbQQIqZsaG7AJvCErX6XDuQfiEw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Stefan Teodorescu , Sean Christopherson , Paolo Bonzini , Sasha Levin Subject: [PATCH 6.12 847/877] KVM: SEV: Do cache maintenance on the source VM during intra-host migration Date: Wed, 30 Sep 2026 17:29:18 +0200 Message-ID: <20260930152433.017664100@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152414.738996857@linuxfoundation.org> References: <20260930152414.738996857@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sean Christopherson [ Upstream commit 93de2a6a4b91b72607136dd656edf03fb399d27f ] Manually perform cache maintenance on the source VM during intra-host migration to ensure no stale data is left in CPU caches after the VM is destroyed. Because the source VM is "converted" to a non-SEV VM, KVM's memory reclaim flows won't trigger cache maintenance, e.g. when all guest memory is reclaimed in response to detaching from the mmu_notifier. Note, relying on the destination VM to do cache maintenance isn't an option as KVM doesn't require identical guest memory configurations, i.e. the source VM may have access to memory that the destination VM does not. Enforcing equivalent memory configurations is infeasible, as it would require a *deep* comparison of memslots, e.g. to verify that not only are the memslot identical, but what the memslots point at is also identical. Fixes: b56639318bb2 ("KVM: SEV: Add support for SEV intra host migration") Cc: stable@vger.kernel.org Reported-by: Stefan Teodorescu Signed-off-by: Sean Christopherson Message-ID: <20260923163721.1584779-3-seanjc@google.com> Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/svm/sev.c | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -2020,6 +2020,12 @@ static void sev_migrate_from(struct kvm src->pages_locked = 0; src->es_active = false; + /* + * Do cache maintenance on the source VM as it is no longer an SEV VM, + * i.e. memory reclaim flows won't trigger cache maintenance on the VM. + */ + sev_writeback_caches(src_kvm); + list_cut_before(&dst->regions_list, &src->regions_list, &src->regions_list); mutex_lock(&sev_mirror_lock); @@ -2159,6 +2165,10 @@ int sev_vm_move_enc_context_from(struct * the set of CPUs from the source. If a CPU was used to run a vCPU in * the source VM but is never used for the destination VM, then the CPU * can only have cached memory that was accessible to the source VM. + * Furthermore, KVM *must* perform cache maintenance on the source VM, + * as the source VM may have access to memory that the destination VM + * does not, i.e. KVM could skip flushes if memory is reclaimed from + * the old VM but not the new VM. */ if (!zalloc_cpumask_var(&dst_sev->have_run_cpus, GFP_KERNEL_ACCOUNT)) { ret = -ENOMEM;