From patchwork Fri Jul 9 14:53:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 12367571 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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE, SPF_PASS 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 719CFC07E9B for ; Fri, 9 Jul 2021 14:54:27 +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 3713861369 for ; Fri, 9 Jul 2021 14:54:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3713861369 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=dabbelt.com 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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Message-ID:To:From:CC:Subject :Date: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=Zpi6++b+fDFLtHDdrLl6qR4pkFrOvrq3ekbeXBqKgok=; b=3CaupkBzpdylfO KJuJULUSy9VZgooDqbp8ghxEPI4LQwnYDS6W3A8a/oLZ+2G+aA4YQ50zi+1Jo/zaX5BKqnIVEBY8v fd8JvXcbTqQADBZm//b6NPtg1i6qTuv5Hr89K/OwjgWlCvl6QwsU3pIsawW243U5G69vbdw50IJPV 9U/81zDEYkLbxopFIYj4f150UoyTVhEyXk2JubJsNjqZIwRx+rgcXzOQK8Q74tobjyIcBTpitLcOG EcKGEcfI8yxl30T5N9iz7befSvLV5VqpdEqG8pScF/B1+4Zzd7v8J0a4viwc7T8nWCdIOUFF5CiuN dXA7rshXDRIy2mRb1CFQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m1rtE-001zRE-85; Fri, 09 Jul 2021 14:54:04 +0000 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m1rtA-001zPp-UN for linux-riscv@lists.infradead.org; Fri, 09 Jul 2021 14:54:02 +0000 Received: by mail-pf1-x436.google.com with SMTP id 21so8940262pfp.3 for ; Fri, 09 Jul 2021 07:53:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dabbelt-com.20150623.gappssmtp.com; s=20150623; h=date:subject:cc:from:to:message-id; bh=7TOvEXp6CxyOVQ6kkvPnStcuSSRvU0Rq/k3nL7rrXds=; b=hhd1UznzDHvfc5Q42o1PVvjw2WA2cBvDz7QSqBphthlexpRXkJdRKc8b58QgyAjxdh d9AqMIv8uR08tPSEo7QDVRU0dpaAtcneEWE/F4OmbI+SBRUCq3X6LFNLCQs8zo5bXccz u/9XuH9pIh3tep/4RQJImWYphQY7VZuTQfJqSxsOSKtj3TMP4N47C2SOOzrtEgpBJkJL kwXgDyjlX0zgQK4iPSZUTgCnnK5/vie7ffOJmkD7Br7op8yh1AgW4k2nMjixdwz40Mse YHneprS5lK3rqyHjh6u1xJysFBfoGIWsb9UZowOIj1R9dpIAqAdJnS1u2817nXd4dQqi CYSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:subject:cc:from:to:message-id; bh=7TOvEXp6CxyOVQ6kkvPnStcuSSRvU0Rq/k3nL7rrXds=; b=Pd0Da98OadNl/EE9JLW5tnbyyyNbRQDEHqQd5O1NtO9cXZGrnhYcjhAzLSq18LU0JW Eq0z08WkgOOY3Aa4OvkckjlOwJKHxJIEjJSiFceiJJj5wJQ+5paYEOLrqpWYJXIhye7a Ea+4NOrw370C9KtOtiGxktjk8r2Ifsrk41Ti14o2a/3d6LEsj4p52MP06oARTcdBPQ1D t+QYWUzLmBHAaYaDwq4TOVg8gHyJlLM5+WsSYBIagq0u9ZAJeBGS+cFtcTRP+jW7sjzj 7brnMhKUdCyoUgjEniUK1nUulf9mvm79CGyTxbS8PkjZd3ZgGQLWDxCLGsEwoweOzGJ/ qJXg== X-Gm-Message-State: AOAM533BhMUorykidA+qydrvwGHIuAonszX3tuB2MHIUKufSuO7+o7jd RFI8b3sslEITkWqmkqK3sk1fcR+GCHTulw== X-Google-Smtp-Source: ABdhPJwJokbZrtZDQ6OXCcHH01AZn+eAlxXwE/yXMT5NU69MviNGWhd13kfai8Bc8VsvDy2gNC5xvA== X-Received: by 2002:a63:5903:: with SMTP id n3mr39025680pgb.104.1625842438616; Fri, 09 Jul 2021 07:53:58 -0700 (PDT) Received: from localhost (76-210-143-223.lightspeed.sntcca.sbcglobal.net. [76.210.143.223]) by smtp.gmail.com with ESMTPSA id c141sm6885959pfc.13.2021.07.09.07.53.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:53:58 -0700 (PDT) Date: Fri, 09 Jul 2021 07:53:58 -0700 (PDT) X-Google-Original-Date: Fri, 09 Jul 2021 07:53:41 PDT (-0700) Subject: [GIT PULL] RISC-V Patches for the 5.14 Merge Window, Part 1 CC: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org From: Palmer Dabbelt To: Linus Torvalds Message-ID: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210709_075401_101987_AF6B0A93 X-CRM114-Status: GOOD ( 19.38 ) 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: , MIME-Version: 1.0 Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org The following changes since commit 8a4102a0cf07cc76a18f373f6b49485258cc6af4: riscv: mm: Fix W+X mappings at boot (2021-06-01 21:15:09 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-5.14-mw0 for you to fetch changes up to 1958e5aef5098e28b7d6e6a2972649901ebecace: riscv: xip: Fix duplicate included asm/pgtable.h (2021-07-06 16:17:40 -0700) ---------------------------------------------------------------- RISC-V Patches for the 5.14 Merge Window, Part 1 In addition to We have a handful of new features for 5.14: * Support for transparent huge pages. * Support for generic PCI resources mapping. * Support for the mem= kernel parameter. * Support for KFENCE. * A handful of fixes to avoid W+X mappings in the kernel. * Support for VMAP_STACK based overflow detection. * An optimized copy_{to,from}_user. ---------------------------------------------------------------- There are some Kconfig merge conflicts. They should be pretty straight-forward, but we do have a symbol out of order -- I thought I had a script to check for that, but I guess it doesn't work. I just sent out a patch to fix it up. +++ b/arch/riscv/Kconfig @@@ -60,12 -61,11 +61,12 @@@ config RISC select GENERIC_TIME_VSYSCALL if MMU && 64BIT select HANDLE_DOMAIN_IRQ select HAVE_ARCH_AUDITSYSCALL - select HAVE_ARCH_JUMP_LABEL - select HAVE_ARCH_JUMP_LABEL_RELATIVE + select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL + select HAVE_ARCH_JUMP_LABEL_RELATIVE if !XIP_KERNEL select HAVE_ARCH_KASAN if MMU && 64BIT select HAVE_ARCH_KASAN_VMALLOC if MMU && 64BIT + select HAVE_ARCH_KFENCE if MMU && 64BIT - select HAVE_ARCH_KGDB + select HAVE_ARCH_KGDB if !XIP_KERNEL select HAVE_ARCH_KGDB_QXFER_PKT select HAVE_ARCH_MMAP_RND_BITS if MMU select HAVE_ARCH_SECCOMP_FILTER @@@ -81,11 -80,9 +82,14 @@@ select HAVE_GCC_PLUGINS select HAVE_GENERIC_VDSO if MMU && 64BIT select HAVE_IRQ_TIME_ACCOUNTING + select HAVE_KPROBES + select HAVE_KPROBES_ON_FTRACE + select HAVE_KRETPROBES + select HAVE_KPROBES if !XIP_KERNEL + select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL + select HAVE_KRETPROBES if !XIP_KERNEL + select HAVE_MOVE_PMD + select HAVE_MOVE_PUD select HAVE_PCI select HAVE_PERF_EVENTS select HAVE_PERF_REGS @@@ -108,7 -104,7 +112,8 @@@ select SYSCTL_EXCEPTION_TRACE select THREAD_INFO_IN_TASK select UACCESS_MEMCPY if !MMU + select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT && MMU + select ZONE_DMA32 if 64BIT config ARCH_MMAP_RND_BITS_MIN default 18 if 64BIT ---------------------------------------------------------------- Akira Tsukamoto (1): riscv: __asm_copy_to-from_user: Optimize unaligned memory access and pipeline stall Alexandre Ghiti (6): 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 riscv: Introduce structure that group all variables regarding kernel mapping riscv: Fix PTDUMP output now BPF region moved back to module region Bixuan Cui (1): riscv: fix build error when CONFIG_SMP is disabled Christoph Hellwig (1): riscv: pass the mm_struct to __sbi_tlb_flush_range Guo Ren (3): riscv: Use global mappings for kernel pages riscv: Cleanup unused functions riscv: add ASID-based tlbflushing methods Jeff Xie (1): riscv: ptrace: add argn syntax Jiapeng Chong (1): riscv: xip: Fix duplicate included asm/pgtable.h Jisheng Zhang (7): riscv: mremap speedup - enable HAVE_MOVE_PUD and HAVE_MOVE_PMD riscv: mm: Remove setup_zero_page() riscv: Optimize switch_mm by passing "cpu" to flush_icache_deferred() riscv: Turn has_fpu into a static key if FPU=y riscv: kprobes: Remove redundant kprobe_step_ctx riscv: Add __init section marker to some functions again riscv: mm: init: Consolidate vars, functions Kefeng Wang (5): riscv: Move setup_bootmem into paging_init riscv: mm: Drop redundant _sdata and _edata declaration riscv: mm: Use better bitmap_zalloc() riscv: Only initialize swiotlb when necessary riscv: Add mem kernel parameter support Liu Shixin (1): riscv: Enable KFENCE for riscv64 Nanyong Sun (5): riscv: mm: add _PAGE_LEAF macro riscv: mm: make pmd_bad() check leaf condition riscv: mm: add param stride for __sbi_tlb_flush_range riscv: mm: add THP support on 64-bit riscv: mm: fix build errors caused by mk_pmd() Palmer Dabbelt (2): RISC-V: Use asm-generic for {in,out}{bwlq} Merge branch 'riscv-wx-mappings' into for-next Randy Dunlap (1): riscv: TRANSPARENT_HUGEPAGE: depends on MMU Stanislaw Kardach (1): riscv: enable generic PCI resource mapping Tong Tiangen (1): riscv: add VMAP_STACK overflow detection Vitaly Wool (1): riscv: fix typo in init.c arch/riscv/Kconfig | 12 +- arch/riscv/include/asm/asm-prototypes.h | 3 + arch/riscv/include/asm/io.h | 13 -- arch/riscv/include/asm/kfence.h | 63 +++++++ arch/riscv/include/asm/kprobes.h | 7 - arch/riscv/include/asm/mmu_context.h | 2 + arch/riscv/include/asm/page.h | 81 +++++---- arch/riscv/include/asm/pci.h | 2 + arch/riscv/include/asm/pgtable-64.h | 5 +- arch/riscv/include/asm/pgtable-bits.h | 5 + arch/riscv/include/asm/pgtable.h | 171 ++++++++++++++++++- arch/riscv/include/asm/ptrace.h | 31 ++++ arch/riscv/include/asm/sections.h | 17 ++ arch/riscv/include/asm/set_memory.h | 24 ++- arch/riscv/include/asm/switch_to.h | 11 +- arch/riscv/include/asm/thread_info.h | 15 ++ arch/riscv/include/asm/tlbflush.h | 5 + arch/riscv/kernel/asm-offsets.c | 2 + arch/riscv/kernel/cpufeature.c | 6 +- arch/riscv/kernel/entry.S | 108 ++++++++++++ arch/riscv/kernel/head.S | 4 +- arch/riscv/kernel/kexec_relocate.S | 4 +- arch/riscv/kernel/machine_kexec.c | 2 +- arch/riscv/kernel/probes/kprobes.c | 40 +---- arch/riscv/kernel/process.c | 2 +- arch/riscv/kernel/setup.c | 18 +- arch/riscv/kernel/signal.c | 4 +- arch/riscv/kernel/traps.c | 35 ++++ arch/riscv/kernel/vmlinux-xip.lds.S | 1 - arch/riscv/kernel/vmlinux.lds.S | 2 +- arch/riscv/lib/uaccess.S | 181 ++++++++++++++++---- arch/riscv/mm/context.c | 14 +- arch/riscv/mm/fault.c | 11 +- arch/riscv/mm/init.c | 283 +++++++++++++++----------------- arch/riscv/mm/physaddr.c | 2 +- arch/riscv/mm/ptdump.c | 6 +- arch/riscv/mm/tlbflush.c | 69 ++++++-- 37 files changed, 901 insertions(+), 360 deletions(-) create mode 100644 arch/riscv/include/asm/kfence.h diff --cc arch/riscv/Kconfig index 3590eb76000e,469a70bd8da6..d36f3c5029fd --- a/arch/riscv/Kconfig