From owner-svn-src-all@freebsd.org Mon Oct 14 17:15:43 2019 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 7BE751310CC; Mon, 14 Oct 2019 17:15:43 +0000 (UTC) (envelope-from dougm@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) server-signature RSA-PSS (4096 bits) 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 46sQDv2f9lz4by0; Mon, 14 Oct 2019 17:15:43 +0000 (UTC) (envelope-from dougm@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 3E1E786C5; Mon, 14 Oct 2019 17:15:43 +0000 (UTC) (envelope-from dougm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9EHFhvf057672; Mon, 14 Oct 2019 17:15:43 GMT (envelope-from dougm@FreeBSD.org) Received: (from dougm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9EHFh6M057671; Mon, 14 Oct 2019 17:15:43 GMT (envelope-from dougm@FreeBSD.org) Message-Id: <201910141715.x9EHFh6M057671@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dougm set sender to dougm@FreeBSD.org using -f From: Doug Moore Date: Mon, 14 Oct 2019 17:15:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353496 - head/sys/vm X-SVN-Group: head X-SVN-Commit-Author: dougm X-SVN-Commit-Paths: head/sys/vm X-SVN-Commit-Revision: 353496 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.29 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: Mon, 14 Oct 2019 17:15:43 -0000 Author: dougm Date: Mon Oct 14 17:15:42 2019 New Revision: 353496 URL: https://svnweb.freebsd.org/changeset/base/353496 Log: Move the definition of _vm_map_assert_consistent so that it can use vm_map_free_{left,right} rather than re-implementing them. Use the VM_MAP_FOREACH macro where applicable. Fix some indentation. Suggested by: kib (in a comment on D21964) Tested by: pho (as part of D21964) Differential Revision: https://reviews.freebsd.org/D22011 Modified: head/sys/vm/vm_map.c Modified: head/sys/vm/vm_map.c ============================================================================== --- head/sys/vm/vm_map.c Mon Oct 14 16:37:41 2019 (r353495) +++ head/sys/vm/vm_map.c Mon Oct 14 17:15:42 2019 (r353496) @@ -739,47 +739,8 @@ static int enable_vmmap_check = 0; SYSCTL_INT(_debug, OID_AUTO, vmmap_check, CTLFLAG_RWTUN, &enable_vmmap_check, 0, "Enable vm map consistency checking"); -static void -_vm_map_assert_consistent(vm_map_t map) -{ - vm_map_entry_t child, entry, prev; - vm_size_t max_left, max_right; +static void _vm_map_assert_consistent(vm_map_t map); - if (!enable_vmmap_check) - return; - - for (prev = &map->header; (entry = prev->next) != &map->header; - prev = entry) { - 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->end <= entry->next->start, - ("map %p end = %jx, next->start = %jx", map, - (uintmax_t)entry->end, (uintmax_t)entry->next->start)); - KASSERT(entry->left == NULL || - 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 == NULL || - entry->start < entry->right->start, - ("map %p start = %jx, right->start = %jx", map, - (uintmax_t)entry->start, (uintmax_t)entry->right->start)); - child = entry->left; - max_left = (child != NULL) ? child->max_free : - entry->start - prev->end; - child = entry->right; - max_right = (child != NULL) ? child->max_free : - entry->next->start - entry->end; - KASSERT(entry->max_free == 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)); - } -} - #define VM_MAP_ASSERT_CONSISTENT(map) \ _vm_map_assert_consistent(map) #else @@ -4823,6 +4784,49 @@ vm_map_pmap_KBI(vm_map_t map) return (map->pmap); } +#ifdef INVARIANTS +static void +_vm_map_assert_consistent(vm_map_t map) +{ + vm_map_entry_t entry, prev; + vm_size_t max_left, max_right; + + if (!enable_vmmap_check) + return; + + 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->end <= entry->next->start, + ("map %p end = %jx, next->start = %jx", map, + (uintmax_t)entry->end, (uintmax_t)entry->next->start)); + KASSERT(entry->left == NULL || + 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 == NULL || + entry->start < entry->right->start, + ("map %p start = %jx, right->start = %jx", map, + (uintmax_t)entry->start, (uintmax_t)entry->right->start)); + max_left = vm_map_entry_max_free_left(entry, lbound); + max_right = vm_map_entry_max_free_right(entry, ubound); + KASSERT(entry->max_free == 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 @@ -4839,8 +4843,8 @@ vm_map_print(vm_map_t map) (void *)map->pmap, map->nentries, map->timestamp); db_indent += 2; - for (prev = &map->header; (entry = prev->next) != &map->header; - prev = entry) { + prev = &map->header; + VM_MAP_ENTRY_FOREACH(entry, map) { db_iprintf("map entry %p: start=%p, end=%p, eflags=%#x, \n", (void *)entry, (void *)entry->start, (void *)entry->end, entry->eflags); @@ -4892,6 +4896,7 @@ vm_map_print(vm_map_t map) db_indent -= 2; } } + prev = entry; } db_indent -= 2; }