From: Dave Martin <Dave.Martin@arm.com> To: kvmarm@lists.cs.columbia.edu Cc: Christoffer Dall <cdall@kernel.org>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, Marc Zyngier <marc.zyngier@arm.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v10 12/18] arm64/sve: Switch sve_pffr() argument from task to thread Date: Tue, 22 May 2018 17:05:13 +0100 [thread overview] Message-ID: <1527005119-6842-13-git-send-email-Dave.Martin@arm.com> (raw) In-Reply-To: <1527005119-6842-1-git-send-email-Dave.Martin@arm.com> sve_pffr(), which is used to derive the base address used for low-level SVE save/restore routines, currently takes the relevant task_struct as an argument. The only accessed fields are actually part of thread_struct, so this patch changes the argument type accordingly. This is done in preparation for moving this function to a header, where we do not want to have to include <linux/sched.h> due to the consequent circular #include problems. No functional change. Signed-off-by: Dave Martin <Dave.Martin@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: Marc Zyngier <marc.zyngier@arm.com> --- arch/arm64/kernel/fpsimd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index 5152bbc..c4e9762 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -44,6 +44,7 @@ #include <asm/fpsimd.h> #include <asm/cpufeature.h> #include <asm/cputype.h> +#include <asm/processor.h> #include <asm/simd.h> #include <asm/sigcontext.h> #include <asm/sysreg.h> @@ -167,10 +168,9 @@ static size_t sve_ffr_offset(int vl) return SVE_SIG_FFR_OFFSET(sve_vq_from_vl(vl)) - SVE_SIG_REGS_OFFSET; } -static void *sve_pffr(struct task_struct *task) +static void *sve_pffr(struct thread_struct *thread) { - return (char *)task->thread.sve_state + - sve_ffr_offset(task->thread.sve_vl); + return (char *)thread->sve_state + sve_ffr_offset(thread->sve_vl); } static void change_cpacr(u64 val, u64 mask) @@ -253,7 +253,7 @@ static void task_fpsimd_load(void) WARN_ON(!in_softirq() && !irqs_disabled()); if (system_supports_sve() && test_thread_flag(TIF_SVE)) - sve_load_state(sve_pffr(current), + sve_load_state(sve_pffr(¤t->thread), ¤t->thread.uw.fpsimd_state.fpsr, sve_vq_from_vl(current->thread.sve_vl) - 1); else @@ -284,7 +284,7 @@ void fpsimd_save(void) return; } - sve_save_state(sve_pffr(current), &st->fpsr); + sve_save_state(sve_pffr(¤t->thread), &st->fpsr); } else fpsimd_save_state(st); } -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Dave.Martin@arm.com (Dave Martin) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v10 12/18] arm64/sve: Switch sve_pffr() argument from task to thread Date: Tue, 22 May 2018 17:05:13 +0100 [thread overview] Message-ID: <1527005119-6842-13-git-send-email-Dave.Martin@arm.com> (raw) In-Reply-To: <1527005119-6842-1-git-send-email-Dave.Martin@arm.com> sve_pffr(), which is used to derive the base address used for low-level SVE save/restore routines, currently takes the relevant task_struct as an argument. The only accessed fields are actually part of thread_struct, so this patch changes the argument type accordingly. This is done in preparation for moving this function to a header, where we do not want to have to include <linux/sched.h> due to the consequent circular #include problems. No functional change. Signed-off-by: Dave Martin <Dave.Martin@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: Marc Zyngier <marc.zyngier@arm.com> --- arch/arm64/kernel/fpsimd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index 5152bbc..c4e9762 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -44,6 +44,7 @@ #include <asm/fpsimd.h> #include <asm/cpufeature.h> #include <asm/cputype.h> +#include <asm/processor.h> #include <asm/simd.h> #include <asm/sigcontext.h> #include <asm/sysreg.h> @@ -167,10 +168,9 @@ static size_t sve_ffr_offset(int vl) return SVE_SIG_FFR_OFFSET(sve_vq_from_vl(vl)) - SVE_SIG_REGS_OFFSET; } -static void *sve_pffr(struct task_struct *task) +static void *sve_pffr(struct thread_struct *thread) { - return (char *)task->thread.sve_state + - sve_ffr_offset(task->thread.sve_vl); + return (char *)thread->sve_state + sve_ffr_offset(thread->sve_vl); } static void change_cpacr(u64 val, u64 mask) @@ -253,7 +253,7 @@ static void task_fpsimd_load(void) WARN_ON(!in_softirq() && !irqs_disabled()); if (system_supports_sve() && test_thread_flag(TIF_SVE)) - sve_load_state(sve_pffr(current), + sve_load_state(sve_pffr(¤t->thread), ¤t->thread.uw.fpsimd_state.fpsr, sve_vq_from_vl(current->thread.sve_vl) - 1); else @@ -284,7 +284,7 @@ void fpsimd_save(void) return; } - sve_save_state(sve_pffr(current), &st->fpsr); + sve_save_state(sve_pffr(¤t->thread), &st->fpsr); } else fpsimd_save_state(st); } -- 2.1.4
next prev parent reply other threads:[~2018-05-22 15:56 UTC|newest] Thread overview: 138+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-22 16:05 [PATCH v10 00/18] KVM: arm64: Optimise FPSIMD context switching Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-22 16:05 ` [PATCH v10 01/18] arm64: fpsimd: Fix TIF_FOREIGN_FPSTATE after invalidating cpu regs Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-23 11:33 ` Christoffer Dall 2018-05-23 11:33 ` Christoffer Dall 2018-05-23 13:44 ` Alex Bennée 2018-05-23 13:44 ` Alex Bennée 2018-05-23 13:46 ` Catalin Marinas 2018-05-23 13:46 ` Catalin Marinas 2018-05-22 16:05 ` [PATCH v10 02/18] thread_info: Add update_thread_flag() helpers Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-23 13:46 ` Alex Bennée 2018-05-23 13:46 ` Alex Bennée 2018-05-23 13:57 ` Dave Martin 2018-05-23 13:57 ` Dave Martin 2018-05-23 14:35 ` Alex Bennée 2018-05-23 14:35 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 03/18] arm64: Use update{,_tsk}_thread_flag() Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-23 13:48 ` Alex Bennée 2018-05-23 13:48 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 04/18] KVM: arm/arm64: Introduce kvm_arch_vcpu_run_pid_change Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-23 14:34 ` Alex Bennée 2018-05-23 14:34 ` Alex Bennée 2018-05-23 14:40 ` Dave Martin 2018-05-23 14:40 ` Dave Martin 2018-05-24 8:11 ` Christoffer Dall 2018-05-24 8:11 ` Christoffer Dall 2018-05-24 9:18 ` Alex Bennée 2018-05-24 9:18 ` Alex Bennée 2018-05-24 10:04 ` Dave Martin 2018-05-24 10:04 ` Dave Martin 2018-05-22 16:05 ` [PATCH v10 05/18] KVM: arm64: Convert lazy FPSIMD context switch trap to C Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-23 19:35 ` Alex Bennée 2018-05-23 19:35 ` Alex Bennée 2018-05-24 8:12 ` Christoffer Dall 2018-05-24 8:12 ` Christoffer Dall 2018-05-24 8:54 ` Dave Martin 2018-05-24 8:54 ` Dave Martin 2018-05-24 9:14 ` Alex Bennée 2018-05-24 9:14 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 06/18] arm64: fpsimd: Generalise context saving for non-task contexts Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-23 20:15 ` Alex Bennée 2018-05-23 20:15 ` Alex Bennée 2018-05-24 9:03 ` Dave Martin 2018-05-24 9:03 ` Dave Martin 2018-05-24 9:41 ` Alex Bennée 2018-05-24 9:41 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 07/18] arm64: fpsimd: Eliminate task->mm checks Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-23 11:48 ` Christoffer Dall 2018-05-23 11:48 ` Christoffer Dall 2018-05-23 13:31 ` Dave Martin 2018-05-23 13:31 ` Dave Martin 2018-05-23 14:56 ` Catalin Marinas 2018-05-23 14:56 ` Catalin Marinas 2018-05-23 15:03 ` Dave Martin 2018-05-23 15:03 ` Dave Martin 2018-05-23 16:42 ` Catalin Marinas 2018-05-23 16:42 ` Catalin Marinas 2018-05-24 8:33 ` Christoffer Dall 2018-05-24 8:33 ` Christoffer Dall 2018-05-24 9:16 ` Alex Bennée 2018-05-24 9:16 ` Alex Bennée 2018-05-24 9:50 ` Dave Martin 2018-05-24 9:50 ` Dave Martin 2018-05-24 10:06 ` Christoffer Dall 2018-05-24 10:06 ` Christoffer Dall 2018-05-24 14:37 ` Dave Martin 2018-05-24 14:37 ` Dave Martin 2018-05-25 9:00 ` Christoffer Dall 2018-05-25 9:00 ` Christoffer Dall 2018-05-25 9:45 ` Dave Martin 2018-05-25 9:45 ` Dave Martin 2018-05-25 11:28 ` Christoffer Dall 2018-05-25 11:28 ` Christoffer Dall 2018-05-24 9:19 ` Alex Bennée 2018-05-24 9:19 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 08/18] arm64/sve: Refactor user SVE trap maintenance for external use Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-23 20:16 ` Alex Bennée 2018-05-23 20:16 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 09/18] KVM: arm64: Repurpose vcpu_arch.debug_flags for general-purpose flags Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-24 9:21 ` Alex Bennée 2018-05-24 9:21 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 10/18] KVM: arm64: Optimise FPSIMD handling to reduce guest/host thrashing Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-24 10:09 ` Alex Bennée 2018-05-24 10:09 ` Alex Bennée 2018-05-24 10:18 ` Dave Martin 2018-05-24 10:18 ` Dave Martin 2018-05-22 16:05 ` [PATCH v10 11/18] arm64/sve: Move read_zcr_features() out of cpufeature.h Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-24 10:12 ` Alex Bennée 2018-05-24 10:12 ` Alex Bennée 2018-05-22 16:05 ` Dave Martin [this message] 2018-05-22 16:05 ` [PATCH v10 12/18] arm64/sve: Switch sve_pffr() argument from task to thread Dave Martin 2018-05-24 10:12 ` Alex Bennée 2018-05-24 10:12 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 13/18] arm64/sve: Move sve_pffr() to fpsimd.h and make inline Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-24 10:20 ` Alex Bennée 2018-05-24 10:20 ` Alex Bennée 2018-05-24 11:22 ` Dave Martin 2018-05-24 11:22 ` Dave Martin 2018-05-22 16:05 ` [PATCH v10 14/18] KVM: arm64: Save host SVE context as appropriate Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-23 14:59 ` Catalin Marinas 2018-05-23 14:59 ` Catalin Marinas 2018-05-24 9:11 ` Christoffer Dall 2018-05-24 9:11 ` Christoffer Dall 2018-05-24 14:49 ` Alex Bennée 2018-05-24 14:49 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 15/18] KVM: arm64: Remove eager host SVE state saving Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-24 14:54 ` Alex Bennée 2018-05-24 14:54 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 16/18] KVM: arm64: Remove redundant *exit_code changes in fpsimd_guest_exit() Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-24 9:11 ` Christoffer Dall 2018-05-24 9:11 ` Christoffer Dall 2018-05-24 15:02 ` Alex Bennée 2018-05-24 15:02 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 17/18] KVM: arm64: Fold redundant exit code checks out of fixup_guest_exit() Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-24 9:12 ` Christoffer Dall 2018-05-24 9:12 ` Christoffer Dall 2018-05-24 15:06 ` Alex Bennée 2018-05-24 15:06 ` Alex Bennée 2018-05-22 16:05 ` [PATCH v10 18/18] KVM: arm64: Invoke FPSIMD context switch trap from C Dave Martin 2018-05-22 16:05 ` Dave Martin 2018-05-24 15:09 ` Alex Bennée 2018-05-24 15:09 ` Alex Bennée
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1527005119-6842-13-git-send-email-Dave.Martin@arm.com \ --to=dave.martin@arm.com \ --cc=ard.biesheuvel@linaro.org \ --cc=catalin.marinas@arm.com \ --cc=cdall@kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.zyngier@arm.com \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.