From nobody Sat Aug 12 06:29:10 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 4RN9jg0qckz4Tvjm; Sat, 12 Aug 2023 06:29:11 +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 4RN9jg06kSz3Y2J; Sat, 12 Aug 2023 06:29:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821751; 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=38xFcI2lnl3LGl1b2T65qtXN/veSghNBBtD00ttzyB4=; b=oL2pGuRKm/OghAJ3KSC13iBdm4dC9X9flxPD2+lcSZeWn8ZezUdHOhFL1gKP5QQ4gD87B0 2rVDkb6O70/Wp3X5p7lH0oa2yXbvrvlNGO2vozhJjlgvh7GOQWDqP99tYeitFe1YF12Yqr h+Yw4Svz5vFKOWEFO92IqOnMxqEjYBHbdfTMdtISrlgAbgpasmTqu7oK0wywoXXbUUL4Lx qsEI8EeDHGvpoirMcEyJmMq4LwxsUrjmxMudyov5BlSBqgqyJ7D1SsvIndu2OghBfs3e5u vCkU7XHNVyIB+JCrxr3sVOOTt0rhr+pva1ERq0DNW98IZ4swHqJediucb/Y8Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821751; 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=38xFcI2lnl3LGl1b2T65qtXN/veSghNBBtD00ttzyB4=; b=EI2Qe6Mffi90++KOR03TST+ZCvvfRdeiHrD8yxolKvNYIptr6Ig1uqOT3DQ55G71VtY6Ir ZP6c6tLjaOM0zjitWDzNvRTTHTYERgNmDsrBHf93wi+ml/f8bAhu0rG/qKpK1BsCkui5Q8 ybFPJttGGuoBING2yN3fZkVhcgPiLfJZoxKQ+m7VCg6LKyAKq4QeFnb+dzUzFHhgloqWsy T2lbt/ErRZ1xf2EDpq0n9NyrJK5deOA69RiRa3DQ608HUhyGbD3zuHdbhhhHBHE7ja1+/L N0ZCha184Pi0Vfb93ukTOB998pQbpkHIVS8oX8H8gTXcjog5DkTRCA11olr94g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691821751; a=rsa-sha256; cv=none; b=xhVZAl3rHpYWlLnLYb4P61hgz4wSfVoxj/cqFgd04o2DwZ1TX5BzyAzi7Vja/DR5+FswMo AACh/8u6No07tqpVN7UQsdQs2bQFoOAnd3H6emeuP24XIoq1GV0gbVxm5fFHmHb7DjuMa7 Oev1RtbldRfU1/xiakSXKenkO2mWMlPVC1+O6PgpQ8RXj2Qy+dchNvStvxg+qNyrXuvVNE w3COGkzJEwhNKjXtidzJokFihJ+DoUB2asf/2xig6cuZlqKdZOavUnxL7xSXFm/GmewrDT C7tM8La6eb4YGOSL0Vkzxu28GuZwzvqXXK1da89QFTqXrGZJOnKB3RYRyaja7A== 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 4RN9jf6DR9z18jW; Sat, 12 Aug 2023 06:29:10 +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 37C6TAfX024956; Sat, 12 Aug 2023 06:29:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C6TACW024953; Sat, 12 Aug 2023 06:29:10 GMT (envelope-from git) Date: Sat, 12 Aug 2023 06:29:10 GMT Message-Id: <202308120629.37C6TACW024953@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: 9d7ea6cff7a7 - main - vm_map: do not allow to merge stack gap entries 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d7ea6cff7a7edc0f3d4fa8d54e6345ee027e754 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9d7ea6cff7a7edc0f3d4fa8d54e6345ee027e754 commit 9d7ea6cff7a7edc0f3d4fa8d54e6345ee027e754 Author: Konstantin Belousov AuthorDate: 2023-07-25 18:48:57 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-12 06:28:13 +0000 vm_map: do not allow to merge stack gap entries At least, offset handling is wrong for them. Reviewed by: alc, markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41099 --- 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 e63fcdc7c6f1..790d81bba44b 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2293,7 +2293,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)