From nobody Thu Sep 12 01:01:02 2024 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 4X3zdp3hpWz5W4Xd; Thu, 12 Sep 2024 01:01:02 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X3zdp24Hxz4TRX; Thu, 12 Sep 2024 01:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726102862; 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=Uz8UEQK7K8pxeGXcJZSvTHT5LK9AY3uEoDus9N35vAY=; b=Uohk0VxII77h7ylVcXHbdxwVkjYWtYEsdK9LPC9ITq37BojwVcBQwVT5VO0icMwFILKO7K StGu9xIDUZHIe9qMuq3ApNjBM+q3eyM+yC/YkADLfrNRtwjY+fanp3szo3hHE9NcaKogCz +NdDQSZoN70dLRDGZYj4LHTbOXTCNn9HE1YbtkGq3oH13NFWU5JIDeBjgb2Yf1S9Mfg6SO 5HH2jN91/HfFWSmYLmUHe9/VvBkpL8hlb3jmCUxGz6kw4wq+JZA3HnooM0wOpgjysgDfox yq23rD3SCK9W9MlOSYJCofBh6hjTjegjSvN8eHn2JO5dAJd8+6cSBSrXzBSeaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726102862; a=rsa-sha256; cv=none; b=YmVPaxQwIXbp1LoKEMAs5qxLH1Vu9NCzw1ve3FQdAmauYZn/eOVSkJzLikcU281FDAuyla MA0IL6jJYQTRwot2r9C2sNxvPE+BaPep3J6HFc53DdGgxJtlWvp3gXb/o1cmSMsDPdDhxx BVR+vs8arTim0c5gNfk/DkqXtkqupsifqUuYqzY8vHdV159UBLhTZtXiN6ZDV5O8Eu4zcG jzhhjDoORcHtdzBLmTUjXb6wzkZIuqkZF+MyVHjSBaEYKwKvm55kYUOrq5SZIcPT8IB5Ry mkEi+lUtikz5SIx2LVlCognfLA0G4rPuX3r2a0p2tc9xv2juN+lMZQ2iS25WfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726102862; 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=Uz8UEQK7K8pxeGXcJZSvTHT5LK9AY3uEoDus9N35vAY=; b=t9qFJ0qgKfkn+vuMJiIJWkqz7oQKGzeuZ3+Zw7FokBXkZZlXUloSphVx3RCsLF/bpnTcyq 7VDVZ8Cmv2M7ZAS24Umaxy3UsU5gd7BkPg+rdP9xCYP7Y/foRP4ajIAcJmSSHA7zZpsHPg YtHPhaXF5K1ahflewNkzK0wIABF2mW5PSJ42deMExbzI99GvUt4UeRV2tqFIyYEV/pVGTd YxwhByXyL+o1qKCQ64G1mHBq3IxDEnb1f8H0MGMvZGw3ru943YtkzDQSaje37M7ta9XHS6 Gv4JlOZdyDbC8++KVtw+lw+6dYCtNEe8E4TDnYfYg4SNvlFsgrbXhGMXAoN26Q== 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 4X3zdp1hTtztkc; Thu, 12 Sep 2024 01:01:02 +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 48C112Yc071264; Thu, 12 Sep 2024 01:01:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48C112sZ071261; Thu, 12 Sep 2024 01:01:02 GMT (envelope-from git) Date: Thu, 12 Sep 2024 01:01:02 GMT Message-Id: <202409120101.48C112sZ071261@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: e8b9bd97e3cb - stable/14 - vop_stdadvise(): restore correct handling of length == 0 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/14 X-Git-Reftype: branch X-Git-Commit: e8b9bd97e3cb1f58d4a4514c48d2fb4d49380511 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e8b9bd97e3cb1f58d4a4514c48d2fb4d49380511 commit e8b9bd97e3cb1f58d4a4514c48d2fb4d49380511 Author: Konstantin Belousov AuthorDate: 2024-09-03 04:20:40 +0000 Commit: Konstantin Belousov CommitDate: 2024-09-11 08:44:01 +0000 vop_stdadvise(): restore correct handling of length == 0 (cherry picked from commit 79eba754bec39d88a6494318a2176d19743cf993) --- sys/kern/vfs_default.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index e5c37433a77d..c2bded76f6dc 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -1066,8 +1066,8 @@ vop_stdadvise(struct vop_advise_args *ap) { struct vnode *vp; struct bufobj *bo; + uintmax_t bstart, bend; daddr_t startn, endn; - off_t bstart, bend, start, end; int bsize, error; vp = ap->a_vp; @@ -1099,7 +1099,8 @@ vop_stdadvise(struct vop_advise_args *ap) */ bsize = vp->v_bufobj.bo_bsize; bstart = rounddown(ap->a_start, bsize); - bend = roundup(ap->a_end, bsize); + bend = ap->a_end; + bend = roundup(bend, bsize); /* * Deactivate pages in the specified range from the backing VM @@ -1108,18 +1109,17 @@ vop_stdadvise(struct vop_advise_args *ap) * below. */ if (vp->v_object != NULL) { - start = trunc_page(bstart); - end = round_page(bend); VM_OBJECT_RLOCK(vp->v_object); - vm_object_page_noreuse(vp->v_object, OFF_TO_IDX(start), - OFF_TO_IDX(end)); + vm_object_page_noreuse(vp->v_object, + OFF_TO_IDX(trunc_page(bstart)), + OFF_TO_IDX(round_page(bend))); VM_OBJECT_RUNLOCK(vp->v_object); } bo = &vp->v_bufobj; - BO_RLOCK(bo); startn = bstart / bsize; endn = bend / bsize; + BO_RLOCK(bo); error = bnoreuselist(&bo->bo_clean, bo, startn, endn); if (error == 0) error = bnoreuselist(&bo->bo_dirty, bo, startn, endn);