From patchwork Wed Mar 22 14:50:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 9639147 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 83C95601E9 for ; Wed, 22 Mar 2017 15:01:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74A842846F for ; Wed, 22 Mar 2017 15:01:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6854528478; Wed, 22 Mar 2017 15:01:28 +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 5BA822846F for ; Wed, 22 Mar 2017 15:01:27 +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=EqDH6Xu6tRvqDZgirA0CD8zDgL9/00M9aSkTWC93GNg=; b=eIa5dVnRjZfw18CE4esQAlTRJD P4m44EYjZbpQCggEZhncEMP62dPssdNPiv+c8/L6g9qVM/f+I/JReHM0/dx6jQn0H/g5KTX+o4MhY hEZmx0MOKwaFz8dkqWiMDwGDekqSRCHyGS0S2Z2m27thIq7Oltx9okajCBh00ZGV34DDcEFvOKFeL dKiQtHrSF8N6KdEwHKDGGwgeqk6KTzC4so1vdCRlyM+0sJ0/pjlg2bM+wyfUKqLIJiP7Nxy7x/rhL Km6iQUC6MU3xmpMN7EAmSLkUzl7bB7YnPeOQEPth5t1pP5lRps215gzbgkaR/YPfZou+ZJDOijifL op+praNQ==; 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 1cqhlL-0000k7-LD; Wed, 22 Mar 2017 15:01:23 +0000 Received: from foss.arm.com ([217.140.101.70]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cqhcr-0007im-3O for linux-arm-kernel@lists.infradead.org; Wed, 22 Mar 2017 14:52:44 +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 7DE31B16; Wed, 22 Mar 2017 07:52:18 -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 B634F3F575; Wed, 22 Mar 2017 07:52:16 -0700 (PDT) From: Dave Martin To: linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH v2 11/41] arm64/sve: Expand task_struct for Scalable Vector Extension state Date: Wed, 22 Mar 2017 14:50:41 +0000 Message-Id: <1490194274-30569-12-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_075237_526861_8A6873D3 X-CRM114-Status: GOOD ( 14.35 ) 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 expands task_struct to accommodate the Scalable Vector Extension state. The extra space is not used for anything yet. Signed-off-by: Dave Martin --- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/fpsimd.h | 11 ++++++ arch/arm64/kernel/fpsimd.c | 75 ++++++++++++++++++++++++++++++++++++++++- arch/arm64/kernel/process.c | 2 +- arch/arm64/kernel/setup.c | 3 ++ 5 files changed, 90 insertions(+), 2 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 289dcb9..820fad1 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -23,6 +23,7 @@ config ARM64 select ARCH_SUPPORTS_NUMA_BALANCING select ARCH_WANT_COMPAT_IPC_PARSE_VERSION select ARCH_WANT_FRAME_POINTERS + select ARCH_WANTS_DYNAMIC_TASK_STRUCT select ARCH_HAS_UBSAN_SANITIZE_ALL select ARM_AMBA select ARM_ARCH_TIMER diff --git a/arch/arm64/include/asm/fpsimd.h b/arch/arm64/include/asm/fpsimd.h index 92f45ee..757d304 100644 --- a/arch/arm64/include/asm/fpsimd.h +++ b/arch/arm64/include/asm/fpsimd.h @@ -51,6 +51,15 @@ struct fpsimd_partial_state { __uint128_t vregs[32]; }; +/* + * Scalable Vector Extension state structure template. + * The layout is vector length dependent, with vector length = vl * 16 bytes. + */ +#define fpsimd_sve_state(vl) { \ + __uint128_t zregs[32][vl]; \ + u16 pregs[16][vl]; \ + u16 ffr[vl]; \ +} #if defined(__KERNEL__) && defined(CONFIG_COMPAT) /* Masks for extracting the FPSR and FPCR from the FPSCR */ @@ -83,6 +92,8 @@ 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 unsigned int sve_get_vl(void); +extern void __init fpsimd_init_task_struct_size(void); #endif diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index 06da8ea..bc7a2d5 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -27,6 +27,7 @@ #include #include +#include #define FPEXC_IOF (1 << 0) #define FPEXC_DZF (1 << 1) @@ -89,6 +90,29 @@ */ static DEFINE_PER_CPU(struct fpsimd_state *, fpsimd_last_state); +#ifdef CONFIG_ARM64_SVE + +static void *__sve_state(struct task_struct *task) +{ + return (char *)task + ALIGN(sizeof(*task), 16); +} + +static void *sve_pffr(struct task_struct *task) +{ + unsigned int vl = sve_get_vl(); + + BUG_ON(vl % 16); + return (char *)__sve_state(task) + 34 * vl; +} + +#else /* ! CONFIG_ARM64_SVE */ + +/* Dummy declarations for usage protected with IS_ENABLED(CONFIG_ARM64_SVE): */ +extern void *__sve_state(struct task_struct *task); +extern void *sve_pffr(struct task_struct *task); + +#endif /* ! CONFIG_ARM64_SVE */ + /* * Trapped FP/ASIMD access. */ @@ -125,6 +149,27 @@ void do_fpsimd_exc(unsigned int esr, struct pt_regs *regs) send_sig_info(SIGFPE, &info, current); } +static void task_fpsimd_load(struct task_struct *task) +{ + if (IS_ENABLED(CONFIG_ARM64_SVE) && (elf_hwcap & HWCAP_SVE)) + sve_load_state(sve_pffr(task), + &task->thread.fpsimd_state.fpsr); + else + fpsimd_load_state(&task->thread.fpsimd_state); +} + +static void task_fpsimd_save(struct task_struct *task) +{ + /* FIXME: remove task argument? */ + BUG_ON(task != current); + + if (IS_ENABLED(CONFIG_ARM64_SVE) && (elf_hwcap & HWCAP_SVE)) + sve_save_state(sve_pffr(task), + &task->thread.fpsimd_state.fpsr); + else + fpsimd_save_state(&task->thread.fpsimd_state); +} + void fpsimd_thread_switch(struct task_struct *next) { if (!system_supports_fpsimd()) @@ -161,8 +206,21 @@ void fpsimd_flush_thread(void) { if (!system_supports_fpsimd()) return; - memset(¤t->thread.fpsimd_state, 0, sizeof(struct fpsimd_state)); + fpsimd_flush_task_state(current); + + memset(¤t->thread.fpsimd_state, 0, sizeof(struct fpsimd_state)); + + if (IS_ENABLED(CONFIG_ARM64_SVE) && (elf_hwcap & HWCAP_SVE)) { + BUG_ON((char *)__sve_state(current) < (char *)current); + BUG_ON(arch_task_struct_size < + ((char *)__sve_state(current) - (char *)current)); + + memset(__sve_state(current), 0, + arch_task_struct_size - + ((char *)__sve_state(current) - (char *)current)); + } + set_thread_flag(TIF_FOREIGN_FPSTATE); } @@ -329,6 +387,21 @@ static inline void fpsimd_hotplug_init(void) static inline void fpsimd_hotplug_init(void) { } #endif +void __init fpsimd_init_task_struct_size(void) +{ + arch_task_struct_size = sizeof(struct task_struct); + + if (IS_ENABLED(CONFIG_ARM64_SVE) && + ((read_cpuid(ID_AA64PFR0_EL1) >> ID_AA64PFR0_SVE_SHIFT) + & 0xf) == 1) { + arch_task_struct_size = sizeof(struct task_struct) + + 35 * sve_get_vl(); + + pr_info("SVE: enabled with maximum %u bits per vector\n", + sve_get_vl() * 8); + } +} + /* * FP/SIMD support code initialisation. */ diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 043d373..717dd0f 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -246,7 +246,7 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src) { if (current->mm) fpsimd_preserve_current_state(); - *dst = *src; + memcpy(dst, src, arch_task_struct_size); return 0; } diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 42274bd..1412a35 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -236,6 +236,9 @@ void __init setup_arch(char **cmdline_p) pr_info("Boot CPU: AArch64 Processor [%08x]\n", read_cpuid_id()); sprintf(init_utsname()->machine, UTS_MACHINE); + + fpsimd_init_task_struct_size(); + init_mm.start_code = (unsigned long) _text; init_mm.end_code = (unsigned long) _etext; init_mm.end_data = (unsigned long) _edata;