Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp418632ybh; Mon, 20 Jul 2020 21:19:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfrkIwt6drX4hUds+sMsQ2vTfgCHEBPDjDVZCtmd5tAaV724wMvcFK3ltxJCMYiVR6zM7d X-Received: by 2002:a05:6402:31ba:: with SMTP id dj26mr24596778edb.181.1595305142748; Mon, 20 Jul 2020 21:19:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595305142; cv=none; d=google.com; s=arc-20160816; b=ounfmuZSfD30WgqYiv8GBqrF30bZGXDtuG/xEWKQQPN+fV2FFOlkPnt2zEfB3JobuQ QVsX5lsUaoRP+F4s4w+qpY65779dPw8lNa6Mbq0PDI3BjAAa5ShDJj3MEN7MujaWZhj2 dBEjnxzIkTAeLiA/P4uO1Qn6xpr9pKgCJw0w5zwRDFKqXc9HO3QB3+LT+NDRWYQbc1/t Mu9D0phq/qrZ50EvK8hlqoJ8dmXlKmALXK1k+RujCiw614Qa4gTZSlKmqnRtm69FHkbq idmPFFhS6ZHzpJhc09FNczPvrXeKmttCNWId7i8E9kBR8Ctb4Noai+eF88qZuH4xzwtV jPug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=QhRkRM1m4qgsAo9eZ39otcpFvlPpO24W7mp8anbogBw=; b=wh2urLmHHKWutkoKBdsXllKr6r61nQdKY77aTf0RqpIcJfafKUYk9bOha5tlmmq2oE ZislVfHuA2d27eLr5gp67VM3lBOwn4IWW5VulsQyF/uF7di2TFGohqVOZIOqhA92IVsi nOy/imWRT/MgqdZ1MDE2MKdYxoRd3m1Dk5ybM2AEKPqAYBh730/JwkHGNPQCVaS7LxeU r4cnUvppU21+itJCGRKx5NCARCWVNwQhYb/UCVM1VOgqsjmJtXTe1/UhjZUAIALIrINU eqbSGj9uIQWuiMJPrDqDUai5bw7awFzv5bY0i9Y2HvWnztvEn2ErPQXOJfuImJFddlWX 3iJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=bqhSzg4Q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w19si11701464eju.41.2020.07.20.21.18.39; Mon, 20 Jul 2020 21:19:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=bqhSzg4Q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726455AbgGUESJ (ORCPT + 99 others); Tue, 21 Jul 2020 00:18:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725294AbgGUESI (ORCPT ); Tue, 21 Jul 2020 00:18:08 -0400 Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9781EC061794 for ; Mon, 20 Jul 2020 21:18:08 -0700 (PDT) Received: by mail-pg1-x544.google.com with SMTP id m22so11320388pgv.9 for ; Mon, 20 Jul 2020 21:18:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QhRkRM1m4qgsAo9eZ39otcpFvlPpO24W7mp8anbogBw=; b=bqhSzg4QOmAx8vDaoW+qgWApTlOrQm4qYUFBFPFk5eJ0mJKUnH+PBOy0rrPoVLuSvj G5nYm2pK68MYqj6x+TCFJB+f5jSKEM8VQr4aztw9FuTmTF+mMsEgmg/KgI32RN54P7bo Bn2WB2MaubV4PEisl9ole2vBWAje7/6zJzcOgvSaMXBVKWeu1m54/+zJ11AFQ9IAPZFj 91rrJTGVdFDuaP2F5FGqiWP3c4TtwHUsRxjZmJ/tHtgrRdyF4+P1bosWHGypJBEIDb/5 Aw3/2v/i3mKymhzPQPRC/tYJPoKK3JPXXYId/NMpEGilerA3j8tWesrhzp4XC8U4VWSl qwfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QhRkRM1m4qgsAo9eZ39otcpFvlPpO24W7mp8anbogBw=; b=kI2ytioTzo9Bgtb2Z4LPvjgaiHCtomzTZ8vcwpWucM8gNd7flqtO86VTXGCk7Vx9J6 j00EQ4nNI//xaxSlbTCvgqeHI8aNTPcs7EYP9NYdoU6TddEpWghU5GPY0Rumd8BEshVQ TkLrPLXt4a4Ukxj9FaJMj7RuHecgqiYcerCQLF0m8UM7eVjdUktbooioMTc1QJPTCNFQ G9bMiR9yxDRxJtQ3dclH4/Hedv/a+XtApa4IVGtxZCb4dpqoJVQGFMgNmv56kfV3rzD9 cCNn1FNEf9IuWTAy6bTp7qvG3UlawfVYp6AQjd5G5hr1BDOfU7duoDOLsE2jf1EXp0d6 G0+g== X-Gm-Message-State: AOAM530uRXLmC5uxSw502rm6B6DB3fiRwS8GlSObkaCiISMH0zK16zeT zgnpHJHG3MGRE1BVApIV2sE= X-Received: by 2002:aa7:9a84:: with SMTP id w4mr21905832pfi.13.1595305088045; Mon, 20 Jul 2020 21:18:08 -0700 (PDT) Received: from localhost.localdomain ([2409:10:2e40:5100:6e29:95ff:fe2d:8f34]) by smtp.gmail.com with ESMTPSA id e28sm18467270pfm.177.2020.07.20.21.18.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2020 21:18:07 -0700 (PDT) From: Sergey Senozhatsky To: Will Deacon , Marc Zyngier , James Morse , Julien Thierry , Suzuki K Poulose Cc: suleiman@google.com, joelaf@google.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [RFC][PATCH 2/4] arm64: add guest pvstate support Date: Tue, 21 Jul 2020 13:17:40 +0900 Message-Id: <20200721041742.197354-3-sergey.senozhatsky@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200721041742.197354-1-sergey.senozhatsky@gmail.com> References: <20200721041742.197354-1-sergey.senozhatsky@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org PV-state is a per-CPU struct, which, for the time being, holds boolean `preempted' vCPU state. During the startup, given that host supports PV-state, each guest vCPU sends a pointer to its per-CPU variable to the host as a payload with the SMCC HV call, so that host can update vCPU state when it puts or loads vCPU. This has impact on the guest's scheduler - it does check the state of the vCPU it wants to run a task on: [..] wake_up_process() try_to_wake_up() select_task_rq_fair() available_idle_cpu() vcpu_is_preempted() Some sched benchmarks data is available on the github page [0]. [0] https://github.com/sergey-senozhatsky/arm64-vcpu_is_preempted Signed-off-by: Sergey Senozhatsky --- arch/arm64/include/asm/paravirt.h | 15 ++++ arch/arm64/kernel/Makefile | 2 +- arch/arm64/kernel/paravirt-state.c | 117 +++++++++++++++++++++++++++++ arch/arm64/kernel/paravirt.c | 4 +- arch/arm64/kernel/time.c | 1 + 5 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 arch/arm64/kernel/paravirt-state.c diff --git a/arch/arm64/include/asm/paravirt.h b/arch/arm64/include/asm/paravirt.h index cf3a0fd7c1a7..1bf164b2041b 100644 --- a/arch/arm64/include/asm/paravirt.h +++ b/arch/arm64/include/asm/paravirt.h @@ -7,12 +7,22 @@ struct static_key; extern struct static_key paravirt_steal_enabled; extern struct static_key paravirt_steal_rq_enabled; +struct pvstate_vcpu_info { + bool preempted; + u8 reserved[63]; +}; + +struct pv_state_ops { + bool (*vcpu_is_preempted)(int cpu); +}; + struct pv_time_ops { unsigned long long (*steal_clock)(int cpu); }; struct paravirt_patch_template { struct pv_time_ops time; + struct pv_state_ops state; }; extern struct paravirt_patch_template pv_ops; @@ -22,10 +32,15 @@ static inline u64 paravirt_steal_clock(int cpu) return pv_ops.time.steal_clock(cpu); } +bool native_vcpu_is_preempted(int cpu); +bool paravirt_vcpu_is_preempted(int cpu); + +int __init pv_state_init(void); int __init pv_time_init(void); #else +#define pv_state_init() do {} while (0) #define pv_time_init() do {} while (0) #endif // CONFIG_PARAVIRT diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 5fb9b728459b..18974d5e798d 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -48,7 +48,7 @@ obj-$(CONFIG_ARMV8_DEPRECATED) += armv8_deprecated.o obj-$(CONFIG_ACPI) += acpi.o obj-$(CONFIG_ACPI_NUMA) += acpi_numa.o obj-$(CONFIG_ARM64_ACPI_PARKING_PROTOCOL) += acpi_parking_protocol.o -obj-$(CONFIG_PARAVIRT) += paravirt.o +obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt-state.o obj-$(CONFIG_RANDOMIZE_BASE) += kaslr.o obj-$(CONFIG_HIBERNATION) += hibernate.o hibernate-asm.o obj-$(CONFIG_KEXEC_CORE) += machine_kexec.o relocate_kernel.o \ diff --git a/arch/arm64/kernel/paravirt-state.c b/arch/arm64/kernel/paravirt-state.c new file mode 100644 index 000000000000..4ae92a84c73d --- /dev/null +++ b/arch/arm64/kernel/paravirt-state.c @@ -0,0 +1,117 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#define pr_fmt(fmt) "arm-pvstate: " fmt + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +static DEFINE_PER_CPU(struct pvstate_vcpu_info, vcpus_states); + +bool native_vcpu_is_preempted(int cpu) +{ + return false; +} + +static bool pv_vcpu_is_preempted(int cpu) +{ + struct pvstate_vcpu_info *st; + + st = &per_cpu(vcpus_states, cpu); + return READ_ONCE(st->preempted); +} + +bool paravirt_vcpu_is_preempted(int cpu) +{ + return pv_ops.state.vcpu_is_preempted(cpu); +} + +static bool has_pvstate(void) +{ + struct arm_smccc_res res; + + /* To detect the presence of PV time support we require SMCCC 1.1+ */ + if (arm_smccc_1_1_get_conduit() == SMCCC_CONDUIT_NONE) + return false; + + arm_smccc_1_1_invoke(ARM_SMCCC_ARCH_FEATURES_FUNC_ID, + ARM_SMCCC_HV_PV_STATE_FEATURES, + &res); + + if (res.a0 != SMCCC_RET_SUCCESS) + return false; + return true; +} + +static int __pvstate_cpu_hook(unsigned int cpu, int event) +{ + struct arm_smccc_res res; + struct pvstate_vcpu_info *st; + + st = &per_cpu(vcpus_states, cpu); + arm_smccc_1_1_invoke(event, virt_to_phys(st), &res); + if (res.a0 != SMCCC_RET_SUCCESS) + return -EINVAL; + return 0; +} + +static int pvstate_cpu_init(unsigned int cpu) +{ + int ret = __pvstate_cpu_hook(cpu, ARM_SMCCC_HV_PV_STATE_INIT); + + if (ret) + pr_warn("Unable to ARM_SMCCC_HV_PV_STATE_INIT\n"); + return ret; +} + +static int pvstate_cpu_release(unsigned int cpu) +{ + int ret = __pvstate_cpu_hook(cpu, ARM_SMCCC_HV_PV_STATE_RELEASE); + + if (ret) + pr_warn("Unable to ARM_SMCCC_HV_PV_STATE_RELEASE\n"); + return ret; +} + +static int pvstate_register_hooks(void) +{ + int ret; + + ret = cpuhp_setup_state(CPUHP_AP_ARM_KVMPV_STARTING, + "hypervisor/arm/pvstate:starting", + pvstate_cpu_init, + pvstate_cpu_release); + if (ret < 0) + pr_warn("Failed to register CPU hooks\n"); + return ret; +} + +static int __pvstate_init(void) +{ + return pvstate_register_hooks(); +} + +int __init pv_state_init(void) +{ + int ret; + + if (!has_pvstate()) + return 0; + + ret = __pvstate_init(); + if (ret) + return ret; + + pv_ops.state.vcpu_is_preempted = pv_vcpu_is_preempted; + return 0; +} diff --git a/arch/arm64/kernel/paravirt.c b/arch/arm64/kernel/paravirt.c index 295d66490584..3fec7563ac27 100644 --- a/arch/arm64/kernel/paravirt.c +++ b/arch/arm64/kernel/paravirt.c @@ -26,7 +26,9 @@ struct static_key paravirt_steal_enabled; struct static_key paravirt_steal_rq_enabled; -struct paravirt_patch_template pv_ops; +struct paravirt_patch_template pv_ops = { + .state.vcpu_is_preempted = native_vcpu_is_preempted, +}; EXPORT_SYMBOL_GPL(pv_ops); struct pv_time_stolen_time_region { diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c index eebbc8d7123e..50c55792f72b 100644 --- a/arch/arm64/kernel/time.c +++ b/arch/arm64/kernel/time.c @@ -68,4 +68,5 @@ void __init time_init(void) lpj_fine = arch_timer_rate / HZ; pv_time_init(); + pv_state_init(); } -- 2.27.0