From patchwork Thu Mar 4 17:11:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 12116605 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 270DCC433E6 for ; Thu, 4 Mar 2021 17:15:18 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B62EA64F59 for ; Thu, 4 Mar 2021 17:15:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B62EA64F59 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=vlk4N+EMm+DEkvVaVl2Wvz96fQiML+h7zIVPLEcm7+c=; b=ikG6IQ6RXqP5QFjHQmL798dnS yjYUVt7URuZlDt7XltkZFWphzWcMVIk/zsyBUhRaIKUtMn9YuDqnGJJg6vvzGq0/giVAuaELhixGR AyoB50HuMB628QVzqjfhjIZK61oeLBbsXYkElEqV4ZJKVSk28HtKlQzX/DH2s50gbqusPH3vhSPqd nCA/xGHyMBDuRmj9/B3BWMdecpXWK+F7xmxp7xi/37NP0cMSoGxQ2b7wTq8gdTpOFyZN6moHf5X4B 944mM3Ep7iXcU2jsVwxM5BPj40jBWF1dKLzubgv9cTeLtZNpgqOg3rI40mED5oOAiJdPqpmEegkWO oomIGX7ag==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lHrXI-009O8h-5O; Thu, 04 Mar 2021 17:13:16 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHrWu-009O3t-HQ for linux-arm-kernel@lists.infradead.org; Thu, 04 Mar 2021 17:12:55 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5293064F55; Thu, 4 Mar 2021 17:12:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614877967; bh=H4Na2ynW4w01AlcXOXf+7Kg2aX6CuzmAPdxg2C9L2pA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qo+VxH1bH3i+0ix7GfUSfDff4Gspe6Zqa3gKF+6xmKSOtkDCln041PmhvRUwS5RDl TnKsuy969mkcpRKd+FohqU57cDEdp1gr7pFkA+Oq0zFCTBb7xdODd8S60ozDOQcFz8 RtR3z5PjVOdNZsFnf/BRxY028hSxCuFCWRPeCXZRTBw5vb4zAGZQ9WblHcK7B1BErY qLvhF5n6LJLTYLtdoVTah51N4X+LqOKye5YJcfdFLDJPZ5aKg/IEwBeeWncL37xX/H jySPsikKOky/GH24SbKlv7E95u3MBUDDVR4h60DhaUhRVikfQ/vQDuyJq+4rh0jupo 0gL9q9ajg99CQ== From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , maz@kernel.org, catalin.marinas@arm.com, will@kernel.org, mark.rutland@arm.com, anshuman.khandual@arm.com, qperret@google.com, kernel-team@android.com Subject: [PATCH 1/2] arm64: mm: add missing P4D definitions and use them consistently Date: Thu, 4 Mar 2021 18:11:44 +0100 Message-Id: <20210304171145.12281-2-ardb@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210304171145.12281-1-ardb@kernel.org> References: <20210304171145.12281-1-ardb@kernel.org> MIME-Version: 1.0 X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Even though level 0, 1 and 2 descriptors share the same attribute encodings, let's be a bit more consistent about using the right one at the right level. So add new macros for level 0/P4D definitions, and clean up some inconsistencies involving these macros. Signed-off-by: Ard Biesheuvel Acked-by: Mark Rutland --- arch/arm64/include/asm/pgtable-hwdef.h | 9 +++++++++ arch/arm64/mm/mmu.c | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h index 42442a0ae2ab..e64e77a345b2 100644 --- a/arch/arm64/include/asm/pgtable-hwdef.h +++ b/arch/arm64/include/asm/pgtable-hwdef.h @@ -94,6 +94,15 @@ /* * Hardware page table definitions. * + * Level 0 descriptor (P4D). + */ +#define P4D_TYPE_TABLE (_AT(p4dval_t, 3) << 0) +#define P4D_TABLE_BIT (_AT(p4dval_t, 1) << 1) +#define P4D_TYPE_MASK (_AT(p4dval_t, 3) << 0) +#define P4D_TYPE_SECT (_AT(p4dval_t, 1) << 0) +#define P4D_SECT_RDONLY (_AT(p4dval_t, 1) << 7) /* AP[2] */ + +/* * Level 1 descriptor (PUD). */ #define PUD_TYPE_TABLE (_AT(pudval_t, 3) << 0) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 3802cfbdd20d..029091474042 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -309,7 +309,7 @@ static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end, phys_addr_t pud_phys; BUG_ON(!pgtable_alloc); pud_phys = pgtable_alloc(PUD_SHIFT); - __p4d_populate(p4dp, pud_phys, PUD_TYPE_TABLE); + __p4d_populate(p4dp, pud_phys, P4D_TYPE_TABLE); p4d = READ_ONCE(*p4dp); } BUG_ON(p4d_bad(p4d)); @@ -1209,11 +1209,11 @@ void __init early_fixmap_init(void) pudp = pud_offset_kimg(p4dp, addr); } else { if (p4d_none(p4d)) - __p4d_populate(p4dp, __pa_symbol(bm_pud), PUD_TYPE_TABLE); + __p4d_populate(p4dp, __pa_symbol(bm_pud), P4D_TYPE_TABLE); pudp = fixmap_pud(addr); } if (pud_none(READ_ONCE(*pudp))) - __pud_populate(pudp, __pa_symbol(bm_pmd), PMD_TYPE_TABLE); + __pud_populate(pudp, __pa_symbol(bm_pmd), PUD_TYPE_TABLE); pmdp = fixmap_pmd(addr); __pmd_populate(pmdp, __pa_symbol(bm_pte), PMD_TYPE_TABLE);