From nobody Tue Oct 06 22:58:52 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 4hzsBN4Nr8z6cf4Q for ; Tue, 06 Oct 2026 22:58:52 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hzsBN1mpvz3DXS for ; Tue, 06 Oct 2026 22:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791327532; 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=A0utc2Gco1KKnQAzNoqvi5ye0j2+oOkJZJM9Q+fkjkE=; b=De+bDNjBqEDONtdhnQxh62HZkjAsYKwhEFVRw0O56k4WnqLr7j+WXbrtCmyrYe0gn+nSuP brJefITWVzzDpMAFCmNr2am8Jk5eIB/F6tTHCYq30bKyNZ5Rk3KLSjBxJPacVIjRpHRcs2 JO7SNG/nMSSvTHfHvqOf20ek4/GLXwvvmMmxjdO6om5Soyw+WZas7ucYCRozS+zdqnVHrb b/DlZzrHSsoMqgF20ZT6e3uoWvOZz6uIyjf57kqrhae1x9lw5VVfW5PjtJZpk1v+VPAb0I JMaH0w1gSYElNoIDR5BFcUJr0iA5XszWD2ZXlAoqshKAKNvnBCVxiU/he/rOCQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791327532; b=nBNHSB2FlcrbynwPjZpHKQwRsZDPO6rDtvLzmXLtbmXQyONifiPfI55NewWwUNZ3YG2IEg ckIn3gAQ34v4X4Y61dnFy5IJmVKy5Y41k7CRyRzW0yn7u7m+GJ9nAOXGuCD3KZv9tZhUm7 nlYqDFnY97PBmjYXUQ6ExhWpOgnaNFk/6ID686XC5XHVkIJKrkmreNbCu+WUWZCDy3REcj 3cjxk2Bu+y23ywUoK3FhapeuBoBRJP52e6yjyHT/GlH8pyjgpw93RP81iw52jl/IFkm9EW 6jxYEDSGDDsK9uHuuKnaPneqTg0HsMyMJXM5RMhrRGNBe8BhBd4CrxyIf9+Eqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791327532; 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=A0utc2Gco1KKnQAzNoqvi5ye0j2+oOkJZJM9Q+fkjkE=; b=AGTX23/HVTOFrYKqvfYEUZGTKJEaqIfW8U4IqdU3D/eA3KR+BsKtC8cqbM8Bc7UCOpP/XE KbaSZypWAp2jZUr8nJSaNh9c4WAfWSC6wQfYeMEGMKV4Y1OvwO2XctXIj8vNf8Db49uihb NfjyBAE4BX7b3Tg9HXB+2H/9Mk07GP5/38cm9ZN9uohqDyYUfD7ffThlPOUaKGjlzb/Uau PKvNySEJ9ymCDN4SA4IdNPNaWw8ZMUFoJ2lMfFIMvT9u5vKgqaEtWLkyQiSfiWupSViaD9 m4Ulm7e/eRPw2pm70tcDeGLW+Cw9WCPA6sHdk4KlLG4W6qz5EHKCC6e7d4DN8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hzsBN0s9mzQPl for ; Tue, 06 Oct 2026 22:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31a1f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Oct 2026 22:58:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7845cf8de8db - main - ada: Update trim stats for every bio 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7845cf8de8db3f6dd60a69379907b51b80123eae Auto-Submitted: auto-generated Date: Tue, 06 Oct 2026 22:58:52 +0000 Message-Id: <6ac57d2c.31a1f.499489b@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7845cf8de8db3f6dd60a69379907b51b80123eae commit 7845cf8de8db3f6dd60a69379907b51b80123eae Author: Warner Losh AuthorDate: 2026-10-06 22:45:55 +0000 Commit: Warner Losh CommitDate: 2026-10-06 22:46:23 +0000 ada: Update trim stats for every bio Separate the updating the stats for the completion from the biodone for each one. Sponsored by: Netflix Reviewed by: ali_mashtizadeh.com Differential Revision: https://reviews.freebsd.org/D60157 --- sys/cam/ata/ata_da.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index 9a088cc74337..9c6a5ba2f51d 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -2941,7 +2941,8 @@ adadone(struct cam_periph *periph, union ccb *done_ccb) case ADA_CCB_BUFFER_IO: case ADA_CCB_TRIM: { - struct bio *bp; + struct bio *bp, *bp1; + struct bio_queue queue; int error; KASSERT(priority == CAM_PRIORITY_NORMAL, @@ -3010,16 +3011,18 @@ adadone(struct cam_periph *periph, union ccb *done_ccb) * extensive. Release the periph refcount taken in adastart() * for each CCB. */ - cam_iosched_bio_update_stats(softc->cam_iosched, bp, done_ccb); + if (state == ADA_CCB_TRIM) { + TAILQ_INIT(&queue); + TAILQ_CONCAT(&queue, &softc->trim_req.bps, bio_queue); + cam_iosched_bio_queue_update_stats(softc->cam_iosched, + &queue, done_ccb, error); + } else + cam_iosched_bio_update_stats(softc->cam_iosched, bp, + done_ccb); xpt_release_ccb(done_ccb); KASSERT(softc->refcount >= 1, ("adadone softc %p refcount %d", softc, softc->refcount)); softc->refcount--; if (state == ADA_CCB_TRIM) { - TAILQ_HEAD(, bio) queue; - struct bio *bp1; - - TAILQ_INIT(&queue); - TAILQ_CONCAT(&queue, &softc->trim_req.bps, bio_queue); /* * Normally, the xpt_release_ccb() above would make sure * that when we have more work to do, that work would @@ -3035,12 +3038,6 @@ adadone(struct cam_periph *periph, union ccb *done_ccb) cam_periph_unlock(periph); while ((bp1 = TAILQ_FIRST(&queue)) != NULL) { TAILQ_REMOVE(&queue, bp1, bio_queue); - bp1->bio_error = error; - if (error != 0) { - bp1->bio_flags |= BIO_ERROR; - bp1->bio_resid = bp1->bio_bcount; - } else - bp1->bio_resid = 0; biodone(bp1); } } else {