From patchwork Mon Jan 11 13:19:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 59476 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp2105119lbb; Mon, 11 Jan 2016 05:21:18 -0800 (PST) X-Received: by 10.66.236.129 with SMTP id uu1mr76193804pac.158.1452518478699; Mon, 11 Jan 2016 05:21:18 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q80si28553905pfa.60.2016.01.11.05.21.18; Mon, 11 Jan 2016 05:21:18 -0800 (PST) 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; dkim=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932932AbcAKNUR (ORCPT + 29 others); Mon, 11 Jan 2016 08:20:17 -0500 Received: from mail-wm0-f45.google.com ([74.125.82.45]:38223 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759916AbcAKNUH (ORCPT ); Mon, 11 Jan 2016 08:20:07 -0500 Received: by mail-wm0-f45.google.com with SMTP id b14so267955073wmb.1 for ; Mon, 11 Jan 2016 05:20:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IBkrCZyoM1Q0LM7iNCTtDvRdO8I+JanHk2RXEUrCXNU=; b=LZP2SsVqTbxcH6T/pZx7D+p5gNdKibB0Wh/nIu773DU3L/af8h+X4t2EIZWfHWgGC3 LR/Uhot/twwdRHKLDqh7aC+q4U3LU/RRVvdWiYssEuOruEvEmZcm/xtGJzrzj8Gmb3OM ule2Ph0KROPcbayaTES/wQFthca1YeaRXIYwY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IBkrCZyoM1Q0LM7iNCTtDvRdO8I+JanHk2RXEUrCXNU=; b=EWRD3StDYXmBecFV2aXoWcjyIo77Rycch21swgeXWmHO5zxkoxL+APfJEUDBCr9U0M jEUqowFsoP49gdWa5rlYA99zS228kwfFJcV2gvy/zAKyXROC18fopDvxtgo+9Qc0yjrg onfQ3mSYpYxXTyGZVG3xmvRNXfJwmUwisBqL+mXrG/mRBR+CmhlCVDHSSrpyZmPiQugb j3aJ3bVEqUiEVfEuA6HCJK/XE/moeUVHsD7zOOEGCneq/IulzQJzmZCJ0xC4rF6mfzhb i5EwZYj30twhoMF6yvmky9Q1kYUcyAtfw89RWYLfbGi8zOUGefPUSsXiJA35el5xyQSO +vyQ== X-Gm-Message-State: ALoCoQkAfMePCmruup8eNVNLzjMDJ9gcWFg8txKDChjIqdQqtY881/E7Uid1RFcJcistUhAQ7vaEFq9tEIL1KDSEREx4u+fCcg== X-Received: by 10.28.23.5 with SMTP id 5mr14152464wmx.82.1452518406028; Mon, 11 Jan 2016 05:20:06 -0800 (PST) Received: from localhost.localdomain (cag06-7-83-153-85-71.fbx.proxad.net. [83.153.85.71]) by smtp.gmail.com with ESMTPSA id c15sm12766055wmd.19.2016.01.11.05.20.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Jan 2016 05:20:05 -0800 (PST) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, kernel-hardening@lists.openwall.com, will.deacon@arm.com, catalin.marinas@arm.com, mark.rutland@arm.com, leif.lindholm@linaro.org, keescook@chromium.org, linux-kernel@vger.kernel.org Cc: stuart.yoder@freescale.com, bhupesh.sharma@freescale.com, arnd@arndb.de, marc.zyngier@arm.com, christoffer.dall@linaro.org, Ard Biesheuvel Subject: [PATCH v3 14/21] arm64: [re]define SWAPPER_TABLE_[SHIFT|SIZE] for use in asm code Date: Mon, 11 Jan 2016 14:19:08 +0100 Message-Id: <1452518355-4606-16-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1452518355-4606-1-git-send-email-ard.biesheuvel@linaro.org> References: <1452518355-4606-1-git-send-email-ard.biesheuvel@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The current definition of SWAPPER_TABLE_SHIFT can only be used in asm code if the configured number of translation levels defines PUD_SHIFT and/or PMD_SHIFT natively (4KB and 16KB/64KB granule, respectively). Otherwise, it depends on the nopmd/nopud fixup headers, which can only be included in C code. So redefine SWAPPER_TABLE_SHIFT in a way that is independent of the number of configured translation levels. Define SWAPPER_TABLE_SIZE as well, we will need it later. Signed-off-by: Ard Biesheuvel --- arch/arm64/include/asm/kernel-pgtable.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.5.0 diff --git a/arch/arm64/include/asm/kernel-pgtable.h b/arch/arm64/include/asm/kernel-pgtable.h index daa8a7b9917a..eaac46097359 100644 --- a/arch/arm64/include/asm/kernel-pgtable.h +++ b/arch/arm64/include/asm/kernel-pgtable.h @@ -57,13 +57,14 @@ #if ARM64_SWAPPER_USES_SECTION_MAPS #define SWAPPER_BLOCK_SHIFT SECTION_SHIFT #define SWAPPER_BLOCK_SIZE SECTION_SIZE -#define SWAPPER_TABLE_SHIFT PUD_SHIFT #else #define SWAPPER_BLOCK_SHIFT PAGE_SHIFT #define SWAPPER_BLOCK_SIZE PAGE_SIZE -#define SWAPPER_TABLE_SHIFT PMD_SHIFT #endif +#define SWAPPER_TABLE_SHIFT (SWAPPER_BLOCK_SHIFT + PAGE_SHIFT - 3) +#define SWAPPER_TABLE_SIZE (1 << SWAPPER_TABLE_SHIFT) + /* The size of the initial kernel direct mapping */ #define SWAPPER_INIT_MAP_SIZE (_AC(1, UL) << SWAPPER_TABLE_SHIFT)