From patchwork Wed Jul 11 13:56:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 141744 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp321353ljj; Wed, 11 Jul 2018 06:57:30 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeNIfd5xyNxcw/M/pK8afWeqQsp+B5SDXwHleRuXu03v1ltbA2TodtDv534EPzNQX/Vv8a5 X-Received: by 2002:a17:902:530a:: with SMTP id b10-v6mr29375576pli.316.1531317450476; Wed, 11 Jul 2018 06:57:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531317450; cv=none; d=google.com; s=arc-20160816; b=cDEXG6K6HZYl35xuO1hKOYatZQalBjEWGPM9kp1GDdgJEArYv/u6rxsAncbDs/74aq tIeW/K2k0q0qA802StUXZAAe8V+BOg3oerBdQnN8k9bGdoyuce60aEF+CcVaQSHQqCr4 LnyURVxwnN3w5/XgJGcsOBD+d+/aUePc/Blvwx0Qcq3IFqgc5K81YtHkMZov1dqG5b0z PUxOVFf4M6ROgtYO5JTzyzI8QfiOKohY2puKS5dlTjf8IbZEWDIhcqWMzo5AkQc7jFoY qL5lN4cJ8P6+FoziWQg2wEV4eqyeoIPllIlywOOWh6/5Yk4gurC0tKSbRP+Ncbu4Mw4G S6kQ== 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:arc-authentication-results; bh=UiyU8iaUkqT4Z3X/mybfGktVPp2I94YgbXLg2VKEndM=; b=031b1BGj6YEHFt/hLEngGMMzWAlKmhG/BUlNLA6JcNg99dDMxq1O3/JmiFHtOT8Hcb Ssm91kDZ2RoILFYmswq/8GhiqCB0gXXY2xnlBcXipmd0LBguE9nu4vgqy7Erx/+apg2m hy2QD+PYZdK7E7kmybDnt+wHQQpLO3F5pQyt8jTYkXnxFo/w3fYQ2kHiTJmZbyTv3oNq Unrr+sdh0x0HAh+/c/ipxApJuerBNN2QLVozOsD8CHhhPXoUngnnrY/2lhA1kbeJ9oKk AjEOC7G2UJSLx3lzc1hF7PPaVASitnRu93+fShkNKkoRm4cM8d+sjLIKIr7gsMscSuAt ks0g== 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 e16-v6si17711792pgv.561.2018.07.11.06.57.30; Wed, 11 Jul 2018 06:57:30 -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 S2388419AbeGKOBz (ORCPT + 23 others); Wed, 11 Jul 2018 10:01:55 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:36356 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388376AbeGKOBy (ORCPT ); Wed, 11 Jul 2018 10:01:54 -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 18C591713; Wed, 11 Jul 2018 06:57:26 -0700 (PDT) Received: from lakrids.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 074B23F5B1; Wed, 11 Jul 2018 06:57:23 -0700 (PDT) From: Mark Rutland To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, will.deacon@arm.com Cc: catalin.marinas@arm.com, dave.martin@arm.com, hch@infradead.org, james.morse@arm.com, linux@dominikbrodowski.net, linux-fsdevel@vger.kernel.org, marc.zyngier@arm.com, mark.rutland@arm.com, viro@zeniv.linux.org.uk Subject: [PATCHv5 05/21] arm64: move sve_user_{enable, disable} to Date: Wed, 11 Jul 2018 14:56:40 +0100 Message-Id: <20180711135656.20670-6-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180711135656.20670-1-mark.rutland@arm.com> References: <20180711135656.20670-1-mark.rutland@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In subsequent patches, we'll want to make use of sve_user_enable() and sve_user_disable() outside of kernel/fpsimd.c. Let's move these to where we can make use of them. To avoid ifdeffery in sequences like: if (system_supports_sve() && some_condition) sve_user_disable(); ... empty stubs are provided when support for SVE is not enabled. Note that system_supports_sve() contains as IS_ENABLED(CONFIG_ARM64_SVE), so the sve_user_disable() call should be optimized away entirely when CONFIG_ARM64_SVE is not selected. To ensure that this is the case, the stub definitions contain a BUILD_BUG(), as we do for other stubs for which calls should always be optimized away when the relevant config option is not selected. At the same time, the include list of is sorted while adding . Signed-off-by: Mark Rutland Acked-by: Catalin Marinas Reviewed-by: Dave Martin Cc: Will Deacon --- arch/arm64/include/asm/fpsimd.h | 17 ++++++++++++++++- arch/arm64/kernel/fpsimd.c | 10 ---------- 2 files changed, 16 insertions(+), 11 deletions(-) -- 2.11.0 diff --git a/arch/arm64/include/asm/fpsimd.h b/arch/arm64/include/asm/fpsimd.h index fa92747a49c8..dd1ad3950ef5 100644 --- a/arch/arm64/include/asm/fpsimd.h +++ b/arch/arm64/include/asm/fpsimd.h @@ -16,13 +16,15 @@ #ifndef __ASM_FP_H #define __ASM_FP_H -#include #include +#include #include #include +#include #ifndef __ASSEMBLY__ +#include #include #include #include @@ -102,6 +104,16 @@ extern int sve_set_vector_length(struct task_struct *task, extern int sve_set_current_vl(unsigned long arg); extern int sve_get_current_vl(void); +static inline void sve_user_disable(void) +{ + sysreg_clear_set(cpacr_el1, CPACR_EL1_ZEN_EL0EN, 0); +} + +static inline void sve_user_enable(void) +{ + sysreg_clear_set(cpacr_el1, 0, CPACR_EL1_ZEN_EL0EN); +} + /* * Probing and setup functions. * Calls to these functions must be serialised with one another. @@ -128,6 +140,9 @@ static inline int sve_get_current_vl(void) return -EINVAL; } +static inline void sve_user_disable(void) { BUILD_BUG(); } +static inline void sve_user_enable(void) { BUILD_BUG(); } + static inline void sve_init_vq_map(void) { } static inline void sve_update_vq_map(void) { } static inline int sve_verify_vq_map(void) { return 0; } diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index a98a7f96aff1..58c53bc96928 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -159,16 +159,6 @@ static void sve_free(struct task_struct *task) __sve_free(task); } -static void sve_user_disable(void) -{ - sysreg_clear_set(cpacr_el1, CPACR_EL1_ZEN_EL0EN, 0); -} - -static void sve_user_enable(void) -{ - sysreg_clear_set(cpacr_el1, 0, CPACR_EL1_ZEN_EL0EN); -} - /* * TIF_SVE controls whether a task can use SVE without trapping while * in userspace, and also the way a task's FPSIMD/SVE state is stored