From nobody Wed May 13 17:45:28 2026 X-Original-To: dev-commits-src-main@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 4gG18825Rlz6cl74 for ; Wed, 13 May 2026 17:45:28 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG1881JKCz452g for ; Wed, 13 May 2026 17:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778694328; 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=IwvzIg28aU1VG2f9X8Q3WbPs4kSkjYwj9lNZWRBpd0Y=; b=p/FkSD8LgeedAbsODS0lrVqAX/ccsUeOHo3AwyIDuE0i2EKn4VVrBVbQqfaCk8Yj/jr5KL AnqK3MloC6G4o7nqtrNlj+OqEZTZoMrblCVh9XucXlphGVhd3kK7QEV6Gjr06ZtM8C8H1M mnC66KbayOARWx6T4+vvEY9TqtxItWys/j4p3tQjMzGGL9j9/tGJg62FyAh5H59k+3DfYS H97XJWDFjxORFFInuqENBxQ7E4riwb+JxtgGmmZ8QXiGZ3gahPUtRBWS6lZnArAKbAQjdp /tVxQue3Rf5V2yo6cp1WgwAoqbNlYTsLwh+M7br1aDo6ZNqsKNbPmclfFrDMAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778694328; a=rsa-sha256; cv=none; b=qlR4rhRwQCEsXkbKz/mue470hRnZyJmE81Oqw0eTIaeWA8GQJ3r64FLqxO8wNBk0WxuXUl anRAjqGQYc/pi16xwvREl7aACl5/+CDcKV7p28LGMlscgXnsDcJW06x4xFBgRfN/n01Bp5 GHEZumE41LptCMMPaCHGz1+rd156QXHeIIPeVD6OsPAk7ADSXxzOpxoNwtzbKPuAJAjagd 99NL8yf2MQZgOq4o+6k4L/GV4y70cfow1mmoOrZ6v+z/xWuZ2Le8SbruBHkWPZTGU5bBiv e8JxPfGnlIyNDjxYNUMBzwADPpyQDtqN/8091m5ipLKIBofc8n8RmHI2B12gVQ== 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=1778694328; 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=IwvzIg28aU1VG2f9X8Q3WbPs4kSkjYwj9lNZWRBpd0Y=; b=urTxmU9nOjHGb4danyvgmsTuwFcEoIr3t7N/vPvoI0wirDlQ3v1sL0aAsCYJArnLUnwGFT 92t7iI0yau2RQJkURHtacBl7MUT0QKUoi1AoLJrbcGNgS4slD2oYSTAL0uaZ80a5Sv7Jfx Jo4gAchxcAxNCyiCds9Yyfj2DkZjclD1nZ/NX6BFL1qs5ZTqvzezQw9d97/EO/JyZTDRaW 5Tsr5lF1jtZZLGRuDYNg4Bi/1kTEUbmX/R9lWEtahq46IuIzMBsDxY/wTmJrN8UGzT4Tpo 7TL1n62NwcpjuJvr6AmDB06bmOJTkHaYS8llCV/M8u64MXRu5N0BHjFO4EQDmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG1880cr0z11Xb for ; Wed, 13 May 2026 17:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d59a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 17:45:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 2a56cedac2e4 - main - bq_insert: delay the BUF_UNLOCK if not bd_flush()ing List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a56cedac2e43c77e037e2d0c7e5af2ccb083c53 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 17:45:28 +0000 Message-Id: <6a04b8b8.1d59a.24dd7c7c@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=2a56cedac2e43c77e037e2d0c7e5af2ccb083c53 commit 2a56cedac2e43c77e037e2d0c7e5af2ccb083c53 Author: Ryan Libby AuthorDate: 2026-05-13 17:43:21 +0000 Commit: Ryan Libby CommitDate: 2026-05-13 17:43:21 +0000 bq_insert: delay the BUF_UNLOCK if not bd_flush()ing Reduce bufqueue lock contention by delaying the BUF_UNLOCK to after dropping the bufqueue lock. Still do the early BUF_UNLOCK if we actually have to bd_flush. Reviewed by: kib, markj Sponsored by: Dell Inc. Differential Revision: https://reviews.freebsd.org/D56948 --- sys/kern/vfs_bio.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 675f6fb4e526..181f2907c245 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -2053,22 +2053,26 @@ bq_insert(struct bufqueue *bq, struct buf *bp, bool unlock) bp->b_qindex = bq->bq_index; bp->b_subqueue = bq->bq_subqueue; - /* - * Unlock before we notify so that we don't wakeup a waiter that - * fails a trylock on the buf and sleeps again. - */ - if (unlock) - BUF_UNLOCK(bp); - if (bp->b_qindex == QUEUE_CLEAN) { /* * Flush the per-cpu queue and notify any waiters. + * + * Unlock before we notify so that we don't wakeup a waiter + * that fails a trylock on the buf and sleeps again. */ if (bd->bd_wanted || (bq != bd->bd_cleanq && - bq->bq_len >= bd->bd_lim)) + bq->bq_len >= bd->bd_lim)) { + if (unlock) { + BUF_UNLOCK(bp); + unlock = false; + } bd_flush(bd, bq); + } } BQ_UNLOCK(bq); + + if (unlock) + BUF_UNLOCK(bp); } /*