From nobody Fri Dec 06 08:00:19 2024 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 4Y4NwN1fCwz5fp2v; Fri, 06 Dec 2024 08:00:20 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4NwM5KmXz4Xpq; Fri, 6 Dec 2024 08:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733472019; 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=v44VRBQcSY82nzjfpgUt1VntQFL08aL1AoFobLjHGs0=; b=Xi0eXkVdFwVcfjiTxIq//k9iKaTmy2C3mCHsXCZryxfW+84z5DxlLAveXcsICetzfn8EZA zvnZNIgyj7bpmZK04VdbsM2CQS9BqIGDrHB6fsIS1yo1fikUV/nEQ6BlPt+lpK2b3DP5Kp Vz5QC45lyNhz2UhM/06vNbNeMWge99anMxpaDZDad5l7ouuoGQumysxWLwgOCc5Ou/ab0v 18JQ0h0OtGLnH+l5jQV4KXIUWXpPPtiVtuVKRiodsthEA3nzMmVp/DKWVXZyt2XQiEesgZ AmSlkwe4K0COq03LbGz63r2sz9ieCak3Vv0jP3i9rnaOBJE3IR+0ASjh4oQc4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733472019; 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=v44VRBQcSY82nzjfpgUt1VntQFL08aL1AoFobLjHGs0=; b=wNZGreKFyVOHbpGOCvlSC4J4yOnGv32tKQMwkTunIzxauCfssUGyJ1uLkBlTOnaYDVlK7/ yVWXxnqE7soZ+JVp9hiYLeG51MoWba76xpjCCglbjwVWnDdzl2Y5bQUCFopsNCz5sJjxpW k1LcCbFwZIw5K/tGNG68zl+sgNWt1RYqg/MVWOrO7cKay1IraKZ8Ins/wGTqyHY2cJxFUO xuN5jImkdcPDW/C2jeWwO1v8Eg7NqGp78NnJIp706mXFNKUcbkvfsSydT71T8VSCkaDBgq 8v9rioW3H0wRUkmpx9bC8nX6K3A7Ts1rgS72S7icH+vkZY4yQ0FVtsOo37LehQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733472019; a=rsa-sha256; cv=none; b=oxi0GZ+GHf9pJBwy+OK6EGauQHuVx4Y8wuecYKS2V8YNrzWUTUdRTMO6g+PiJQs37KLKdp k/ep+B7B9RFo8hf6DDfq6ANy4Cnl8az52KFdOToMlQAm1cApWgSlGyCuJ4sjY6wx4HY1zk 4Qgw4VLMhp4wSmuAY5MqHhXFMROUDTjxusz05lrI3Rl0S7NUDfS8S4WZ2bo6WSGm91uBWc G7fpafbEwdEKqp7JP3tdwvGiAU6lVRJhsQhl8SSgxQcEo9f4ITzchmd6/2ttf3U0lpZaXL h4beyWRy3fxLDnxyR/2O6QnKBt9Ndfr1hqnJ0wjqpm2HO77RAaiXddO+xQKqng== 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 4Y4NwM4x9dzTD4; Fri, 6 Dec 2024 08:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B680JdJ061325; Fri, 6 Dec 2024 08:00:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B680JB2061322; Fri, 6 Dec 2024 08:00:19 GMT (envelope-from git) Date: Fri, 6 Dec 2024 08:00:19 GMT Message-Id: <202412060800.4B680JB2061322@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 030467548611 - main - vm_map: remove _GN suffix from MAP_ENTRY_STACK_GAP and MAP_CREATE_STACK_GAP symbols` 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0304675486114e3ab7da242c5a9c945dc584f6c2 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0304675486114e3ab7da242c5a9c945dc584f6c2 commit 0304675486114e3ab7da242c5a9c945dc584f6c2 Author: Konstantin Belousov AuthorDate: 2024-12-04 04:12:25 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-06 07:46:55 +0000 vm_map: remove _GN suffix from MAP_ENTRY_STACK_GAP and MAP_CREATE_STACK_GAP symbols` Reviewed by: alc, dougm, markj Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D47892 --- sys/vm/vm_map.c | 30 +++++++++++++++--------------- sys/vm/vm_map.h | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index d48b2cb8b73f..3d0fa6da15bc 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1410,7 +1410,7 @@ vm_map_entry_link(vm_map_t map, vm_map_entry_t entry) KASSERT(entry->end < root->end, ("%s: clip_start not within entry", __func__)); vm_map_splay_findprev(root, &llist); - if ((root->eflags & MAP_ENTRY_STACK_GAP_DN) == 0) + if ((root->eflags & MAP_ENTRY_STACK_GAP) == 0) root->offset += entry->end - root->start; root->start = entry->end; max_free_left = vm_map_splay_merge_pred(header, entry, llist); @@ -1427,7 +1427,7 @@ vm_map_entry_link(vm_map_t map, vm_map_entry_t entry) KASSERT(entry->end == root->end, ("%s: clip_start not within entry", __func__)); vm_map_splay_findnext(root, &rlist); - if ((entry->eflags & MAP_ENTRY_STACK_GAP_DN) == 0) + if ((entry->eflags & MAP_ENTRY_STACK_GAP) == 0) entry->offset += entry->start - root->start; root->end = entry->start; max_free_left = root->max_free = vm_size_max( @@ -1462,7 +1462,7 @@ vm_map_entry_unlink(vm_map_t map, vm_map_entry_t entry, vm_map_splay_findnext(root, &rlist); if (op == UNLINK_MERGE_NEXT) { rlist->start = root->start; - MPASS((rlist->eflags & MAP_ENTRY_STACK_GAP_DN) == 0); + MPASS((rlist->eflags & MAP_ENTRY_STACK_GAP) == 0); rlist->offset = root->offset; } if (llist != header) { @@ -1675,8 +1675,8 @@ vm_map_insert1(vm_map_t map, vm_object_t object, vm_ooffset_t offset, protoeflags |= MAP_ENTRY_VN_EXEC; if ((cow & MAP_CREATE_GUARD) != 0) protoeflags |= MAP_ENTRY_GUARD; - if ((cow & MAP_CREATE_STACK_GAP_DN) != 0) - protoeflags |= MAP_ENTRY_STACK_GAP_DN; + if ((cow & MAP_CREATE_STACK_GAP) != 0) + protoeflags |= MAP_ENTRY_STACK_GAP; if (cow & MAP_INHERIT_SHARE) inheritance = VM_INHERIT_SHARE; else @@ -2322,7 +2322,7 @@ vm_map_find_min(vm_map_t map, vm_object_t object, vm_ooffset_t offset, */ #define MAP_ENTRY_NOMERGE_MASK (MAP_ENTRY_GROWS_DOWN | \ MAP_ENTRY_IN_TRANSITION | MAP_ENTRY_IS_SUB_MAP | MAP_ENTRY_VN_EXEC | \ - MAP_ENTRY_STACK_GAP_DN) + MAP_ENTRY_STACK_GAP) static bool vm_map_mergeable_neighbors(vm_map_entry_t prev, vm_map_entry_t entry) @@ -2763,7 +2763,7 @@ vm_map_protect_guard(vm_map_entry_t entry, vm_prot_t new_prot, vm_prot_t old_prot; MPASS((entry->eflags & MAP_ENTRY_GUARD) != 0); - if ((entry->eflags & MAP_ENTRY_STACK_GAP_DN) == 0) + if ((entry->eflags & MAP_ENTRY_STACK_GAP) == 0) return; old_prot = PROT_EXTRACT(entry->offset); @@ -2838,7 +2838,7 @@ again: * guard). */ while (!CONTAINS_BITS(first_entry->eflags, - MAP_ENTRY_GUARD | MAP_ENTRY_STACK_GAP_DN) && + MAP_ENTRY_GUARD | MAP_ENTRY_STACK_GAP) && first_entry != vm_map_entry_first(map)) first_entry = vm_map_entry_pred(first_entry); start = first_entry->start; @@ -2859,9 +2859,9 @@ again: return (KERN_INVALID_ARGUMENT); } if ((entry->eflags & (MAP_ENTRY_GUARD | - MAP_ENTRY_STACK_GAP_DN)) == MAP_ENTRY_GUARD) + MAP_ENTRY_STACK_GAP)) == MAP_ENTRY_GUARD) continue; - max_prot = (entry->eflags & MAP_ENTRY_STACK_GAP_DN) != 0 ? + max_prot = (entry->eflags & MAP_ENTRY_STACK_GAP) != 0 ? PROT_MAX_EXTRACT(entry->offset) : entry->max_protection; if (!CONTAINS_BITS(max_prot, check_prot)) { vm_map_unlock(map); @@ -4645,12 +4645,12 @@ vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize, if (gap_bot == gap_top) return (KERN_SUCCESS); rv = vm_map_insert1(map, NULL, 0, gap_bot, gap_top, VM_PROT_NONE, - VM_PROT_NONE, MAP_CREATE_GUARD | MAP_CREATE_STACK_GAP_DN, + VM_PROT_NONE, MAP_CREATE_GUARD | MAP_CREATE_STACK_GAP, &gap_entry); if (rv == KERN_SUCCESS) { KASSERT((gap_entry->eflags & MAP_ENTRY_GUARD) != 0, ("entry %p not gap %#x", gap_entry, gap_entry->eflags)); - KASSERT((gap_entry->eflags & MAP_ENTRY_STACK_GAP_DN) != 0, + KASSERT((gap_entry->eflags & MAP_ENTRY_STACK_GAP) != 0, ("entry %p not stack gap %#x", gap_entry, gap_entry->eflags)); @@ -4717,7 +4717,7 @@ retry: return (KERN_FAILURE); if ((gap_entry->eflags & MAP_ENTRY_GUARD) == 0) return (KERN_SUCCESS); - if ((gap_entry->eflags & MAP_ENTRY_STACK_GAP_DN) != 0) { + if ((gap_entry->eflags & MAP_ENTRY_STACK_GAP) != 0) { stack_entry = vm_map_entry_succ(gap_entry); if ((stack_entry->eflags & MAP_ENTRY_GROWS_DOWN) == 0 || stack_entry->start != gap_entry->end) @@ -4840,7 +4840,7 @@ retry: if (gap_deleted) { rv1 = vm_map_insert1(map, NULL, 0, gap_start, gap_end, VM_PROT_NONE, VM_PROT_NONE, - MAP_CREATE_GUARD | MAP_CREATE_STACK_GAP_DN, + MAP_CREATE_GUARD | MAP_CREATE_STACK_GAP, &gap_entry); MPASS(rv1 == KERN_SUCCESS); gap_entry->next_read = sgp; @@ -5023,7 +5023,7 @@ RetryLookupLocked: fault_typea &= ~VM_PROT_FAULT_LOOKUP; if (prot == VM_PROT_NONE && map != kernel_map && (entry->eflags & MAP_ENTRY_GUARD) != 0 && - (entry->eflags & MAP_ENTRY_STACK_GAP_DN) != 0 && + (entry->eflags & MAP_ENTRY_STACK_GAP) != 0 && vm_map_growstack(map, vaddr, entry) == KERN_SUCCESS) goto RetryLookupLocked; } diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index cd30a4268efa..7c5981463ef7 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -145,7 +145,7 @@ struct vm_map_entry { #define MAP_ENTRY_WRITECNT 0x00008000 /* tracked writeable mapping */ #define MAP_ENTRY_GUARD 0x00010000 -#define MAP_ENTRY_STACK_GAP_DN 0x00020000 +#define MAP_ENTRY_STACK_GAP 0x00020000 #define MAP_ENTRY_UNUSED1 0x00040000 #define MAP_ENTRY_HEADER 0x00080000 @@ -381,7 +381,7 @@ long vmspace_resident_count(struct vmspace *vmspace); #define MAP_ACC_CHARGED 0x00004000 #define MAP_ACC_NO_CHARGE 0x00008000 #define MAP_COW_UNUSED1 0x00010000 -#define MAP_CREATE_STACK_GAP_DN 0x00020000 +#define MAP_CREATE_STACK_GAP 0x00020000 #define MAP_VN_EXEC 0x00040000 #define MAP_SPLIT_BOUNDARY_MASK 0x00180000 #define MAP_NO_HINT 0x00200000