From patchwork Mon Oct 11 09:14:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Wool X-Patchwork-Id: 12549457 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2E78C433FE for ; Mon, 11 Oct 2021 09:14:28 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 772E960F5B for ; Mon, 11 Oct 2021 09:14:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 772E960F5B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id BA3FA6B006C; Mon, 11 Oct 2021 05:14:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B52A76B0071; Mon, 11 Oct 2021 05:14:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9F36A900002; Mon, 11 Oct 2021 05:14:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0080.hostedemail.com [216.40.44.80]) by kanga.kvack.org (Postfix) with ESMTP id 8C8356B006C for ; Mon, 11 Oct 2021 05:14:27 -0400 (EDT) Received: from smtpin34.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 390B0180AE7E2 for ; Mon, 11 Oct 2021 09:14:27 +0000 (UTC) X-FDA: 78683595774.34.4CD7E01 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by imf16.hostedemail.com (Postfix) with ESMTP id BEAF1F00249B for ; Mon, 11 Oct 2021 09:14:26 +0000 (UTC) Received: by mail-lf1-f48.google.com with SMTP id x27so70835082lfa.9 for ; Mon, 11 Oct 2021 02:14:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aYK0t2A+iFWYLArJmrhlQnzM1LrjxbAnutJ7r5EoWfU=; b=bKrjwjRDGkaTFC/KjPZBW/GHCJKQ2f3GUr3kuQqhJA4TNpbn3koeSzAd5KqeNOBVsl QdccD7nOSq4lrDTwW5tkfakki/JZ2OOrFXoUvJLTbgReUQsjDxDMvni8nwiANeYr2Aex QH3ObFO160yKC/b4uhEAmVSGT1CnmwyHWNRDQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aYK0t2A+iFWYLArJmrhlQnzM1LrjxbAnutJ7r5EoWfU=; b=6iIpIS3w7uSyzYveWUMaHJMmscI2mjMT4ncOSR83I+PjQ8fNX3Zd9yT7Akgvjd+wZ4 08l0Dd5b6nd8r8cpXzbU7FYx0casvr3JZq4GfZ7yIc8lRwp5es5zeFNMPGY73D4BE9SC ecz1A1hGjQ/bbbjeFkGxvnoLNqTSZiaCZ5ucsHt6i9U+ZYNfCOh3V7wM+VcP01nS+Hy5 oYNgGZOhi/NEjS9jnPG+m4QNXpGnAMSiZqrcsx02ykEyHteNv59mtsYRAoMVqG+x/OL9 BqIgyZqzQMJoGeg7VjvCy235/vkpi3o72CqeeH7IJS/8mEFWSVgyfY+hfxECn34J7rD2 kehQ== X-Gm-Message-State: AOAM530j1k9DM1onuI1LGtpcvYc0pIZZ/U97W8svxrih6ef4i7PRBQ9x WJbLg0+uuQRDF2N6xml0nat24w== X-Google-Smtp-Source: ABdhPJywdRS0cfvpTdnwWvqOVO9vl8115LwXVAux0pAuR+cgL9Jy9nNOKoMModzwTeVxZ63ZCVCybg== X-Received: by 2002:a2e:a88a:: with SMTP id m10mr12639873ljq.3.1633943665181; Mon, 11 Oct 2021 02:14:25 -0700 (PDT) Received: from localhost.localdomain (m83-186-96-96.cust.tele2.se. [83.186.96.96]) by smtp.gmail.com with ESMTPSA id y6sm679788lfj.47.2021.10.11.02.14.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Oct 2021 02:14:24 -0700 (PDT) From: Vitaly Wool To: linux-riscv@lists.infradead.org Cc: Alexandre Ghiti , Palmer Dabbelt , Jisheng Zhang , linux-mm@kvack.org, Nicolas Pitre , Vitaly Wool Subject: [PATCH] riscv: remove .text section size limitation for XIP Date: Mon, 11 Oct 2021 11:14:14 +0200 Message-Id: <20211011091414.1998846-1-vitaly.wool@konsulko.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Rspamd-Queue-Id: BEAF1F00249B X-Stat-Signature: pq5kp9w9i3x7irp6bjd9akb1i8jhd3n5 Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=konsulko.com header.s=google header.b=bKrjwjRD; spf=pass (imf16.hostedemail.com: domain of vitaly.wool@konsulko.com designates 209.85.167.48 as permitted sender) smtp.mailfrom=vitaly.wool@konsulko.com; dmarc=none X-Rspamd-Server: rspam06 X-HE-Tag: 1633943666-329599 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Currently there's a limit of 8MB for the .text section of a RISC-V image in the XIP case. This breaks compilation of many automatic builds and is generally inconvenient. This patch removes that limitation and optimizes XIP image file size at the same time. Signed-off-by: Vitaly Wool --- arch/riscv/include/asm/pgtable.h | 6 ++++-- arch/riscv/kernel/head.S | 12 ++++++++++++ arch/riscv/kernel/vmlinux-xip.lds.S | 10 +++++++--- arch/riscv/mm/init.c | 7 +++---- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 39b550310ec6..bf204e7c1f74 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -75,7 +75,8 @@ #endif #ifdef CONFIG_XIP_KERNEL -#define XIP_OFFSET SZ_8M +#define XIP_OFFSET SZ_32M +#define XIP_OFFSET_MASK (SZ_32M - 1) #else #define XIP_OFFSET 0 #endif @@ -97,7 +98,8 @@ #ifdef CONFIG_XIP_KERNEL #define XIP_FIXUP(addr) ({ \ uintptr_t __a = (uintptr_t)(addr); \ - (__a >= CONFIG_XIP_PHYS_ADDR && __a < CONFIG_XIP_PHYS_ADDR + SZ_16M) ? \ + (__a >= CONFIG_XIP_PHYS_ADDR && \ + __a < CONFIG_XIP_PHYS_ADDR + XIP_OFFSET * 2) ? \ __a - CONFIG_XIP_PHYS_ADDR + CONFIG_PHYS_RAM_BASE - XIP_OFFSET :\ __a; \ }) diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S index fce5184b22c3..ed316d02cd7e 100644 --- a/arch/riscv/kernel/head.S +++ b/arch/riscv/kernel/head.S @@ -20,10 +20,20 @@ REG_L t0, _xip_fixup add \reg, \reg, t0 .endm +.macro XIP_FIXUP_FLASH_OFFSET reg + la t1, __data_loc + li t0, XIP_OFFSET_MASK + and t1, t1, t0 + li t1, XIP_OFFSET + sub t0, t0, t1 + sub \reg, \reg, t0 +.endm _xip_fixup: .dword CONFIG_PHYS_RAM_BASE - CONFIG_XIP_PHYS_ADDR - XIP_OFFSET #else .macro XIP_FIXUP_OFFSET reg .endm +.macro XIP_FIXUP_FLASH_OFFSET reg +.endm #endif /* CONFIG_XIP_KERNEL */ __HEAD @@ -266,6 +276,7 @@ pmp_done: la a3, hart_lottery mv a2, a3 XIP_FIXUP_OFFSET a2 + XIP_FIXUP_FLASH_OFFSET a3 lw t1, (a3) amoswap.w t0, t1, (a2) /* first time here if hart_lottery in RAM is not set */ @@ -304,6 +315,7 @@ clear_bss_done: XIP_FIXUP_OFFSET sp #ifdef CONFIG_BUILTIN_DTB la a0, __dtb_start + XIP_FIXUP_OFFSET a0 #else mv a0, s1 #endif /* CONFIG_BUILTIN_DTB */ diff --git a/arch/riscv/kernel/vmlinux-xip.lds.S b/arch/riscv/kernel/vmlinux-xip.lds.S index 9c9f35091ef0..f5ed08262139 100644 --- a/arch/riscv/kernel/vmlinux-xip.lds.S +++ b/arch/riscv/kernel/vmlinux-xip.lds.S @@ -64,8 +64,11 @@ SECTIONS /* * From this point, stuff is considered writable and will be copied to RAM */ - __data_loc = ALIGN(16); /* location in file */ - . = LOAD_OFFSET + XIP_OFFSET; /* location in memory */ + __data_loc = ALIGN(PAGE_SIZE); /* location in file */ + . = KERNEL_LINK_ADDR + XIP_OFFSET; /* location in memory */ + +#undef LOAD_OFFSET +#define LOAD_OFFSET (KERNEL_LINK_ADDR + XIP_OFFSET - (__data_loc & XIP_OFFSET_MASK)) _sdata = .; /* Start of data section */ _data = .; @@ -96,7 +99,6 @@ SECTIONS KEEP(*(__soc_builtin_dtb_table)) __soc_builtin_dtb_table_end = .; } - PERCPU_SECTION(L1_CACHE_BYTES) . = ALIGN(8); .alternative : { @@ -122,6 +124,8 @@ SECTIONS BSS_SECTION(PAGE_SIZE, PAGE_SIZE, 0) + PERCPU_SECTION(L1_CACHE_BYTES) + .rel.dyn : AT(ADDR(.rel.dyn) - LOAD_OFFSET) { *(.rel.dyn*) } diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index c0cddf0fc22d..24b2b8044602 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -41,7 +41,7 @@ phys_addr_t phys_ram_base __ro_after_init; EXPORT_SYMBOL(phys_ram_base); #ifdef CONFIG_XIP_KERNEL -extern char _xiprom[], _exiprom[]; +extern char _xiprom[], _exiprom[], __data_loc; #endif unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)] @@ -454,10 +454,9 @@ static uintptr_t __init best_map_size(phys_addr_t base, phys_addr_t size) /* called from head.S with MMU off */ asmlinkage void __init __copy_data(void) { - void *from = (void *)(&_sdata); - void *end = (void *)(&_end); + void *from = (void *)(&__data_loc); void *to = (void *)CONFIG_PHYS_RAM_BASE; - size_t sz = (size_t)(end - from + 1); + size_t sz = (size_t)((uintptr_t)(&_end) - (uintptr_t)(&_sdata)); memcpy(to, from, sz); }