From nobody Fri Aug 25 01:08:34 2023 X-Original-To: dev-commits-src-all@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 4RX1zl1qRhz4qbBZ; Fri, 25 Aug 2023 01:08:35 +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 4RX1zl16Mfz4Stf; Fri, 25 Aug 2023 01:08:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925715; 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=qEpVpLIWZJe7GFJdu0M/JIhep5sFG16sOgZ1Z4SYVd8=; b=w6gMj8PZxsLuS2AEhbqw2zvmioFhFDpcgl1hURD3fY2a+kJ2VQWKI+V8R9VwxO8R988sRA e5dnJBbER7P5NwMi3lidbjflEZryBzNIcYPXpx5M1+e0od0NgkSFny/54opv//cel7ga35 fmlsQFhyvl5GbtKW77UBkiRpMZ2ugWxMDtZovF6v4tn2106eACMDW2AZAe3AueuH2Znw+w ho3INqqqnkgJHv0PoruhLkf7eideabWB4qNpc+zyHiaQjTnF91n8KEkdJzYx5LwLiU3Rgy cZF9ETSIVViXHBK6Wohwtf2BmwKjjOGhK9oc4kbzrvSkmMF5kX1ZsgBvKQkeqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925715; 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=qEpVpLIWZJe7GFJdu0M/JIhep5sFG16sOgZ1Z4SYVd8=; b=ilRqTXVd3D0gNkiSfs2eBIrkGYxwfl5EJMDVR0QrON6g18N7LL9zhf3POQZDNkuB1fk1KG xFmTEAsH73JdT4BKacjA31cAh/Vd2DkO1LbIA7UJ5y714DDCPcuyUt6u+EprjFPLBdjLJD pSDgR6jNze5AFgYgaMqdMTVJIAwLulaBz6bKip0UEP8Y7aqcJuUCy4jl3eFvHurVAbadKI 5cJDRGgbz5o5c6C3311PGoCk+5GCzF0qqDS0RzyG8HzRQtioN8OkmBwfx+ZRjEftAEAj3b 72vKXYTWt4ZSMidLXGXvLKZGsTYhTGy87lGzkxEY4wRz4Ohrd1BgWU41T4x0kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925715; a=rsa-sha256; cv=none; b=xK3KAPP6Oevv9fM6/0fAjq5osAJmwNknujswDuubpq4Tdihlk0trPHUxrNydw/bb9XPNME 4KnXFg45UwkkAoZeaDLDbzcavyB8DSlgefCg9pA9Iiocd07TBDNUWldJEtdbtRzbvg6IN+ iboTot/0zxZLu9Pz+WBeRmq1RMH0gCFBsSuW0vne4BEUL0JjX1aolMzMppg6AWYdAun3IB 9DJCkCgISw0pty3HiKeu3kT36BBp93ZH/Q09ok9BBBjwj7fDNbgkAgKhn0+c0jNPtADjVr t976xzepEp/wqXt3DjEnkhiKU7wFIhjC+bEoekg00T3z2hYUCMsx0KqUk2isnQ== 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 4RX1zl0BHrzptZ; Fri, 25 Aug 2023 01:08:35 +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 37P18YBv058409; Fri, 25 Aug 2023 01:08:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18Yvu058406; Fri, 25 Aug 2023 01:08:34 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:34 GMT Message-Id: <202308250108.37P18Yvu058406@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ce5d4af8bce6 - stable/13 - vm_map: do not allow to merge stack gap entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: ce5d4af8bce6701e8c1370a45146edfca447a618 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ce5d4af8bce6701e8c1370a45146edfca447a618 commit ce5d4af8bce6701e8c1370a45146edfca447a618 Author: Konstantin Belousov AuthorDate: 2023-07-25 18:48:57 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:44 +0000 vm_map: do not allow to merge stack gap entries (cherry picked from commit 9d7ea6cff7a7edc0f3d4fa8d54e6345ee027e754) --- sys/vm/vm_map.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 09e78b3e18f9..076528126e44 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2287,7 +2287,8 @@ vm_map_find_min(vm_map_t map, vm_object_t object, vm_ooffset_t offset, * another entry. */ #define MAP_ENTRY_NOMERGE_MASK (MAP_ENTRY_GROWS_DOWN | MAP_ENTRY_GROWS_UP | \ - MAP_ENTRY_IN_TRANSITION | MAP_ENTRY_IS_SUB_MAP | MAP_ENTRY_VN_EXEC) + MAP_ENTRY_IN_TRANSITION | MAP_ENTRY_IS_SUB_MAP | MAP_ENTRY_VN_EXEC | \ + MAP_ENTRY_STACK_GAP_UP | MAP_ENTRY_STACK_GAP_DN) static bool vm_map_mergeable_neighbors(vm_map_entry_t prev, vm_map_entry_t entry)