From nobody Tue Sep 23 00:40:59 2025 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 4cW1P81FbPz67m7v; Tue, 23 Sep 2025 00:41:00 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cW1P773sCz3vn9; Tue, 23 Sep 2025 00:40:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758588060; 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=hZCOZzMztTMm8BYZvsCFlrCvgmHIpNxx4SxU9YLGkFE=; b=HZN2/UyUciia0/F9J/3o76oR2nh79jUh2EyTvHliUIhG+hidv7INBihIaWyaDW1x9LT0/U s1FOPR1kGQ+aMJT8Y+z+9mL71J86+SFS9D0OXzHm1Sq1erNuAJS1CKhkIN+etm7KujM1kt AOYTX5gs6OKQLfwi7p8JoEG8csmAlqDTwZMx3xPwZptl2zvhC79ZFVPDJ8OJVN2pl/Hh59 4mUK/CbJtpNxCi9+m0jlSTxVaiEc6/14WfsOWyB0NpDNZFEFPfmdgMpXWaT6u5sfSvntG4 4rj1i+74kFfkN2YiiraUHTnKA8qNe7o/6bRyNXahVb6IAINot3H5qUu+kM900g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758588060; 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=hZCOZzMztTMm8BYZvsCFlrCvgmHIpNxx4SxU9YLGkFE=; b=m2ItAj3ciqSvXaaxm2b9ZxKc4YK6aousm5OrTpV+4olXkndFLXExKgeL5of2JnIHd12Y5c oPy/LmHW43SKiDQ19hi4FqxStpU3kQzNExhUePVx/UzsDb1jccH3wXTOKxW/vf30plV8Nh CbIFbTgWJ5KRuhTOKOcH0QtQdkdpXdB1eHvz53EJVftOQhUO3LKkMTeKHmLRRhoVfspHl5 JwOsN8E1Uy+tNayVae46ZVSkPNNxNG2dx5LnVgTI0GikUyJdUtrqH+QATI2CcoGYnXj1uj Erf9KcHNByfrB9IrEkxhhN29Pkim8kdpxw4PR1foSgBHXgO6stcU00kanT+jrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758588060; a=rsa-sha256; cv=none; b=Ox2zQLXit4/L6pdk758XF2dm26itAQVtaRAMszDkFFSJhzs+vMKdyZbncLFV0AgmqcLxEJ zEd2j7P0kT9d75v250mp43CD77+PBCv4eALnv9pHDygagyGhMh8FbeCuHEJQWtYa2YK29/ Dgfh5B6vSp3wM+sFzywiMcYUv80J+9iYwMszccf6BTmrpZOWeR6ksFjgrjmM+hApN2HL4U x4v5dzzgdhlx1utJK9DqRgvCA93wTEl+q+R1FhXztINxlRTZBIHcFOvF+0fnTIp4vBp4rl z2G8Er6GmhrA4mFWSSCEx8HC0RdCUtBvvGR+lIHgGoPPmzUuKZc/4PKKgFICAg== 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 4cW1P76BPBz6xK; Tue, 23 Sep 2025 00:40:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58N0exp3020813; Tue, 23 Sep 2025 00:40:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58N0exYO020810; Tue, 23 Sep 2025 00:40:59 GMT (envelope-from git) Date: Tue, 23 Sep 2025 00:40:59 GMT Message-Id: <202509230040.58N0exYO020810@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: a05c806a78a7 - stable/15 - vm/vm_fault.c: update and split comments for vm_fault() and vm_fault_trap() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: a05c806a78a7ad359e607c92d1e1f60c78d51e48 Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a05c806a78a7ad359e607c92d1e1f60c78d51e48 commit a05c806a78a7ad359e607c92d1e1f60c78d51e48 Author: Konstantin Belousov AuthorDate: 2025-09-16 03:41:55 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-23 00:40:33 +0000 vm/vm_fault.c: update and split comments for vm_fault() and vm_fault_trap() (cherry picked from commit 22cce201da76a1916be5c993201f0478f3048292) --- sys/vm/vm_fault.c | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 58f8ac16fa0c..22558a12b44b 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -694,21 +694,18 @@ _Static_assert(UCODE_PAGEFLT == T_PAGEFLT, "T_PAGEFLT"); #endif /* - * vm_fault_trap: + * vm_fault_trap: * - * Handle a page fault occurring at the given address, - * requiring the given permissions, in the map specified. - * If successful, the page is inserted into the - * associated physical map. + * Helper for the page fault trap handlers, wrapping vm_fault(). + * Issues ktrace(2) tracepoints for the faults. * - * NOTE: the given address should be truncated to the - * proper page address. + * If a fault cannot be handled successfully by satisfying the + * required mapping, and the faulted instruction cannot be restarted, + * the signal number and si_code values are returned for trapsignal() + * to deliver. * - * KERN_SUCCESS is returned if the page fault is handled; otherwise, - * a standard error specifying why the fault is fatal is returned. - * - * The map in question must be referenced, and remains so. - * Caller may hold no locks. + * Returns Mach error codes, but callers should only check for + * KERN_SUCCESS. */ int vm_fault_trap(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type, @@ -1546,6 +1543,27 @@ vm_fault_object(struct faultstate *fs, int *behindp, int *aheadp) return (res); } +/* + * vm_fault: + * + * Handle a page fault occurring at the given address, requiring the + * given permissions, in the map specified. If successful, the page + * is inserted into the associated physical map, and optionally + * referenced and returned in *m_hold. + * + * The given address should be truncated to the proper page address. + * + * KERN_SUCCESS is returned if the page fault is handled; otherwise, a + * Mach error specifying why the fault is fatal is returned. + * + * The map in question must be alive, either being the map for current + * process, or the owner process hold count incremented to prevent + * exit(). + * + * If the thread private TDP_NOFAULTING flag is set, any fault results + * in immediate protection failure. Otherwise the fault is processed, + * and caller may hold no locks. + */ int vm_fault(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type, int fault_flags, vm_page_t *m_hold)