From nobody Fri Mar 31 00:59:22 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 4Pnhky3b83z42dPn; Fri, 31 Mar 2023 00:59:22 +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 4Pnhky28Vlz3Lb4; Fri, 31 Mar 2023 00:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680224362; 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=EH+zOJqCNMwRGBPBNIGc1LTvOiqVv8AdOr4oozIPPpQ=; b=F9WBGsZv8ekLayj37txTqmbdby1Vz8Y0hqMT91LfaleV3dHP5FRMwS6UFYo/jE4sPrcCOp 2RUuQ0AR+Ty4KCr+lb2zYKQx7zUoRSJ7lGkfNf+OY+jPxOE4i5CnpVU8BnCQnO83ngfgWC 75ml6LYM1tsDqWtN+c8yTBlkO6f0LCT0+LMqW80Mw84L9zwj5YoHTC4S9Zj9+q3Or1vf2S aYAzSsRelgUDrOBYzaAxQkKdjyOxGLWJfaExoO0aUizKwwF2Q9DlFHEHPyU0iaibw6eWa6 E1IMFWzXo+KGFbF63gK/7Z4ISVzrJSuzk5b2mE//hZCKz0zY319fv1AddF65xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680224362; 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=EH+zOJqCNMwRGBPBNIGc1LTvOiqVv8AdOr4oozIPPpQ=; b=hOWnDMtq6TeNTNohOMA+KHgwQMfs1cbXKyiUG9etLUcuyl38/TAWTXAnlkUb/7mNby+N2Q eUdsLopJcx1nzizDDEpYLLBb10jPh6NQ+KEdYSNyNnGboyFFx4TceiT9A3aYtoKmvMsixX JCinpM+AtkQB/sZVX9u5tD5mlVHseiFrGIarbDvj/nalhvaAm+LmbwHsTE8/pyzHEtOp3D wL89Uk8j5kcZVhoXQIWwi40EwrTd/NaVo5UVHUVSKmECiF0dnklnYEd/QRYFoS8YadFvzJ LruV6O/H+h9uVLeK9MULq/h9XsY5GTKOdt6+DgeaaBm3sdSUSMesuWOJBYmbsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680224362; a=rsa-sha256; cv=none; b=SOhHwQR8eYW1IiCugmb3ORg46KXfRrOMiau+qNNapk8+sXr8EYTh3g1yq06q84VDiXVjI6 46wIP8RBRmBcFVZgpA0x9CtcnQJGkadHogASuF61VfdYWeH5+CZp2ceZg+kgAR7/8h5k8v 7OI63AGAlJGvPajfU5hVasR5VY6MmC3I2cl5DO3u038WPuHiZaOnyVIIIp5qEhgfttzKGB vO6l2ZLBBeBs/KW3cgZzu66K1p3WhoiY8S4niiGRssrTS9S2j+YqS5pwmI1N+pry4PlGrx xXyyDfsaxebpyf2OUwQrrfl5icFXsQfN80b8KdurhsrJweJEj3+WroUgwSlQdQ== 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 4Pnhky1DzFzYY3; Fri, 31 Mar 2023 00:59:22 +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 32V0xMUn001665; Fri, 31 Mar 2023 00:59:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32V0xMWA001664; Fri, 31 Mar 2023 00:59:22 GMT (envelope-from git) Date: Fri, 31 Mar 2023 00:59:22 GMT Message-Id: <202303310059.32V0xMWA001664@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: 464c507f5daa - stable/13 - vnode_pager_input: return runningbufspace back 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 464c507f5daa28512b934f71ccb8e1bf6af95071 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=464c507f5daa28512b934f71ccb8e1bf6af95071 commit 464c507f5daa28512b934f71ccb8e1bf6af95071 Author: Konstantin Belousov AuthorDate: 2023-03-24 21:12:21 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-31 00:47:52 +0000 vnode_pager_input: return runningbufspace back (cherry picked from commit 28f957b8b3a22086927451fee89789fdf596260b) --- sys/vm/vnode_pager.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 08927b5671f6..68e2916daad9 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -568,6 +568,13 @@ vnode_pager_addr(struct vnode *vp, vm_ooffset_t address, daddr_t *rtaddress, return (err); } +static void +vnode_pager_input_bdone(struct buf *bp) +{ + runningbufwakeup(bp); + bdone(bp); +} + /* * small block filesystem vnode pager input */ @@ -614,7 +621,7 @@ vnode_pager_input_smlfs(vm_object_t object, vm_page_t m) /* build a minimal buffer header */ bp->b_iocmd = BIO_READ; - bp->b_iodone = bdone; + bp->b_iodone = vnode_pager_input_bdone; KASSERT(bp->b_rcred == NOCRED, ("leaking read ucred")); KASSERT(bp->b_wcred == NOCRED, ("leaking write ucred")); bp->b_rcred = crhold(curthread->td_ucred); @@ -1132,6 +1139,8 @@ vnode_pager_generic_getpages_done(struct buf *bp) error = (bp->b_ioflags & BIO_ERROR) != 0 ? bp->b_error : 0; object = bp->b_vp->v_object; + runningbufwakeup(bp); + if (error == 0 && bp->b_bcount != bp->b_npages * PAGE_SIZE) { if (!buf_mapped(bp)) { bp->b_data = bp->b_kvabase;