From nobody Tue Aug 1 14:13:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RFcX20nYCz4qDLm; Tue, 1 Aug 2023 14:13:04 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RFcX038mRz44MN; Tue, 1 Aug 2023 14:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690899184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zvm3A3OjrJdU/Y/pvY/jV3xHE46DekjvS5jQwIxFfx0=; b=LnoV9DJxUY8eqCnjdxOa6WN15ugKBv7jhEgnQh+TKULApGDZ0Mpt1QoWuyFewskzcR3XDc Pp4tEXx7NLNLe9CsL9pUaMZeRoZzbRiD9AZIWFODm99qKxgvIgi0jayZ7YEiT1G4MFgVKa AE3Msl6distgvIGX6UW+ivkwZCUb6c0BdFFyaOO1XzeYE6ShK+Pn6YzuGQ5lKY0bDYTcbC eUnL3Mx9/MiPp6Ahosqp2Aa86MeFd0iSVTQmITSVKBfJbBUST/+1E/isg8W7WG8x3Lkald wJlrzsWOPJLYG7bDaakb48FyZ+53ph5Gl9fmtnlXjRQ4lGlCpZV6LCqWQ6oi2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690899184; a=rsa-sha256; cv=none; b=DsCrO0L4KhFbRSK5d0X6Id0xRTHdbEzFYSARrMeKbCLPwwdczxyMmgNCijzjutpJ8TTq3X 9DCgiwOB13jHDs0Y4fk01bRkHX9IKh8bZoeh6qZYR/QYpXAkuqEVmW964D0oefNMbXhrqs GUQutoqO8nnxt6Em2k8TJE58HDfywUVLxF116sj+SvYbEiP8i9QRcsULD3t4PRoDcyL70F OXh3qD2mGlyDl/QK1ddIqb+2IkpeUtgKmmIR6awlc7e624mqzjOonqmG1TSM2d/lz589B5 Uh1sV7unP6qUY7+TSXnDPO5s1gInILQDPOdOgqNh+E1q8MEWUOLFbFCc8FxvdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690899184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zvm3A3OjrJdU/Y/pvY/jV3xHE46DekjvS5jQwIxFfx0=; b=TNme+6Xn3CXNFeB25x6VipBx0JgA7BNLsFuvWFRlPDhB+KspfnHmjl7UwjXdnSt4boSTZ8 twiWf8Ozztq7RmeMdBjgfHElDfWQPDQ7swnruAONFnj52R5WpwPZPGSplYO0JPCCX9H0gA sBSN2xKJKwYHPo6PuZm1b3yjHXX/l6hkiQVneiwKy+rRvvIDsxPNG9Bn0CwXkcNF6i5gf5 xT2SdAvft4Lk6xtDS/q1ANrsxG8BsQnNrdv/0s4AES9nakMAY0ez//YC2tpN/j54VPzspp cpcy44fqmKy1meu5Q8l92d0sm/NCyUag8jXQVuicvSfaZf2JazedNB04feqLzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFcX01Lf0zgJm; Tue, 1 Aug 2023 14:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 371ED3ZW031898; Tue, 1 Aug 2023 14:13:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371ED3FT031897; Tue, 1 Aug 2023 14:13:03 GMT (envelope-from git) Date: Tue, 1 Aug 2023 14:13:03 GMT Message-Id: <202308011413.371ED3FT031897@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d0e4e53ebd64 - main - vm_map: Add a macro to fetch a map entry's split boundary index List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0e4e53ebd6499d420c19426586eeeafec157150 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d0e4e53ebd6499d420c19426586eeeafec157150 commit d0e4e53ebd6499d420c19426586eeeafec157150 Author: Mark Johnston AuthorDate: 2023-05-09 14:07:15 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 14:10:02 +0000 vm_map: Add a macro to fetch a map entry's split boundary index The resulting code is a bit more concise. No functional change intended. Reviewed by: alc, dougm, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41249 --- sys/vm/vm_fault.c | 3 +-- sys/vm/vm_map.c | 13 ++++--------- sys/vm/vm_map.h | 4 +++- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 8b4b8ebb7375..458772d976fc 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -539,8 +539,7 @@ vm_fault_populate(struct faultstate *fs) MPASS(pager_last < fs->first_object->size); vm_fault_restore_map_lock(fs); - bdry_idx = (fs->entry->eflags & MAP_ENTRY_SPLIT_BOUNDARY_MASK) >> - MAP_ENTRY_SPLIT_BOUNDARY_SHIFT; + bdry_idx = MAP_ENTRY_SPLIT_BOUNDARY_INDEX(fs->entry); if (fs->map->timestamp != fs->map_generation) { if (bdry_idx == 0) { vm_fault_populate_cleanup(fs->first_object, pager_first, diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index eb607d519247..8ab38ae2a087 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2449,8 +2449,7 @@ vm_map_clip_start(vm_map_t map, vm_map_entry_t entry, vm_offset_t startaddr) KASSERT(entry->end > startaddr && entry->start < startaddr, ("%s: invalid clip of entry %p", __func__, entry)); - bdry_idx = (entry->eflags & MAP_ENTRY_SPLIT_BOUNDARY_MASK) >> - MAP_ENTRY_SPLIT_BOUNDARY_SHIFT; + bdry_idx = MAP_ENTRY_SPLIT_BOUNDARY_INDEX(entry); if (bdry_idx != 0) { if ((startaddr & (pagesizes[bdry_idx] - 1)) != 0) return (KERN_INVALID_ARGUMENT); @@ -2523,8 +2522,7 @@ vm_map_clip_end(vm_map_t map, vm_map_entry_t entry, vm_offset_t endaddr) KASSERT(entry->start < endaddr && entry->end > endaddr, ("%s: invalid clip of entry %p", __func__, entry)); - bdry_idx = (entry->eflags & MAP_ENTRY_SPLIT_BOUNDARY_MASK) >> - MAP_ENTRY_SPLIT_BOUNDARY_SHIFT; + bdry_idx = MAP_ENTRY_SPLIT_BOUNDARY_INDEX(entry); if (bdry_idx != 0) { if ((endaddr & (pagesizes[bdry_idx] - 1)) != 0) return (KERN_INVALID_ARGUMENT); @@ -3516,8 +3514,7 @@ vm_map_wire_locked(vm_map_t map, vm_offset_t start, vm_offset_t end, int flags) saved_start = entry->start; saved_end = entry->end; last_timestamp = map->timestamp; - bidx = (entry->eflags & MAP_ENTRY_SPLIT_BOUNDARY_MASK) - >> MAP_ENTRY_SPLIT_BOUNDARY_SHIFT; + bidx = MAP_ENTRY_SPLIT_BOUNDARY_INDEX(entry); incr = pagesizes[bidx]; vm_map_busy(map); vm_map_unlock(map); @@ -3715,9 +3712,7 @@ vm_map_sync( vm_map_unlock_read(map); return (KERN_INVALID_ARGUMENT); } - bdry_idx = (entry->eflags & - MAP_ENTRY_SPLIT_BOUNDARY_MASK) >> - MAP_ENTRY_SPLIT_BOUNDARY_SHIFT; + bdry_idx = MAP_ENTRY_SPLIT_BOUNDARY_INDEX(entry); if (bdry_idx != 0 && ((start & (pagesizes[bdry_idx] - 1)) != 0 || (end & (pagesizes[bdry_idx] - 1)) != 0)) { diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index c4ed36ce57ba..b974f52e51ed 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -154,8 +154,10 @@ struct vm_map_entry { #define MAP_ENTRY_HEADER 0x00080000 #define MAP_ENTRY_SPLIT_BOUNDARY_MASK 0x00300000 - #define MAP_ENTRY_SPLIT_BOUNDARY_SHIFT 20 +#define MAP_ENTRY_SPLIT_BOUNDARY_INDEX(entry) \ + (((entry)->eflags & MAP_ENTRY_SPLIT_BOUNDARY_MASK) >> \ + MAP_ENTRY_SPLIT_BOUNDARY_SHIFT) #ifdef _KERNEL static __inline u_char