From nobody Thu Oct 10 09:08:11 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 4XPP6z4YzPz5Yhp1; Thu, 10 Oct 2024 09:08:11 +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 4XPP6z3xYHz4m16; Thu, 10 Oct 2024 09:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728551291; 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=wQGov3nWcsnMqZle6pnQewDKtdp0ssHsHF2cbRUv9Mo=; b=ObA8O9HvDctdHSi0j+22I4LdR8xsN2i/p3skigpFb/puws7wOIuBgbL0ifLoVzCc0/a79U +1eLpcOfKhrx9RTtIJxCqP9AqTooEMT9uYlHkWKmH8JJLuaIBTqed+RhREhncJw7+xC5te N8y0ojpBnLZj7psGaSFP5lRmSkqvE4NPYZfa0lNv0/zxp59F2QsbOQGHwdt/fWkGQEEbR1 WK2HhBNoTqLNPvbMwWnzsYlMUsXv9wDm4ihnh+4/JBXlVAiZfgR0vUyjcuasq0DjL9fZ3A AUyxjUWzrlRxS1V0okIjnaY51K5QTm4lX9HVwIhu8DeTglBJM27om/+tAU0K5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728551291; 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=wQGov3nWcsnMqZle6pnQewDKtdp0ssHsHF2cbRUv9Mo=; b=UoLRi+5KTEe8VxV0Dgo1HKBz3DXCCCeTKJXAOMwZfQjsRlGWPUfYAie0iEt2SNg/GfFmoT 0DRBuxBkXjex4It2QEk/iJaOnrWe1/BcRnrn5plqLTCPFrq4tQ9PsaHG1y+kvkvrjYjfum 9jjPfes4w1oqjrw6WNGodjeZyikn8FJMLXeZG3msYBAKdF8hpdkxvESQ1i+Mbjk2Txpnia 1MOPOz/2QfFo7wHFyzynCLB8vbUxh6FOMItvN1CevMVxcD3qYa1q8BiMJO7nCHcpurJK1w 39kmozIlHpeKVh626GEYz7Ro2gy5bpYOKesJuHf23JfOKmSIs+wpExk3AQ703Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728551291; a=rsa-sha256; cv=none; b=oQDQKuLuM5ntiqJ4mclXV3QxjqRlhFwAkhYj8/Za6hFaaRH4Ccfrjxf9m6Xz+GMU5wa0S7 IiZXZ4W1hOUaprVgabU7yrvbl1oZuQeLL6PiyVzZmxDYgGT90/U5YA767HdBJMbS/+kv7q oJQ17/vGgl/UmiLNlzUa43TjrVPzcNFYYVpnfJWkbKXDJJfkH4MqlNbemrryr50DtmH08D pQME02nBZVYtoTs9t+BjYzHb1cGXQIUacvlK3U+QEuKCjKGkzNy22rLau9S1kvghQVjZim ZvWBaWog6Zco4oxcdR26x9JpzYhluP1NgLZXCJbdVpbi94Es/p89YdVaTuSKCg== 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 4XPP6z39FBzrYN; Thu, 10 Oct 2024 09:08:11 +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 49A98BgX051040; Thu, 10 Oct 2024 09:08:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49A98BFg051037; Thu, 10 Oct 2024 09:08:11 GMT (envelope-from git) Date: Thu, 10 Oct 2024 09:08:11 GMT Message-Id: <202410100908.49A98BFg051037@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: af4cd5e7b5b5 - main - vfs_subr: optimize inval_buf_range 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af4cd5e7b5b50502922b5d2bb42daa7fc66545bb Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=af4cd5e7b5b50502922b5d2bb42daa7fc66545bb commit af4cd5e7b5b50502922b5d2bb42daa7fc66545bb Author: Doug Moore AuthorDate: 2024-10-10 09:06:52 +0000 Commit: Doug Moore CommitDate: 2024-10-10 09:06:52 +0000 vfs_subr: optimize inval_buf_range Use a pctrie_lookup to avoid walking over low out-of-range buf list entries, and an early break to avoid the high out-of-range entries. Avoid writing almost identical loops for the dirty and clean lists. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D46963 --- sys/kern/vfs_subr.c | 49 +++++++++++++++++-------------------------------- 1 file changed, 17 insertions(+), 32 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index f192c6798858..328507efd1fd 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -2616,17 +2616,24 @@ static int v_inval_buf_range_locked(struct vnode *vp, struct bufobj *bo, daddr_t startlbn, daddr_t endlbn) { + struct bufv *bv; struct buf *bp, *nbp; - bool anyfreed; + uint8_t anyfreed; + bool clean; ASSERT_VOP_LOCKED(vp, "v_inval_buf_range_locked"); ASSERT_BO_LOCKED(bo); + anyfreed = 1; + clean = true; do { - anyfreed = false; - TAILQ_FOREACH_SAFE(bp, &bo->bo_clean.bv_hd, b_bobufs, nbp) { - if (bp->b_lblkno < startlbn || bp->b_lblkno >= endlbn) - continue; + bv = clean ? &bo->bo_clean : &bo->bo_dirty; + bp = BUF_PCTRIE_LOOKUP_GE(&bv->bv_root, startlbn); + if (bp == NULL) + continue; + TAILQ_FOREACH_FROM_SAFE(bp, &bv->bv_hd, b_bobufs, nbp) { + if (bp->b_lblkno >= endlbn) + break; if (BUF_LOCK(bp, LK_EXCLUSIVE | LK_SLEEPFAIL | LK_INTERLOCK, BO_LOCKPTR(bo)) == ENOLCK) { @@ -2638,39 +2645,17 @@ v_inval_buf_range_locked(struct vnode *vp, struct bufobj *bo, bp->b_flags |= B_INVAL | B_RELBUF; bp->b_flags &= ~B_ASYNC; brelse(bp); - anyfreed = true; + anyfreed = 2; BO_LOCK(bo); if (nbp != NULL && - (((nbp->b_xflags & BX_VNCLEAN) == 0) || + (((nbp->b_xflags & + (clean ? BX_VNCLEAN : BX_VNDIRTY)) == 0) || nbp->b_vp != vp || - (nbp->b_flags & B_DELWRI) != 0)) - return (EAGAIN); - } - - TAILQ_FOREACH_SAFE(bp, &bo->bo_dirty.bv_hd, b_bobufs, nbp) { - if (bp->b_lblkno < startlbn || bp->b_lblkno >= endlbn) - continue; - if (BUF_LOCK(bp, - LK_EXCLUSIVE | LK_SLEEPFAIL | LK_INTERLOCK, - BO_LOCKPTR(bo)) == ENOLCK) { - BO_LOCK(bo); - return (EAGAIN); - } - bremfree(bp); - bp->b_flags |= B_INVAL | B_RELBUF; - bp->b_flags &= ~B_ASYNC; - brelse(bp); - anyfreed = true; - - BO_LOCK(bo); - if (nbp != NULL && - (((nbp->b_xflags & BX_VNDIRTY) == 0) || - (nbp->b_vp != vp) || - (nbp->b_flags & B_DELWRI) == 0)) + (nbp->b_flags & B_DELWRI) == (clean? B_DELWRI: 0))) return (EAGAIN); } - } while (anyfreed); + } while (clean = !clean, anyfreed-- > 0); return (0); }