From nobody Fri Aug 25 01:08:36 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 4RX1zm4fjpz4qZkH; Fri, 25 Aug 2023 01:08:36 +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 4RX1zm2L23z4T6f; Fri, 25 Aug 2023 01:08:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925716; 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=9221Zt/wApvPZBGnYsw62cHU+0ulC4gv/APZIqlw3kA=; b=WMb3oDJ44ugKVd9J1lgQ650q/BIJBkOBQyUugOOqAsy8kQV5oyUDi5nNXOVAZgATr9zCZG 3cpPm4ksgk8cLdyIVxaJGn7VAdz5U4yoM4czlDhX1P1zo31SC76juk738sUki/sFzDpHxK 9wmBUTpFmFq5H5ZY76j3dhMEiIQZbQlVy4cQWwBTUFJEH3kA68yPOf/9e4Xch/E7VgiKUU YRadLM8b1RfVTBdHXx3Hhrun7KVRWtqu24pq9vEUq7PjZAAqAPhLHvvOVDN6JNJwb6wRN3 s2DcUGPSl5NMxHmKh7UrWsuNZoIkBqp07KWaq9P1ue+JUAS1fwC2Mz2bO0+o0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925716; 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=9221Zt/wApvPZBGnYsw62cHU+0ulC4gv/APZIqlw3kA=; b=N7G05x9KWrWPaNO5DE/B/FuF9yDYdr++mchhQhbG0Jb/tuDeIzp819mUIusDjbc98Tt/e3 8l0LGoymrpmSjrw2Aiz6UVl415/BsWdrm4uXH7rzRqQ96q83v4kSukcoRqkjDHx64bPThB NCAIFxIt0x0ovPvAFwoQ8KgFu+I4iAKK2h6cb/xY8Xu/KR4Vct1+XG5YOr5F4WeCjA9zHO GowmMw/27H4EO3nxyIkdLAuORgbO6Gp0YeQo/ui1hBUM9m90mb2yEm/NleDLEvhlRV0p19 hYbOs7WamVkbHSsHRTSS9mzbSLkAGA8ff55drbZmvJU+tX4EgZZNTyLl7MCYfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925716; a=rsa-sha256; cv=none; b=e0DUFKEEJSt4q4g9BDGyTEOysqWcNY1DmUnO9El9oCAh1uuu9exDfUoNiI2aQ3V4BdLwTO ewZo0ZhGuQX/R9yeZ3sCclGL1/+m1mwvxnPVDBykEl5UbXBoUUXEkqgRBVkb+x5Qmr58I+ r/uPSev85QDvdKPsFzU7rc9WCDrVEZSeb7uLmp4jq2xzjXV2V3ARdldDpwMvLl3OH1F/99 mYoODaB4spIiq5PnOVt721GtRPdJZrzlGZ3JMixV0xQ5dm5z0sZ3X2+9B2x/lS2MN1X92V vxCoNl3OBffrq+LhKnUZ7+HQQkfCeaTp7Dq3Or72VgGg9V16f3eX1nco/kERkA== 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 4RX1zm1Q2Nzpnn; Fri, 25 Aug 2023 01:08:36 +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 37P18ahg058470; Fri, 25 Aug 2023 01:08:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18aca058468; Fri, 25 Aug 2023 01:08:36 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:36 GMT Message-Id: <202308250108.37P18aca058468@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: f60811fed642 - stable/13 - vm_map_growstack(): restore stack gap data if gap entry was removed 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: f60811fed6428ebf75c888aec67e71714b75e618 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f60811fed6428ebf75c888aec67e71714b75e618 commit f60811fed6428ebf75c888aec67e71714b75e618 Author: Konstantin Belousov AuthorDate: 2023-07-25 18:52:15 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:44 +0000 vm_map_growstack(): restore stack gap data if gap entry was removed (cherry picked from commit b6037edbd17dd3144aa1a7b0814cd5ebe98d765a) --- sys/vm/vm_map.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 076528126e44..1f223bbbd396 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4658,7 +4658,7 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) struct vmspace *vm; struct ucred *cred; vm_offset_t gap_end, gap_start, grow_start; - vm_size_t grow_amount, guard, max_grow; + vm_size_t grow_amount, guard, max_grow, sgp; vm_prot_t prot, max; rlim_t lmemlim, stacklim, vmemlim; int rv, rv1; @@ -4806,6 +4806,7 @@ retry: */ prot = PROT_EXTRACT(gap_entry->offset); max = PROT_MAX_EXTRACT(gap_entry->offset); + sgp = gap_entry->next_read; grow_start = gap_entry->end - grow_amount; if (gap_entry->start + grow_amount == gap_entry->end) { @@ -4822,10 +4823,13 @@ retry: grow_start + grow_amount, prot, max, MAP_STACK_GROWS_DOWN); if (rv != KERN_SUCCESS) { if (gap_deleted) { - rv1 = vm_map_insert(map, NULL, 0, gap_start, + 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_DN, + &gap_entry); MPASS(rv1 == KERN_SUCCESS); + gap_entry->next_read = sgp; + gap_entry->offset = prot | PROT_MAX(max); } else vm_map_entry_resize(map, gap_entry, grow_amount);