From owner-svn-src-all@freebsd.org Wed Sep 23 19:34:24 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0273042489E; Wed, 23 Sep 2020 19:34:24 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BxSzg6C51z4F3M; Wed, 23 Sep 2020 19:34:23 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9EB3615D00; Wed, 23 Sep 2020 19:34:23 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08NJYNl6055293; Wed, 23 Sep 2020 19:34:23 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08NJYLTT055281; Wed, 23 Sep 2020 19:34:21 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009231934.08NJYLTT055281@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Wed, 23 Sep 2020 19:34:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366090 - in head/sys: amd64/include arm/include arm64/include i386/include kern mips/include powerpc/include riscv/include vm X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in head/sys: amd64/include arm/include arm64/include i386/include kern mips/include powerpc/include riscv/include vm X-SVN-Commit-Revision: 366090 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Sep 2020 19:34:24 -0000 Author: markj Date: Wed Sep 23 19:34:21 2020 New Revision: 366090 URL: https://svnweb.freebsd.org/changeset/base/366090 Log: Add a vmparam.h constant indicating pmap support for large pages. Enable SHM_LARGEPAGE support on arm64. Reviewed by: alc, kib Sponsored by: Juniper Networks, Inc., Klara, Inc. Differential Revision: https://reviews.freebsd.org/D26467 Modified: head/sys/amd64/include/vmparam.h head/sys/arm/include/vmparam.h head/sys/arm64/include/vmparam.h head/sys/i386/include/vmparam.h head/sys/kern/uipc_shm.c head/sys/mips/include/vmparam.h head/sys/powerpc/include/vmparam.h head/sys/riscv/include/vmparam.h head/sys/vm/vm_fault.c Modified: head/sys/amd64/include/vmparam.h ============================================================================== --- head/sys/amd64/include/vmparam.h Wed Sep 23 19:33:47 2020 (r366089) +++ head/sys/amd64/include/vmparam.h Wed Sep 23 19:34:21 2020 (r366090) @@ -254,6 +254,11 @@ #define VM_BATCHQUEUE_SIZE 31 /* + * The pmap can create non-transparent large page mappings. + */ +#define PMAP_HAS_LARGEPAGES 1 + +/* * Need a page dump array for minidump. */ #define MINIDUMP_PAGE_TRACKING 1 Modified: head/sys/arm/include/vmparam.h ============================================================================== --- head/sys/arm/include/vmparam.h Wed Sep 23 19:33:47 2020 (r366089) +++ head/sys/arm/include/vmparam.h Wed Sep 23 19:34:21 2020 (r366090) @@ -194,6 +194,11 @@ extern vm_offset_t vm_max_kernel_address; #define DEVMAP_MAX_VADDR ARM_VECTORS_HIGH /* + * No non-transparent large page support in the pmap. + */ +#define PMAP_HAS_LARGEPAGES 0 + +/* * Need a page dump array for minidump. */ #define MINIDUMP_PAGE_TRACKING 1 Modified: head/sys/arm64/include/vmparam.h ============================================================================== --- head/sys/arm64/include/vmparam.h Wed Sep 23 19:33:47 2020 (r366089) +++ head/sys/arm64/include/vmparam.h Wed Sep 23 19:34:21 2020 (r366090) @@ -244,6 +244,11 @@ extern vm_offset_t init_pt_va; #define DEVMAP_MAX_VADDR VM_MAX_KERNEL_ADDRESS /* + * The pmap can create non-transparent large page mappings. + */ +#define PMAP_HAS_LARGEPAGES 1 + +/* * Need a page dump array for minidump. */ #define MINIDUMP_PAGE_TRACKING 1 Modified: head/sys/i386/include/vmparam.h ============================================================================== --- head/sys/i386/include/vmparam.h Wed Sep 23 19:33:47 2020 (r366089) +++ head/sys/i386/include/vmparam.h Wed Sep 23 19:34:21 2020 (r366090) @@ -241,6 +241,11 @@ #define DMAP_TO_PHYS(x) ({ panic("No direct map exists"); 0; }) /* + * No non-transparent large page support in the pmap. + */ +#define PMAP_HAS_LARGEPAGES 0 + +/* * Need a page dump array for minidump. */ #define MINIDUMP_PAGE_TRACKING 1 Modified: head/sys/kern/uipc_shm.c ============================================================================== --- head/sys/kern/uipc_shm.c Wed Sep 23 19:33:47 2020 (r366089) +++ head/sys/kern/uipc_shm.c Wed Sep 23 19:34:21 2020 (r366090) @@ -1067,10 +1067,8 @@ kern_shm_open2(struct thread *td, const char *userpath return (EINVAL); largepage = (shmflags & SHM_LARGEPAGE) != 0; -#if !defined(__amd64__) - if (largepage) + if (largepage && !PMAP_HAS_LARGEPAGES) return (ENOTTY); -#endif /* * Currently only F_SEAL_SEAL may be set when creating or opening shmfd. Modified: head/sys/mips/include/vmparam.h ============================================================================== --- head/sys/mips/include/vmparam.h Wed Sep 23 19:33:47 2020 (r366089) +++ head/sys/mips/include/vmparam.h Wed Sep 23 19:34:21 2020 (r366090) @@ -198,6 +198,11 @@ #define DMAP_TO_PHYS(x) MIPS_DIRECT_TO_PHYS(x) /* + * No non-transparent large page support in the pmap. + */ +#define PMAP_HAS_LARGEPAGES 0 + +/* * Need a page dump array for minidump. */ #define MINIDUMP_PAGE_TRACKING 1 Modified: head/sys/powerpc/include/vmparam.h ============================================================================== --- head/sys/powerpc/include/vmparam.h Wed Sep 23 19:33:47 2020 (r366089) +++ head/sys/powerpc/include/vmparam.h Wed Sep 23 19:34:21 2020 (r366090) @@ -327,4 +327,9 @@ struct pmap_physseg { KASSERT(hw_direct_map, ("Direct map not provided by PMAP")); \ (x) &~ DMAP_BASE_ADDRESS; }) +/* + * No non-transparent large page support in the pmap. + */ +#define PMAP_HAS_LARGEPAGES 0 + #endif /* _MACHINE_VMPARAM_H_ */ Modified: head/sys/riscv/include/vmparam.h ============================================================================== --- head/sys/riscv/include/vmparam.h Wed Sep 23 19:33:47 2020 (r366089) +++ head/sys/riscv/include/vmparam.h Wed Sep 23 19:34:21 2020 (r366090) @@ -237,6 +237,11 @@ extern vm_offset_t init_pt_va; #define DEVMAP_MAX_VADDR VM_MAX_KERNEL_ADDRESS /* + * No non-transparent large page support in the pmap. + */ +#define PMAP_HAS_LARGEPAGES 0 + +/* * Need a page dump array for minidump. */ #define MINIDUMP_PAGE_TRACKING 1 Modified: head/sys/vm/vm_fault.c ============================================================================== --- head/sys/vm/vm_fault.c Wed Sep 23 19:33:47 2020 (r366089) +++ head/sys/vm/vm_fault.c Wed Sep 23 19:34:21 2020 (r366090) @@ -487,6 +487,8 @@ vm_fault_populate(struct faultstate *fs) * populate only busies the first page in superpage run. */ if (bdry_idx != 0) { + KASSERT(PMAP_HAS_LARGEPAGES, + ("missing pmap support for large pages")); m = vm_page_lookup(fs->first_object, pager_first); vm_fault_populate_check_page(m); VM_OBJECT_WUNLOCK(fs->first_object);