From owner-svn-src-all@freebsd.org Thu Jul 16 13:37:12 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 0440B362400; Thu, 16 Jul 2020 13:37:12 +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 4B6wKM66lMz4WT2; Thu, 16 Jul 2020 13:37:11 +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 B69D69294; Thu, 16 Jul 2020 13:37:11 +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 06GDbB9K026325; Thu, 16 Jul 2020 13:37:11 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06GDbBik026323; Thu, 16 Jul 2020 13:37:11 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202007161337.06GDbBik026323@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 16 Jul 2020 13:37:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r363243 - stable/12/sys/vm X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/12/sys/vm X-SVN-Commit-Revision: 363243 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: Thu, 16 Jul 2020 13:37:12 -0000 Author: markj Date: Thu Jul 16 13:37:11 2020 New Revision: 363243 URL: https://svnweb.freebsd.org/changeset/base/363243 Log: MFC r363158: Add vm_map_valid_range_KBI(). Modified: stable/12/sys/vm/vm_map.c stable/12/sys/vm/vm_map.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/vm/vm_map.c ============================================================================== --- stable/12/sys/vm/vm_map.c Thu Jul 16 11:28:24 2020 (r363242) +++ stable/12/sys/vm/vm_map.c Thu Jul 16 13:37:11 2020 (r363243) @@ -4853,6 +4853,79 @@ vm_map_pmap_KBI(vm_map_t map) return (map->pmap); } +bool +vm_map_range_valid_KBI(vm_map_t map, vm_offset_t start, vm_offset_t end) +{ + + return (vm_map_range_valid(map, start, end)); +} + +#ifdef INVARIANTS +static void +_vm_map_assert_consistent(vm_map_t map, int check) +{ + vm_map_entry_t entry, prev; + vm_map_entry_t cur, header, lbound, ubound; + vm_size_t max_left, max_right; + +#ifdef DIAGNOSTIC + ++map->nupdates; +#endif + if (enable_vmmap_check != check) + return; + + header = prev = &map->header; + VM_MAP_ENTRY_FOREACH(entry, map) { + KASSERT(prev->end <= entry->start, + ("map %p prev->end = %jx, start = %jx", map, + (uintmax_t)prev->end, (uintmax_t)entry->start)); + KASSERT(entry->start < entry->end, + ("map %p start = %jx, end = %jx", map, + (uintmax_t)entry->start, (uintmax_t)entry->end)); + KASSERT(entry->left == header || + entry->left->start < entry->start, + ("map %p left->start = %jx, start = %jx", map, + (uintmax_t)entry->left->start, (uintmax_t)entry->start)); + KASSERT(entry->right == header || + entry->start < entry->right->start, + ("map %p start = %jx, right->start = %jx", map, + (uintmax_t)entry->start, (uintmax_t)entry->right->start)); + cur = map->root; + lbound = ubound = header; + for (;;) { + if (entry->start < cur->start) { + ubound = cur; + cur = cur->left; + KASSERT(cur != lbound, + ("map %p cannot find %jx", + map, (uintmax_t)entry->start)); + } else if (cur->end <= entry->start) { + lbound = cur; + cur = cur->right; + KASSERT(cur != ubound, + ("map %p cannot find %jx", + map, (uintmax_t)entry->start)); + } else { + KASSERT(cur == entry, + ("map %p cannot find %jx", + map, (uintmax_t)entry->start)); + break; + } + } + max_left = vm_map_entry_max_free_left(entry, lbound); + max_right = vm_map_entry_max_free_right(entry, ubound); + KASSERT(entry->max_free == vm_size_max(max_left, max_right), + ("map %p max = %jx, max_left = %jx, max_right = %jx", map, + (uintmax_t)entry->max_free, + (uintmax_t)max_left, (uintmax_t)max_right)); + prev = entry; + } + KASSERT(prev->end <= entry->start, + ("map %p prev->end = %jx, start = %jx", map, + (uintmax_t)prev->end, (uintmax_t)entry->start)); +} +#endif + #include "opt_ddb.h" #ifdef DDB #include Modified: stable/12/sys/vm/vm_map.h ============================================================================== --- stable/12/sys/vm/vm_map.h Thu Jul 16 11:28:24 2020 (r363242) +++ stable/12/sys/vm/vm_map.h Thu Jul 16 13:37:11 2020 (r363243) @@ -224,6 +224,8 @@ struct vm_map { #define vm_map_max(map) vm_map_max_KBI((map)) #define vm_map_min(map) vm_map_min_KBI((map)) #define vm_map_pmap(map) vm_map_pmap_KBI((map)) +#define vm_map_range_valid(map, start, end) \ + vm_map_range_valid_KBI((map), (start), (end)) #else static __inline vm_offset_t vm_map_max(const struct vm_map *map) @@ -325,6 +327,7 @@ void vm_map_wait_busy(vm_map_t map); vm_offset_t vm_map_max_KBI(const struct vm_map *map); vm_offset_t vm_map_min_KBI(const struct vm_map *map); pmap_t vm_map_pmap_KBI(vm_map_t map); +bool vm_map_range_valid_KBI(vm_map_t map, vm_offset_t start, vm_offset_t end); #define vm_map_lock(map) _vm_map_lock(map, LOCK_FILE, LOCK_LINE) #define vm_map_unlock(map) _vm_map_unlock(map, LOCK_FILE, LOCK_LINE)