From owner-dev-commits-src-branches@freebsd.org Sun Jun 13 02:16:27 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 87810654F82; Sun, 13 Jun 2021 02:16:27 +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 4G2dVg3Gpmz4l58; Sun, 13 Jun 2021 02:16:27 +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 594FD19046; Sun, 13 Jun 2021 02:16:27 +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 15D2GRpp092553; Sun, 13 Jun 2021 02:16:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15D2GRB5092552; Sun, 13 Jun 2021 02:16:27 GMT (envelope-from git) Date: Sun, 13 Jun 2021 02:16:27 GMT Message-Id: <202106130216.15D2GRB5092552@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: cfd6c9b99f49 - stable/13 - vfs: slightly rework vn_rlimit_fsize MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cfd6c9b99f49dd24860456742eecccabfc100326 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2021 02:16:27 -0000 The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=cfd6c9b99f49dd24860456742eecccabfc100326 commit cfd6c9b99f49dd24860456742eecccabfc100326 Author: Mateusz Guzik AuthorDate: 2021-05-29 17:33:50 +0000 Commit: Mateusz Guzik CommitDate: 2021-06-13 02:15:25 +0000 vfs: slightly rework vn_rlimit_fsize (cherry picked from commit 478c52f1e3654213c7d79096a2bc7f908e0b501d) --- sys/kern/vfs_vnops.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index cf6a1f715d83..fc5118e8aa24 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -2364,12 +2364,25 @@ vn_rlimit_fsize(const struct vnode *vp, const struct uio *uio, off_t lim; bool ktr_write; - if (vp->v_type != VREG || td == NULL || - (td->td_pflags2 & TDP2_ACCT) != 0) + if (td == NULL) return (0); + + /* + * There are conditions where the limit is to be ignored. + * However, since it is almost never reached, check it first. + */ ktr_write = (td->td_pflags & TDP_INKTRACE) != 0; - lim = ktr_write ? td->td_ktr_io_lim : lim_cur(td, RLIMIT_FSIZE); - if ((uoff_t)uio->uio_offset + uio->uio_resid <= lim) + lim = lim_cur(td, RLIMIT_FSIZE); + if (__predict_false(ktr_write)) + lim = td->td_ktr_io_lim; + if (__predict_true((uoff_t)uio->uio_offset + uio->uio_resid <= lim)) + return (0); + + /* + * The limit is reached. + */ + if (vp->v_type != VREG || + (td->td_pflags2 & TDP2_ACCT) != 0) return (0); if (!ktr_write || ktr_filesize_limit_signal) {