From patchwork Wed Mar 22 14:51:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 9639213 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 80FCD602CB for ; Wed, 22 Mar 2017 15:18:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7228628420 for ; Wed, 22 Mar 2017 15:18:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 65C9728461; Wed, 22 Mar 2017 15:18:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D95B528420 for ; Wed, 22 Mar 2017 15:18:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=criR/DPY4tf+u553w5ViX0htfDJrgrBYmFmq7BUfk8w=; b=Zq3ESvVdoHSsmPTN4c2qn692i5 /eq58h7m3Ej3gA6hCoS0g1s4KpcSq5jfMHK/sgoupVKG8Vwuv09lJ62d7hzGs37RAm3/FN/LOAtXe 0ymaI4pJiwmhdF29VRCKxpeIYpbNh9cM6olRwz1X8HbUv8nQy7wCIgAvKQCojMr+Ewq11glPMSLiG rPd2d7p2CtcD79YnW7cAVjHV+jYY47OYmk5a/cQz+HRnXRM8LQUMisvt8HYmEu5dedzc8d7SY86re cfLOxqdsayOVUmeqj7DD0rkLje36CkM3xMog57fmtCHrdxjp+eIYmI0/7+8jdPQitX+4Xvm47f26h pqGHKphA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cqi22-00050s-D9; Wed, 22 Mar 2017 15:18:38 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cqhxi-00018w-IO for linux-arm-kernel@bombadil.infradead.org; Wed, 22 Mar 2017 15:14:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=9Zg43GNF6wZ1Zs6rppy1+Wlsni1WXS0jE1oJXShoDcc=; b=A3gZeVSTlW0vIj/GETocb+dZY RHvFLdwS0SZcj0SQrtpa/18+YqtCUm+grfnjKmz10RAPYG6EtV8orKxbW97FHq97+Up7tQSUBLtbK cIrJSByEOa5oxCbChV6qn6GYU0F3/T3qpIdLOmfrNWIv+oEXjE+xXxpvQl4MiczD41n6kfqPO/4wr XY1uEE1oNAmX4qJBHgWV7Jcrv5DCTbJhe4IezL+wrj2Mw1nHDwR858C0odbYJgJHKdXa3i0CMdK9g cAb1v+K0EnNlAHj5iQmdFoLTTWpLp4gTsArQUH4K/wmtIcRLyRFe+X0npuVBiIE8UWpyl9nQMSfE8 eykIh/H0w==; Received: from foss.arm.com ([217.140.101.70]) by merlin.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cqhe5-0006l7-2r for linux-arm-kernel@lists.infradead.org; Wed, 22 Mar 2017 14:53:53 +0000 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 EF2071576; Wed, 22 Mar 2017 07:53:52 -0700 (PDT) Received: from e103592.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A8FA93F575; Wed, 22 Mar 2017 07:53:51 -0700 (PDT) From: Dave Martin To: linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH v2 31/41] arm64/sve: Set CPU vector length to match current task Date: Wed, 22 Mar 2017 14:51:01 +0000 Message-Id: <1490194274-30569-32-git-send-email-Dave.Martin@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1490194274-30569-1-git-send-email-Dave.Martin@arm.com> References: <1490194274-30569-1-git-send-email-Dave.Martin@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170322_105353_337642_05A8E38E X-CRM114-Status: GOOD ( 10.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Florian Weimer , Ard Biesheuvel , Marc Zyngier , Catalin Marinas , Will Deacon , Szabolcs Nagy , Joseph Myers MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds the necessary code to configure the CPU for the task's vector length, whenever SVE state is loaded for a task. No special action is needed on sched-out: only user tasks with SVE state care what the CPU's VL is set to. Signed-off-by: Dave Martin --- arch/arm64/include/asm/fpsimd.h | 3 ++- arch/arm64/include/asm/fpsimdmacros.h | 7 ++++++- arch/arm64/kernel/entry-fpsimd.S | 2 +- arch/arm64/kernel/fpsimd.c | 10 +++++++--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/fpsimd.h b/arch/arm64/include/asm/fpsimd.h index 7dba890..557e755 100644 --- a/arch/arm64/include/asm/fpsimd.h +++ b/arch/arm64/include/asm/fpsimd.h @@ -97,7 +97,8 @@ extern void fpsimd_save_partial_state(struct fpsimd_partial_state *state, extern void fpsimd_load_partial_state(struct fpsimd_partial_state *state); extern void sve_save_state(void *state, u32 *pfpsr); -extern void sve_load_state(void const *state, u32 const *pfpsr); +extern void sve_load_state(void const *state, u32 const *pfpsr, + unsigned long vq_minus_1); extern unsigned int sve_get_vl(void); extern void __init fpsimd_init_task_struct_size(void); extern void *__sve_state(struct task_struct *task); diff --git a/arch/arm64/include/asm/fpsimdmacros.h b/arch/arm64/include/asm/fpsimdmacros.h index e2bb032..4586468 100644 --- a/arch/arm64/include/asm/fpsimdmacros.h +++ b/arch/arm64/include/asm/fpsimdmacros.h @@ -254,7 +254,12 @@ .purgem savep .endm -.macro sve_load nb, xpfpsr, ntmp +.macro sve_load nb, xpfpsr, xvqminus1 ntmp + mrs_s x\ntmp, SYS_ZCR_EL1 + bic x\ntmp, x\ntmp, ZCR_EL1_LEN_MASK + orr x\ntmp, x\ntmp, \xvqminus1 + msr_s SYS_ZCR_EL1, x\ntmp // self-synchronising + .macro loadz n _zldrv \n, \nb, (\n) - 34 .endm diff --git a/arch/arm64/kernel/entry-fpsimd.S b/arch/arm64/kernel/entry-fpsimd.S index 5dcec55..0a3fdcb 100644 --- a/arch/arm64/kernel/entry-fpsimd.S +++ b/arch/arm64/kernel/entry-fpsimd.S @@ -73,7 +73,7 @@ ENTRY(sve_save_state) ENDPROC(sve_save_state) ENTRY(sve_load_state) - sve_load 0, x1, 2 + sve_load 0, x1, x2, 3 ret ENDPROC(sve_load_state) diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index d3f89ac6..09d3d23 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -272,10 +272,14 @@ void do_fpsimd_exc(unsigned int esr, struct pt_regs *regs) static void task_fpsimd_load(struct task_struct *task) { if (IS_ENABLED(CONFIG_ARM64_SVE) && - test_tsk_thread_flag(task, TIF_SVE)) + test_tsk_thread_flag(task, TIF_SVE)) { + unsigned int vl = task->thread.sve_vl; + + BUG_ON(!sve_vl_valid(vl)); sve_load_state(sve_pffr(task), - &task->thread.fpsimd_state.fpsr); - else + &task->thread.fpsimd_state.fpsr, + sve_vq_from_vl(vl) - 1); + } else fpsimd_load_state(&task->thread.fpsimd_state); /*