From patchwork Thu Nov 26 15:54:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Brazdil X-Patchwork-Id: 11934337 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5984C56202 for ; Thu, 26 Nov 2020 16:02:31 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C4FD721D40 for ; Thu, 26 Nov 2020 16:02:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="IM63zcSu"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="ZVUoTU+g" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C4FD721D40 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=RsfFCmOhKsvKi4cO+MHTNEG7YhuHkaXnkxh829lTwaA=; b=IM63zcSu6G8M7tyem/qAt3lsy 5cYhiH7XT+xQzmpf2Ln6bll+ek4oRc1a7gTtrYkjXJOKcGDftL8tQFf7UkMW0XF7nFKqU+QLH+LJ+ QOkJylCnFHnRldmCV/AMTCl4C/2lg5dALYg2yuOCqPF0dq4HN+pCnbkCeEAQD2xH6lo0U+QKM/Iu7 FdhSzgfKJd+PJlXucRixDGNxsEYU48ltezj14gDiDqz7p3BH7uLXm7BbdMRI1RBr73CvvnWRBbads N5chJV/TstboG57iU8Rd/C4lydoVohBnvTbevPqpcpDFxXHNQX9xmzk35qkYmiatf6jkUPFnbtVYm SkHJDJjxQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kiJgG-0001PY-4C; Thu, 26 Nov 2020 15:59:36 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kiJbz-0007rW-Cl for linux-arm-kernel@lists.infradead.org; Thu, 26 Nov 2020 15:55:16 +0000 Received: by mail-wr1-x444.google.com with SMTP id e7so2642569wrv.6 for ; Thu, 26 Nov 2020 07:55:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zOoo3Sgmv8F42l97WnsUvAdYKac9P9JfqD+cuM/Sn9g=; b=ZVUoTU+gAuCOCKAA0JLDhF23GWfoPMRCkpRKeYuO2EHe2Onkr6VOoTZUTexi44Rir1 M7Vec/VJjU910zroh1GatIekcjEn1KcoZUYX6zTIR6xbl5/W+BI4ijNuriBY4wzxq6o0 th2sQXhqNToAPL2A4a3jTYDvdhRPGxKoBR1YLOiGZat0oLUmpTjtTL5xf9QYbPo6cRaz LeC0zcowK1CpA5rM9SPW/xuLsByt07lyInueXKnZbfVrraPEbzK2Hp2YKnke9CJtx74L 7eywhbuxnO+at1gvgIEjiycO99JM0jHyGOtXQzmevEWogclk6qZxfgi8ain9mePuu9R6 wdOA== 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=zOoo3Sgmv8F42l97WnsUvAdYKac9P9JfqD+cuM/Sn9g=; b=RFnluo/rXJlr/kty/ln2HZkh5rjdIzV6DOZaewWSnGKPh8uEOac/vem8P5pg41q2yZ GANFM4lB+j8bex2RbOvRtXa6oIoUg+uhJucRhVDTRbbtPmmqWJfMuuqKJ9WGah4mToHa AUdIrkTbQKiWuzpGHX6r4E/f8O9ip98nl4Ah44j7RNGJVPoXu1SlVC80+g9VDVB+nXN9 qvfUOozcGWVbn7tPSjeuRXc5/hyaPhpA53maMKHbBAusNJflglmDWPCxxt0kA6ELzuvb rkSyav75sauMB2lGuM4JEBO8Dnj7jyyk6oXYabfAUywEswR7YPiW6IT0XwAZuEnlI/Qy DdQw== X-Gm-Message-State: AOAM532VmL4hg87JwesPpxDjU+adJGNrfNIP/rxEu0Zzu5rmsR1QKfTN N4P154EPx8XU5hDpk7GNp+VeuA== X-Google-Smtp-Source: ABdhPJx7GWZaDHcnXn1i3ov34ALXy1EHh5jMhQYPSdtzUtu5jpP/ecukZb3UeFP0dVO5FD7/MCcz8A== X-Received: by 2002:adf:82f5:: with SMTP id 108mr4670137wrc.269.1606406109770; Thu, 26 Nov 2020 07:55:09 -0800 (PST) Received: from localhost ([2a01:4b00:8523:2d03:f008:704d:8d4b:9951]) by smtp.gmail.com with ESMTPSA id d13sm10931063wrb.39.2020.11.26.07.55.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 26 Nov 2020 07:55:08 -0800 (PST) From: David Brazdil To: kvmarm@lists.cs.columbia.edu Subject: [PATCH v3 20/23] kvm: arm64: Intercept host's CPU_SUSPEND PSCI SMCs Date: Thu, 26 Nov 2020 15:54:18 +0000 Message-Id: <20201126155421.14901-21-dbrazdil@google.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201126155421.14901-1-dbrazdil@google.com> References: <20201126155421.14901-1-dbrazdil@google.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201126_105511_647843_2F38F055 X-CRM114-Status: GOOD ( 22.69 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Lorenzo Pieralisi , kernel-team@android.com, Jonathan Corbet , Catalin Marinas , Suzuki K Poulose , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Sudeep Holla , James Morse , linux-arm-kernel@lists.infradead.org, Marc Zyngier , Tejun Heo , Dennis Zhou , Christoph Lameter , David Brazdil , Will Deacon , Julien Thierry Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add a handler of CPU_SUSPEND host PSCI SMCs. The SMC can either enter a sleep state indistinguishable from a WFI or a deeper sleep state that behaves like a CPU_OFF+CPU_ON except that the core is still considered online when asleep. The handler saves r0,pc of the host and makes the same call to EL3 with the hyp CPU entry point. It either returns back to the handler and then back to the host, or wakes up into the entry point and initializes EL2 state before dropping back to EL1. A core can only suspend itself but other cores can concurrently invoke CPU_ON with this core as target. To avoid racing them for the same boot args struct, CPU_SUSPEND uses a different struct instance and entry point. Each entry point selects the corresponding struct to restore host boot args from. This avoids the need for locking in CPU_SUSPEND. Signed-off-by: David Brazdil --- arch/arm64/kvm/hyp/nvhe/hyp-init.S | 9 +++++ arch/arm64/kvm/hyp/nvhe/psci-relay.c | 50 +++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-init.S b/arch/arm64/kvm/hyp/nvhe/hyp-init.S index ea71f653af55..fbb195851fb9 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-init.S +++ b/arch/arm64/kvm/hyp/nvhe/hyp-init.S @@ -162,7 +162,15 @@ alternative_else_nop_endif ret SYM_CODE_END(___kvm_hyp_init) +SYM_CODE_START(__kvm_hyp_cpu_suspend_entry) + mov x28, #0 // is_cpu_on = false + b __kvm_hyp_cpu_common_entry +SYM_CODE_END(__kvm_hyp_cpu_suspend_entry) + SYM_CODE_START(__kvm_hyp_cpu_on_entry) + mov x28, #1 // is_cpu_on = true + +SYM_INNER_LABEL(__kvm_hyp_cpu_common_entry, SYM_L_LOCAL) msr SPsel, #1 // We want to use SP_EL{1,2} /* Check that the core was booted in EL2. */ @@ -188,6 +196,7 @@ SYM_CODE_START(__kvm_hyp_cpu_on_entry) kimg_hyp_va x1, x2 /* Leave idmap. */ + mov x0, x28 br x1 SYM_CODE_END(__kvm_hyp_cpu_on_entry) diff --git a/arch/arm64/kvm/hyp/nvhe/psci-relay.c b/arch/arm64/kvm/hyp/nvhe/psci-relay.c index 39e507672e6e..592c11e9851c 100644 --- a/arch/arm64/kvm/hyp/nvhe/psci-relay.c +++ b/arch/arm64/kvm/hyp/nvhe/psci-relay.c @@ -17,6 +17,7 @@ #include extern char __kvm_hyp_cpu_on_entry[]; +extern char __kvm_hyp_cpu_suspend_entry[]; void __noreturn __host_enter(struct kvm_cpu_context *host_ctxt); @@ -39,6 +40,7 @@ struct cpu_boot_args { static DEFINE_PER_CPU(atomic_t, cpu_on_lock) = ATOMIC_INIT(0); static DEFINE_PER_CPU(struct cpu_boot_args, cpu_on_args); +static DEFINE_PER_CPU(struct cpu_boot_args, cpu_suspend_args); static u64 get_psci_func_id(struct kvm_cpu_context *host_ctxt) { @@ -112,6 +114,34 @@ static unsigned int find_cpu_id(u64 mpidr) return INVALID_CPU_ID; } +static int psci_cpu_suspend(u64 func_id, struct kvm_cpu_context *host_ctxt) +{ + DECLARE_REG(u64, power_state, host_ctxt, 1); + DECLARE_REG(unsigned long, pc, host_ctxt, 2); + DECLARE_REG(unsigned long, r0, host_ctxt, 3); + + struct cpu_boot_args *boot_args; + struct kvm_nvhe_init_params *init_params; + + boot_args = this_cpu_ptr(hyp_symbol_addr(cpu_suspend_args)); + init_params = this_cpu_ptr(hyp_symbol_addr(kvm_init_params)); + + /* + * No need to acquire a lock before writing to boot_args because a core + * can only suspend itself and the racy CPU_ON uses a separate struct. + */ + + *boot_args = (struct cpu_boot_args){ .pc = pc, .r0 = r0 }; + + /* + * Will either return if shallow sleep state, or wake up into the entry + * point if it is a deep sleep state. + */ + return psci_call(func_id, power_state, + __hyp_pa(hyp_symbol_addr(__kvm_hyp_cpu_suspend_entry)), + __hyp_pa(init_params)); +} + static __always_inline bool try_acquire_cpu_on_lock(atomic_t *l) { return atomic_cmpxchg_acquire(l, CPU_UNLOCKED, CPU_LOCKED) == CPU_UNLOCKED; } @@ -165,27 +195,35 @@ static int psci_cpu_on(u64 func_id, struct kvm_cpu_context *host_ctxt) return ret; } -asmlinkage void __noreturn __kvm_hyp_psci_cpu_entry(void) +asmlinkage void __noreturn __kvm_hyp_psci_cpu_entry(bool is_cpu_on) { atomic_t *lock; struct cpu_boot_args *boot_args; struct kvm_cpu_context *host_ctxt; - lock = this_cpu_ptr(hyp_symbol_addr(cpu_on_lock)); - boot_args = this_cpu_ptr(hyp_symbol_addr(cpu_on_args)); + if (is_cpu_on) + boot_args = this_cpu_ptr(hyp_symbol_addr(cpu_on_args)); + else + boot_args = this_cpu_ptr(hyp_symbol_addr(cpu_suspend_args)); + host_ctxt = &this_cpu_ptr(hyp_symbol_addr(kvm_host_data))->host_ctxt; cpu_reg(host_ctxt, 0) = boot_args->r0; write_sysreg_el2(boot_args->pc, SYS_ELR); - release_cpu_on_lock(lock); + if (is_cpu_on) { + lock = this_cpu_ptr(hyp_symbol_addr(cpu_on_lock)); + release_cpu_on_lock(lock); + } __host_enter(host_ctxt); } static unsigned long psci_0_1_handler(u64 func_id, struct kvm_cpu_context *host_ctxt) { - if (func_id == kvm_host_psci_function_id[PSCI_FN_CPU_OFF]) + if (func_id == kvm_host_psci_function_id[PSCI_FN_CPU_SUSPEND]) + return psci_cpu_suspend(func_id, host_ctxt); + else if (func_id == kvm_host_psci_function_id[PSCI_FN_CPU_OFF]) return psci_forward(host_ctxt); else if (func_id == kvm_host_psci_function_id[PSCI_FN_CPU_ON]) return psci_cpu_on(func_id, host_ctxt); @@ -209,6 +247,8 @@ static unsigned long psci_0_2_handler(u64 func_id, struct kvm_cpu_context *host_ case PSCI_0_2_FN_SYSTEM_RESET: psci_forward_noreturn(host_ctxt); unreachable(); + case PSCI_0_2_FN64_CPU_SUSPEND: + return psci_cpu_suspend(func_id, host_ctxt); case PSCI_0_2_FN64_CPU_ON: return psci_cpu_on(func_id, host_ctxt); default: