From nobody Mon Apr 15 14:07:56 2024 X-Original-To: dev-commits-src-branches@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 4VJ8C106wrz5Gfdm; Mon, 15 Apr 2024 14:07:57 +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 4VJ8C06PDRz4bg4; Mon, 15 Apr 2024 14:07:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713190076; 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=gPlVrnA7qvDKnv24R+hDNCCRwmIK4fzmeu5m2Qb2pIg=; b=dd8f+bVXHI4sLxBWDp99KqM+7uJE4uC0YTe1CRnUjcZD1TrBeILGo0kotFBvXnvToFdYPp VGmRuilLk0QcxYUcFFZH2uEUIBZC6/AKLRd07mT5uPGOeS6tZofObLrrgfOkOQIsVOYB+1 wjQmBBHN9ynIH8CDvxoyLGMpnWnxav5+3dKo26Lz8HJk9uSmOA8hhIsz9F8HFs35hFNF+6 KRwazQW0XEfhj6GVEiIa99KxCA82k6oZy/+/52MYdWwz9A2lTouHwTDzBhbxpZfbGSSyDI oPMyTj3SBxYEa9vdPwyVSTI647Eq9IlmkRBEwWicuoUpbW3Bzsxvm/tPrCJ54w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713190076; a=rsa-sha256; cv=none; b=pCs2bqVMcDQRDicuVNg7sYN7GrN5Nh8V6w0jBG4I833Si1Ur/gMygho2/io6Ya5SHS2Mw+ iuKVPNpAPsGw3P904Cdt9SEpgs5NXzvD20u/Nnr+9KZDvWB2rKMx2ni01Emn7lvdoqPtrE BJrAkCx6oRpmxa1e0spJwUWb95cGxYW3UUmcX7RRqLDYtZROIjdyvnjnHVVFdVd+CbRR2/ sPVjYiiNQtJj+kk6KxQmg+ObA6D1XS++IdK3yXQvCrvYY+tof0qYLWsdWpo7icqi3sznD2 Lhz0b43CycSUGhckN5lGy4848r40mM7PKMOFGT9wDK5zaJuxLvoilSlfMrQGOg== 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=1713190076; 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=gPlVrnA7qvDKnv24R+hDNCCRwmIK4fzmeu5m2Qb2pIg=; b=MpAv2KMLVa9VB7/mY4Fz58zRzOjurjYDg7wfDZHG1LRE55lz98cPBENBIY/0QI22P1OQP9 uU5VpZexovJ1X1RaZ1eeiakbNnXsNuZs3+Ut9+yH6h5fzfZ9AxaxvIb31DbVK15qm3YmFR SZlABSMfjXtQXT9yqM7aW8EykT44kBt+dCCiIJKhqztGz1N6s6EensJvgPfSRH0UBEGc94 mf51aonLJ16aRLhYQxDPqvCWUp/k77LtRpDvhmx+l38PimaX2qL9K1DGH/uk1vLIhRjQrO cD8Qia2V3tldb5TnLr02nNV2Wi8Rlobpa0BE3U9fgS15L481+ST5KpQ7xEf/NA== 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 4VJ8C05jk1z12vy; Mon, 15 Apr 2024 14:07:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43FE7uf3070875; Mon, 15 Apr 2024 14:07:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FE7uuE070872; Mon, 15 Apr 2024 14:07:56 GMT (envelope-from git) Date: Mon, 15 Apr 2024 14:07:56 GMT Message-Id: <202404151407.43FE7uuE070872@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 268afe724791 - stable/14 - tarfs: Implement VOP_BMAP List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 268afe724791468118a3c12838489b0b9460e623 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=268afe724791468118a3c12838489b0b9460e623 commit 268afe724791468118a3c12838489b0b9460e623 Author: Mark Johnston AuthorDate: 2024-04-05 15:14:36 +0000 Commit: Mark Johnston CommitDate: 2024-04-15 14:06:12 +0000 tarfs: Implement VOP_BMAP This lets tarfs provide readahead/behind hints to the VFS, which helps memory-mapped I/O performance, important when running faulting in executables out of a tarfs mount as one might if tarfs is used to back the root filesystem, for example. The improvement is particularly noticeable when the backing tarball is zstd-compressed. The implementation simply returns the extent of the virtual block containing the target offset, clamped by the maximum I/O size. This is perhaps simplistic; it effectively just chooses values that would correspond to a single VOP_READ call in tarfs_read_file(). Reviewed by: des, kib MFC after: 1 month Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D44626 (cherry picked from commit a0895e394d3fec374e61a207bdfa0245dae86f53) --- sys/fs/tarfs/tarfs_vnops.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/sys/fs/tarfs/tarfs_vnops.c b/sys/fs/tarfs/tarfs_vnops.c index 7a04f891350e..f2828c60f8a7 100644 --- a/sys/fs/tarfs/tarfs_vnops.c +++ b/sys/fs/tarfs/tarfs_vnops.c @@ -125,6 +125,60 @@ tarfs_access(struct vop_access_args *ap) return (error); } +static int +tarfs_bmap(struct vop_bmap_args *ap) +{ + struct tarfs_node *tnp; + struct vnode *vp; + off_t off; + uint64_t iosize; + int ra, rb, rmax; + + vp = ap->a_vp; + iosize = vp->v_mount->mnt_stat.f_iosize; + + if (ap->a_bop != NULL) + *ap->a_bop = &vp->v_bufobj; + if (ap->a_bnp != NULL) + *ap->a_bnp = ap->a_bn * btodb(iosize); + if (ap->a_runp == NULL) + return (0); + + tnp = VP_TO_TARFS_NODE(vp); + off = ap->a_bn * iosize; + + ra = rb = 0; + for (u_int i = 0; i < tnp->nblk; i++) { + off_t bs, be; + + bs = tnp->blk[i].o; + be = tnp->blk[i].o + tnp->blk[i].l; + if (off > be) + continue; + else if (off < bs) { + /* We're in a hole. */ + ra = bs - off < iosize ? + 0 : howmany(bs - (off + iosize), iosize); + rb = howmany(off - (i == 0 ? + 0 : tnp->blk[i - 1].o + tnp->blk[i - 1].l), + iosize); + break; + } else { + /* We'll be reading from the backing file. */ + ra = be - off < iosize ? + 0 : howmany(be - (off + iosize), iosize); + rb = howmany(off - bs, iosize); + break; + } + } + + rmax = vp->v_mount->mnt_iosize_max / iosize - 1; + *ap->a_runp = imin(ra, rmax); + if (ap->a_runb != NULL) + *ap->a_runb = imin(rb, rmax); + return (0); +} + static int tarfs_getattr(struct vop_getattr_args *ap) { @@ -629,6 +683,7 @@ struct vop_vector tarfs_vnodeops = { .vop_default = &default_vnodeops, .vop_access = tarfs_access, + .vop_bmap = tarfs_bmap, .vop_cachedlookup = tarfs_lookup, .vop_close = tarfs_close, .vop_getattr = tarfs_getattr,