From patchwork Tue Aug 15 12:50:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 110156 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp5441992obb; Tue, 15 Aug 2017 05:55:43 -0700 (PDT) X-Received: by 10.84.232.11 with SMTP id h11mr32006415plk.126.1502801743512; Tue, 15 Aug 2017 05:55:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502801743; cv=none; d=google.com; s=arc-20160816; b=PMBbd9V+tFMscxsDnrqW5k25JFWenylRORUp+I5GAurhTvTSnQx2/cZL44/qK6zqXb uxlZYsd+vdcZq0i+gWPzTqXDd4O65fVcP/BJxwpu5XPO1JTS4pCsvzUbRCpjMeRxtHTs JJ4BttqZ4yfxYtVmO7sfVxumQc+lEIA8pqfU8/Gql8m3rpRT2mzvyBkEAV3tY63xNxna aT9MtCZcoLzUvqwZnBwvoq+Ugxc0FE5RIR+77eG1Kkr4tAHbjCD2LaafcJtrlKsMrOJE HVQ2d3ijhjNzf+Ei33UFLJ9R0lqs/vBrPXH7ZqnxyTvMMdV/dJbfvUFj8HiBj9Bdf++2 FBeQ== 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=zoJfAKFCtf47xzIccC4zHTzYlbWQVIlYS4lQ0vV6nF4=; b=ENxK1gGHGgHXBCNoNCiTtAiLwGPuO9Cn9doF6cgRmjizXrIAxlM+S+g3P54NFJ03ZQ 7kJXz+4EAhLu5lSgW5yOP99fwcmRgdPhe2rUixO6DtSXTGQhWB412ZphfmJ0zM0yUI+c 8fkeDFB/5WFIzB87MJidsUDfZhVwxVW5u3vJAV0U+S1Dlad+00SCd9r4KELUVTUzdH4G sASmJ0UgkXiCi+vZr/3V71DaBrAHrf+fsKO6b/NKCsc7TqYbiKmtVWtkUO/Xb78TozUY IGhaLC2lQiXpStX5TMQwjn2MX4uSFFwt+o8HuVQJxUOT9+ot1RuIaOO4EV64Zx9djI1/ Xh6w== 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 f4si6124033plm.562.2017.08.15.05.55.43; Tue, 15 Aug 2017 05:55:43 -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 S1752913AbdHOMzl (ORCPT + 25 others); Tue, 15 Aug 2017 08:55:41 -0400 Received: from foss.arm.com ([217.140.101.70]:51486 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752717AbdHOMwq (ORCPT ); Tue, 15 Aug 2017 08:52:46 -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 7DBBC1650; Tue, 15 Aug 2017 05:52:45 -0700 (PDT) Received: from leverpostej.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 8ED423F540; Tue, 15 Aug 2017 05:52:43 -0700 (PDT) From: Mark Rutland To: linux-arm-kernel@lists.infradead.org Cc: ard.biesheuvel@linaro.org, catalin.marinas@arm.com, james.morse@arm.com, labbott@redhat.com, linux-kernel@vger.kernel.org, luto@amacapital.net, mark.rutland@arm.com, matt@codeblueprint.co.uk, will.deacon@arm.com, kernel-hardening@lists.openwall.com, keescook@chromium.org Subject: [PATCHv2 05/14] arm64: clean up THREAD_* definitions Date: Tue, 15 Aug 2017 13:50:40 +0100 Message-Id: <1502801449-29246-6-git-send-email-mark.rutland@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1502801449-29246-1-git-send-email-mark.rutland@arm.com> References: <1502801449-29246-1-git-send-email-mark.rutland@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently we define THREAD_SIZE and THREAD_SIZE_ORDER separately, with the latter dependent on particular CONFIG_ARM64_*K_PAGES definitions. This is somewhat opaque, and will get in the way of future modifications to THREAD_SIZE. This patch cleans this up, defining both in terms of a common THREAD_SHIFT, and using PAGE_SHIFT to calculate THREAD_SIZE_ORDER, rather than using a number of definitions dependent on config symbols. Subsequent patches will make use of this to alter the stack size used in some configurations. At the same time, these are moved into , which will avoid circular include issues in subsequent patches. To ensure that existing code isn't adversely affected, is updated to transitively include these definitions. Signed-off-by: Mark Rutland Cc: Ard Biesheuvel Cc: Catalin Marinas Cc: James Morse Cc: Laura Abbott Cc: Will Deacon --- arch/arm64/include/asm/memory.h | 8 ++++++++ arch/arm64/include/asm/thread_info.h | 9 +-------- 2 files changed, 9 insertions(+), 8 deletions(-) -- 1.9.1 diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 77d55dc..8ab4774 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -102,6 +102,14 @@ #define KASAN_SHADOW_SIZE (0) #endif +#define THREAD_SHIFT 14 + +#if THREAD_SHIFT >= PAGE_SHIFT +#define THREAD_SIZE_ORDER (THREAD_SHIFT - PAGE_SHIFT) +#endif + +#define THREAD_SIZE (UL(1) << THREAD_SHIFT) + /* * Memory types available. */ diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h index b29ab0e..aa04b73 100644 --- a/arch/arm64/include/asm/thread_info.h +++ b/arch/arm64/include/asm/thread_info.h @@ -23,18 +23,11 @@ #include -#ifdef CONFIG_ARM64_4K_PAGES -#define THREAD_SIZE_ORDER 2 -#elif defined(CONFIG_ARM64_16K_PAGES) -#define THREAD_SIZE_ORDER 0 -#endif - -#define THREAD_SIZE 16384 - #ifndef __ASSEMBLY__ struct task_struct; +#include #include #include