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 1637EC71135 for ; Fri, 13 Jun 2025 06:58:18 +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=1lzdauj37iK43UzER87bB5leSJcqNUxf3BFAU9+ESBU=; b=2Vn96s+TMEX6w9 /NpGFSa2JyBLiu5I5XXvj8UQCA386aQcZvrQBAwIhrqeLSRW2aeTp+QJiNVsw8t9a3/NZpy2RMdWD Q2ysooO+76TTidNRpLG+sz1gIqadIATl5+eQe1okmg1+dhdyCfIlNlSmeudEN/87FbxVDRn8o2uBd cTaSWL5ILIgM+a7v4zGegLBlP5XQlv19qQT1t2Hu7k7hpI7Oa6UzxSgjRiD31XXJgk08STOLMfGyd caqSEsm4T/td7rra3Cj3/SgGFjbrMaH0zhet0uvgbZXPTFz+ylOiEJFKdBYbzkcwwL3XSNlvtPWG9 TfAMzxSQBdYoAEIEyzew==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uPyMj-0000000FXQn-3YBL; Fri, 13 Jun 2025 06:58:17 +0000 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uPyMg-0000000FXOB-18U8 for kvm-riscv@lists.infradead.org; Fri, 13 Jun 2025 06:58:15 +0000 Received: by mail-pj1-x1035.google.com with SMTP id 98e67ed59e1d1-313154270bbso1950078a91.2 for ; Thu, 12 Jun 2025 23:58:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1749797894; x=1750402694; 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=0APR23xoSpRoPrmHOoIW/fZKPHEwlO7VgBzBq3Nrcg8=; b=doXJigJblpiyOBg1+ZGfDVulw4TmTaAz7NofWGf2i9hzSX48JSLiu2cXthzoju+MoS Fpbcj3n0J8Ge4hpctyA7UkTCTC8ZEINUN9kj0zlWaA/p4ny8R/wlkRLcvHAbHZRVjXuu 1LINuRBV7Vwp/wn10bIWPQIQk/lXExNeZOdE53/60PBrFqMwgVXWEXKwnFYpgWjJfri7 kW9H42sKeD9RkdrkAPQSysP2kzgKNr9mVD5J8/Gpu9EgEAXnoQf7rsahpVPIBvpMIzAU UY9TbIvlZSEDPXlMAF0tAnmFZLEIwL3D5wYzYTMB5cWADau7ukH8/JlNlX7IK76FJlFG 8vxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749797894; x=1750402694; 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=0APR23xoSpRoPrmHOoIW/fZKPHEwlO7VgBzBq3Nrcg8=; b=kLStEsH0UuQMOpy1PxkwNbEQtU3JfCPSrCvP8rcXqb91kILsValmOG49vM/dWsIZNW brXrY2tRiute/Ru7C/4wwl3htb3F8mcqsyJPZ9PD1iksUsUPMsoCgbdu3cW6B5qMv+7z 4RPvWsgVamFlzRJzVTMQpJ/43y1lObsnkq+pke2Usf65+Yfq6/yN67pKQKmTP0ZQ86Ol VgvMUt+5xgwSPF2fKdAcysMLDYf0ViTJuytVMUQBmkbz2upCy23YN8almq3vCQY/G346 YDlm7nw4K2gjlEEejGm5gvPNMOj1i2EnzhGO8nMSeeuL4Vbs8MrYQeuZ0JJsSBTysG0C hthQ== X-Forwarded-Encrypted: i=1; AJvYcCUV6pyzmHG1e3FEekxlvFs/ojPbJ64p0UEFVSf5nZYfBhUffeI/jzcPXpSpg/Ilumbps39f/i868L8=@lists.infradead.org X-Gm-Message-State: AOJu0Ywg1cbLKwq6VxemBOCLW+DwISiuBKXr9JtAQM4q/IS75VfTOR1n hTHsb+mIQwktJg/558IeWQIMxVZlzI21GcYusFsgUqAOIoS1BXQJAuUyYSgyH7EEIwQ= X-Gm-Gg: ASbGncvcP23DTZ6B8C98R2qp6B1U73yCUESwz27ZoXYrtiDmMvMVgwsDT2L+OvkyALZ +pZDP1ste2tK/fJJadlHbOZxTKMrRRb+DbLkOaH2rAgE9ajcOJRVzPO/cxEfTwfX27XbBGj8BET m6pNTZK3qvybujZaDWvvV+C47a0zn9Q0Lzgxm3QAvA5rBAnWV+V8fL2WHpCPnph+ybEOJ9vBefp qWghJI4OKj9hzWQUlkJ3ujNObtISonLtKTHuWu4tX+Zndyszj6epdTWmxwtTXQUk+8n1NKlbL+W 4kJ/NiSEoPC/Jk8rRREzvIq1QGjjaOdV+b3eEBZluHaDCe9dgYMvOW2NAHC4/uDZcfvdHtL7yjm oFwu0KGLqZcViiJjBMI4= X-Google-Smtp-Source: AGHT+IF4XmbWIExFu1mlduKfiNfTLu/tQXyVfpn87Q8JCh/3y9agaf4v394uxNt/X9mcs0VMw2lIeA== X-Received: by 2002:a17:90b:5212:b0:312:25dd:1c99 with SMTP id 98e67ed59e1d1-313d9e92702mr2795609a91.19.1749797893528; Thu, 12 Jun 2025 23:58:13 -0700 (PDT) Received: from localhost.localdomain ([103.97.166.196]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-313c1b49b7fsm2653022a91.24.2025.06.12.23.58.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 23:58:13 -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 Subject: [PATCH v2 04/12] RISC-V: KVM: Replace KVM_REQ_HFENCE_GVMA_VMID_ALL with KVM_REQ_TLB_FLUSH Date: Fri, 13 Jun 2025 12:27:35 +0530 Message-ID: <20250613065743.737102-5-apatel@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250613065743.737102-1-apatel@ventanamicro.com> References: <20250613065743.737102-1-apatel@ventanamicro.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250612_235814_300245_169C6801 X-CRM114-Status: GOOD ( 12.32 ) 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_REQ_HFENCE_GVMA_VMID_ALL is same as KVM_REQ_TLB_FLUSH so to avoid confusion let's replace KVM_REQ_HFENCE_GVMA_VMID_ALL with KVM_REQ_TLB_FLUSH. Also, rename kvm_riscv_hfence_gvma_vmid_all_process() to kvm_riscv_tlb_flush_process(). Reviewed-by: Atish Patra Signed-off-by: Anup Patel --- arch/riscv/include/asm/kvm_host.h | 4 ++-- arch/riscv/kvm/tlb.c | 8 ++++---- arch/riscv/kvm/vcpu.c | 8 ++------ 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/arch/riscv/include/asm/kvm_host.h b/arch/riscv/include/asm/kvm_host.h index 8aa705ac75a5..ff1f76d6f177 100644 --- a/arch/riscv/include/asm/kvm_host.h +++ b/arch/riscv/include/asm/kvm_host.h @@ -37,7 +37,6 @@ #define KVM_REQ_UPDATE_HGATP KVM_ARCH_REQ(2) #define KVM_REQ_FENCE_I \ KVM_ARCH_REQ_FLAGS(3, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP) -#define KVM_REQ_HFENCE_GVMA_VMID_ALL KVM_REQ_TLB_FLUSH #define KVM_REQ_HFENCE_VVMA_ALL \ KVM_ARCH_REQ_FLAGS(4, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP) #define KVM_REQ_HFENCE \ @@ -331,8 +330,9 @@ 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_tlb_flush_process(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); void kvm_riscv_hfence_process(struct kvm_vcpu *vcpu); diff --git a/arch/riscv/kvm/tlb.c b/arch/riscv/kvm/tlb.c index b3461bfd9756..da98ca801d31 100644 --- a/arch/riscv/kvm/tlb.c +++ b/arch/riscv/kvm/tlb.c @@ -162,7 +162,7 @@ void kvm_riscv_fence_i_process(struct kvm_vcpu *vcpu) local_flush_icache_all(); } -void kvm_riscv_hfence_gvma_vmid_all_process(struct kvm_vcpu *vcpu) +void kvm_riscv_tlb_flush_process(struct kvm_vcpu *vcpu) { struct kvm_vmid *v = &vcpu->kvm->arch.vmid; unsigned long vmid = READ_ONCE(v->vmid); @@ -342,14 +342,14 @@ void kvm_riscv_hfence_gvma_vmid_gpa(struct kvm *kvm, data.size = gpsz; data.order = order; make_xfence_request(kvm, hbase, hmask, KVM_REQ_HFENCE, - KVM_REQ_HFENCE_GVMA_VMID_ALL, &data); + KVM_REQ_TLB_FLUSH, &data); } void kvm_riscv_hfence_gvma_vmid_all(struct kvm *kvm, unsigned long hbase, unsigned long hmask) { - make_xfence_request(kvm, hbase, hmask, KVM_REQ_HFENCE_GVMA_VMID_ALL, - KVM_REQ_HFENCE_GVMA_VMID_ALL, NULL); + make_xfence_request(kvm, hbase, hmask, KVM_REQ_TLB_FLUSH, + KVM_REQ_TLB_FLUSH, NULL); } void kvm_riscv_hfence_vvma_asid_gva(struct kvm *kvm, diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index a2dd4161e5a4..6eb11c913b13 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -721,12 +721,8 @@ static void kvm_riscv_check_vcpu_requests(struct kvm_vcpu *vcpu) if (kvm_check_request(KVM_REQ_FENCE_I, vcpu)) kvm_riscv_fence_i_process(vcpu); - /* - * The generic KVM_REQ_TLB_FLUSH is same as - * KVM_REQ_HFENCE_GVMA_VMID_ALL - */ - if (kvm_check_request(KVM_REQ_HFENCE_GVMA_VMID_ALL, vcpu)) - kvm_riscv_hfence_gvma_vmid_all_process(vcpu); + if (kvm_check_request(KVM_REQ_TLB_FLUSH, vcpu)) + kvm_riscv_tlb_flush_process(vcpu); if (kvm_check_request(KVM_REQ_HFENCE_VVMA_ALL, vcpu)) kvm_riscv_hfence_vvma_all_process(vcpu); -- 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-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) (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 890A225CC6E for ; Fri, 13 Jun 2025 06:58:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749797896; cv=none; b=nYWfK/eo6kUSDtAAVdXwaKpKDWKntx4emyFV+VlfeyodSGBx09cs7hJH5Ari+NAYz3kGrXFGBxeW4kaVs2REEge7OYgnY9wfRAQL12JvXMD1NR9qNjIf29eyUFC4ROS/n3SD6zSHYz8BTKy2FwngigyJqzNaji9j0z4wMwYoYq8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749797896; c=relaxed/simple; bh=UNJDgyGRwKsBGAVSWW07IY+xb3iaC5t5L0oSJfwXEpY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C/jArPVqXBGIaCi/GsRlxbNYcMXavjUf77UwCOpohGP6SnJKZbdhu61r6vRyALHX0W2wCpNz6MsUCsp7UrhjGYjIR1zh5IvgOQLE1ZGhJjZbW5pt22oxohXottRZC1Y6DABb8s6rZhHltCW4G0cOX5q/QUn3fbn9dh8MXfbAWEY= 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=Y2IrjyvL; arc=none smtp.client-ip=209.85.215.178 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="Y2IrjyvL" Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-b26f7d2c1f1so1730386a12.0 for ; Thu, 12 Jun 2025 23:58:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1749797894; x=1750402694; 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=0APR23xoSpRoPrmHOoIW/fZKPHEwlO7VgBzBq3Nrcg8=; b=Y2IrjyvLyVi2V1jMJivm9rU6tHvy6jPoplagXWPOrX5fTmas/jOUA6m6Ax5Ho+5XZ4 D8O6GIhi3ID0M42TA8PS0oqM4xm/SAWKoZxum2WV4ZDtv5W68fR5oVCdPEFiA8VOaUXR jbtXi94reH1k1AWlRY6rHSi2ECuUDEI0iBdJRXPM77PGGSNoQ/76OxopKxGtI5TnHcBG vw6tpwGpTgATIDbzI55386IBcZ3uvJ4nQ6HEbZoH9ooUE9zPBTYMck/8W3qvyrmhezhK JnvNhRM3G1TNTOWGjzrxWdgYjahy8M0xMmujwt4pZp9K6b7fsuQ4RmnvG9yfuHQbFux2 RpcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749797894; x=1750402694; 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=0APR23xoSpRoPrmHOoIW/fZKPHEwlO7VgBzBq3Nrcg8=; b=YVvOVJsu81ZRSyOvYpVjmw9H7q/eTB+Q4k9augQr1Qy9RpMb3FSmKc25md9qHJAJXh KulyBgLJ3H12y1IGkKImsSum3tOP0u/m58jeJ7xisXt1iRw1SpduKsoxSdVAIndfMMtp ARQRLw/IeR/YemtRVKqiV/1z/ONHuu59JRf/A/X+cnozcQ30JkwH5n4T74NV8mA/5og/ zl2Wsqfj4J/Bpt+g1iL1NW70lujOCeIE8vl0H85uVcc6BKEa15Ze3tGlMRBHL3wklp4H 6ShnNZIBq7Nmhd1U7/0a9p/N314v3X17fCnQxtNaHi3QFP+eSRH8VYhPD7XZ7mfcdb6/ soIA== X-Forwarded-Encrypted: i=1; AJvYcCX6WvXKmLFKSTHt0/pi+Qg4rsYljiFCTsa5tdD4oCvbTsDmUxFmHzrZvXBRJKxxGJqPEvs=@vger.kernel.org X-Gm-Message-State: AOJu0Yz5IRrXNhwRNio+ggpLiLDUOZ5pS3fwvF+VMgBhHU1iZreNhrfX WcW6BVgBf14LEc7e1tI3Z5SEvYEEjmpeQe6k/17wWUX6sMAkNtmhX+7RQls9Q4sMJtE= X-Gm-Gg: ASbGncttzoOS6X+6LUtmh7N9HAflz3e3sgRs9sMmEl+12AmkevDV96Z8Kiu886xv6RW 1L4SEE9PDUt2tGogYtDKg+UjigzFpPeXYz2ewqQQPKXseF8CPQrEugflCvhLP3GQAFhTR9Dd6ZP wAxwxPQbY4YItApXUsYhvkzNAvA5t3SQ0TOtGXDLDpJQ+xbgUk86z/BkY29twpn3gLo4lDH2uKo n7UUzNouHghtRJWZbDN+/mO35nWsQL5Rpr1sswjkuHWbRodHr1oFJU00rVjNPv5CJKwf3qw5KJz jN/rMgjrxpABe3jVfIarFdGwfRZ99IEAij8pjOnVcy9LcS39efn4NsyC7g+xQ1f4S0M7xkshkDa TNuIolM/NZg7+np0a5kw= X-Google-Smtp-Source: AGHT+IF4XmbWIExFu1mlduKfiNfTLu/tQXyVfpn87Q8JCh/3y9agaf4v394uxNt/X9mcs0VMw2lIeA== X-Received: by 2002:a17:90b:5212:b0:312:25dd:1c99 with SMTP id 98e67ed59e1d1-313d9e92702mr2795609a91.19.1749797893528; Thu, 12 Jun 2025 23:58:13 -0700 (PDT) Received: from localhost.localdomain ([103.97.166.196]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-313c1b49b7fsm2653022a91.24.2025.06.12.23.58.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 23:58:13 -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 Subject: [PATCH v2 04/12] RISC-V: KVM: Replace KVM_REQ_HFENCE_GVMA_VMID_ALL with KVM_REQ_TLB_FLUSH Date: Fri, 13 Jun 2025 12:27:35 +0530 Message-ID: <20250613065743.737102-5-apatel@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250613065743.737102-1-apatel@ventanamicro.com> References: <20250613065743.737102-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_REQ_HFENCE_GVMA_VMID_ALL is same as KVM_REQ_TLB_FLUSH so to avoid confusion let's replace KVM_REQ_HFENCE_GVMA_VMID_ALL with KVM_REQ_TLB_FLUSH. Also, rename kvm_riscv_hfence_gvma_vmid_all_process() to kvm_riscv_tlb_flush_process(). Reviewed-by: Atish Patra Signed-off-by: Anup Patel --- arch/riscv/include/asm/kvm_host.h | 4 ++-- arch/riscv/kvm/tlb.c | 8 ++++---- arch/riscv/kvm/vcpu.c | 8 ++------ 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/arch/riscv/include/asm/kvm_host.h b/arch/riscv/include/asm/kvm_host.h index 8aa705ac75a5..ff1f76d6f177 100644 --- a/arch/riscv/include/asm/kvm_host.h +++ b/arch/riscv/include/asm/kvm_host.h @@ -37,7 +37,6 @@ #define KVM_REQ_UPDATE_HGATP KVM_ARCH_REQ(2) #define KVM_REQ_FENCE_I \ KVM_ARCH_REQ_FLAGS(3, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP) -#define KVM_REQ_HFENCE_GVMA_VMID_ALL KVM_REQ_TLB_FLUSH #define KVM_REQ_HFENCE_VVMA_ALL \ KVM_ARCH_REQ_FLAGS(4, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP) #define KVM_REQ_HFENCE \ @@ -331,8 +330,9 @@ 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_tlb_flush_process(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); void kvm_riscv_hfence_process(struct kvm_vcpu *vcpu); diff --git a/arch/riscv/kvm/tlb.c b/arch/riscv/kvm/tlb.c index b3461bfd9756..da98ca801d31 100644 --- a/arch/riscv/kvm/tlb.c +++ b/arch/riscv/kvm/tlb.c @@ -162,7 +162,7 @@ void kvm_riscv_fence_i_process(struct kvm_vcpu *vcpu) local_flush_icache_all(); } -void kvm_riscv_hfence_gvma_vmid_all_process(struct kvm_vcpu *vcpu) +void kvm_riscv_tlb_flush_process(struct kvm_vcpu *vcpu) { struct kvm_vmid *v = &vcpu->kvm->arch.vmid; unsigned long vmid = READ_ONCE(v->vmid); @@ -342,14 +342,14 @@ void kvm_riscv_hfence_gvma_vmid_gpa(struct kvm *kvm, data.size = gpsz; data.order = order; make_xfence_request(kvm, hbase, hmask, KVM_REQ_HFENCE, - KVM_REQ_HFENCE_GVMA_VMID_ALL, &data); + KVM_REQ_TLB_FLUSH, &data); } void kvm_riscv_hfence_gvma_vmid_all(struct kvm *kvm, unsigned long hbase, unsigned long hmask) { - make_xfence_request(kvm, hbase, hmask, KVM_REQ_HFENCE_GVMA_VMID_ALL, - KVM_REQ_HFENCE_GVMA_VMID_ALL, NULL); + make_xfence_request(kvm, hbase, hmask, KVM_REQ_TLB_FLUSH, + KVM_REQ_TLB_FLUSH, NULL); } void kvm_riscv_hfence_vvma_asid_gva(struct kvm *kvm, diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index a2dd4161e5a4..6eb11c913b13 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -721,12 +721,8 @@ static void kvm_riscv_check_vcpu_requests(struct kvm_vcpu *vcpu) if (kvm_check_request(KVM_REQ_FENCE_I, vcpu)) kvm_riscv_fence_i_process(vcpu); - /* - * The generic KVM_REQ_TLB_FLUSH is same as - * KVM_REQ_HFENCE_GVMA_VMID_ALL - */ - if (kvm_check_request(KVM_REQ_HFENCE_GVMA_VMID_ALL, vcpu)) - kvm_riscv_hfence_gvma_vmid_all_process(vcpu); + if (kvm_check_request(KVM_REQ_TLB_FLUSH, vcpu)) + kvm_riscv_tlb_flush_process(vcpu); if (kvm_check_request(KVM_REQ_HFENCE_VVMA_ALL, vcpu)) kvm_riscv_hfence_vvma_all_process(vcpu); -- 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 6A812C61DB2 for ; Fri, 13 Jun 2025 06:58:20 +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=xgosGhY9xAV79iZHBAJFY0fo2ImjHh3HbXAZZHWoT+s=; b=1lskOSBl6RFeqd UvWlwqPqDskXGyNFEwcChRAT54YID6RiTWvTynb+WEzvv4/xI+6xJxt8i8oyYV80n1xbnPJP7UmiK LJi3t22E8urp71bp0JL7ETorUyflUsVcYwozB5WWUlLUCNcC/qLyf34TtGAZCxM4oBer7iEwuOG8Z O2KqG7YrCebKHQ/hE2AjdbxSwdp2puu7xA6M/qKj5pAoe/mHcahKGGap9zqNcuM0hYuK3X4A95uM9 2s/XeRANU6w7EHwXtGAd3OW4CQJw5eyGdHG2WiT9exW9RVZRPCvn7+HcXFknp3QOeGVbSQPCVThvY vHnxbIIV8pSvK3jkbfKg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uPyMi-0000000FXPn-10YU; Fri, 13 Jun 2025 06:58:16 +0000 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uPyMg-0000000FXOA-13lg for linux-riscv@lists.infradead.org; Fri, 13 Jun 2025 06:58:15 +0000 Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-3134c67a173so2013793a91.1 for ; Thu, 12 Jun 2025 23:58:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1749797894; x=1750402694; 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=0APR23xoSpRoPrmHOoIW/fZKPHEwlO7VgBzBq3Nrcg8=; b=doXJigJblpiyOBg1+ZGfDVulw4TmTaAz7NofWGf2i9hzSX48JSLiu2cXthzoju+MoS Fpbcj3n0J8Ge4hpctyA7UkTCTC8ZEINUN9kj0zlWaA/p4ny8R/wlkRLcvHAbHZRVjXuu 1LINuRBV7Vwp/wn10bIWPQIQk/lXExNeZOdE53/60PBrFqMwgVXWEXKwnFYpgWjJfri7 kW9H42sKeD9RkdrkAPQSysP2kzgKNr9mVD5J8/Gpu9EgEAXnoQf7rsahpVPIBvpMIzAU UY9TbIvlZSEDPXlMAF0tAnmFZLEIwL3D5wYzYTMB5cWADau7ukH8/JlNlX7IK76FJlFG 8vxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749797894; x=1750402694; 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=0APR23xoSpRoPrmHOoIW/fZKPHEwlO7VgBzBq3Nrcg8=; b=vui4tdf73VV2ZlyzY3dQb2xRZt1e/3WEkVmm8n+KM/K9piTKzunDpMyyJt3WRSYUnK LW9ZjWD3NK5uzCXpx8H0ZAKJ8X/2VaHEqZNLvqtPi8y9PzbnEVJ3mK2ST0SOc+oZ4eZc XMLkqOanGgAdHcEfPUlm//6znWwtoNhMdpnIiMV7qMlyXOz4Qh3uRd3EuziYsC9Mj11/ VfueIFCSxKG8ABiZiuW6JSABw/fXaaBw/0ur733OUyocwcCzLQnMGyQGU938l5B7Zul8 eGOuYP8FKSxBUvFI7Txl8GPheBphbo/P9mhrZEJMhRfT3iYOyhx5zp8XR6/exYzhw79F RESw== X-Forwarded-Encrypted: i=1; AJvYcCUM6587cC5PWx2txLXnB0TNsW1wpbNBAnbuP4lTqSVraH7VC8lKloqQKPjg6slasx9ZTNYZTedHOEBhkw==@lists.infradead.org X-Gm-Message-State: AOJu0Yz417VpCKYIL7ib6NjWqemGe/bGcdzgjgBFCVGL5UfGEIDMoikB jzyeKP2OAi/+J6knB+76odwObwyGXipTdvgqR8/YZ0f4gFbSws+mqcw/oPssujN91co= X-Gm-Gg: ASbGncsPc6x7dDQLcYtOdJNde1n9S7zOlo/cyMdvg3FH8MaULQj/3lrG2GqUZBlufYO 2iHeCROLEGgeBovvi41gTUdzkgJlO5aIWJl+atQ+3WISnr83/xVrjGPD1aYD0lxEC5dKrUTfn9h Av0CXMg9AEewr65edZiwzC2g1B1J2gfgxojAYYijFsEy1cqDu2iMkNGjM2gECTBJ7Qk+pdJaqUa OcTgK0JwDmoaP7Hh1qgt+UIa13RZBXw5eGkKfbOUbT+Q600ZfFHDOpoN3lVZRHoge+gLA0LHfAu l+qv6T/Mz7tvbh9eSrw0G62QJRPQ41C5X6TvLmyOoufUjfORWYmbZnXtPRn0heQba2OzYCp1vm0 vFrVdNpd7GgtubDnOEDw= X-Google-Smtp-Source: AGHT+IF4XmbWIExFu1mlduKfiNfTLu/tQXyVfpn87Q8JCh/3y9agaf4v394uxNt/X9mcs0VMw2lIeA== X-Received: by 2002:a17:90b:5212:b0:312:25dd:1c99 with SMTP id 98e67ed59e1d1-313d9e92702mr2795609a91.19.1749797893528; Thu, 12 Jun 2025 23:58:13 -0700 (PDT) Received: from localhost.localdomain ([103.97.166.196]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-313c1b49b7fsm2653022a91.24.2025.06.12.23.58.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 23:58:13 -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 Subject: [PATCH v2 04/12] RISC-V: KVM: Replace KVM_REQ_HFENCE_GVMA_VMID_ALL with KVM_REQ_TLB_FLUSH Date: Fri, 13 Jun 2025 12:27:35 +0530 Message-ID: <20250613065743.737102-5-apatel@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250613065743.737102-1-apatel@ventanamicro.com> References: <20250613065743.737102-1-apatel@ventanamicro.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250612_235814_291581_0D7E205C X-CRM114-Status: GOOD ( 12.32 ) 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_REQ_HFENCE_GVMA_VMID_ALL is same as KVM_REQ_TLB_FLUSH so to avoid confusion let's replace KVM_REQ_HFENCE_GVMA_VMID_ALL with KVM_REQ_TLB_FLUSH. Also, rename kvm_riscv_hfence_gvma_vmid_all_process() to kvm_riscv_tlb_flush_process(). Reviewed-by: Atish Patra Signed-off-by: Anup Patel --- arch/riscv/include/asm/kvm_host.h | 4 ++-- arch/riscv/kvm/tlb.c | 8 ++++---- arch/riscv/kvm/vcpu.c | 8 ++------ 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/arch/riscv/include/asm/kvm_host.h b/arch/riscv/include/asm/kvm_host.h index 8aa705ac75a5..ff1f76d6f177 100644 --- a/arch/riscv/include/asm/kvm_host.h +++ b/arch/riscv/include/asm/kvm_host.h @@ -37,7 +37,6 @@ #define KVM_REQ_UPDATE_HGATP KVM_ARCH_REQ(2) #define KVM_REQ_FENCE_I \ KVM_ARCH_REQ_FLAGS(3, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP) -#define KVM_REQ_HFENCE_GVMA_VMID_ALL KVM_REQ_TLB_FLUSH #define KVM_REQ_HFENCE_VVMA_ALL \ KVM_ARCH_REQ_FLAGS(4, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP) #define KVM_REQ_HFENCE \ @@ -331,8 +330,9 @@ 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_tlb_flush_process(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); void kvm_riscv_hfence_process(struct kvm_vcpu *vcpu); diff --git a/arch/riscv/kvm/tlb.c b/arch/riscv/kvm/tlb.c index b3461bfd9756..da98ca801d31 100644 --- a/arch/riscv/kvm/tlb.c +++ b/arch/riscv/kvm/tlb.c @@ -162,7 +162,7 @@ void kvm_riscv_fence_i_process(struct kvm_vcpu *vcpu) local_flush_icache_all(); } -void kvm_riscv_hfence_gvma_vmid_all_process(struct kvm_vcpu *vcpu) +void kvm_riscv_tlb_flush_process(struct kvm_vcpu *vcpu) { struct kvm_vmid *v = &vcpu->kvm->arch.vmid; unsigned long vmid = READ_ONCE(v->vmid); @@ -342,14 +342,14 @@ void kvm_riscv_hfence_gvma_vmid_gpa(struct kvm *kvm, data.size = gpsz; data.order = order; make_xfence_request(kvm, hbase, hmask, KVM_REQ_HFENCE, - KVM_REQ_HFENCE_GVMA_VMID_ALL, &data); + KVM_REQ_TLB_FLUSH, &data); } void kvm_riscv_hfence_gvma_vmid_all(struct kvm *kvm, unsigned long hbase, unsigned long hmask) { - make_xfence_request(kvm, hbase, hmask, KVM_REQ_HFENCE_GVMA_VMID_ALL, - KVM_REQ_HFENCE_GVMA_VMID_ALL, NULL); + make_xfence_request(kvm, hbase, hmask, KVM_REQ_TLB_FLUSH, + KVM_REQ_TLB_FLUSH, NULL); } void kvm_riscv_hfence_vvma_asid_gva(struct kvm *kvm, diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index a2dd4161e5a4..6eb11c913b13 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -721,12 +721,8 @@ static void kvm_riscv_check_vcpu_requests(struct kvm_vcpu *vcpu) if (kvm_check_request(KVM_REQ_FENCE_I, vcpu)) kvm_riscv_fence_i_process(vcpu); - /* - * The generic KVM_REQ_TLB_FLUSH is same as - * KVM_REQ_HFENCE_GVMA_VMID_ALL - */ - if (kvm_check_request(KVM_REQ_HFENCE_GVMA_VMID_ALL, vcpu)) - kvm_riscv_hfence_gvma_vmid_all_process(vcpu); + if (kvm_check_request(KVM_REQ_TLB_FLUSH, vcpu)) + kvm_riscv_tlb_flush_process(vcpu); if (kvm_check_request(KVM_REQ_HFENCE_VVMA_ALL, vcpu)) kvm_riscv_hfence_vvma_all_process(vcpu); -- 2.43.0 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv