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 E9C7AC7115A for ; Wed, 18 Jun 2025 13:08:31 +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:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MCQa7DTfT5103hq0QJlqB/CaXFhxxdc+sxVAoFkX3Zw=; b=MaYDAD2Hy5ta5J +FaEmX8rQ1AcJeR1+JnVTPfovK091P4bNnrTpuvi1ycQXqzGMTuH5ne51T4Fp5zumlb4yolH3KAIH uf6XPh3XOEJTT1xnsCDms+XuJ7y5ACiuaUfoOXYPIFZMek6lbL402U9eUPITDNfFV9vTO/mg0IDHE U5uzk9DUqOu62vUMdW12MrhszHaKMhzdqS62pgeHS3ZqU0tj+P11SskQyVGLSCHNpKkCKZlJBZIfi /L6Fpc0VITT9K8jcTIbzaLuCXfhcmU+r/rj9sq+TEBwX0RYAyI+mJ1bjf+7k52jH0MV3TlrWUA5yS C2PL/muKEy9oLu9q9daQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uRsWl-0000000AEb8-2X1Q; Wed, 18 Jun 2025 13:08:31 +0000 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uRr5E-00000009xfM-2RxJ for kvm-riscv@lists.infradead.org; Wed, 18 Jun 2025 11:36:02 +0000 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-2350fc2591dso5606545ad.1 for ; Wed, 18 Jun 2025 04:36:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1750246560; x=1750851360; darn=lists.infradead.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=3W7Bv8eoCvTNzkNO4nvyVAxgoupNAJKpC3g9nF1nD78=; b=kMhCbrwz2/W6LZUkWiS1WdU+d/1U3Mzbh1Lhf8uk1ePUlef6B0pHhucV+4dn/0bfNy UlfOheb6GfNa5oNx0wb4k8QdmE4U7na0WoakFvm5Lf1YVdQlJigL4RDVjT2Tx7TjtVLj ZdS+vgRkdIYiINpTekFYOMxjwFWoVCrWxLr1HyJ5uiH0KtQg0SxjKD5Jqcm9cz/mIlPK gzAf7QYlqEHAYr3GMjwffVI94WbC/ZFA64LyMIZjFM4a1Pq2+EagjrJee+OdE0+vZ8/V +vmttWy1FHVq/t7SbUc9U2g+0ppETSGIj9AsaI5OLG83n8ayMvFF09p6u3OhrMJ/asNG 6nrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750246560; x=1750851360; 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=3W7Bv8eoCvTNzkNO4nvyVAxgoupNAJKpC3g9nF1nD78=; b=WTq55L1uJY4ZgIdHizfmwHv4ECD+hcLMnVOIVUttu1srL5M+Zix2PPQosIOueFg6c6 h5kB9Fi4xacC8l6ovmxOf9x7Hpw95mt0TsErUMA7SnmIgP0p/KOJTIwFEOkvkoFUuTl/ nvDnbH7qEGXTBh+07H/LsNZR/CIUGY0q72b8D7fbgHkgZj4Kdo1YAt4HW9H38L8U86eJ WtUAXz1MTh5/qqdjQu2m7piRFaYBI308GyOckD2TA0zKpwgLrTzoipFu0arp861C+zNr awSMFe42cOIgZhpzjJ53UIEUfsA8f6b3Bzvwumi78Lb4r1Xf+hF57wEONy7sveWwwWgr PCGQ== X-Forwarded-Encrypted: i=1; AJvYcCUsJbr4bhkk3tLXTuTm3i9wFNcyd51WxGe+IvYEM1V39mF2SHkzJzyChPQsIFnsDcFg7z7CImuQpKY=@lists.infradead.org X-Gm-Message-State: AOJu0Yx7/2hAf8jWqFd5nGo/P4HUDUkLMt30uT95R42It3jKmh5oYCbP Fe8+8NVkxbeCt+fOiYzTk2zMbLemC9mUeKDeCEYjiuyVOIAbxZQ97ND6VcgRe2YgY3A= X-Gm-Gg: ASbGncsrKMdHBGaN2F3Y/rjVw9SXaz0Li5mcKPBqh8xy+uCuY/Sgke9FifJqJxAaEne Ax/A28m6VLLgi3Y9p+SqXLkBr0E7FnmpuHJfCgV4jyVg7DRc85FeKfpUT/yU0kZ99X3Dk0VXzqn 6ZoVCYxV/nhNbDe8/mnD1H9aXsixTqhBUWRz3taDndiuioe1vqqRcPmHJlqZlkm7KH6f1zJlq31 hcgAN6MwcFlmJp/PrCiaXS6n6eWS+9qmmtgPDZjHlQoJBgiY0NbwvCInMIbLGHV7xBem9n5RAcg fb72jMcE/dM6NJDdygpshJlJNtAfgGP1vQSf7EmXQa7yj8gCeVNBkjY8718PavDZ8r4aWF3rdLa d0Akl5wu+RatuKCV1Iw== X-Google-Smtp-Source: AGHT+IG6YfMEu9lcXrd2qiAepReJXbM/lA1ChWg4x51TipxipgSLPLblK8ZINKPH1NwWxJ/vO5o07w== X-Received: by 2002:a17:902:c94e:b0:231:9817:6ec1 with SMTP id d9443c01a7336-237c20e022cmr32723525ad.17.1750246559668; Wed, 18 Jun 2025 04:35:59 -0700 (PDT) Received: from localhost.localdomain ([122.171.23.44]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-237c57c63efsm9112475ad.172.2025.06.18.04.35.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jun 2025 04:35:59 -0700 (PDT) From: Anup Patel To: Atish Patra Cc: Palmer Dabbelt , Paul Walmsley , Alexandre Ghiti , Andrew Jones , Anup Patel , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel , Atish Patra , Nutty Liu Subject: [PATCH v3 03/12] RISC-V: KVM: Rename and move kvm_riscv_local_tlb_sanitize() Date: Wed, 18 Jun 2025 17:05:23 +0530 Message-ID: <20250618113532.471448-4-apatel@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250618113532.471448-1-apatel@ventanamicro.com> References: <20250618113532.471448-1-apatel@ventanamicro.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250618_043600_622186_19D35ED4 X-CRM114-Status: GOOD ( 12.84 ) 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 The kvm_riscv_local_tlb_sanitize() deals with sanitizing current VMID related TLB mappings when a VCPU is moved from one host CPU to another. Let's move kvm_riscv_local_tlb_sanitize() to VMID management sources and rename it to kvm_riscv_gstage_vmid_sanitize(). Reviewed-by: Atish Patra Reviewed-by: Nutty Liu Signed-off-by: Anup Patel --- arch/riscv/include/asm/kvm_host.h | 3 +-- arch/riscv/kvm/tlb.c | 23 ----------------------- arch/riscv/kvm/vcpu.c | 4 ++-- arch/riscv/kvm/vmid.c | 23 +++++++++++++++++++++++ 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/arch/riscv/include/asm/kvm_host.h b/arch/riscv/include/asm/kvm_host.h index 9a617bf5363d..8aa705ac75a5 100644 --- a/arch/riscv/include/asm/kvm_host.h +++ b/arch/riscv/include/asm/kvm_host.h @@ -331,8 +331,6 @@ void kvm_riscv_local_hfence_vvma_gva(unsigned long vmid, unsigned long order); void kvm_riscv_local_hfence_vvma_all(unsigned long vmid); -void kvm_riscv_local_tlb_sanitize(struct kvm_vcpu *vcpu); - void kvm_riscv_fence_i_process(struct kvm_vcpu *vcpu); void kvm_riscv_hfence_gvma_vmid_all_process(struct kvm_vcpu *vcpu); void kvm_riscv_hfence_vvma_all_process(struct kvm_vcpu *vcpu); @@ -380,6 +378,7 @@ unsigned long kvm_riscv_gstage_vmid_bits(void); int kvm_riscv_gstage_vmid_init(struct kvm *kvm); bool kvm_riscv_gstage_vmid_ver_changed(struct kvm_vmid *vmid); void kvm_riscv_gstage_vmid_update(struct kvm_vcpu *vcpu); +void kvm_riscv_gstage_vmid_sanitize(struct kvm_vcpu *vcpu); int kvm_riscv_setup_default_irq_routing(struct kvm *kvm, u32 lines); diff --git a/arch/riscv/kvm/tlb.c b/arch/riscv/kvm/tlb.c index 2f91ea5f8493..b3461bfd9756 100644 --- a/arch/riscv/kvm/tlb.c +++ b/arch/riscv/kvm/tlb.c @@ -156,29 +156,6 @@ void kvm_riscv_local_hfence_vvma_all(unsigned long vmid) csr_write(CSR_HGATP, hgatp); } -void kvm_riscv_local_tlb_sanitize(struct kvm_vcpu *vcpu) -{ - unsigned long vmid; - - if (!kvm_riscv_gstage_vmid_bits() || - vcpu->arch.last_exit_cpu == vcpu->cpu) - return; - - /* - * On RISC-V platforms with hardware VMID support, we share same - * VMID for all VCPUs of a particular Guest/VM. This means we might - * have stale G-stage TLB entries on the current Host CPU due to - * some other VCPU of the same Guest which ran previously on the - * current Host CPU. - * - * To cleanup stale TLB entries, we simply flush all G-stage TLB - * entries by VMID whenever underlying Host CPU changes for a VCPU. - */ - - vmid = READ_ONCE(vcpu->kvm->arch.vmid.vmid); - kvm_riscv_local_hfence_gvma_vmid_all(vmid); -} - void kvm_riscv_fence_i_process(struct kvm_vcpu *vcpu) { kvm_riscv_vcpu_pmu_incr_fw(vcpu, SBI_PMU_FW_FENCE_I_RCVD); diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index f9fb3dbbe0c3..a2dd4161e5a4 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -962,12 +962,12 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) } /* - * Cleanup stale TLB enteries + * Sanitize VMID mappings cached (TLB) on current CPU * * Note: This should be done after G-stage VMID has been * updated using kvm_riscv_gstage_vmid_ver_changed() */ - kvm_riscv_local_tlb_sanitize(vcpu); + kvm_riscv_gstage_vmid_sanitize(vcpu); trace_kvm_entry(vcpu); diff --git a/arch/riscv/kvm/vmid.c b/arch/riscv/kvm/vmid.c index ddc98714ce8e..92c01255f86f 100644 --- a/arch/riscv/kvm/vmid.c +++ b/arch/riscv/kvm/vmid.c @@ -122,3 +122,26 @@ void kvm_riscv_gstage_vmid_update(struct kvm_vcpu *vcpu) kvm_for_each_vcpu(i, v, vcpu->kvm) kvm_make_request(KVM_REQ_UPDATE_HGATP, v); } + +void kvm_riscv_gstage_vmid_sanitize(struct kvm_vcpu *vcpu) +{ + unsigned long vmid; + + if (!kvm_riscv_gstage_vmid_bits() || + vcpu->arch.last_exit_cpu == vcpu->cpu) + return; + + /* + * On RISC-V platforms with hardware VMID support, we share same + * VMID for all VCPUs of a particular Guest/VM. This means we might + * have stale G-stage TLB entries on the current Host CPU due to + * some other VCPU of the same Guest which ran previously on the + * current Host CPU. + * + * To cleanup stale TLB entries, we simply flush all G-stage TLB + * entries by VMID whenever underlying Host CPU changes for a VCPU. + */ + + vmid = READ_ONCE(vcpu->kvm->arch.vmid.vmid); + kvm_riscv_local_hfence_gvma_vmid_all(vmid); +} -- 2.43.0 -- 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-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 816A22DE1FE for ; Wed, 18 Jun 2025 11:36:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750246562; cv=none; b=BTABw093XdfgN2875HFnDlWoC1eyMSvtrWAiSET2/BtL7uDYDrXyJ7Xovnexu6OYTiiZ0YsHgG6QRMNYK1uZFN4YW4zF0OBhmH8e5ram6JrAKvzU9t6Hkc8oEdvvZm7uZOHO+GYPM4rkqDOO17/p/9k/H5WWWlatt5I/4Sm3u2M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750246562; c=relaxed/simple; bh=U71gyvnkFRTjwDI8pxtkBdAEgTm+G+VjYBDnQo+6/v4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SGYjHgVpJ5D2KgiZEshU2koSfP8Mc0AOPjG76bhhws1QNPrO7yplmo/ePCr4oeL7ubfAgCWUw9HqbG0iTX67515gsYBJDj69jsN0RKtFSuDRAZiCbSRKcYMF/aBad5FutO/tI5lO+38OuPPza9SoeTxKfx7QHGFkVxjYY9BbRAQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com; spf=pass smtp.mailfrom=ventanamicro.com; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b=TWtx+WH1; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="TWtx+WH1" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2363e973db1so4871265ad.0 for ; Wed, 18 Jun 2025 04:36:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1750246560; x=1750851360; 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=3W7Bv8eoCvTNzkNO4nvyVAxgoupNAJKpC3g9nF1nD78=; b=TWtx+WH14juYstivK53he26LbWHVaqVb6KWwe2s88xmx+0MJtXdd/61fGIlIvS6d2d wSrKoEqfHlc6Mmy3S3badVu1NtUlCyCvNiOrcQ179MXpHI+oWDKBf196p5dGnv8iYuJx SbZ3pd+TSeAygYWd6lHZ7LN86cFwulUzGyzUvaRXZcaiaGy2E8z4+8aw3qr/rLQN9w5w uxVEi8pW6f2UlQojzcrBV/xc4sv7cgIGTQr1fXVCQlwLr1KZNYdmUz1JyoOgGN792OC6 z2ePngoPrDLZgo8M/+qgM4QisL09RKRL132Y5jnUW4ReKCo2RIzOcfNr6VHVlY3/ZKrl SuvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750246560; x=1750851360; 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=3W7Bv8eoCvTNzkNO4nvyVAxgoupNAJKpC3g9nF1nD78=; b=WTYwF/I5e6ysst10YYoH/bJmuj5uexucStNdGhZRrbBAaTuBUyXlCFs9iNT2Z2kKZT 7bCaYKZXGFF17qTLc+TF+B3tLCIDLZCee8iKHPe9anHOxn5Bu2mN9ie7I8wlprFVCDqr mUmNxc/bDrxSFbi4M+stVXELuTZBVthNX8NLpf+CeUYVyyD3dCLyHKCwE9P1n0dGwlkb 3gDh1EVEFYFkHiz3Mt02b8LTFYtDm3hnIa48cSWqaEFpUrPamahNkn96P+2eXDw1G2G4 G0DrJMTeL34xKWB0txn1CVYdlyqTTv6XAACp63ul3OnFLAmbqgy1Vv5/GR4b+fD/Axfs 2xJA== X-Forwarded-Encrypted: i=1; AJvYcCWdaJ2RqsBxfpzWvYc0ECM5zfNhDpLZWREDcp6WssID+amQ5pywlld7gGUWx57YTxG0f/Q=@vger.kernel.org X-Gm-Message-State: AOJu0Ywb2N9Wn3cuLnw/MQXbCgQyMD3yv5prmnknRD+H4vAX/aco+ujz 5WEv6yC9V4fIliONizPQDCXBJ4Sa8+mNxEj2G4SIhrfr88kIowTXB9/7WYnjfYoTWpQ= X-Gm-Gg: ASbGncuzfj9aVmun27CQ5IdMuNWHZ7/oCK3vlDWh0ZVQlqG5s7GqjwGF01r9jXqDnC3 TdAo2DTa+tTLe7CRe2qLuNLTqeshtj5MyLm5EasfgNrJw3OZTtFbxDbET0x81AQPElp0vKUABpZ xj5j5DLn82zSNprdKgpTepTh3jIRSK+KatwDuBcFQzOcY2Gx+h6tn4GGzWFNsoGMyKVXeugSM8Z ITfd9OWFt0emWWCNvUH14SsJSWLS5MYwQ17cw6cYItxyZ0cJuT3FOuazk7HKZdLikZGL70yMPlj WGgN8AK2FHceskjqL5oU7bhAeYKg/mhqIKet2sCJs+Qcy/26dqa26o3T95+HQG3h3QyvPkGINvu cr5UwolF4ygQ0EuTp8Q== X-Google-Smtp-Source: AGHT+IG6YfMEu9lcXrd2qiAepReJXbM/lA1ChWg4x51TipxipgSLPLblK8ZINKPH1NwWxJ/vO5o07w== X-Received: by 2002:a17:902:c94e:b0:231:9817:6ec1 with SMTP id d9443c01a7336-237c20e022cmr32723525ad.17.1750246559668; Wed, 18 Jun 2025 04:35:59 -0700 (PDT) Received: from localhost.localdomain ([122.171.23.44]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-237c57c63efsm9112475ad.172.2025.06.18.04.35.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jun 2025 04:35:59 -0700 (PDT) From: Anup Patel To: Atish Patra Cc: Palmer Dabbelt , Paul Walmsley , Alexandre Ghiti , Andrew Jones , Anup Patel , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel , Atish Patra , Nutty Liu Subject: [PATCH v3 03/12] RISC-V: KVM: Rename and move kvm_riscv_local_tlb_sanitize() Date: Wed, 18 Jun 2025 17:05:23 +0530 Message-ID: <20250618113532.471448-4-apatel@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250618113532.471448-1-apatel@ventanamicro.com> References: <20250618113532.471448-1-apatel@ventanamicro.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The kvm_riscv_local_tlb_sanitize() deals with sanitizing current VMID related TLB mappings when a VCPU is moved from one host CPU to another. Let's move kvm_riscv_local_tlb_sanitize() to VMID management sources and rename it to kvm_riscv_gstage_vmid_sanitize(). Reviewed-by: Atish Patra Reviewed-by: Nutty Liu Signed-off-by: Anup Patel --- arch/riscv/include/asm/kvm_host.h | 3 +-- arch/riscv/kvm/tlb.c | 23 ----------------------- arch/riscv/kvm/vcpu.c | 4 ++-- arch/riscv/kvm/vmid.c | 23 +++++++++++++++++++++++ 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/arch/riscv/include/asm/kvm_host.h b/arch/riscv/include/asm/kvm_host.h index 9a617bf5363d..8aa705ac75a5 100644 --- a/arch/riscv/include/asm/kvm_host.h +++ b/arch/riscv/include/asm/kvm_host.h @@ -331,8 +331,6 @@ void kvm_riscv_local_hfence_vvma_gva(unsigned long vmid, unsigned long order); void kvm_riscv_local_hfence_vvma_all(unsigned long vmid); -void kvm_riscv_local_tlb_sanitize(struct kvm_vcpu *vcpu); - void kvm_riscv_fence_i_process(struct kvm_vcpu *vcpu); void kvm_riscv_hfence_gvma_vmid_all_process(struct kvm_vcpu *vcpu); void kvm_riscv_hfence_vvma_all_process(struct kvm_vcpu *vcpu); @@ -380,6 +378,7 @@ unsigned long kvm_riscv_gstage_vmid_bits(void); int kvm_riscv_gstage_vmid_init(struct kvm *kvm); bool kvm_riscv_gstage_vmid_ver_changed(struct kvm_vmid *vmid); void kvm_riscv_gstage_vmid_update(struct kvm_vcpu *vcpu); +void kvm_riscv_gstage_vmid_sanitize(struct kvm_vcpu *vcpu); int kvm_riscv_setup_default_irq_routing(struct kvm *kvm, u32 lines); diff --git a/arch/riscv/kvm/tlb.c b/arch/riscv/kvm/tlb.c index 2f91ea5f8493..b3461bfd9756 100644 --- a/arch/riscv/kvm/tlb.c +++ b/arch/riscv/kvm/tlb.c @@ -156,29 +156,6 @@ void kvm_riscv_local_hfence_vvma_all(unsigned long vmid) csr_write(CSR_HGATP, hgatp); } -void kvm_riscv_local_tlb_sanitize(struct kvm_vcpu *vcpu) -{ - unsigned long vmid; - - if (!kvm_riscv_gstage_vmid_bits() || - vcpu->arch.last_exit_cpu == vcpu->cpu) - return; - - /* - * On RISC-V platforms with hardware VMID support, we share same - * VMID for all VCPUs of a particular Guest/VM. This means we might - * have stale G-stage TLB entries on the current Host CPU due to - * some other VCPU of the same Guest which ran previously on the - * current Host CPU. - * - * To cleanup stale TLB entries, we simply flush all G-stage TLB - * entries by VMID whenever underlying Host CPU changes for a VCPU. - */ - - vmid = READ_ONCE(vcpu->kvm->arch.vmid.vmid); - kvm_riscv_local_hfence_gvma_vmid_all(vmid); -} - void kvm_riscv_fence_i_process(struct kvm_vcpu *vcpu) { kvm_riscv_vcpu_pmu_incr_fw(vcpu, SBI_PMU_FW_FENCE_I_RCVD); diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index f9fb3dbbe0c3..a2dd4161e5a4 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -962,12 +962,12 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) } /* - * Cleanup stale TLB enteries + * Sanitize VMID mappings cached (TLB) on current CPU * * Note: This should be done after G-stage VMID has been * updated using kvm_riscv_gstage_vmid_ver_changed() */ - kvm_riscv_local_tlb_sanitize(vcpu); + kvm_riscv_gstage_vmid_sanitize(vcpu); trace_kvm_entry(vcpu); diff --git a/arch/riscv/kvm/vmid.c b/arch/riscv/kvm/vmid.c index ddc98714ce8e..92c01255f86f 100644 --- a/arch/riscv/kvm/vmid.c +++ b/arch/riscv/kvm/vmid.c @@ -122,3 +122,26 @@ void kvm_riscv_gstage_vmid_update(struct kvm_vcpu *vcpu) kvm_for_each_vcpu(i, v, vcpu->kvm) kvm_make_request(KVM_REQ_UPDATE_HGATP, v); } + +void kvm_riscv_gstage_vmid_sanitize(struct kvm_vcpu *vcpu) +{ + unsigned long vmid; + + if (!kvm_riscv_gstage_vmid_bits() || + vcpu->arch.last_exit_cpu == vcpu->cpu) + return; + + /* + * On RISC-V platforms with hardware VMID support, we share same + * VMID for all VCPUs of a particular Guest/VM. This means we might + * have stale G-stage TLB entries on the current Host CPU due to + * some other VCPU of the same Guest which ran previously on the + * current Host CPU. + * + * To cleanup stale TLB entries, we simply flush all G-stage TLB + * entries by VMID whenever underlying Host CPU changes for a VCPU. + */ + + vmid = READ_ONCE(vcpu->kvm->arch.vmid.vmid); + kvm_riscv_local_hfence_gvma_vmid_all(vmid); +} -- 2.43.0 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 DEA64C7115A for ; Wed, 18 Jun 2025 13:08:35 +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:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nRSeOxMHGfXL4C3xLOIsoERMrXiBb67xht/6MBdyoSI=; b=TQqooKOgZ5nkRR d/qVd7X2e3CSEGJkdRLi/WGoXtT2qhQ+54jPTw1VJZ6jvlX84SGCnmvTuRLBZskIt0bHtKoBhIlLx fMyw1NO/bDqlXolzEoKHViz3lmssuDjf9h6/5ZuqEFPAzr8n92p4ZkYg2PfpYmxzbWbj92RYgs4+B ACYy9n2fke4TegzsG2tnUS9kcmG6002x0uYSC1ZcW9Ew/hc1X025wcmUwwnL4M3K4w/NEqHeF0DgF /3H5/u4t91CYSk4cWg3jqCLeJ5C+kGtX/jxWvdSL4mfTDM/oM4qbyfngacdNWby/J+KibqHUNZcQP xjz9WABCe71SVQAR1ZYQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uRsWk-0000000AEaV-42CC; Wed, 18 Jun 2025 13:08:30 +0000 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uRr5E-00000009xfL-2S0G for linux-riscv@lists.infradead.org; Wed, 18 Jun 2025 11:36:01 +0000 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-2350fc2591dso5606535ad.1 for ; Wed, 18 Jun 2025 04:36:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1750246560; x=1750851360; darn=lists.infradead.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=3W7Bv8eoCvTNzkNO4nvyVAxgoupNAJKpC3g9nF1nD78=; b=kMhCbrwz2/W6LZUkWiS1WdU+d/1U3Mzbh1Lhf8uk1ePUlef6B0pHhucV+4dn/0bfNy UlfOheb6GfNa5oNx0wb4k8QdmE4U7na0WoakFvm5Lf1YVdQlJigL4RDVjT2Tx7TjtVLj ZdS+vgRkdIYiINpTekFYOMxjwFWoVCrWxLr1HyJ5uiH0KtQg0SxjKD5Jqcm9cz/mIlPK gzAf7QYlqEHAYr3GMjwffVI94WbC/ZFA64LyMIZjFM4a1Pq2+EagjrJee+OdE0+vZ8/V +vmttWy1FHVq/t7SbUc9U2g+0ppETSGIj9AsaI5OLG83n8ayMvFF09p6u3OhrMJ/asNG 6nrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750246560; x=1750851360; 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=3W7Bv8eoCvTNzkNO4nvyVAxgoupNAJKpC3g9nF1nD78=; b=mbRYPGz4UFRcmKbNu8OLvaetsoGSXTpRKWp8ixzByyeJwVQaH0Cd/HTrLmSdbDHIBA QTuxwPXfxrTSUE6PrnmWmUNzweKEJrkLdquKnPTMdNft3qNBJt/RECnfRow2VYCju16B 1dvK+lqAgy6t7bgQE2kIItmFmjbrRw3GqkaV5NjiKj/khRu5NSkA7ChSUB1H+kFvoVzT 9g9ornBuaZ/7ef16hEFMU5Ghjo6NNSBueRKgg/HBOoL+dmCWCSbIWiQtuOpUGJSwK5q7 w+GLFXwhBiSAZ++l9sO8/1pHSkM7D38e3nMhzOgrC2tjeUFAw7F4rll0eJZMLT1jt09A +CrQ== X-Forwarded-Encrypted: i=1; AJvYcCUim4/tqdOVHubdpc+0UGvKL4YMM4tiJc9a/vs23R3ArwfUpSDOK2289zeDL3GXzUmzmpTEiVJzgqSvpQ==@lists.infradead.org X-Gm-Message-State: AOJu0YzQX9H/gGUv2Kc4z3H6j1iWaM0Qr7qPDBNx27+H5L+UdErff3EM K+kcKV7DcD5V1kRPLG1eDjMskegX6dZJ6Cgw5Q4AQ3PqeCACFdnSy9FKZuYzMXDAKo8= X-Gm-Gg: ASbGncvXkfdvTZDYfXWGlJXLVSwwsOmtfQZeb9ktyrxk033oNN9nXv1nYE+xoOHU5Ut j3QNA1gjxTcpxLgWXhXFWk3hAAtk5Cwqi75+XQTGLQX7PlYg7dqHD7lZdc9W6S5VCZbnF3DXrVQ XKhE7haRWMJJJindwaag8TRuxLnLBhzLxjsxGGroFP0BxEWJsMxiXB0lNAcCKcnydmhiNav7+do UFdK+MJztqVA/OSedP3URcmo9AIK+614TPIjSsLhT9yKpBKf+zp3dqN+JYBiJ0Y5IaOjROmzE4f 8+VG3bDaePq4IXvukPaW7fQGyk8Jel8PFNXoB/GLO+g7BZAea6VWEsHce2BEng/i934yn0NfV/U GGqd9ZP/gebqZafwmgQ== X-Google-Smtp-Source: AGHT+IG6YfMEu9lcXrd2qiAepReJXbM/lA1ChWg4x51TipxipgSLPLblK8ZINKPH1NwWxJ/vO5o07w== X-Received: by 2002:a17:902:c94e:b0:231:9817:6ec1 with SMTP id d9443c01a7336-237c20e022cmr32723525ad.17.1750246559668; Wed, 18 Jun 2025 04:35:59 -0700 (PDT) Received: from localhost.localdomain ([122.171.23.44]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-237c57c63efsm9112475ad.172.2025.06.18.04.35.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jun 2025 04:35:59 -0700 (PDT) From: Anup Patel To: Atish Patra Cc: Palmer Dabbelt , Paul Walmsley , Alexandre Ghiti , Andrew Jones , Anup Patel , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel , Atish Patra , Nutty Liu Subject: [PATCH v3 03/12] RISC-V: KVM: Rename and move kvm_riscv_local_tlb_sanitize() Date: Wed, 18 Jun 2025 17:05:23 +0530 Message-ID: <20250618113532.471448-4-apatel@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250618113532.471448-1-apatel@ventanamicro.com> References: <20250618113532.471448-1-apatel@ventanamicro.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250618_043600_621538_6DF81268 X-CRM114-Status: GOOD ( 12.84 ) 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 The kvm_riscv_local_tlb_sanitize() deals with sanitizing current VMID related TLB mappings when a VCPU is moved from one host CPU to another. Let's move kvm_riscv_local_tlb_sanitize() to VMID management sources and rename it to kvm_riscv_gstage_vmid_sanitize(). Reviewed-by: Atish Patra Reviewed-by: Nutty Liu Signed-off-by: Anup Patel --- arch/riscv/include/asm/kvm_host.h | 3 +-- arch/riscv/kvm/tlb.c | 23 ----------------------- arch/riscv/kvm/vcpu.c | 4 ++-- arch/riscv/kvm/vmid.c | 23 +++++++++++++++++++++++ 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/arch/riscv/include/asm/kvm_host.h b/arch/riscv/include/asm/kvm_host.h index 9a617bf5363d..8aa705ac75a5 100644 --- a/arch/riscv/include/asm/kvm_host.h +++ b/arch/riscv/include/asm/kvm_host.h @@ -331,8 +331,6 @@ void kvm_riscv_local_hfence_vvma_gva(unsigned long vmid, unsigned long order); void kvm_riscv_local_hfence_vvma_all(unsigned long vmid); -void kvm_riscv_local_tlb_sanitize(struct kvm_vcpu *vcpu); - void kvm_riscv_fence_i_process(struct kvm_vcpu *vcpu); void kvm_riscv_hfence_gvma_vmid_all_process(struct kvm_vcpu *vcpu); void kvm_riscv_hfence_vvma_all_process(struct kvm_vcpu *vcpu); @@ -380,6 +378,7 @@ unsigned long kvm_riscv_gstage_vmid_bits(void); int kvm_riscv_gstage_vmid_init(struct kvm *kvm); bool kvm_riscv_gstage_vmid_ver_changed(struct kvm_vmid *vmid); void kvm_riscv_gstage_vmid_update(struct kvm_vcpu *vcpu); +void kvm_riscv_gstage_vmid_sanitize(struct kvm_vcpu *vcpu); int kvm_riscv_setup_default_irq_routing(struct kvm *kvm, u32 lines); diff --git a/arch/riscv/kvm/tlb.c b/arch/riscv/kvm/tlb.c index 2f91ea5f8493..b3461bfd9756 100644 --- a/arch/riscv/kvm/tlb.c +++ b/arch/riscv/kvm/tlb.c @@ -156,29 +156,6 @@ void kvm_riscv_local_hfence_vvma_all(unsigned long vmid) csr_write(CSR_HGATP, hgatp); } -void kvm_riscv_local_tlb_sanitize(struct kvm_vcpu *vcpu) -{ - unsigned long vmid; - - if (!kvm_riscv_gstage_vmid_bits() || - vcpu->arch.last_exit_cpu == vcpu->cpu) - return; - - /* - * On RISC-V platforms with hardware VMID support, we share same - * VMID for all VCPUs of a particular Guest/VM. This means we might - * have stale G-stage TLB entries on the current Host CPU due to - * some other VCPU of the same Guest which ran previously on the - * current Host CPU. - * - * To cleanup stale TLB entries, we simply flush all G-stage TLB - * entries by VMID whenever underlying Host CPU changes for a VCPU. - */ - - vmid = READ_ONCE(vcpu->kvm->arch.vmid.vmid); - kvm_riscv_local_hfence_gvma_vmid_all(vmid); -} - void kvm_riscv_fence_i_process(struct kvm_vcpu *vcpu) { kvm_riscv_vcpu_pmu_incr_fw(vcpu, SBI_PMU_FW_FENCE_I_RCVD); diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index f9fb3dbbe0c3..a2dd4161e5a4 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -962,12 +962,12 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) } /* - * Cleanup stale TLB enteries + * Sanitize VMID mappings cached (TLB) on current CPU * * Note: This should be done after G-stage VMID has been * updated using kvm_riscv_gstage_vmid_ver_changed() */ - kvm_riscv_local_tlb_sanitize(vcpu); + kvm_riscv_gstage_vmid_sanitize(vcpu); trace_kvm_entry(vcpu); diff --git a/arch/riscv/kvm/vmid.c b/arch/riscv/kvm/vmid.c index ddc98714ce8e..92c01255f86f 100644 --- a/arch/riscv/kvm/vmid.c +++ b/arch/riscv/kvm/vmid.c @@ -122,3 +122,26 @@ void kvm_riscv_gstage_vmid_update(struct kvm_vcpu *vcpu) kvm_for_each_vcpu(i, v, vcpu->kvm) kvm_make_request(KVM_REQ_UPDATE_HGATP, v); } + +void kvm_riscv_gstage_vmid_sanitize(struct kvm_vcpu *vcpu) +{ + unsigned long vmid; + + if (!kvm_riscv_gstage_vmid_bits() || + vcpu->arch.last_exit_cpu == vcpu->cpu) + return; + + /* + * On RISC-V platforms with hardware VMID support, we share same + * VMID for all VCPUs of a particular Guest/VM. This means we might + * have stale G-stage TLB entries on the current Host CPU due to + * some other VCPU of the same Guest which ran previously on the + * current Host CPU. + * + * To cleanup stale TLB entries, we simply flush all G-stage TLB + * entries by VMID whenever underlying Host CPU changes for a VCPU. + */ + + vmid = READ_ONCE(vcpu->kvm->arch.vmid.vmid); + kvm_riscv_local_hfence_gvma_vmid_all(vmid); +} -- 2.43.0 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv