From patchwork Mon Feb 24 09:56:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bibo mao X-Patchwork-Id: 13987726 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7E8CE24A048; Mon, 24 Feb 2025 09:56:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740390985; cv=none; b=rT3hETUw6Vv/gcFN/VpHXfuqUoKBoG+EpA0Q8OmWBpWHDoBmu74t826Og0cowqwar6ypc24eMix/X2zNM/S6ASeyCc7rrBlIbeP9kMjfhfH0Gk7f/fspFEG821qZSQNLWpeSD1fINvY2fHXqybNWArhMse0RcYGUgAW9YI8Deos= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740390985; c=relaxed/simple; bh=jr8k2chuEf4YyG2CznmAKtkBYn7Y+zMKBFySaDiAy6s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=anUYPS2kSfahUtozlnBqm0ZYWGZ+fVu/Ilo0dVZhAtP/Ps1MernVPYMuQ56TXjaQBgrIkeCGSe8Mjhbk2z1xwCTkH27wRcdwVXTSTml6VQyW/DEs7SKyfVAiCSA4yOtDEL1MCwLoUcC9tX5PQjn8JLaNRGhlP9TJrd/WDufJUUU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn; spf=pass smtp.mailfrom=loongson.cn; arc=none smtp.client-ip=114.242.206.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [10.2.5.213]) by gateway (Coremail) with SMTP id _____8AxGHFDQrxnJq+AAA--.24653S3; Mon, 24 Feb 2025 17:56:19 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowMBxXsVCQrxnRBkmAA--.9703S3; Mon, 24 Feb 2025 17:56:19 +0800 (CST) From: Bibo Mao To: Tianrui Zhao , Huacai Chen Cc: WANG Xuerui , kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] LoongArch: KVM: Add stub for kvm_arch_vcpu_preempted_in_kernel Date: Mon, 24 Feb 2025 17:56:16 +0800 Message-Id: <20250224095618.1436016-2-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20250224095618.1436016-1-maobibo@loongson.cn> References: <20250224095618.1436016-1-maobibo@loongson.cn> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: qMiowMBxXsVCQrxnRBkmAA--.9703S3 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Since Pause-Loop Exiting is not supported by LoongArch hardware, nor pv spinlock feature is not supported, function kvm_vcpu_on_spin() is not used. Function kvm_arch_vcpu_preempted_in_kernel() is defined as stub function here since it is only called by unused function kvm_vcpu_on_spin(). Signed-off-by: Bibo Mao --- arch/loongarch/kvm/vcpu.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c index 20f941af3e9e..3318a55a0699 100644 --- a/arch/loongarch/kvm/vcpu.c +++ b/arch/loongarch/kvm/vcpu.c @@ -364,6 +364,11 @@ bool kvm_arch_vcpu_in_kernel(struct kvm_vcpu *vcpu) return false; } +bool kvm_arch_vcpu_preempted_in_kernel(struct kvm_vcpu *vcpu) +{ + return false; +} + vm_fault_t kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf) { return VM_FAULT_SIGBUS; From patchwork Mon Feb 24 09:56:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bibo mao X-Patchwork-Id: 13987727 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CAF3924A053; Mon, 24 Feb 2025 09:56:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740390986; cv=none; b=cAtN1VubXKI1DTLshRYrpEQ8m8NrvFI4f5P4qzGEhg2XGTTM3v6ju+myUxlHIj8J437uzKg0y6WfTfnDpH8UZK5bIL7yWcmENjZEbnjPILFeOSAiwGbP56g71UGMJwzeJaudm47jiromuASLkEUfrfD264OM9RdyWn27emRKWk0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740390986; c=relaxed/simple; bh=vTY7IcIUedKbnWecJ5rFRLrsW0yOtuv4iisggvG/U4M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fZcnaVZy4CwvmnTDAn7J99CeTXBQf31o489NWcxCvZ7GpWofcdVwXoNhz4u9V8U/hhXSVNkHhVasYO+KFF5rNQcZIcNmoI0HPH4UlV2dc49msXtKy8hSjaphuJ4ifNrRNnN2DADnrZsC3BRHP8dvH5vwarm/BHOC1Y45a7AkrsY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn; spf=pass smtp.mailfrom=loongson.cn; arc=none smtp.client-ip=114.242.206.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [10.2.5.213]) by gateway (Coremail) with SMTP id _____8BxIK9DQrxnK6+AAA--.21994S3; Mon, 24 Feb 2025 17:56:19 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowMBxXsVCQrxnRBkmAA--.9703S4; Mon, 24 Feb 2025 17:56:19 +0800 (CST) From: Bibo Mao To: Tianrui Zhao , Huacai Chen Cc: WANG Xuerui , kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] LoongArch: KVM: Implement arch specified functions for guest perf Date: Mon, 24 Feb 2025 17:56:17 +0800 Message-Id: <20250224095618.1436016-3-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20250224095618.1436016-1-maobibo@loongson.cn> References: <20250224095618.1436016-1-maobibo@loongson.cn> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: qMiowMBxXsVCQrxnRBkmAA--.9703S4 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Three architecture specified functions are added for guest perf feature, they are kvm_arch_pmi_in_guest(), kvm_arch_vcpu_in_kernel() and kvm_arch_vcpu_get_ip(). Signed-off-by: Bibo Mao --- arch/loongarch/include/asm/kvm_host.h | 2 ++ arch/loongarch/kvm/vcpu.c | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/arch/loongarch/include/asm/kvm_host.h b/arch/loongarch/include/asm/kvm_host.h index 590982cd986e..49b71ea9c44f 100644 --- a/arch/loongarch/include/asm/kvm_host.h +++ b/arch/loongarch/include/asm/kvm_host.h @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -291,6 +292,7 @@ static inline int kvm_get_pmu_num(struct kvm_vcpu_arch *arch) /* Debug: dump vcpu state */ int kvm_arch_vcpu_dump_regs(struct kvm_vcpu *vcpu); +bool kvm_arch_pmi_in_guest(struct kvm_vcpu *vcpu); /* MMU handling */ void kvm_flush_tlb_all(void); diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c index 3318a55a0699..fb85c38f4886 100644 --- a/arch/loongarch/kvm/vcpu.c +++ b/arch/loongarch/kvm/vcpu.c @@ -361,8 +361,34 @@ int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu) bool kvm_arch_vcpu_in_kernel(struct kvm_vcpu *vcpu) { + unsigned long val; + + preempt_disable(); + val = gcsr_read(LOONGARCH_CSR_CRMD); + preempt_enable(); + + return (val & CSR_PRMD_PPLV) == 0; +} + +#ifdef CONFIG_GUEST_PERF_EVENTS +unsigned long kvm_arch_vcpu_get_ip(struct kvm_vcpu *vcpu) +{ + return vcpu->arch.pc; +} + +/* + * Returns true if a Performance Monitoring Interrupt (PMI), a.k.a. perf event, + * arrived in guest context. For loongarch64, if pmu is not passthrough to VM, + * any event that arrives while a vCPU is loaded is considered to be "in guest". + */ +bool kvm_arch_pmi_in_guest(struct kvm_vcpu *vcpu) +{ + if (vcpu && !(vcpu->arch.aux_inuse & KVM_LARCH_PMU)) + return true; + return false; } +#endif bool kvm_arch_vcpu_preempted_in_kernel(struct kvm_vcpu *vcpu) { From patchwork Mon Feb 24 09:56:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bibo mao X-Patchwork-Id: 13987725 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D946A24A05C; Mon, 24 Feb 2025 09:56:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740390985; cv=none; b=oUmd4s+84dghaSPNAXHZ+d5XjNkIHZ52+0oP94iRNK3WF0VqlE9vrynsmdJQ3EKpM/GGb3aw6CASSC/JuxUVaDoQubh6YBpTDiNxlOrXXCupXAXXaG/+mN6mzKN0+bBaEP0ecM62xG6ueM0HXi1wXw+xv0KCjOfqZUtxu4iKN+c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740390985; c=relaxed/simple; bh=ELUSK/HZUHvCwY6+pKfb6g9xX5U5riy1F+LdY6xt/HE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JksmWV+X2/Lun5XwesyvteQOc6UhrPSJaYobee3Xm7r3nM9vJB8lINN4d4Tb/M3O0xHADa0eEYaTB3TMV612NXjEgKuSGQPjLmLs/IT/e3YEf8B4UzL91OhW95IFSnf2iq2z09Lrnz+L7bhOQxTOFe9e5PYfR+o8vRuWujzxNVQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn; spf=pass smtp.mailfrom=loongson.cn; arc=none smtp.client-ip=114.242.206.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [10.2.5.213]) by gateway (Coremail) with SMTP id _____8DxbKxEQrxnMK+AAA--.24412S3; Mon, 24 Feb 2025 17:56:20 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowMBxXsVCQrxnRBkmAA--.9703S5; Mon, 24 Feb 2025 17:56:19 +0800 (CST) From: Bibo Mao To: Tianrui Zhao , Huacai Chen Cc: WANG Xuerui , kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] LoongArch: KVM: Register perf callback for guest Date: Mon, 24 Feb 2025 17:56:18 +0800 Message-Id: <20250224095618.1436016-4-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20250224095618.1436016-1-maobibo@loongson.cn> References: <20250224095618.1436016-1-maobibo@loongson.cn> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: qMiowMBxXsVCQrxnRBkmAA--.9703S5 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Add selection for GUEST_PERF_EVENTS if KVM is enabled, also add perf callback register when KVM module is loading. Signed-off-by: Bibo Mao --- arch/loongarch/kvm/Kconfig | 1 + arch/loongarch/kvm/main.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/arch/loongarch/kvm/Kconfig b/arch/loongarch/kvm/Kconfig index 97a811077ac3..40eea6da7c25 100644 --- a/arch/loongarch/kvm/Kconfig +++ b/arch/loongarch/kvm/Kconfig @@ -33,6 +33,7 @@ config KVM select KVM_MMIO select KVM_XFER_TO_GUEST_WORK select SCHED_INFO + select GUEST_PERF_EVENTS if PERF_EVENTS help Support hosting virtualized guest machines using hardware virtualization extensions. You will need diff --git a/arch/loongarch/kvm/main.c b/arch/loongarch/kvm/main.c index f6d3242b9234..4c5af4718182 100644 --- a/arch/loongarch/kvm/main.c +++ b/arch/loongarch/kvm/main.c @@ -387,6 +387,7 @@ static int kvm_loongarch_env_init(void) } kvm_init_gcsr_flag(); + kvm_register_perf_callbacks(NULL); /* Register LoongArch IPI interrupt controller interface. */ ret = kvm_loongarch_register_ipi_device(); @@ -408,6 +409,7 @@ static void kvm_loongarch_env_exit(void) { unsigned long addr; + kvm_unregister_perf_callbacks(); if (vmcs) free_percpu(vmcs);