From nobody Sat Aug 12 06:29:07 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 4RN9jb5QKKz4TvQ7; Sat, 12 Aug 2023 06:29:07 +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 4RN9jb4KB0z3XrS; Sat, 12 Aug 2023 06:29:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821747; 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=UCJhy+9zaaQI5h5OEn+eyt6JQIJagib11qf8m7Ivv9k=; b=bwAqQ3Br3voByLDaRFbn4+o4taT0CIJ2gIrtkOhbUoarMmWFlwemGKvRS/nZePKzG0VHcM GBY1bNODn81Mh/LkmOEGGzYTjjPqyq/6nH39gEtuG6mdlBmN8KXZ+HD3Kcr68y4SQZr6d7 Iqtm/34Nx5+rBQJ01QwnvmhOnq5bOJ7aKVwe+ikuXV1G2hd7nKhyX8ADzsWTMNne1Io+zT JCt8yVhm/ssEkWFQyroYt6fejd7oEgMkdfN5KG0CfybAGV61ptktyTPScA9TnttFv0ym1S r7fg1b2COZA7bq9RvhAmBfaJ1cVcsRhaOLgDn0bGxoJ7ShwqdHEg2QWr0Wg+pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821747; 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=UCJhy+9zaaQI5h5OEn+eyt6JQIJagib11qf8m7Ivv9k=; b=mYrcXkwsSSz+1BrFXYZgOINgEfQn0WmVI/dhuOnZP5OHDGNIa0EmCRsN+y6M8E/9sxgJ11 Zig1WltRvkkSm2JDiGnHYOY8M1NjJBprDtpI57ZjbZ+thj2a9VvwG4bzzUc19dHweZb+SB lNP2lCOXLPHZHU5WW7r75Fywdbdpef8dHsPL2QqYhBZ0DELd9ZSmsc3M9rVjmufNTEzjE2 N4to5E5tVoafSfO6IUOgxbZ/zqTYPROWO4ECQORHatiAv4Zceb1eI9o9WypVhN/A1tK6+L W9BohSsXu1HaceLpgkD05W6kkkuCfny/RCV4766NanN1HALrFZHobY19Xo3/kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691821747; a=rsa-sha256; cv=none; b=XveVyxkpn9NqYFdB4GofCx5ZQtB6jcEpeK0v2Z6fGnH+t71H4PIaxX038xVJ7KyodFZnhp en8+Z4m0DnEglyVNd6QnCrrJhwzCao4kz3GVgk+rhkjRkgySGYDsjnL/veluRTVGANMlCe ZqrDelFL+6H0bIwGxdChlEjYLD+fAxIsFE8BmxZbnD/ojmQ3l04ZHJJAlrPg8fJVWsfBhO 5zuEMsThrQcuV/zeLFdYz4rcb5e3K/E9bvIu/rAFSdWX8O7Z19UP7GQmOvIBmulQe+Z5oH P8sojh5Jl/iW+rTVPoVX+HHtRuFXKBqXSYLQV5j4NSh+OAu50/HqgPucMwowcw== 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 4RN9jb3Jv5z18YF; Sat, 12 Aug 2023 06:29:07 +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 37C6T78J024781; Sat, 12 Aug 2023 06:29:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C6T7CR024778; Sat, 12 Aug 2023 06:29:07 GMT (envelope-from git) Date: Sat, 12 Aug 2023 06:29:07 GMT Message-Id: <202308120629.37C6T7CR024778@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: aa928a52164f - main - vm_map_growstack(): handle max protection for stacks 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: aa928a52164fe57965491d63e57de66e9c078e1a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=aa928a52164fe57965491d63e57de66e9c078e1a commit aa928a52164fe57965491d63e57de66e9c078e1a Author: Konstantin Belousov AuthorDate: 2023-07-25 13:56:29 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-12 06:28:13 +0000 vm_map_growstack(): handle max protection for stacks Do not assume that protection is same as max_protection. Store both in offset, packed in the same way as the prot syscall parameter. Reviewed by: alc, markj (previous version) Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41099 --- sys/vm/vm_map.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 8c12f2a92bcb..28c44544c660 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4605,7 +4605,7 @@ vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize, * object offset. */ gap_entry->next_read = sgp; - gap_entry->offset = prot; + gap_entry->offset = prot | PROT_MAX(max); } else { (void)vm_map_delete(map, bot, top); } @@ -4625,7 +4625,7 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) struct ucred *cred; vm_offset_t gap_end, gap_start, grow_start; vm_size_t grow_amount, guard, max_grow; - vm_prot_t prot; + vm_prot_t prot, max; rlim_t lmemlim, stacklim, vmemlim; int rv, rv1 __diagused; bool gap_deleted, grow_down, is_procstack; @@ -4770,7 +4770,8 @@ retry: * The gap_entry "offset" field is overloaded. See * vm_map_stack_locked(). */ - prot = gap_entry->offset; + prot = PROT_EXTRACT(gap_entry->offset); + max = PROT_MAX_EXTRACT(gap_entry->offset); grow_start = gap_entry->end - grow_amount; if (gap_entry->start + grow_amount == gap_entry->end) { @@ -4784,7 +4785,7 @@ retry: gap_deleted = false; } rv = vm_map_insert(map, NULL, 0, grow_start, - grow_start + grow_amount, prot, prot, MAP_STACK_GROWS_DOWN); + 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,