From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 051E4C021BB for ; Tue, 25 Feb 2025 16:42:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=mdthn4xDz2Sz/LS1a9RdVhLSkol/67cEIwRLeTkSvJk=; b=XJcQOYvQAnOCfLUxPs+00PlWb5 5e01QVxYCzp3KYWRsgZqxiU9Lie67kZL/ysF/2FeHAkZP/o1d2vZX/x4kUWsdgG/Ptur0u3DUaUuf lMJ0R0x9hNdC6vKKjP0bJYbBTzSxu1KWdbRNVQCK1vmoUnLhizWcj5rIK1JiZ5MBjOPxPuh0moL7Q 7FexRaHt05FrJ83eIOyO05EjvO24WNlkrZZ/pluGYFgY2F3TWMaJftY5wCjAqB8oE/3EBcfex5L5+ K42MBNckK6hjHe5AaAimbvpIFgh1M+5eP12qQF2SPh9CWtYqCTW3LgQITeb4mzP7WpOnuXSkuQGyf 2Y1KJ5cA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tmy17-00000000Lis-1Ezm; Tue, 25 Feb 2025 16:42:45 +0000 Received: from mail-pj1-x104a.google.com ([2607:f8b0:4864:20::104a]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tmwUU-0000000011h-1bku for kvm-riscv@lists.infradead.org; Tue, 25 Feb 2025 15:05:00 +0000 Received: by mail-pj1-x104a.google.com with SMTP id 98e67ed59e1d1-2f81a0d0a18so12372909a91.3 for ; Tue, 25 Feb 2025 07:04:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740495897; x=1741100697; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=SksBvCkZJsvM7Rmqh0mGEf+0QRJJwMrgdQAdOhKbL9I=; b=EJuZi/Y9WKcejbG4SNkoKZArhM1GrOZIRmYClA7e55+X/nGOg2r9DdRVtTlwn9Exiq wlBI0tFJOrR4i1s1x+kCkBH8Nw7inHcTvtg2jNGrweMgyTV+4sy/d333kY/00hKu2fG7 bjQ3VlZHgjixrm/s84mF9ImBHXVbj16hj4t5gHDraGL0Ri0gIl6cWDKJt/bq8QxoEcRK xZSjjOpaVB9PtWIgLrsW4/8mcKphanUzi9ki/m8lq58rQtdm66PbekemrJmnmOGbGV5T pJWGYdhNLafU3G5V/4JmpmUA7eif0M+aZgFZ36J5ukfCV1j1Co9G5IoCoj9R6djvjEVz 4Slg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740495897; x=1741100697; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=SksBvCkZJsvM7Rmqh0mGEf+0QRJJwMrgdQAdOhKbL9I=; b=oaNu4Pgh7X+NFjBmUiAu6xdwj1Zu50G+nqfV5Z/MRwdAL00etw4q8iVKWVrYWB2xCO qIwkx9gfRpQRGsJa3vE5geVg3otDIcBmZpEOgHyJ+Fnevy4FO+QZXlZZWSu9ht3NNnOd Su865AvMl5jgLkuA9pCu6ysfOSseur8W/iPDleOiqxGVQovfF+KjC3+zqV6tciXtPHlU BsdSjS/IqM03EA6z9tY9xs4AIlSbyciFnQnBFOhWrJjwogX5EKWzYuJNvb4gpvY7YBBo 5M2whr0aoOUcACBs0EVM/9IyKuyso2uPFuEIFV/Ur4Y3W9LmYfcQQgXp9ZnTclm42qLS we0A== X-Forwarded-Encrypted: i=1; AJvYcCVKFvJh311ANjqpvSLuwS9r9+DT8vwxCQQmk/NtO7a6pcfFserzEF9LqumFO5I9I6zmtOODseyWz1Y=@lists.infradead.org X-Gm-Message-State: AOJu0YxHWgqbKYYDtaGzepDOuuukU8icrRgX/PdyDdsmWkQKz4ui0jiw k8WgkJ/nI3oHGE8unFV3dX5YZaZb/MVxkdxbTIk7kIvmA/1AmmxsgmNUmtLN/cXTo004i6oUKZ4 OxA== X-Google-Smtp-Source: AGHT+IGZHL7uZNM7BfQEbB7Kx7BtB5DxGYYXBfSiN251AAOj3wJWNSwzk9hwQvuFf2tqN0hxCASkCwncVrs= X-Received: from pgmm27.prod.google.com ([2002:a05:6a02:551b:b0:ad5:4c6b:ab72]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:9d8f:b0:1f0:e430:43f8 with SMTP id adf61e73a8af0-1f0fbff6f36mr6428815637.1.1740495896725; Tue, 25 Feb 2025 07:04:56 -0800 (PST) Date: Tue, 25 Feb 2025 07:04:55 -0800 In-Reply-To: Mime-Version: 1.0 References: <20250224235542.2562848-1-seanjc@google.com> <20250224235542.2562848-2-seanjc@google.com> Message-ID: Subject: Re: [PATCH 1/7] KVM: x86: Free vCPUs before freeing VM state From: Sean Christopherson To: Yan Zhao Cc: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Madhavan Srinivasan , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Paolo Bonzini , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Aaron Lewis , Jim Mattson , Rick P Edgecombe , Kai Huang , Isaku Yamahata X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250225_070458_413940_70875835 X-CRM114-Status: GOOD ( 17.01 ) X-BeenThere: kvm-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kvm-riscv" Errors-To: kvm-riscv-bounces+kvm-riscv=archiver.kernel.org@lists.infradead.org On Tue, Feb 25, 2025, Yan Zhao wrote: > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > > index 58b82d6fd77c..045c61cc7e54 100644 > > --- a/arch/x86/kvm/x86.c > > +++ b/arch/x86/kvm/x86.c > > @@ -12890,11 +12890,11 @@ void kvm_arch_destroy_vm(struct kvm *kvm) > > mutex_unlock(&kvm->slots_lock); > > } > > kvm_unload_vcpu_mmus(kvm); > > + kvm_destroy_vcpus(kvm); > > kvm_x86_call(vm_destroy)(kvm); > > kvm_free_msr_filter(srcu_dereference_check(kvm->arch.msr_filter, &kvm->srcu, 1)); > > kvm_pic_destroy(kvm); > > kvm_ioapic_destroy(kvm); > > - kvm_destroy_vcpus(kvm); > > kvfree(rcu_dereference_check(kvm->arch.apic_map, 1)); > > kfree(srcu_dereference_check(kvm->arch.pmu_event_filter, &kvm->srcu, 1)); > > kvm_mmu_uninit_vm(kvm); > After this change, now the sequence is that > > 1. kvm_arch_pre_destroy_vm() > 2. kvm_arch_destroy_vm() > 2.1 kvm_destroy_vcpus() > 2.2 .vm_destroy hook > 2.3 kvm_mmu_uninit_vm() --> mirror root ref is 1 upon here. Zap the mirror > root and reclaim SETP page table pages. > 2.4 .vm_free hook > > Since TDX needs to reclaim the TDR page after reclaiming all other pages, we > currently added a vm_free hook at 2.4, after 2.3. > > Could we move kvm_mmu_uninit_vm() before the .vm_destroy hook and after > kvm_destroy_vcpus()? > > Or move the .vm_destroy hook after kvm_mmu_uninit_vm(), e.g. after > kvm_page_track_cleanup()? I would go for the first option. I'll tack on a patch since I need to test all of these flows anyways, and I would much prefer to change course sooner rather than later if it doesn't work for whatever reason. Is this comment accurate? diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 1e5f6f820c0b..f5685f153e08 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12874,13 +12874,19 @@ void kvm_arch_destroy_vm(struct kvm *kvm) mutex_unlock(&kvm->slots_lock); } kvm_destroy_vcpus(kvm); + + /* + * Do final MMU teardown prior to calling into vendor code. All pages + * that were donated to the TDX module, e.g. for S-EPT tables, need to + * be reclaimed before the VM metadata page can be freed. + */ + kvm_mmu_uninit_vm(kvm); kvm_x86_call(vm_destroy)(kvm); kvm_free_msr_filter(srcu_dereference_check(kvm->arch.msr_filter, &kvm->srcu, 1)); kvm_pic_destroy(kvm); kvm_ioapic_destroy(kvm); kvfree(rcu_dereference_check(kvm->arch.apic_map, 1)); kfree(srcu_dereference_check(kvm->arch.pmu_event_filter, &kvm->srcu, 1)); - kvm_mmu_uninit_vm(kvm); kvm_page_track_cleanup(kvm); kvm_xen_destroy_vm(kvm); kvm_hv_destroy_vm(kvm); -- kvm-riscv mailing list kvm-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kvm-riscv From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 750BE3A27B for ; Tue, 25 Feb 2025 15:04:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740495899; cv=none; b=pUDEZSRUDY6dz/Y7bhJSy6UbgGS/fepzLm6TwfXLvTtqAeOB2Ncr6zKAekGBzj9KbP/xqjeBqIIWsEhuTbyTCTgD/QZtfMHkaPxckh9VuPhvWm2qIISugcqwiM1AKY78boNAy2Mik0av7gZ0WOAwqmURXUAo1F6WDX+Pw+zmGuE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740495899; c=relaxed/simple; bh=vHxREudX9bj9dETQmre2TyJ+AerbIUB9johHAra0OcY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ghCD4geiREQ2ig04SmmMLrfTUUt8adc4F29h+QMAAq9m7O9l9j6ZIHLLysqbHIFLIQxG7njHswnuKE8eA0EVz/2V+SSM40iLBw+Ozcr4YhwIXZkEpV7d/1PygzLVgdd1tc/6e4zlF0IIsaTnKjiKmncwYrm3FFnlLPmbzN1oIag= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=xBeN/Yg6; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="xBeN/Yg6" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2fc518f0564so12376860a91.2 for ; Tue, 25 Feb 2025 07:04:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740495897; x=1741100697; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=SksBvCkZJsvM7Rmqh0mGEf+0QRJJwMrgdQAdOhKbL9I=; b=xBeN/Yg6seyw2+zB6ZEiNjX9hpxkH/QBdcXGsrWIN7M0zfX1n3KZREQovfsb5sHBCB BBCj3RS0xtpAB/TaL5zpddubnYGjgCckKobWK9b5wsQqk+Iv4kahgb8m3rMVNe8dlrh7 T78QtLJX/3Fq5wuzdvbQTR9QbEl431bQ/VPsg/4CePOy4EqfaES+j/3GWIdNyQLPrPdk k33GeSW1YbQTMa63TCG6yMVykOG0s3BymxU1V8p58hnBKHxjP2CgDT+FgM9T1DJ92UrO zYl7qOszMIfcpHt+f3UcZxQFRf7GXVQAqLJzLmTuwNF1hxdnT6YdSmFoE+o2IbCTo6M7 Gxgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740495897; x=1741100697; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=SksBvCkZJsvM7Rmqh0mGEf+0QRJJwMrgdQAdOhKbL9I=; b=Vzhwe5ruw0SVPuVrlltVaz5MAdi97KZU7jxqniyewZ7V4ggWEuffsVQPNDSr0h2db4 CG2aEAbJItCwKX4e/Kt8hyrJXb2KgFHQhQ3Pj8SSXlloyYY66dUz+xT2nxTAuFTUU9IB L8zACjHdkQNIy0l+hewlHOdf4kmAPDlxhAyHNPv7Oq+JgQh3rSMON3/u+VSxjStgj/34 vgE8IBR0oB8ITk5wQSQgj8U2IeIlVCZw7ZVLqpqvajjixF4/lHISx0lqHthx9K2Bb916 H13LNaEGDcA1NZtzPE2EB5IcMu57sbGdB05nOZBgx6mrdmiQo2WHV3FEn3HbWQrwmIia X/sw== X-Forwarded-Encrypted: i=1; AJvYcCVqytdTrlQwUoSpF+D2t72vj+EXgXpDUR6Q88LwklsACTbJ3aq2RDJ45zGqZIWHl7/Vjrg=@vger.kernel.org X-Gm-Message-State: AOJu0YxLaLfBsy2sNU4qmo3KwVRIsb9ASS0X1dM0cUcy0KfvbNH8UVve dLexemz/FCH0d/7XunZUIaQpPnaZPZhVn6hPLT7UmOgspRqA+5M+AiontZeSZPMSAnqoSnlrSnr +7w== X-Google-Smtp-Source: AGHT+IGZHL7uZNM7BfQEbB7Kx7BtB5DxGYYXBfSiN251AAOj3wJWNSwzk9hwQvuFf2tqN0hxCASkCwncVrs= X-Received: from pgmm27.prod.google.com ([2002:a05:6a02:551b:b0:ad5:4c6b:ab72]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:9d8f:b0:1f0:e430:43f8 with SMTP id adf61e73a8af0-1f0fbff6f36mr6428815637.1.1740495896725; Tue, 25 Feb 2025 07:04:56 -0800 (PST) Date: Tue, 25 Feb 2025 07:04:55 -0800 In-Reply-To: Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250224235542.2562848-1-seanjc@google.com> <20250224235542.2562848-2-seanjc@google.com> Message-ID: Subject: Re: [PATCH 1/7] KVM: x86: Free vCPUs before freeing VM state From: Sean Christopherson To: Yan Zhao Cc: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Madhavan Srinivasan , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Paolo Bonzini , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Aaron Lewis , Jim Mattson , Rick P Edgecombe , Kai Huang , Isaku Yamahata Content-Type: text/plain; charset="us-ascii" On Tue, Feb 25, 2025, Yan Zhao wrote: > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > > index 58b82d6fd77c..045c61cc7e54 100644 > > --- a/arch/x86/kvm/x86.c > > +++ b/arch/x86/kvm/x86.c > > @@ -12890,11 +12890,11 @@ void kvm_arch_destroy_vm(struct kvm *kvm) > > mutex_unlock(&kvm->slots_lock); > > } > > kvm_unload_vcpu_mmus(kvm); > > + kvm_destroy_vcpus(kvm); > > kvm_x86_call(vm_destroy)(kvm); > > kvm_free_msr_filter(srcu_dereference_check(kvm->arch.msr_filter, &kvm->srcu, 1)); > > kvm_pic_destroy(kvm); > > kvm_ioapic_destroy(kvm); > > - kvm_destroy_vcpus(kvm); > > kvfree(rcu_dereference_check(kvm->arch.apic_map, 1)); > > kfree(srcu_dereference_check(kvm->arch.pmu_event_filter, &kvm->srcu, 1)); > > kvm_mmu_uninit_vm(kvm); > After this change, now the sequence is that > > 1. kvm_arch_pre_destroy_vm() > 2. kvm_arch_destroy_vm() > 2.1 kvm_destroy_vcpus() > 2.2 .vm_destroy hook > 2.3 kvm_mmu_uninit_vm() --> mirror root ref is 1 upon here. Zap the mirror > root and reclaim SETP page table pages. > 2.4 .vm_free hook > > Since TDX needs to reclaim the TDR page after reclaiming all other pages, we > currently added a vm_free hook at 2.4, after 2.3. > > Could we move kvm_mmu_uninit_vm() before the .vm_destroy hook and after > kvm_destroy_vcpus()? > > Or move the .vm_destroy hook after kvm_mmu_uninit_vm(), e.g. after > kvm_page_track_cleanup()? I would go for the first option. I'll tack on a patch since I need to test all of these flows anyways, and I would much prefer to change course sooner rather than later if it doesn't work for whatever reason. Is this comment accurate? diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 1e5f6f820c0b..f5685f153e08 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12874,13 +12874,19 @@ void kvm_arch_destroy_vm(struct kvm *kvm) mutex_unlock(&kvm->slots_lock); } kvm_destroy_vcpus(kvm); + + /* + * Do final MMU teardown prior to calling into vendor code. All pages + * that were donated to the TDX module, e.g. for S-EPT tables, need to + * be reclaimed before the VM metadata page can be freed. + */ + kvm_mmu_uninit_vm(kvm); kvm_x86_call(vm_destroy)(kvm); kvm_free_msr_filter(srcu_dereference_check(kvm->arch.msr_filter, &kvm->srcu, 1)); kvm_pic_destroy(kvm); kvm_ioapic_destroy(kvm); kvfree(rcu_dereference_check(kvm->arch.apic_map, 1)); kfree(srcu_dereference_check(kvm->arch.pmu_event_filter, &kvm->srcu, 1)); - kvm_mmu_uninit_vm(kvm); kvm_page_track_cleanup(kvm); kvm_xen_destroy_vm(kvm); kvm_hv_destroy_vm(kvm); From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3B50AC021B2 for ; Tue, 25 Feb 2025 16:42:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=S4g47zm1yYPssrD73fNMOhvYKNPKAF/XnY8B+Y62jsI=; b=sb2S7lz+KFu0GjImiXU3IsUlPN AXFWuJSD8LVBF08K3F58hRVBhGHqyDB62p8Wve/QALvZ9uQL7QNhmnI5bfqzGdujQVdHFBhRT1EM9 86vr0+KJRpZOm/DnyOk69PquGDSECG9BhMUWDGDruvwzmu3oS8R5OkVU+8EsDQmV0CWWa1WqOcPlN i6IrWWTo6P4QxxlRje1RnhOioq/Myx0lumns+G+uz8L5cbJrK8snRu7QdA5WRtR1RgcKNPLMZJUKE xPVFhXC3S6CAR3tZXQPC/5bUQypn5tAfXHaE402Q13wBcNIFNWkRQy7GCmV0LVuetqcLtgCUOj57J CuCBsgzw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tmy10-00000000LaR-28Xs; Tue, 25 Feb 2025 16:42:38 +0000 Received: from mail-pj1-x1049.google.com ([2607:f8b0:4864:20::1049]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tmwUU-0000000011j-1ayO for linux-riscv@lists.infradead.org; Tue, 25 Feb 2025 15:04:59 +0000 Received: by mail-pj1-x1049.google.com with SMTP id 98e67ed59e1d1-2fc518f0564so12376857a91.2 for ; Tue, 25 Feb 2025 07:04:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740495897; x=1741100697; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=SksBvCkZJsvM7Rmqh0mGEf+0QRJJwMrgdQAdOhKbL9I=; b=EJuZi/Y9WKcejbG4SNkoKZArhM1GrOZIRmYClA7e55+X/nGOg2r9DdRVtTlwn9Exiq wlBI0tFJOrR4i1s1x+kCkBH8Nw7inHcTvtg2jNGrweMgyTV+4sy/d333kY/00hKu2fG7 bjQ3VlZHgjixrm/s84mF9ImBHXVbj16hj4t5gHDraGL0Ri0gIl6cWDKJt/bq8QxoEcRK xZSjjOpaVB9PtWIgLrsW4/8mcKphanUzi9ki/m8lq58rQtdm66PbekemrJmnmOGbGV5T pJWGYdhNLafU3G5V/4JmpmUA7eif0M+aZgFZ36J5ukfCV1j1Co9G5IoCoj9R6djvjEVz 4Slg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740495897; x=1741100697; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=SksBvCkZJsvM7Rmqh0mGEf+0QRJJwMrgdQAdOhKbL9I=; b=lXz46p7iYHAsYAaatLO61MyH0OyQTNyusiUUfk3Muj7+9Lb+ToMxIZRZY4WqeQVRCy TiQOARFvmsyg209xQTlNTbNGwdrSEqdxNxCm9++4vuji0QWx9y4udIZcfhd/6Ait98KM 2syZ8825/w08XFVTdHU3N4ezTC67reSAjqAeuRbN3I9eovKnSsF+EGDUFkBzuLs3efYk 0y/oqIm15EeSN3k4bDk/BTDB20nsRi7ePHgklwzM+7OiS6efW7Nw1RQqqAtamhN08rIa UskOrNMiaLMKNwXqeG7HHNTWtEn1Iv10p+lgUtczryJBQqRWPiGnGAys+zLl2EEWIiUJ tSjg== X-Forwarded-Encrypted: i=1; AJvYcCURF3tFUVOufyqqv3FBEyNs/M4h6Uetd9uoCv7/mT/V7mxLMOaUJrHVvekpwPqbvw/xrXI2NpcC/YccXQ==@lists.infradead.org X-Gm-Message-State: AOJu0YwodM4ihHQNPTHJOpe3YTahQ6JwRkpbJ9IUgXb8AgUh5e99+SJb BA33JitBgbzTAXggLDYAQB+J6XfSD9mWEMZbfV24nz+UXpp7VEgLFBL+dAJFe+Ek6Bt+mbOmbGy 7Cg== X-Google-Smtp-Source: AGHT+IGZHL7uZNM7BfQEbB7Kx7BtB5DxGYYXBfSiN251AAOj3wJWNSwzk9hwQvuFf2tqN0hxCASkCwncVrs= X-Received: from pgmm27.prod.google.com ([2002:a05:6a02:551b:b0:ad5:4c6b:ab72]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:9d8f:b0:1f0:e430:43f8 with SMTP id adf61e73a8af0-1f0fbff6f36mr6428815637.1.1740495896725; Tue, 25 Feb 2025 07:04:56 -0800 (PST) Date: Tue, 25 Feb 2025 07:04:55 -0800 In-Reply-To: Mime-Version: 1.0 References: <20250224235542.2562848-1-seanjc@google.com> <20250224235542.2562848-2-seanjc@google.com> Message-ID: Subject: Re: [PATCH 1/7] KVM: x86: Free vCPUs before freeing VM state From: Sean Christopherson To: Yan Zhao Cc: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Madhavan Srinivasan , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Paolo Bonzini , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Aaron Lewis , Jim Mattson , Rick P Edgecombe , Kai Huang , Isaku Yamahata X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250225_070458_413522_B2B80299 X-CRM114-Status: GOOD ( 17.01 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org On Tue, Feb 25, 2025, Yan Zhao wrote: > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > > index 58b82d6fd77c..045c61cc7e54 100644 > > --- a/arch/x86/kvm/x86.c > > +++ b/arch/x86/kvm/x86.c > > @@ -12890,11 +12890,11 @@ void kvm_arch_destroy_vm(struct kvm *kvm) > > mutex_unlock(&kvm->slots_lock); > > } > > kvm_unload_vcpu_mmus(kvm); > > + kvm_destroy_vcpus(kvm); > > kvm_x86_call(vm_destroy)(kvm); > > kvm_free_msr_filter(srcu_dereference_check(kvm->arch.msr_filter, &kvm->srcu, 1)); > > kvm_pic_destroy(kvm); > > kvm_ioapic_destroy(kvm); > > - kvm_destroy_vcpus(kvm); > > kvfree(rcu_dereference_check(kvm->arch.apic_map, 1)); > > kfree(srcu_dereference_check(kvm->arch.pmu_event_filter, &kvm->srcu, 1)); > > kvm_mmu_uninit_vm(kvm); > After this change, now the sequence is that > > 1. kvm_arch_pre_destroy_vm() > 2. kvm_arch_destroy_vm() > 2.1 kvm_destroy_vcpus() > 2.2 .vm_destroy hook > 2.3 kvm_mmu_uninit_vm() --> mirror root ref is 1 upon here. Zap the mirror > root and reclaim SETP page table pages. > 2.4 .vm_free hook > > Since TDX needs to reclaim the TDR page after reclaiming all other pages, we > currently added a vm_free hook at 2.4, after 2.3. > > Could we move kvm_mmu_uninit_vm() before the .vm_destroy hook and after > kvm_destroy_vcpus()? > > Or move the .vm_destroy hook after kvm_mmu_uninit_vm(), e.g. after > kvm_page_track_cleanup()? I would go for the first option. I'll tack on a patch since I need to test all of these flows anyways, and I would much prefer to change course sooner rather than later if it doesn't work for whatever reason. Is this comment accurate? diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 1e5f6f820c0b..f5685f153e08 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12874,13 +12874,19 @@ void kvm_arch_destroy_vm(struct kvm *kvm) mutex_unlock(&kvm->slots_lock); } kvm_destroy_vcpus(kvm); + + /* + * Do final MMU teardown prior to calling into vendor code. All pages + * that were donated to the TDX module, e.g. for S-EPT tables, need to + * be reclaimed before the VM metadata page can be freed. + */ + kvm_mmu_uninit_vm(kvm); kvm_x86_call(vm_destroy)(kvm); kvm_free_msr_filter(srcu_dereference_check(kvm->arch.msr_filter, &kvm->srcu, 1)); kvm_pic_destroy(kvm); kvm_ioapic_destroy(kvm); kvfree(rcu_dereference_check(kvm->arch.apic_map, 1)); kfree(srcu_dereference_check(kvm->arch.pmu_event_filter, &kvm->srcu, 1)); - kvm_mmu_uninit_vm(kvm); kvm_page_track_cleanup(kvm); kvm_xen_destroy_vm(kvm); kvm_hv_destroy_vm(kvm); _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv