From nobody Wed Aug 9 20:57:09 2023 X-Original-To: dev-commits-src-branches@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 4RLj6Z0L93z4mJ34; Wed, 9 Aug 2023 20:57:10 +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 4RLj6Y6y5Jz4D8N; Wed, 9 Aug 2023 20:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691614630; 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=K0h3RUK3gxET5jqrMWH5S2qz9EPabHCAiwf6uqAEUuw=; b=gRpdzvRz79uhJ7fZsQYpfKkuAHkKW9oZIG3o4d104ppUL8NAKRRExrn/Tgl3fiUKTA+U/u PG5JW+3JZ4/vtzZ8VAq1+EAKATKC/aV/BVq3p4JNplHs1Cb0ERXixwUvOehB42XLlqj5c2 w/k4n3IUGiKYaHPfKN0/rE8JespRH5sL+agMINe6yWoxY0rWN3MX8E5+cRxshmz7q2ImaO kJi84Yzv5Y0na2Xc8t8upH202104l5WBe/keWYhdyHubYRrHK33EEEeXfUZdbHhYo6h78K qS3rIVY1b7m59nqOMHORyOgi1XP/WFWUNkeXB7N/jI3XTD+xxbMhXo5NbO92cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691614630; 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=K0h3RUK3gxET5jqrMWH5S2qz9EPabHCAiwf6uqAEUuw=; b=T086jRe5UmuFCixVy4AiMJxSWW6Q0sNqPTidcHBoRHvZofRYaU060dpqGwG8cwaGrY+89l +n0/CitAbNJ47fojGPeT56DjaA0+YUees/r09z1RoQFKYXKQJB16JEQmKX8G2vCGfQ9kL5 E8208U6/9DWGbYloZjkJhLD+DG7GMCPrpeytQbrC+Q/0inIgrQdSlqf8KFbgoFQ0xxhT+i I8h47/WBJOl2gFNQ8jzhdqW5sDLcwZXbTw5ds/rgWLF5HyG8bQ2gGLwyEn6MHroedx5vY9 emBW2TJvXRJiZG/n96rDgDkP062SD+BpXKSQy+Soova4ZKdZyi2/pz1NVU08tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691614630; a=rsa-sha256; cv=none; b=Szq9xoKEYHF2DDv0QN8R8EXziDWRp5/bcrsEMSDUvYMt7x0K3mdPe4BhcyhxegbcbPUrzI hYYCjxyu2fPKSFOY9f02dBQ79d2QVUFY1vzsvMf5RpJiWxYmwy6+Vgil0YYCOrRIQk1a0c JSZ5JSp6+u+QGGZZnlhoGKRDRlNgMGBtpkqr2dc/uTwegNJGKNKi8NIajyC88/tjdEorYJ THuEv6VLGk+D4YNaZzKBvcVvlFbbsEunuMkLtaxOkrMJjYGxhkivQE3AOi8PPR9EnsRW1q EnpHf5xlmA3YwfsOVthJOjsGrub6fZuqO2gygpxnXfLzKwIQIJ7njnQfZDpSIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RLj6Y5hZjzWPw; Wed, 9 Aug 2023 20:57:09 +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 379Kv9Od076074; Wed, 9 Aug 2023 20:57:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379Kv9pR076072; Wed, 9 Aug 2023 20:57:09 GMT (envelope-from git) Date: Wed, 9 Aug 2023 20:57:09 GMT Message-Id: <202308092057.379Kv9pR076072@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5abba9619cbb - stable/13 - vm_map: Add a macro to fetch a map entry's split boundary index List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 5abba9619cbb6f1cdd598d6eaa80ebd1947fa7f5 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5abba9619cbb6f1cdd598d6eaa80ebd1947fa7f5 commit 5abba9619cbb6f1cdd598d6eaa80ebd1947fa7f5 Author: Mark Johnston AuthorDate: 2023-05-09 14:07:15 +0000 Commit: Mark Johnston CommitDate: 2023-08-09 20:48:18 +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 (cherry picked from commit d0e4e53ebd6499d420c19426586eeeafec157150) --- 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 51fb51f69f3d..86ffd8d141b6 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -486,8 +486,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 ce520de160ef..c2b7dd81d3ca 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2445,8 +2445,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); @@ -2519,8 +2518,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); @@ -3513,8 +3511,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); @@ -3712,9 +3709,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 8f318b34e601..7854a91f36a9 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -150,8 +150,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