From nobody Fri Aug 25 01:08:39 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 4RX1zq6Gmyz4qZsH; Fri, 25 Aug 2023 01:08:39 +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 4RX1zq5MsZz4TJt; Fri, 25 Aug 2023 01:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925719; 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=6A22wbvi0CW4u58JPWTVTyanVC7uHkxNCg6KY/zcxZY=; b=KXhHv8vh6Qr796lxsIawHRQ0quKS7ECCNIl9oTDgFgXEqsB9E0QZvum4B8OecPTkORoSGX s9dRkSrJbgSalnZta0bYs0hW83qbGr40gHF5x7S5pw8mPvKf9p31qIh7HVZ++MhagJgLm7 zaIlEVQ9RJzcZ3UA1foo0DKQE/j25Ta/MDrbg24szl9/wrfC4p9P/XiqxnOXKiSF4VDvzk 1pGfoJgIw2QO6AXtkpHOngUA7bt5RCxMw1SQi8oW3f0raORF5EGCHwN2/JcDz39MaDplfy h+QoMcUF2RfQokOMH/IP8tc+R+bDhqyU/qdyDjmF9EaeipX8wpdbYUy58Z8qaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925719; 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=6A22wbvi0CW4u58JPWTVTyanVC7uHkxNCg6KY/zcxZY=; b=hdCmzwaPqk+RwyNhjlXaAEstE7JUrrco9xJtH7E1dbOeH/ZPbCjMtz00cW6fxDK2hUb4hq gT8cvvmHSmdgJtVJI01aS9wI0JcCgFn5j/EHd2UIj6wy6r+x+U9Wfw00fkmLYp0cXW/xUT Sl82QYVY3ptx7iB7IHhM6WvEXy6VA6sBPV/doj39BXVQ+MdoOs18J0uniWfIXQg2XT1MAU 3ewWlM+PMNPcPuDoR9/aMM0R7b+rMqfEKUpGRXqGvwHGILQwYjzcaoTHALc+s4RZUVooiw N35Hw80+wWbTtjwAvroDHFA7y8yGpYg9TmtTR7uRSECVbf8ECz4L45NJX5a6qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925719; a=rsa-sha256; cv=none; b=Y51zv98N33Yxwa7ien3zMfQhDq+ByqoQC62jgwGTsQzQjLGWCGBwTaXvggcAsfHDjgYafb UwjW7NEIIFcPfY7rXjcdDl4vRFUoQl48AtQQ7aSFytCu1GAUdUP39pQgCBbnsxIDmKjJAR mxd2fxpPbmHoF6XmsFI+7gFs1wcW8CI9HWdLC17NCliMgOPJzysZrxd7nUVqpqag8vbWI8 EcF8cWt77Q3AW8EViNb0u3Wv73GvB4KsXHqcG7AtvvBD3K2rFlkadMuSeQCgmQGMnrbvPs SfUtpdrnRyfpi2348vbbT9PDg3mqPRfPi0N4JNZTeNZrB8HzxVXPd4wsra83AA== 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 4RX1zq4T19zpnp; Fri, 25 Aug 2023 01:08:39 +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 37P18dhT058605; Fri, 25 Aug 2023 01:08:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18dPh058602; Fri, 25 Aug 2023 01:08:39 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:39 GMT Message-Id: <202308250108.37P18dPh058602@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: b96ca29b6248 - stable/13 - vm_map.c: plug several more places which might modify entry->offset 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b96ca29b62488f50c468b964ee684e6d0245b2ee Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b96ca29b62488f50c468b964ee684e6d0245b2ee commit b96ca29b62488f50c468b964ee684e6d0245b2ee Author: Konstantin Belousov AuthorDate: 2023-08-15 19:05:33 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:44 +0000 vm_map.c: plug several more places which might modify entry->offset (cherry picked from commit c718009884b3d65528deaff24712cbf98e3be656) --- sys/vm/vm_map.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 029605eb272a..d046cd34afea 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1413,7 +1413,9 @@ 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); - root->offset += entry->end - root->start; + if ((root->eflags & (MAP_ENTRY_STACK_GAP_DN | + MAP_ENTRY_STACK_GAP_UP)) == 0) + root->offset += entry->end - root->start; root->start = entry->end; max_free_left = vm_map_splay_merge_pred(header, entry, llist); max_free_right = root->max_free = vm_size_max( @@ -1429,7 +1431,9 @@ 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); - entry->offset += entry->start - root->start; + if ((entry->eflags & (MAP_ENTRY_STACK_GAP_DN | + MAP_ENTRY_STACK_GAP_UP)) == 0) + entry->offset += entry->start - root->start; root->end = entry->start; max_free_left = root->max_free = vm_size_max( vm_map_splay_merge_left(header, root, llist), @@ -1463,6 +1467,8 @@ 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 | + MAP_ENTRY_STACK_GAP_UP) == 0); rlist->offset = root->offset; } if (llist != header) { @@ -3100,7 +3106,8 @@ vm_map_madvise( entry = vm_map_entry_succ(entry)) { vm_offset_t useEnd, useStart; - if ((entry->eflags & MAP_ENTRY_IS_SUB_MAP) != 0) + if ((entry->eflags & (MAP_ENTRY_IS_SUB_MAP | + MAP_ENTRY_GUARD)) != 0) continue; /*