From nobody Thu Nov 4 01:08:01 2021
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 BD68D184A82A;
Thu, 4 Nov 2021 01:08:03 +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 4Hl59G5gwkz4jZP;
Thu, 4 Nov 2021 01:08:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
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 C979523084;
Thu, 4 Nov 2021 01:08:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1A4181tS007778;
Thu, 4 Nov 2021 01:08:01 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A41819T007777;
Thu, 4 Nov 2021 01:08:01 GMT
(envelope-from git)
Date: Thu, 4 Nov 2021 01:08:01 GMT
Message-Id: <202111040108.1A41819T007777@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 3e322ded35f7 - stable/13 - Unmap shared page manually before doing vm_map_remove() on exit or exec
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
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: 3e322ded35f72e0851ab9cfe0c0d37f479c1347e
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=3e322ded35f72e0851ab9cfe0c0d37f479c1347e
commit 3e322ded35f72e0851ab9cfe0c0d37f479c1347e
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2021-10-20 20:32:59 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2021-11-04 00:56:39 +0000
Unmap shared page manually before doing vm_map_remove() on exit or exec
(cherry picked from commit 1c69690319c5bb7deae6ce1add6ea25bb40b3b91)
---
sys/kern/kern_exec.c | 25 +++++++++++++++++++++++++
sys/kern/kern_exit.c | 1 +
sys/sys/sysent.h | 1 +
3 files changed, 27 insertions(+)
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index eb2d7d9986e2..4a405637be4a 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1047,6 +1047,30 @@ exec_onexec_old(struct thread *td)
umtx_exec(td->td_proc);
}
+/*
+ * This is an optimization which removes the unmanaged shared page
+ * mapping. In combination with pmap_remove_pages(), which cleans all
+ * managed mappings in the process' vmspace pmap, no work will be left
+ * for pmap_remove(min, max).
+ */
+void
+exec_free_abi_mappings(struct proc *p)
+{
+ struct vmspace *vmspace;
+ struct sysentvec *sv;
+
+ vmspace = p->p_vmspace;
+ if (refcount_load(&vmspace->vm_refcnt) != 1)
+ return;
+
+ sv = p->p_sysent;
+ if (sv->sv_shared_page_obj == NULL)
+ return;
+
+ pmap_remove(vmspace_pmap(vmspace), sv->sv_shared_page_base,
+ sv->sv_shared_page_base + sv->sv_shared_page_len);
+}
+
/*
* Destroy old address space, and allocate a new stack.
* The new stack is only sgrowsiz large because it is grown
@@ -1091,6 +1115,7 @@ exec_new_vmspace(struct image_params *imgp, struct sysentvec *sv)
vm_map_min(map) == sv_minuser &&
vm_map_max(map) == sv->sv_maxuser &&
cpu_exec_vmspace_reuse(p, map)) {
+ exec_free_abi_mappings(p);
shmexit(vmspace);
pmap_remove_pages(vmspace_pmap(vmspace));
vm_map_remove(map, vm_map_min(map), vm_map_max(map));
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index bfd25366b49c..47ead49bb202 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -416,6 +416,7 @@ exit1(struct thread *td, int rval, int signo)
mtx_unlock(&ppeers_lock);
}
+ exec_free_abi_mappings(p);
vmspace_exit(td);
(void)acct_process(td);
diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h
index a6b4b9fe9378..3e87bc7c3744 100644
--- a/sys/sys/sysent.h
+++ b/sys/sys/sysent.h
@@ -318,6 +318,7 @@ void exec_sysvec_init_secondary(struct sysentvec *sv, struct sysentvec *sv2);
void exec_inittk(void);
void exit_onexit(struct proc *p);
+void exec_free_abi_mappings(struct proc *p);
void exec_onexec_old(struct thread *td);
#define INIT_SYSENTVEC(name, sv) \