From patchwork Fri Apr 21 12:15:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 86276 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1025575vqo; Fri, 21 Apr 2023 05:23:27 -0700 (PDT) X-Google-Smtp-Source: AKy350Z+PpxZ1f4AX9RcNksK+If045oE15QHlcS60dssKmyOstyizRixYNJ+a6/qr+/+8DlPfehm X-Received: by 2002:a05:6a20:3956:b0:ec:6e2d:5a32 with SMTP id r22-20020a056a20395600b000ec6e2d5a32mr6655745pzg.62.1682079806918; Fri, 21 Apr 2023 05:23:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682079806; cv=none; d=google.com; s=arc-20160816; b=zWvdByIYiTFJA8Bkq/8zM+oj17HPI4QSMQRV8Dj/EYhMzEon+lRD0k53IepUhreYlE 76e1QCDFyYZJVK+660SfWG1cMYAna9AbcglRAYUkyJT6fO619qWb+q9ocqJ0FLRB85ZQ JAV2X+OrivaNNe4uSDVZAA2c18zx2fQqSLWXx918rfZu4dwpxqChglFNylv57a0qNwYC lr+QRhQEmKoNWi0s4QVJnrjlKktBkcLql67aU722Vz/f6yko0VwMoInYbMwgAX+Gnxt6 QNac0ZWonbtSvd5LybY0BG35fKehFdYQLlJLrQ5rJPEUYUJRY8vz3tCN+4ea3hbbF/Y5 FFAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ZiUuCI6rtswOsHaqgsbzE/uGVT5Zkmxk0gTiftezTcU=; b=MFIIGWkdDaPvcOMXHkV5iLJ1DDfs3kfMobcIhWRFl7TrV1EMpQFG/XfxWbB1mTJRG1 BRFhq99CgcEhyDY/4qv+pDXJvZHHi/TfqxjLrwedhQn3xdXQ/KQNX3g8I7U8spYGl2AL gvzmRv1Mr0dqjx3387mfe06cQgWWVMAn9u6ty15YVhkas1W5Qx6GzCWNyrM/9QWzmcWk txB4vTsko5EraBFXIWiHZazXUV3mhfQSpvHf7beNq/TjSo/IaOkmfICxKMFPXBQR5Cvz k02QKgHMbUffRdnAF6jp0ueYBxWzavLG2K6wwA4AV3GThAqSW5Kff619PVH/M20axRTo HcRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=eKl5BQzr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c26-20020a6566da000000b005186bbfb286si4345845pgw.308.2023.04.21.05.23.12; Fri, 21 Apr 2023 05:23:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=eKl5BQzr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231880AbjDUMP2 (ORCPT + 99 others); Fri, 21 Apr 2023 08:15:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229843AbjDUMP0 (ORCPT ); Fri, 21 Apr 2023 08:15:26 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3E6D5B93; Fri, 21 Apr 2023 05:15:25 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3DACB60B01; Fri, 21 Apr 2023 12:15:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28B42C433D2; Fri, 21 Apr 2023 12:15:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682079324; bh=4CzcETXQykZY+fHpWCvvKB+S7P+we+lzEzbxvcgMVeM=; h=From:To:Cc:Subject:Date:From; b=eKl5BQzrlZSF8qZrskzbZqlNQI76ROsBhYulGMAU6sb094LsQGtTHFngWS8l/w05R /MktApIRkIE/Irk3G8I1K3YqX92esw7l02UEkhh4ncwN8E7lXbjtY2Wi8xBxSb21pY YDeG8/NQlvtCHsplTRg8WoAtVzaWlmcSFnZQOHPi24SmAGhrntCnwL47gFcFMU0Kw6 FdmSH+FtW7b7s2c756mjlEhAh/dP1XS95/8/0S9xvE/gYdt/8xW4LyGO5j6UwRY/oN Xe+DH8rBRCRX2XpJ/Qak1OgvdzJgWlNunybUCDQ6OUoTj91R1X4pKrY+4tYFKOKTz0 e41cUz4jrSFrQ== From: broonie@kernel.org To: Palmer Dabbelt , Paul Walmsley Cc: Alexandre Ghiti , Linux Kernel Mailing List , Linux Next Mailing List , Palmer Dabbelt Subject: linux-next: manual merge of the risc-v tree with the origin tree Date: Fri, 21 Apr 2023 13:15:19 +0100 Message-Id: <20230421121519.75428-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763788515546658858?= X-GMAIL-MSGID: =?utf-8?q?1763788515546658858?= Hi all, Today's linux-next merge of the risc-v tree got a conflict in: arch/riscv/mm/init.c between commit: ef69d2559fe91 ("riscv: Move early dtb mapping into the fixmap region") from the origin tree and commits: 8589e346bbb67 ("riscv: Move the linear mapping creation in its own function") 3335068f87217 ("riscv: Use PUD/P4D/PGD pages for the linear mapping") 401e84488800d ("riscv: Move DTB_EARLY_BASE_VA to the kernel address space") 39b33072941f8 ("riscv: Introduce CONFIG_RELOCATABLE") from the risc-v tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. I suspect something more is needed to handle 401e84488800d ("riscv: Move DTB_EARLY_BASE_VA to the kernel address space") properly but I have zero familiarity with this code or ability to test. +++ b/arch/riscv/mm/init.c @@@ -1070,23 -1164,63 +1144,74 @@@ asmlinkage void __init setup_vm(uintptr pt_ops_set_fixmap(); } - static void __init setup_vm_final(void) + static void __init create_linear_mapping_range(phys_addr_t start, + phys_addr_t end) { + phys_addr_t pa; uintptr_t va, map_size; - phys_addr_t pa, start, end; + + for (pa = start; pa < end; pa += map_size) { + va = (uintptr_t)__va(pa); + map_size = best_map_size(pa, end - pa); + + create_pgd_mapping(swapper_pg_dir, va, pa, map_size, + pgprot_from_va(va)); + } + } + + static void __init create_linear_mapping_page_table(void) + { + phys_addr_t start, end; u64 i; + #ifdef CONFIG_STRICT_KERNEL_RWX + phys_addr_t ktext_start = __pa_symbol(_start); + phys_addr_t ktext_size = __init_data_begin - _start; + phys_addr_t krodata_start = __pa_symbol(__start_rodata); + phys_addr_t krodata_size = _data - __start_rodata; + + /* Isolate kernel text and rodata so they don't get mapped with a PUD */ + memblock_mark_nomap(ktext_start, ktext_size); + memblock_mark_nomap(krodata_start, krodata_size); + #endif + + /* Map all memory banks in the linear mapping */ + for_each_mem_range(i, &start, &end) { + if (start >= end) + break; + if (start <= __pa(PAGE_OFFSET) && + __pa(PAGE_OFFSET) < end) + start = __pa(PAGE_OFFSET); + if (end >= __pa(PAGE_OFFSET) + memory_limit) + end = __pa(PAGE_OFFSET) + memory_limit; + + create_linear_mapping_range(start, end); + } + + #ifdef CONFIG_STRICT_KERNEL_RWX + create_linear_mapping_range(ktext_start, ktext_start + ktext_size); + create_linear_mapping_range(krodata_start, + krodata_start + krodata_size); + + memblock_clear_nomap(ktext_start, ktext_size); + memblock_clear_nomap(krodata_start, krodata_size); + #endif + } + + static void __init setup_vm_final(void) + { /* Setup swapper PGD for fixmap */ +#if !defined(CONFIG_64BIT) + /* + * In 32-bit, the device tree lies in a pgd entry, so it must be copied + * directly in swapper_pg_dir in addition to the pgd entry that points + * to fixmap_pte. + */ + unsigned long idx = pgd_index(__fix_to_virt(FIX_FDT)); + + set_pgd(&swapper_pg_dir[idx], early_pg_dir[idx]); +#endif ++ create_pgd_mapping(swapper_pg_dir, FIXADDR_START, __pa_symbol(fixmap_pgd_next), PGDIR_SIZE, PAGE_TABLE); diff --cc arch/riscv/mm/init.c index 0f14f4a8d179a,bce899b180cd2..0000000000000 --- a/arch/riscv/mm/init.c