From patchwork Fri Jun 4 11:49:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 12299611 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=-12.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 4AFCBC07E94 for ; Fri, 4 Jun 2021 11:50:29 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 9A2B961406 for ; Fri, 4 Jun 2021 11:50:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9A2B961406 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ghiti.fr Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References: List-Owner; bh=IUf69dqRSqPnlnxFxHoVGP4JI/mc4xOwJiZVTvIDhBs=; b=lXzZMtiw5dC19x Lqyw5meWWSW4LV7iUdiedJhDD3WdOVDZTIDioMznTbc2ITBhHxvxwT/mkCqAXs3+wI5jQx6Sx9KZo PbqjYCdp0YhwJpmuEiJ7xFzBO/z4RYsLkmkGEzpLpwKlHoQvD2lMD7wKsoD7Uj5VEdHacoL/YJdtg L8sv5EvoIcNciblIV2LT68u0RD9U97UC21BCQV0ra9I/WhE0b1l83dtfOH+sp0QVrn8cU9Y7msi9J Z3r/m2NAZZqkGAKXBkanIEhsSEptEeg5Zm/nuaodCCTlnSQrvdykHGCTY65eAaVgKybft5p3J5NRq h/qH5lIYwRMq2tna0KJw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lp8L0-00DP0E-8R; Fri, 04 Jun 2021 11:50:06 +0000 Received: from relay12.mail.gandi.net ([217.70.178.232]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lp8Ku-00DOxc-EZ for linux-riscv@lists.infradead.org; Fri, 04 Jun 2021 11:50:05 +0000 Received: (Authenticated sender: alex@ghiti.fr) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 393C2200007; Fri, 4 Jun 2021 11:49:51 +0000 (UTC) From: Alexandre Ghiti To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Jisheng Zhang , Christoph Hellwig , Zong Li , Anup Patel , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Alexandre Ghiti Subject: [PATCH v4 0/4] riscv: Map the kernel with correct permissions the first time Date: Fri, 4 Jun 2021 13:49:46 +0200 Message-Id: <20210604114950.1446390-1-alex@ghiti.fr> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210604_045000_648415_ABC57116 X-CRM114-Status: GOOD ( 11.23 ) X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org The kernel permissions are fixed after the kernel page table is created: avoid that by mapping the kernel 'correctly' the first time. Patch 2 is a cleanup patch on which the next patches are based on, not necessary for this patchset though and relies on patch 1. Patch 3 introduces a new helper to set kernel mapping permissions while avoiding all the casts when using set_memory_* API. Patch 4 is the bulk of this work and deals with mapping the kernel with the right permissions. Changes in v4: * Add patch 1 as noted by Jisheng * Changes patch 2 title as suggested by Anup * Add Reviewed-by from Anup Changes in v3: * Add a patch that factorizes kernel address conversions * Add a helper called set_kernel_memory in its own patch, as suggested by Christoph * Prefer IS_ENABLED over #ifdef, as suggested by Christoph * Split overly long lines, as suggested by Christoph * Simplify kernel mapping by mapping ALL text as readonly and taking advantage of already present code that enables write for init text before free_initmem_default. Changes in v2: * Rebased on top of for-next (and "riscv: mm: fix build errors caused by mk_pmd()") * Get rid of protect_kernel_linear_mapping_text_rodata as suggested by Jisheng * Improve code in general compared to previous RFC Alexandre Ghiti (4): riscv: Remove CONFIG_PHYS_RAM_BASE_FIXED riscv: Simplify xip and !xip kernel address conversion macros riscv: Introduce set_kernel_memory helper riscv: Map the kernel with correct permissions the first time arch/riscv/Kconfig | 6 -- arch/riscv/include/asm/page.h | 27 ++++---- arch/riscv/include/asm/pgtable.h | 2 + arch/riscv/include/asm/sections.h | 17 +++++ arch/riscv/include/asm/set_memory.h | 13 ++-- arch/riscv/kernel/setup.c | 11 +-- arch/riscv/mm/init.c | 102 ++++++++++++---------------- arch/riscv/mm/pageattr.c | 10 +++ 8 files changed, 95 insertions(+), 93 deletions(-)