Received: by 2002:ab2:1689:0:b0:1f7:5705:b850 with SMTP id d9csp1733777lqa; Mon, 29 Apr 2024 18:45:59 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWBEBrPoXRE1BSmeZSQ0YOUCAKsEjEMN7yF/lwBFYvSF79GoWQJBW5dWlsH6yS6jbd0Ux+JuT3+ZLKUN5PBhd0+0u+MbWqKI7yjL9Wfgg== X-Google-Smtp-Source: AGHT+IFpG/TcVdklwE1mjidOak+pS8+hbjcuhF4wynblNho4uuw6cJQnBDkhyNMu4EyFPr/Qgyvt X-Received: by 2002:a05:6830:e02:b0:6eb:ca6e:3e5e with SMTP id do2-20020a0568300e0200b006ebca6e3e5emr14059829otb.16.1714441559739; Mon, 29 Apr 2024 18:45:59 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714441559; cv=pass; d=google.com; s=arc-20160816; b=fWR7Ril0LzTSR1nY2KyildENOWh+WGm5JnTKh1HN9C0zLis/Y5VD5xfy+4pp0n7FVi /gqgJappbD4NGZAsAKYDVNhcD9iPxB5H4LR0X8DbtzQIZB8Cq3faOpWp6Ea9PgWOVM/P 2Yetqc/TpMpTGD12O8381DYyhtenYVLhjrbHYXTSU52+G13F5WG++duMIVGfx4cRorXB kR4qmGBTOk9DsA5/BbCKPpYBb80pmK+xGexQJBn3FFhCvOrkPYJ1NI6gby0DTuCW2DjD yHcyE9PFespniFgjezGiWYmEfb8l8LcqLJJ1HgepUXZycXaWTcQCgBCKGS07No7jBzN3 FxjA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=WXVdGh/fQC/kb6P1f1ObHuJEvTtwsbuj9vbClIh9zRg=; fh=qdV62HKG2O0E2jvRwrIfwpeQ+X1zBkVKEmCAXswaWZQ=; b=ZGYbPqiqzRiEsiPNbbDUCZvsSbO7jxKOg6ubdjLVEotgCWT1Az6NiYEzX1OQVwlzit qlI3BYQ+b9EeYWcqp+Sw8SHKW5xSQKsFiZRP5lX66k+wnJXdJRLJVWeNWaLCGWoQVv8H 6Sh/6Zr0n9Yt+BwglmSWr/UYfpIa5H72uCUgaeyXEU8U1u9cyso7lv/IoK515d9zaBs7 hypOwgUIe7sLJ9pPJrEVCU4BDiToq2ze8jqHIn2KhyfdqWrC2Is8i+gSrf0qXbYZaufj 10ONxzkHsskFgY84/0zSdyJlHyKUNpzx/yfUWdQwB/F3/3/e3iN6O1amKXgUlApwsWSR Zssw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=loongson.cn); spf=pass (google.com: domain of linux-kernel+bounces-163249-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-163249-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id a1-20020a656541000000b005f77a64dfc5si9963317pgw.33.2024.04.29.18.45.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Apr 2024 18:45:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-163249-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=loongson.cn); spf=pass (google.com: domain of linux-kernel+bounces-163249-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-163249-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 2B2FD284334 for ; Tue, 30 Apr 2024 01:45:59 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 138D710979; Tue, 30 Apr 2024 01:45:18 +0000 (UTC) Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2B45679DC; Tue, 30 Apr 2024 01:45:14 +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=1714441517; cv=none; b=Bzs4Q4Jc2mFea8huCi/WqgTCGDLfVRJvI5+U2nJsWju6feSUwhUmF5ZIOlXvlR86gXhK0QZP3CHqVJsO9tQU4RB+vC7ycXnvJ5AGusdadTNIfSb3ZCPPAkL0BAGFNtf1VGVvi0DBI41egGT8xI9abzvaWXJUb4h/SPu8XLkRvG0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714441517; c=relaxed/simple; bh=xXcBGYp3GoVBzGo3k3QNCsnrHBE5132LzCISjuSlhe8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SMkKU9iUdEICZa2yrtPIpk8mRGCzk36brGsitxYnhXih9XT0ZEXPtbgU6DHsIbz/Sx6Jln0U3kFh/tymvNZ3DxztNWLC8AgnYq7a3Iza9arhx5p8iEx8djU2kol7SmBBgjb4QdT+MWkmOOwTsaDLjH9NBSacyRO6Sc239urXw9k= 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 _____8BxN+kpTTBmvDoFAA--.5168S3; Tue, 30 Apr 2024 09:45:13 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Cxyt0hTTBmfrwKAA--.25728S4; Tue, 30 Apr 2024 09:45:12 +0800 (CST) From: Bibo Mao To: Tianrui Zhao , Huacai Chen Cc: Juergen Gross , kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, x86@kernel.org, virtualization@lists.linux.dev Subject: [PATCH v2 2/2] LoongArch: Add steal time support in guest side Date: Tue, 30 Apr 2024 09:45:05 +0800 Message-Id: <20240430014505.2102631-3-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240430014505.2102631-1-maobibo@loongson.cn> References: <20240430014505.2102631-1-maobibo@loongson.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:AQAAf8Cxyt0hTTBmfrwKAA--.25728S4 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Percpu struct kvm_steal_time is added here, its size is 64 bytes and also defined as 64 bytes, so that the whole structure is in one physical page. When vcpu is onlined, function pv_enable_steal_time() is called. This function will pass guest physical address of struct kvm_steal_time and tells hypervisor to enable steal time. When vcpu is offline, physical address is set as 0 and tells hypervisor to disable steal time. Here is output of vmstat on guest when there is workload on both host and guest. It includes steal time stat information. procs -----------memory---------- -----io---- -system-- ------cpu----- r b swpd free inact active bi bo in cs us sy id wa st 15 1 0 7583616 184112 72208 20 0 162 52 31 6 43 0 20 17 0 0 7583616 184704 72192 0 0 6318 6885 5 60 8 5 22 16 0 0 7583616 185392 72144 0 0 1766 1081 0 49 0 1 50 16 0 0 7583616 184816 72304 0 0 6300 6166 4 62 12 2 20 18 0 0 7583632 184480 72240 0 0 2814 1754 2 58 4 1 35 Signed-off-by: Bibo Mao --- arch/loongarch/Kconfig | 11 +++ arch/loongarch/include/asm/paravirt.h | 5 + arch/loongarch/kernel/paravirt.c | 131 ++++++++++++++++++++++++++ arch/loongarch/kernel/time.c | 2 + 4 files changed, 149 insertions(+) diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig index 0a1540a8853e..f3a03c33a052 100644 --- a/arch/loongarch/Kconfig +++ b/arch/loongarch/Kconfig @@ -592,6 +592,17 @@ config PARAVIRT over full virtualization. However, when run without a hypervisor the kernel is theoretically slower and slightly larger. +config PARAVIRT_TIME_ACCOUNTING + bool "Paravirtual steal time accounting" + select PARAVIRT + help + Select this option to enable fine granularity task steal time + accounting. Time spent executing other tasks in parallel with + the current vCPU is discounted from the vCPU power. To account for + that, there can be a small performance impact. + + If in doubt, say N here. + config ARCH_SUPPORTS_KEXEC def_bool y diff --git a/arch/loongarch/include/asm/paravirt.h b/arch/loongarch/include/asm/paravirt.h index 58f7b7b89f2c..fe27fb5e82b8 100644 --- a/arch/loongarch/include/asm/paravirt.h +++ b/arch/loongarch/include/asm/paravirt.h @@ -17,11 +17,16 @@ static inline u64 paravirt_steal_clock(int cpu) } int pv_ipi_init(void); +int __init pv_time_init(void); #else static inline int pv_ipi_init(void) { return 0; } +static inline int pv_time_init(void) +{ + return 0; +} #endif // CONFIG_PARAVIRT #endif diff --git a/arch/loongarch/kernel/paravirt.c b/arch/loongarch/kernel/paravirt.c index 9044ed62045c..3f83afc7e2d2 100644 --- a/arch/loongarch/kernel/paravirt.c +++ b/arch/loongarch/kernel/paravirt.c @@ -5,10 +5,13 @@ #include #include #include +#include #include struct static_key paravirt_steal_enabled; struct static_key paravirt_steal_rq_enabled; +static DEFINE_PER_CPU(struct kvm_steal_time, steal_time) __aligned(64); +static int has_steal_clock; static u64 native_steal_clock(int cpu) { @@ -17,6 +20,57 @@ static u64 native_steal_clock(int cpu) DEFINE_STATIC_CALL(pv_steal_clock, native_steal_clock); +static bool steal_acc = true; +static int __init parse_no_stealacc(char *arg) +{ + steal_acc = false; + return 0; +} +early_param("no-steal-acc", parse_no_stealacc); + +static u64 para_steal_clock(int cpu) +{ + u64 steal; + struct kvm_steal_time *src; + int version; + + src = &per_cpu(steal_time, cpu); + do { + + version = src->version; + /* Make sure that the version is read before the steal */ + virt_rmb(); + steal = src->steal; + /* Make sure that the steal is read before the next version */ + virt_rmb(); + + } while ((version & 1) || (version != src->version)); + return steal; +} + +static int pv_enable_steal_time(void) +{ + int cpu = smp_processor_id(); + struct kvm_steal_time *st; + unsigned long addr; + + if (!has_steal_clock) + return -EPERM; + + st = &per_cpu(steal_time, cpu); + addr = per_cpu_ptr_to_phys(st); + + /* The whole structure kvm_steal_time should be one page */ + if (PFN_DOWN(addr) != PFN_DOWN(addr + sizeof(*st))) { + pr_warn("Illegal PV steal time addr %lx\n", addr); + return -EFAULT; + } + + addr |= KVM_STEAL_PHYS_VALID; + kvm_hypercall2(KVM_HCALL_FUNC_NOTIFY, KVM_FEATURE_STEAL_TIME, addr); + return 0; +} + #ifdef CONFIG_SMP static void pv_send_ipi_single(int cpu, unsigned int action) { @@ -110,6 +164,32 @@ static void pv_init_ipi(void) if (r < 0) panic("SWI0 IRQ request failed\n"); } + +static void pv_disable_steal_time(void) +{ + if (has_steal_clock) + kvm_hypercall2(KVM_HCALL_FUNC_NOTIFY, KVM_FEATURE_STEAL_TIME, 0); +} + +static int pv_time_cpu_online(unsigned int cpu) +{ + unsigned long flags; + + local_irq_save(flags); + pv_enable_steal_time(); + local_irq_restore(flags); + return 0; +} + +static int pv_time_cpu_down_prepare(unsigned int cpu) +{ + unsigned long flags; + + local_irq_save(flags); + pv_disable_steal_time(); + local_irq_restore(flags); + return 0; +} #endif static bool kvm_para_available(void) @@ -149,3 +229,54 @@ int __init pv_ipi_init(void) return 1; } + +static void pv_cpu_reboot(void *unused) +{ + pv_disable_steal_time(); +} + +static int pv_reboot_notify(struct notifier_block *nb, unsigned long code, + void *unused) +{ + on_each_cpu(pv_cpu_reboot, NULL, 1); + return NOTIFY_DONE; +} + +static struct notifier_block pv_reboot_nb = { + .notifier_call = pv_reboot_notify, +}; + +int __init pv_time_init(void) +{ + int feature; + + if (!cpu_has_hypervisor) + return 0; + if (!kvm_para_available()) + return 0; + + feature = read_cpucfg(CPUCFG_KVM_FEATURE); + if (!(feature & KVM_FEATURE_STEAL_TIME)) + return 0; + + has_steal_clock = 1; + if (pv_enable_steal_time()) { + has_steal_clock = 0; + return 0; + } + + register_reboot_notifier(&pv_reboot_nb); + static_call_update(pv_steal_clock, para_steal_clock); + static_key_slow_inc(¶virt_steal_enabled); + if (steal_acc) + static_key_slow_inc(¶virt_steal_rq_enabled); + +#ifdef CONFIG_SMP + if (cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, + "loongarch/pvi_time:online", + pv_time_cpu_online, pv_time_cpu_down_prepare) < 0) + pr_err("Failed to install cpu hotplug callbacks\n"); +#endif + pr_info("Using stolen time PV\n"); + return 0; +} diff --git a/arch/loongarch/kernel/time.c b/arch/loongarch/kernel/time.c index fd5354f9be7c..46d7d40c87e3 100644 --- a/arch/loongarch/kernel/time.c +++ b/arch/loongarch/kernel/time.c @@ -15,6 +15,7 @@ #include #include +#include #include u64 cpu_clock_freq; @@ -214,4 +215,5 @@ void __init time_init(void) constant_clockevent_init(); constant_clocksource_init(); + pv_time_init(); } -- 2.39.3