Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp2401298ybi; Mon, 1 Jul 2019 11:21:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqwXA78E0qWdgzt39lDcNcsO+/5T7VlwSDdj0kf8lznEPNFv5fWRFLq4JDDArl4QNfJ90F9C X-Received: by 2002:a63:5463:: with SMTP id e35mr2288671pgm.451.1562005312889; Mon, 01 Jul 2019 11:21:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562005312; cv=none; d=google.com; s=arc-20160816; b=bV6ExyvOokZlcHsfZa4P5XEiIdQ40USQN2kIob0Np8B1G94uUKxYX6xy8QR3HYJoCc gqSiOzPyeGL9RtaaF45HEGp60iS/N9oXKtLI6TOObBJ/61vstbdNWpbDgtK5SUgaf8mR sfVuTFe9QUnPnFJhZNYnUfRhAOThiTVSxgPCMiS1FTHkN8WaVlHochOGQ0EB9tDCAOA8 frZnOSFxzzciEjZfF1ZESHHKHEP5k44Ww1lW3NYumjbEqjuEKaXzdXlQ0FY/cUI18HDH hbCM787OST2tf0M+yxeNBYscwv9uuxwB+mPTECBwiBjuqBchlYal4RLdSzfXlN0k+7M6 RNVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Z87rVl3AoGz/+Q9YIyHmP2J+zEtaTq3KeyzggFKchM8=; b=BSeuXagdtfzrRTKEA/YpWEPkL15WACcjJx3Hh1S2tHECNVzALKCEpXFxS4BhIEKulP y8v9dFP7s+KtbPE3nzUaf/8Cqxe4ozm6a29UNfvnutw98hkEiDzF7ozcXBMyTjVtIPuH N6JKiE9u+/rSOA/Pvg18B+sUQXSynP+vFW4+mFviWW0Ca7RVrlPexLpZrVpe1PD257ph 7HE66hKb/xigS3kDc6QYnDOt7ghG1HDJdCoCib+iDkbJCKFUjIgApASz4rlzEBtlBwsI KDvjz+IC2pFiPn742Cb1nXvnyc77N+SqWUTbBoxu5eeb9Z1OqxH6K9YB2YNjgOqsZi9y n7Qw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w186si4235040pgd.48.2019.07.01.11.21.37; Mon, 01 Jul 2019 11:21:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730321AbfGAR7S (ORCPT + 99 others); Mon, 1 Jul 2019 13:59:18 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:40381 "EHLO relay5-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729972AbfGAR7P (ORCPT ); Mon, 1 Jul 2019 13:59:15 -0400 X-Originating-IP: 79.86.19.127 Received: from alex.numericable.fr (127.19.86.79.rev.sfr.net [79.86.19.127]) (Authenticated sender: alex@ghiti.fr) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 6092F1C000A; Mon, 1 Jul 2019 17:59:01 +0000 (UTC) From: Alexandre Ghiti To: Hanjun Guo , Christoph Hellwig , Mike Kravetz , Catalin Marinas , Will Deacon , Palmer Dabbelt , Albert Ou , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H . Peter Anvin" , x86@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-riscv@lists.infradead.org Cc: Alexandre Ghiti Subject: [PATCH v3 0/2] Hugetlbfs support for riscv Date: Mon, 1 Jul 2019 13:58:58 -0400 Message-Id: <20190701175900.4034-1-alex@ghiti.fr> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This series introduces hugetlbfs support for both riscv 32/64. Riscv32 is architecturally limited to huge pages of size 4MB whereas riscv64 has 2MB/1G huge pages support. Transparent huge page support is not implemented here, I will submit another series later. As stated in "The RISC-V Instruction Set Manual, Volume II: Privileged Architecture", riscv page table entries are marked as non-leaf entries as soon as at least one of the R/W/X bit set: - pmd_huge/pud_huge check if one of those bits are set, - pte_mkhuge simply returns the same pte value and does not set any of the R/W/X bits This series was validated using libhugetlbfs testsuite ported to riscv64 without linker script support. (https://github.com/AlexGhiti/libhugetlbfs.git, branch dev/alex/riscv). - libhugetlbfs testsuite on riscv64/2M: - brk_near_huge triggers an assert in malloc.c, does not on x86. - libhugetlbfs testsuite on riscv64/1G: - brk_near_huge triggers an assert in malloc.c, does not on x86. - mmap-gettest, mmap-cow: testsuite passes the number of default free pages as parameters and then fails for 1G which is not the default. Otherwise succeeds when given the right number of pages. - map_high_truncate_2 fails on x86 too: 0x60000000 is not 1G aligned and fails at line 694 of fs/hugetlbfs/inode.c. - heapshrink on 1G fails on x86 too, not investigated. - counters.sh on 1G fails on x86 too: alloc_surplus_huge_page returns NULL in case of gigantic pages. - icache-hygiene succeeds after patch #3 of this series which lowers the base address of mmap. - fallocate_stress.sh on 1G never ends, on x86 too, not investigated. - libhugetlbfs testsuite on riscv32/4M: kernel build passes, lacks libhugetlbfs support for 32bits. * Output for riscv64 2M and 1G libhugetbfs testsuite: zero_filesize_segment (2M: 64): zero_filesize_segment (1024M: 64): test_root (2M: 64): PASS test_root (1024M: 64): PASS meminfo_nohuge (2M: 64): PASS meminfo_nohuge (1024M: 64): PASS gethugepagesize (2M: 64): PASS gethugepagesize (1024M: 64): PASS gethugepagesizes (2M: 64): PASS gethugepagesizes (1024M: 64): PASS HUGETLB_VERBOSE=1 empty_mounts (2M: 64): PASS HUGETLB_VERBOSE=1 empty_mounts (1024M: 64): PASS HUGETLB_VERBOSE=1 large_mounts (2M: 64): PASS HUGETLB_VERBOSE=1 large_mounts (1024M: 64): PASS find_path (2M: 64): PASS find_path (1024M: 64): PASS unlinked_fd (2M: 64): PASS unlinked_fd (1024M: 64): PASS readback (2M: 64): PASS readback (1024M: 64): PASS truncate (2M: 64): PASS truncate (1024M: 64): PASS shared (2M: 64): PASS shared (1024M: 64): PASS mprotect (2M: 64): PASS mprotect (1024M: 64): PASS mlock (2M: 64): PASS mlock (1024M: 64): PASS misalign (2M: 64): PASS misalign (1024M: 64): PASS fallocate_basic.sh (2M: 64): PASS fallocate_basic.sh (1024M: 64): PASS fallocate_align.sh (2M: 64): PASS fallocate_align.sh (1024M: 64): PASS ptrace-write-hugepage (2M: 64): PASS ptrace-write-hugepage (1024M: 64): PASS icache-hygiene (2M: 64): PASS icache-hygiene (1024M: 64): PASS slbpacaflush (2M: 64): PASS (inconclusive) slbpacaflush (1024M: 64): PASS (inconclusive) straddle_4GB_static (2M: 64): PASS straddle_4GB_static (1024M: 64): PASS huge_at_4GB_normal_below_static (2M: 64): PASS huge_at_4GB_normal_below_static (1024M: 64): PASS huge_below_4GB_normal_above_static (2M: 64): PASS huge_below_4GB_normal_above_static (1024M: 64): PASS map_high_truncate_2 (2M: 64): PASS map_high_truncate_2 (1024M: 64): FAIL ftruncate(): Invalid argument misaligned_offset (2M: 64): PASS (inconclusive) misaligned_offset (1024M: 64): PASS (inconclusive) truncate_above_4GB (2M: 64): PASS truncate_above_4GB (1024M: 64): PASS brk_near_huge (2M: 64): brk_near_huge: malloc.c:2385: sysmalloc: Assertion `(old_top == initial_top (av) && old_size == 0) || ((unsigned long) (old_size) >= MINSIZE && prev_inuse (old_top) && ((unsigned long) old_end & (pagesize - 1)) == 0)' failed. brk_near_huge (1024M: 64): brk_near_huge: malloc.c:2385: sysmalloc: Assertion `(old_top == initial_top (av) && old_size == 0) || ((unsigned long) (old_size) >= MINSIZE && prev_inuse (old_top) && ((unsigned long) old_end & (pagesize - 1)) == 0)' failed. task-size-overrun (2M: 64): PASS task-size-overrun (1024M: 64): PASS stack_grow_into_huge (2M: 64): PASS stack_grow_into_huge (1024M: 64): PASS corrupt-by-cow-opt (2M: 64): PASS corrupt-by-cow-opt (1024M: 64): PASS noresv-preserve-resv-page (2M: 64): PASS noresv-preserve-resv-page (1024M: 64): PASS noresv-regarded-as-resv (2M: 64): PASS noresv-regarded-as-resv (1024M: 64): PASS readahead_reserve.sh (2M: 64): PASS readahead_reserve.sh (1024M: 64): PASS madvise_reserve.sh (2M: 64): PASS madvise_reserve.sh (1024M: 64): PASS fadvise_reserve.sh (2M: 64): PASS fadvise_reserve.sh (1024M: 64): PASS mremap-expand-slice-collision.sh (2M: 64): PASS mremap-expand-slice-collision.sh (1024M: 64): PASS mremap-fixed-normal-near-huge.sh (2M: 64): PASS mremap-fixed-normal-near-huge.sh (1024M: 64): PASS mremap-fixed-huge-near-normal.sh (2M: 64): PASS mremap-fixed-huge-near-normal.sh (1024M: 64): PASS set shmmax limit to 67108864 shm-perms (2M: 64): PASS private (2M: 64): PASS private (1024M: 64): PASS fork-cow (2M: 64): PASS fork-cow (1024M: 64): PASS direct (2M: 64): Bad configuration: Failed to open direct-IO file: Invalid argument direct (1024M: 64): Bad configuration: Failed to open direct-IO file: File exists malloc (2M: 64): PASS malloc (1024M: 64): PASS LD_PRELOAD=libhugetlbfs.so HUGETLB_MORECORE=yes malloc (2M: 64): PASS LD_PRELOAD=libhugetlbfs.so HUGETLB_MORECORE=yes malloc (1024M: 64): PASS LD_PRELOAD=libhugetlbfs.so HUGETLB_RESTRICT_EXE=unknown:none HUGETLB_MORECORE=yes malloc (2M: 64): PASS LD_PRELOAD=libhugetlbfs.so HUGETLB_RESTRICT_EXE=unknown:none HUGETLB_MORECORE=yes malloc (1024M: 64):PASS LD_PRELOAD=libhugetlbfs.so HUGETLB_RESTRICT_EXE=unknown:malloc HUGETLB_MORECORE=yes malloc (2M: 64): PASS LD_PRELOAD=libhugetlbfs.so HUGETLB_RESTRICT_EXE=unknown:malloc HUGETLB_MORECORE=yes malloc (1024M: 64): PASS malloc_manysmall (2M: 64): PASS malloc_manysmall (1024M: 64): PASS LD_PRELOAD=libhugetlbfs.so HUGETLB_MORECORE=yes malloc_manysmall (2M: 64): PASS LD_PRELOAD=libhugetlbfs.so HUGETLB_MORECORE=yes malloc_manysmall (1024M: 64): PASS heapshrink (2M: 64): PASS heapshrink (1024M: 64): PASS LD_PRELOAD=libheapshrink.so heapshrink (2M: 64): PASS LD_PRELOAD=libheapshrink.so heapshrink (1024M: 64): PASS LD_PRELOAD=libhugetlbfs.so HUGETLB_MORECORE=yes heapshrink (2M: 64): PASS LD_PRELOAD=libhugetlbfs.so HUGETLB_MORECORE=yes heapshrink (1024M: 64): PASS LD_PRELOAD=libhugetlbfs.so libheapshrink.so HUGETLB_MORECORE=yes heapshrink (2M: 64): PASS LD_PRELOAD=libhugetlbfs.so libheapshrink.so HUGETLB_MORECORE=yes heapshrink (1024M: 64): PASS LD_PRELOAD=libheapshrink.so HUGETLB_MORECORE_SHRINK=yes HUGETLB_MORECORE=yes heapshrink (2M: 64): PASS (inconclusive) LD_PRELOAD=libheapshrink.so HUGETLB_MORECORE_SHRINK=yes HUGETLB_MORECORE=yes heapshrink (1024M: 64): PASS (inconclusive) LD_PRELOAD=libhugetlbfs.so libheapshrink.so HUGETLB_MORECORE_SHRINK=yes HUGETLB_MORECORE=yes heapshrink (2M: 64): PASS LD_PRELOAD=libhugetlbfs.so libheapshrink.so HUGETLB_MORECORE_SHRINK=yes HUGETLB_MORECORE=yes heapshrink (1024M: 64): FAIL Heap did not shrink HUGETLB_VERBOSE=1 HUGETLB_MORECORE=yes heap-overflow (2M: 64): PASS HUGETLB_VERBOSE=1 HUGETLB_MORECORE=yes heap-overflow (1024M: 64): PASS HUGETLB_VERBOSE=0 linkhuge_nofd (2M: 64): HUGETLB_VERBOSE=0 linkhuge_nofd (1024M: 64): LD_PRELOAD=libhugetlbfs.so HUGETLB_VERBOSE=0 linkhuge_nofd (2M: 64): LD_PRELOAD=libhugetlbfs.so HUGETLB_VERBOSE=0 linkhuge_nofd (1024M: 64): linkhuge (2M: 64): linkhuge (1024M: 64): LD_PRELOAD=libhugetlbfs.so linkhuge (2M: 64): LD_PRELOAD=libhugetlbfs.so linkhuge (1024M: 64): linkhuge_rw (2M: 64): linkhuge_rw (1024M: 64): HUGETLB_ELFMAP=R linkhuge_rw (2M: 64): HUGETLB_ELFMAP=R linkhuge_rw (1024M: 64): HUGETLB_ELFMAP=W linkhuge_rw (2M: 64): HUGETLB_ELFMAP=W linkhuge_rw (1024M: 64): HUGETLB_ELFMAP=RW linkhuge_rw (2M: 64): HUGETLB_ELFMAP=RW linkhuge_rw (1024M: 64): HUGETLB_ELFMAP=no linkhuge_rw (2M: 64): HUGETLB_ELFMAP=no linkhuge_rw (1024M: 64): HUGETLB_ELFMAP=R HUGETLB_MINIMAL_COPY=no linkhuge_rw (2M: 64): HUGETLB_ELFMAP=R HUGETLB_MINIMAL_COPY=no linkhuge_rw (1024M: 64): HUGETLB_ELFMAP=W HUGETLB_MINIMAL_COPY=no linkhuge_rw (2M: 64): HUGETLB_ELFMAP=W HUGETLB_MINIMAL_COPY=no linkhuge_rw (1024M: 64): HUGETLB_ELFMAP=RW HUGETLB_MINIMAL_COPY=no linkhuge_rw (2M: 64): HUGETLB_ELFMAP=RW HUGETLB_MINIMAL_COPY=no linkhuge_rw (1024M: 64): HUGETLB_SHARE=0 HUGETLB_ELFMAP=R linkhuge_rw (2M: 64): HUGETLB_SHARE=0 HUGETLB_ELFMAP=R linkhuge_rw (1024M: 64): HUGETLB_SHARE=1 HUGETLB_ELFMAP=R linkhuge_rw (2M: 64): HUGETLB_SHARE=1 HUGETLB_ELFMAP=R linkhuge_rw (1024M: 64): HUGETLB_SHARE=0 HUGETLB_ELFMAP=W linkhuge_rw (2M: 64): HUGETLB_SHARE=0 HUGETLB_ELFMAP=W linkhuge_rw (1024M: 64): HUGETLB_SHARE=1 HUGETLB_ELFMAP=W linkhuge_rw (2M: 64): HUGETLB_SHARE=1 HUGETLB_ELFMAP=W linkhuge_rw (1024M: 64): HUGETLB_SHARE=0 HUGETLB_ELFMAP=RW linkhuge_rw (2M: 64): HUGETLB_SHARE=0 HUGETLB_ELFMAP=RW linkhuge_rw (1024M: 64): HUGETLB_SHARE=1 HUGETLB_ELFMAP=RW linkhuge_rw (2M: 64): HUGETLB_SHARE=1 HUGETLB_ELFMAP=RW linkhuge_rw (1024M: 64): chunk-overcommit (2M: 64): PASS chunk-overcommit (1024M: 64): PASS alloc-instantiate-race shared (2M: 64): PASS alloc-instantiate-race shared (1024M: 64): PASS alloc-instantiate-race private (2M: 64): PASS alloc-instantiate-race private (1024M: 64): PASS truncate_reserve_wraparound (2M: 64): PASS truncate_reserve_wraparound (1024M: 64): PASS truncate_sigbus_versus_oom (2M: 64): PASS truncate_sigbus_versus_oom (1024M: 64): PASS get_huge_pages (2M: 64): PASS get_huge_pages (1024M: 64): PASS shmoverride_linked (2M: 64): PASS HUGETLB_SHM=yes shmoverride_linked (2M: 64): PASS shmoverride_linked_static (2M: 64): HUGETLB_SHM=yes shmoverride_linked_static (2M: 64): LD_PRELOAD=libhugetlbfs.so shmoverride_unlinked (2M: 64): PASS LD_PRELOAD=libhugetlbfs.so HUGETLB_SHM=yes shmoverride_unlinked (2M: 64): PASS quota.sh (2M: 64): PASS quota.sh (1024M: 64): PASS counters.sh (2M: 64): PASS counters.sh (1024M: 64): FAIL mmap failed: Invalid argument mmap-gettest 10 35 (2M: 64): PASS mmap-gettest 10 35 (1024M: 64): FAIL Failed to mmap the hugetlb file: Cannot allocate memory mmap-cow 34 35 (2M: 64): PASS mmap-cow 34 35 (1024M: 64): FAIL Thread 15 (pid=514) failed set shmmax limit to 73400320 shm-fork 10 17 (2M: 64): PASS set shmmax limit to 73400320 shm-fork 10 35 (2M: 64): PASS set shmmax limit to 73400320 shm-getraw 35 /dev/full (2M: 64): PASS fallocate_stress.sh (2M: 64): libgcc_s.so.1 must be installed for pthread_cancel to work fallocate_stress.sh (1024M: 64): ********** TEST SUMMARY * 2M 1024M * 32-bit 64-bit 32-bit 64-bit * Total testcases: 0 93 0 83 * Skipped: 0 0 0 0 * PASS: 0 69 0 56 * FAIL: 0 0 0 5 * Killed by signal: 0 1 0 2 * Bad configuration: 0 1 0 1 * Expected FAIL: 0 0 0 0 * Unexpected PASS: 0 0 0 0 * Test not present: 0 21 0 19 * Strange test result: 0 1 0 0 ********** Changes in v3: - Remove the config ARCH_WANT_HUGE_PMD_SHARE in arm64, thanks to Hanjun. - Rebased on top v5.2-rc7. - Dropped the reviewed-by Palmer, and did not add Catalin and Ingo acked-by. Changes in v2: - Merge comment fix about task size. - Patch about mmap base address was merged separately. - Rebased on top of linux-next where series about the capability to free gigantic pages regardless of the configuration was merged. - Add huge pmd sharing as suggested by Mike Kravetz. - Gigantic page hstate is automatically created if CONTIG_ALLOC is set, even if not explicitly asked for in command line, as suggested by Mike. - Replace #ifdef CONFIG_64BIT into IS_ENABLED(CONFIG_64BIT), as suggested by Christoph Hellwig. Alexandre Ghiti (2): x86, arm64: Move ARCH_WANT_HUGE_PMD_SHARE config in arch/Kconfig riscv: Introduce huge page support for 32/64bit kernel arch/Kconfig | 3 +++ arch/arm64/Kconfig | 4 +-- arch/riscv/Kconfig | 8 ++++++ arch/riscv/include/asm/hugetlb.h | 18 +++++++++++++ arch/riscv/include/asm/page.h | 10 ++++++++ arch/riscv/include/asm/pgtable.h | 8 ++++-- arch/riscv/mm/Makefile | 2 ++ arch/riscv/mm/hugetlbpage.c | 44 ++++++++++++++++++++++++++++++++ arch/x86/Kconfig | 4 +-- 9 files changed, 93 insertions(+), 8 deletions(-) create mode 100644 arch/riscv/include/asm/hugetlb.h create mode 100644 arch/riscv/mm/hugetlbpage.c -- 2.20.1