From patchwork Fri Apr 12 17:14:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 162135 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp885202jan; Fri, 12 Apr 2019 10:14:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqzD8TH/7MZfQTlIdiqbqwT9d1mlGUjFayOPpQPu95j/9rVLf4InaJJtHP5BIo/hUmdbRtOu X-Received: by 2002:aa7:91d5:: with SMTP id z21mr57917108pfa.222.1555089285005; Fri, 12 Apr 2019 10:14:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555089284; cv=none; d=google.com; s=arc-20160816; b=qd2zeNZb060E93rcP6C57hCsnRxcMevqbowHVWEdo1H22A8qpWRHFEv0J9cZjEGPcK xDEtqkqpKSLMRMf5RuxAfLWJZLETOnCsLYfrFkqk737tp1/qylvzao160bz48BVFEf4N DALBAHL89FiTlkejimzaUabunkESF8sgqMP8uPwT+HcESZ3Ef2rmju1C6hqBtW089ag+ 1QscV4i00Uanv9Z/LVWgiqe1w7GBSit49iWpXj3g4cvqfkDjUk2CbPNGZXVcaeDtaGha 6f6FLO7Dd2VLLXrIJVsk06NA1sCBQMfBbEJWQlSKVYtRNXbmMhqYvasQ4jf4TnQ5MbY4 Q74g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=Bu+ztIovb5gV05IA0sGWXBRYUNsSKNMLMoAG+5Q+zq4=; b=lUwdZrSElOSfuwK8lsnCifXlpa3cQJkc00mTm4RbojJviWdY8C/dIKmhCS3ltSY/iS K4zB0Zgp+gybGBosDg6daBWN07EluTRayfD/KOp6Bsye2CYTeQf8g9hn2WHcQjnG04T2 wOLOBOgJ/abt8FkEnMGmMkh/ErpralTZxsyWpKUoSeB280Q0xd4LEu2DclPJpKsoZl6G lvzZ55LSqRajkTIDU82qNRtKJoBq51getmog+xipgJq8BZOPjTaCJQgiuxJa3pmnlWqi sQrCfO+u82b08xcLYgxtuw/dSf6kXia3QnWLl0G2/ZrhQxieldpPabu9jJ4MFwBMdJtc qtyw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f1si20482843pff.158.2019.04.12.10.14.44; Fri, 12 Apr 2019 10:14:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726993AbfDLROj (ORCPT + 31 others); Fri, 12 Apr 2019 13:14:39 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:37080 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726711AbfDLROf (ORCPT ); Fri, 12 Apr 2019 13:14:35 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 46AF615AB; Fri, 12 Apr 2019 10:14:35 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.196.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2E5EC3F718; Fri, 12 Apr 2019 10:14:33 -0700 (PDT) From: Julien Grall To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: catalin.marinas@arm.com, will.deacon@arm.com, christoffer.dall@arm.com, marc.zyngier@arm.com, james.morse@arm.com, julien.thierry@arm.com, suzuki.poulose@arm.com, Dave.Martin@arm.com, ard.biesheuvel@linaro.org, Julien Grall Subject: [PATCH v2 2/3] arch/arm64: fpsimd: Introduce fpsimd_save_and_flush_cpu_state() and use it Date: Fri, 12 Apr 2019 18:14:19 +0100 Message-Id: <20190412171420.29065-3-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190412171420.29065-1-julien.grall@arm.com> References: <20190412171420.29065-1-julien.grall@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The only external user of fpsimd_save() and fpsimd_flush_cpu_state() is the KVM FPSIMD code. A follow-up patch will mandate hold of the FPSIMD context while modifying it. Rather than having to export the new helpers to get/put the context, we can just introduce a new function to combine fpsimd_save() and fpsimd_flush_cpu_state(). This has also the advantage to remove any external call of fpsimd_save() and fpsimd_flush_cpu_state(), so they can be turned static. Lastly, the new function can also be used in the PM notifier. Signed-off-by: Julien Grall --- Changes in v2: - Patch added --- arch/arm64/include/asm/fpsimd.h | 5 ++--- arch/arm64/kernel/fpsimd.c | 17 +++++++++++++---- arch/arm64/kvm/fpsimd.c | 3 +-- 3 files changed, 16 insertions(+), 9 deletions(-) -- 2.11.0 diff --git a/arch/arm64/include/asm/fpsimd.h b/arch/arm64/include/asm/fpsimd.h index 32abbfd852e8..88c223f6ded6 100644 --- a/arch/arm64/include/asm/fpsimd.h +++ b/arch/arm64/include/asm/fpsimd.h @@ -48,11 +48,11 @@ struct task_struct; extern void fpsimd_save_state(struct user_fpsimd_state *state); extern void fpsimd_load_state(struct user_fpsimd_state *state); -extern void fpsimd_save(void); - extern void fpsimd_thread_switch(struct task_struct *next); extern void fpsimd_flush_thread(void); +extern void fpsimd_save_and_flush_cpu_state(void); + extern void fpsimd_signal_preserve_current_state(void); extern void fpsimd_preserve_current_state(void); extern void fpsimd_restore_current_state(void); @@ -63,7 +63,6 @@ extern void fpsimd_bind_state_to_cpu(struct user_fpsimd_state *state, void *sve_state, unsigned int sve_vl); extern void fpsimd_flush_task_state(struct task_struct *target); -extern void fpsimd_flush_cpu_state(void); /* Maximum VL that SVE VL-agnostic software can transparently support */ #define SVE_VL_ARCH_MAX 0x100 diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index 577296bba730..9e4e4b6acd93 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -241,7 +241,7 @@ static void task_fpsimd_load(void) * * Softirqs (and preemption) must be disabled. */ -void fpsimd_save(void) +static void fpsimd_save(void) { struct fpsimd_last_state_struct const *last = this_cpu_ptr(&fpsimd_last_state); @@ -1117,12 +1117,22 @@ void fpsimd_flush_task_state(struct task_struct *t) * Invalidate any task's FPSIMD state that is present on this cpu. * This function must be called with softirqs disabled. */ -void fpsimd_flush_cpu_state(void) +static void fpsimd_flush_cpu_state(void) { __this_cpu_write(fpsimd_last_state.st, NULL); set_thread_flag(TIF_FOREIGN_FPSTATE); } +/* + * Save the FPSIMD state to memory and invalidate cpu view. + * This function must be called with softirqs (and preemption) disabled. + */ +void fpsimd_save_and_flush_cpu_state(void) +{ + fpsimd_save(); + fpsimd_flush_cpu_state(); +} + #ifdef CONFIG_KERNEL_MODE_NEON DEFINE_PER_CPU(bool, kernel_neon_busy); @@ -1279,8 +1289,7 @@ static int fpsimd_cpu_pm_notifier(struct notifier_block *self, { switch (cmd) { case CPU_PM_ENTER: - fpsimd_save(); - fpsimd_flush_cpu_state(); + fpsimd_save_and_flush_cpu_state(); break; case CPU_PM_EXIT: break; diff --git a/arch/arm64/kvm/fpsimd.c b/arch/arm64/kvm/fpsimd.c index 6e3c9c8b2df9..01bd2e862506 100644 --- a/arch/arm64/kvm/fpsimd.c +++ b/arch/arm64/kvm/fpsimd.c @@ -113,8 +113,7 @@ void kvm_arch_vcpu_put_fp(struct kvm_vcpu *vcpu) u64 *guest_zcr = &vcpu->arch.ctxt.sys_regs[ZCR_EL1]; /* Clean guest FP state to memory and invalidate cpu view */ - fpsimd_save(); - fpsimd_flush_cpu_state(); + fpsimd_save_and_flush_cpu_state(); if (guest_has_sve) *guest_zcr = read_sysreg_s(SYS_ZCR_EL12);