From nobody Thu Oct 9 11:05:47 2025 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 E58B42DBF4C for ; Wed, 18 Jun 2025 11:36:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750246599; cv=none; b=GlB/Fixl5m/gpOltAJjGAF/+u8cEUDGBobZ9Wzwr0lKUTHKIA/4hQj6HyneePrMTBIuCanlpPJbi7nLQ/BQBIRevkifoGoUVsDM90n4H/ZJlp1UgO5HGAWYkW4mDkBcRR4CC+CfKV3FUboAbbwii/pFyeVo1u1pKPI5Zno6tgXY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750246599; c=relaxed/simple; bh=9DkH1MnmKplYHcxUKPSWXUR9/q6pa0raZeD0CabKAcM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SetTIjH0FZYvsIAkBJPVQziLRnMU1GXKWf0hEm5Vl++A7k7liANRsAod/J4U6WvYoEZj57ux+ku3czNpP2V7oAO6FQeN7RJNAA2q69jpSk/C1qvDEkEw+IlaJrr6b91CWt4nTmzyU8h50guDYlSLP3kvBsu74AdKDDKQSmLwzYs= 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=IzM/ZEo5; arc=none smtp.client-ip=209.85.214.179 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="IzM/ZEo5" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2353a2bc210so59860495ad.2 for ; Wed, 18 Jun 2025 04:36:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1750246595; x=1750851395; 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=wv2Dv1D3mRBWch3U2QfEIQG6aPxPGFrtjz75yYPWcVQ=; b=IzM/ZEo5d4+FVrnCR3TYOO3BBK0QT93GQpbSlRA5liM5icaOONCS9KR/ZuVeN4SgJ9 uTasFjgwgrMFydL10qhxK3KreE66el+N+yKfJxO6DM5lFy/JRFMjlQPn3fQKBTYRyMRI DIeQmE/fY/ZvNBJR8d0Wd5RIciMAn0VkGWMXcIReNhCykitdNFhz87zJwv6zurdwbFYP ZVh/kB680G5uFgg1TAL/6UjCYq2vd2QCtu28IaLgQgS0iroaE3mHUL1Wmx0Bs8V3X1ec H3EcKcTWYXAV/wfcOOVCp8OBrnLVhx9Iq5xxjfuhlnhvvQL+6v7YBbE9MOc62IBquMNQ xFVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750246595; x=1750851395; 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=wv2Dv1D3mRBWch3U2QfEIQG6aPxPGFrtjz75yYPWcVQ=; b=mM0WszlB5db2jdbJgGj73nwOkVbHE1ikR8tNPfxvsQq08tbYUaL5y0GvArLAsB1ZBp btZ00BLL78OOMAZpUNYVnwCzKH2KcBM9y5S52TcXwk4R5jsVypMU8TazIM4zoQo0ELYk KbsB4uIwWXAr2gvIY7VmbxMjbp99+r4a9rGcAIGkAMEeAL8H7XvuBAuT6TlZcPW0PerM ECAucu9SaGxZ60kTc7EKewBwqpaaIrPJFP0F8rVxXHqG04tCVW2TKQdhcUuuKLNyUpg+ fSRnqKwRRlK1uMLjSgZ3KX1oBAaB21fNcDMmBZsO9Qu+YxtTAfgv4wRCzWBwfXG4UycY 4QOg== X-Forwarded-Encrypted: i=1; AJvYcCWP+dQfVf8Oo079Oz6OklZm4TYFTBcAYVqTmkkPETva+C/YW1q86c0XFl6frXeOKxkuaxf792kxjZs4OK0=@vger.kernel.org X-Gm-Message-State: AOJu0YxYKLzaRSeOmQLH4YIkUvuWMYmvmskoWeWeDzGVoT4d9HeYVWyy qGYcEO1NVE7qtxhce+U/L5GnQjriIeMUpdWhD8+rB6GLQ6nVmr/+DRL5onJa1dq51HE= X-Gm-Gg: ASbGncsIEvJMsqQ03jNSZFJiLVB0llOd5xRNXLZgr8LWZvFezb7t8KibA4PMeaBI5Dx Y8ARgzbyf2AGTtJZDS7c3cAsMQW99VuBFcltQdNDVPjMVZDODhm0rBNAJnsTi7Gn1mxbb6HtDe+ +nuW6QZtFVC7ymHZIchcoswuPmeFYruKv3vxBt7P4T1NPzAtoDKmO1Ta11ulJteqmXVtbamslLE xD/LfJG7UgorNKkT2j/o+mwhZkXFY5e8zquoXNoQbkDK7yrLy0QpyZO9uL5CM/38SoZ0sUo2ol0 434pkzq6VW/OTQGx6+wDbGRbJ7m89pZymoWERpXep5LwuvHe3NTtukx6OJ7HBYBhW1wmpAwoR2A 6OGpVtilBZyfhJKVQNw== X-Google-Smtp-Source: AGHT+IHj3Fmtrtd3/iR0RBFJ3K5R+ndUPF941cuYVZNiiA3rRlmLdRt/HqLMxHP7frHFlTuPO9nuwA== X-Received: by 2002:a17:903:41c8:b0:234:f580:a11 with SMTP id d9443c01a7336-2366b344b39mr298672495ad.19.1750246594829; Wed, 18 Jun 2025 04:36:34 -0700 (PDT) Received: from localhost.localdomain ([122.171.23.44]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-237c57c63efsm9112475ad.172.2025.06.18.04.36.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jun 2025 04:36:34 -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 v3 10/12] RISC-V: KVM: Add vmid field to struct kvm_riscv_hfence Date: Wed, 18 Jun 2025 17:05:30 +0530 Message-ID: <20250618113532.471448-11-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: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, the struct kvm_riscv_hfence does not have vmid field and various hfence processing functions always pick vmid assigned to the guest/VM. This prevents us from doing hfence operation on arbitrary vmid hence add vmid field to struct kvm_riscv_hfence and use it wherever applicable. Reviewed-by: Atish Patra Signed-off-by: Anup Patel Reviewed-by: Nutty Liu --- arch/riscv/include/asm/kvm_tlb.h | 1 + arch/riscv/kvm/tlb.c | 30 ++++++++++++++++-------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/arch/riscv/include/asm/kvm_tlb.h b/arch/riscv/include/asm/kvm_= tlb.h index cd00c9a46cb1..f67e03edeaec 100644 --- a/arch/riscv/include/asm/kvm_tlb.h +++ b/arch/riscv/include/asm/kvm_tlb.h @@ -19,6 +19,7 @@ enum kvm_riscv_hfence_type { struct kvm_riscv_hfence { enum kvm_riscv_hfence_type type; unsigned long asid; + unsigned long vmid; unsigned long order; gpa_t addr; gpa_t size; diff --git a/arch/riscv/kvm/tlb.c b/arch/riscv/kvm/tlb.c index 6fc4361c3d75..349fcfc93f54 100644 --- a/arch/riscv/kvm/tlb.c +++ b/arch/riscv/kvm/tlb.c @@ -237,49 +237,43 @@ static bool vcpu_hfence_enqueue(struct kvm_vcpu *vcpu, =20 void kvm_riscv_hfence_process(struct kvm_vcpu *vcpu) { - unsigned long vmid; struct kvm_riscv_hfence d =3D { 0 }; - struct kvm_vmid *v =3D &vcpu->kvm->arch.vmid; =20 while (vcpu_hfence_dequeue(vcpu, &d)) { switch (d.type) { case KVM_RISCV_HFENCE_UNKNOWN: break; case KVM_RISCV_HFENCE_GVMA_VMID_GPA: - vmid =3D READ_ONCE(v->vmid); if (kvm_riscv_nacl_available()) - nacl_hfence_gvma_vmid(nacl_shmem(), vmid, + nacl_hfence_gvma_vmid(nacl_shmem(), d.vmid, d.addr, d.size, d.order); else - kvm_riscv_local_hfence_gvma_vmid_gpa(vmid, d.addr, + kvm_riscv_local_hfence_gvma_vmid_gpa(d.vmid, d.addr, d.size, d.order); break; case KVM_RISCV_HFENCE_VVMA_ASID_GVA: kvm_riscv_vcpu_pmu_incr_fw(vcpu, SBI_PMU_FW_HFENCE_VVMA_ASID_RCVD); - vmid =3D READ_ONCE(v->vmid); if (kvm_riscv_nacl_available()) - nacl_hfence_vvma_asid(nacl_shmem(), vmid, d.asid, + nacl_hfence_vvma_asid(nacl_shmem(), d.vmid, d.asid, d.addr, d.size, d.order); else - kvm_riscv_local_hfence_vvma_asid_gva(vmid, d.asid, d.addr, + kvm_riscv_local_hfence_vvma_asid_gva(d.vmid, d.asid, d.addr, d.size, d.order); break; case KVM_RISCV_HFENCE_VVMA_ASID_ALL: kvm_riscv_vcpu_pmu_incr_fw(vcpu, SBI_PMU_FW_HFENCE_VVMA_ASID_RCVD); - vmid =3D READ_ONCE(v->vmid); if (kvm_riscv_nacl_available()) - nacl_hfence_vvma_asid_all(nacl_shmem(), vmid, d.asid); + nacl_hfence_vvma_asid_all(nacl_shmem(), d.vmid, d.asid); else - kvm_riscv_local_hfence_vvma_asid_all(vmid, d.asid); + kvm_riscv_local_hfence_vvma_asid_all(d.vmid, d.asid); break; case KVM_RISCV_HFENCE_VVMA_GVA: kvm_riscv_vcpu_pmu_incr_fw(vcpu, SBI_PMU_FW_HFENCE_VVMA_RCVD); - vmid =3D READ_ONCE(v->vmid); if (kvm_riscv_nacl_available()) - nacl_hfence_vvma(nacl_shmem(), vmid, + nacl_hfence_vvma(nacl_shmem(), d.vmid, d.addr, d.size, d.order); else - kvm_riscv_local_hfence_vvma_gva(vmid, d.addr, + kvm_riscv_local_hfence_vvma_gva(d.vmid, d.addr, d.size, d.order); break; default: @@ -336,10 +330,12 @@ void kvm_riscv_hfence_gvma_vmid_gpa(struct kvm *kvm, gpa_t gpa, gpa_t gpsz, unsigned long order) { + struct kvm_vmid *v =3D &kvm->arch.vmid; struct kvm_riscv_hfence data; =20 data.type =3D KVM_RISCV_HFENCE_GVMA_VMID_GPA; data.asid =3D 0; + data.vmid =3D READ_ONCE(v->vmid); data.addr =3D gpa; data.size =3D gpsz; data.order =3D order; @@ -359,10 +355,12 @@ void kvm_riscv_hfence_vvma_asid_gva(struct kvm *kvm, unsigned long gva, unsigned long gvsz, unsigned long order, unsigned long asid) { + struct kvm_vmid *v =3D &kvm->arch.vmid; struct kvm_riscv_hfence data; =20 data.type =3D KVM_RISCV_HFENCE_VVMA_ASID_GVA; data.asid =3D asid; + data.vmid =3D READ_ONCE(v->vmid); data.addr =3D gva; data.size =3D gvsz; data.order =3D order; @@ -374,10 +372,12 @@ void kvm_riscv_hfence_vvma_asid_all(struct kvm *kvm, unsigned long hbase, unsigned long hmask, unsigned long asid) { + struct kvm_vmid *v =3D &kvm->arch.vmid; struct kvm_riscv_hfence data; =20 data.type =3D KVM_RISCV_HFENCE_VVMA_ASID_ALL; data.asid =3D asid; + data.vmid =3D READ_ONCE(v->vmid); data.addr =3D data.size =3D data.order =3D 0; make_xfence_request(kvm, hbase, hmask, KVM_REQ_HFENCE, KVM_REQ_HFENCE_VVMA_ALL, &data); @@ -388,10 +388,12 @@ void kvm_riscv_hfence_vvma_gva(struct kvm *kvm, unsigned long gva, unsigned long gvsz, unsigned long order) { + struct kvm_vmid *v =3D &kvm->arch.vmid; struct kvm_riscv_hfence data; =20 data.type =3D KVM_RISCV_HFENCE_VVMA_GVA; data.asid =3D 0; + data.vmid =3D READ_ONCE(v->vmid); data.addr =3D gva; data.size =3D gvsz; data.order =3D order; --=20 2.43.0