From nobody Sat Aug 12 06:29:11 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 4RN9jh2cNPz4Tvbs; Sat, 12 Aug 2023 06:29:12 +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 4RN9jh1Xxpz3YCx; Sat, 12 Aug 2023 06:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821752; 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=lL7OpjqUE+uTLeBU2qSvvMx35kxXDdY44ULJFslRNjg=; b=s2mLaPz9bYauvgF03/5Yi7h9qmAwHiAY3pq7vqSvfL2x6dIklRC+WyMwpEj9akm3dTbcRw mEiX8hwkP/brMXlBJpvOf0+HEyFt2svmtlD4qCydzb1DTA6LjuN18IZ1irEWjDwgFGQXgi g/qFV/SIRfRM7pVLJdUPiAKOsOFt84xiZLxL/BKSECYWH40hBCPR4orEkczRCqbXzQnm6S NJhj46Y79h/SX0nEpM9mZnnyoiy14qDKe2MUFtRosnRagzD3JcYkl1k13dx8upfOASzPxw 9Z60zdNHU0GryZeR2IfU99R0GpDBPNhiPpdx5xKRbnKVezTD01zGIKs39oX6ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821752; 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=lL7OpjqUE+uTLeBU2qSvvMx35kxXDdY44ULJFslRNjg=; b=mKb7NGXxuLkSahmEH4HrLReiFpK8t8OENPG8tszBnYgr+lvPlSAKE8jSGoyKvuOgCtKHw6 ItJ8IaxhZrg/3OuRkCGEiX9tdDz+1l56U7hlgdjd+DR1x9eNV98dtEUmtygnQHsNor/IA2 WrTmwPZ1sGjDiP3Xk2Qm83ILnSetmKRP96lrSd3ogosXOiU7u0nCNKQ7Get9GBi9hf0+G9 PAIIpS8jM9UFzBrgaloz8HJGMpzMomSA7kguME7rScDtp83d+gfCcpxzlSHcFuzkgS/FhL GHD35oX/qf9hIFnHLIHXK5yHoSLqVDlX05k4OL6le993Tgay9p/MOEkj6Ef62Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691821752; a=rsa-sha256; cv=none; b=fOr3+MmDaih0Qxoj253gfTH1QQLG6gcdPwZlkcjknhCFoqr35YQzA2fCsx8aVkV1lMztul DrE21XeZGCc97NrQ8HZ6pGrCJuujkzJ30HinkrtlfI2GYX7vJ9ayjRezaWdBS/NQE+9NNd ErJNx2mp4uFyxpUGKSIDlh5s+elixz5qGuEyUF876ddsOTwN60jRLHFSXopI3RiYE546rz g274iTXycLmoG9jL3NWL22tglD4zdmF36y0FOB8my3hybxINnBuROeSgtaBNMN8dHey2Iv ST3ww+z947RjBs5OYWG8yq4+mCMiBP8PTSAbq2SQ5ldzE/C00IhtH4rdEmOkEQ== 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 4RN9jh0RWGz18jX; Sat, 12 Aug 2023 06:29:12 +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 37C6TBkY025016; Sat, 12 Aug 2023 06:29:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C6TBBi025013; Sat, 12 Aug 2023 06:29:11 GMT (envelope-from git) Date: Sat, 12 Aug 2023 06:29:11 GMT Message-Id: <202308120629.37C6TBBi025013@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: b6037edbd17d - main - 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/main X-Git-Reftype: branch X-Git-Commit: b6037edbd17dd3144aa1a7b0814cd5ebe98d765a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b6037edbd17dd3144aa1a7b0814cd5ebe98d765a commit b6037edbd17dd3144aa1a7b0814cd5ebe98d765a Author: Konstantin Belousov AuthorDate: 2023-07-25 18:52:15 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-12 06:28:13 +0000 vm_map_growstack(): restore stack gap data if gap entry was removed and then restored. 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 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 790d81bba44b..1c806d6cae34 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4657,7 +4657,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 __diagused; @@ -4805,6 +4805,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) { @@ -4821,10 +4822,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);