From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793811285; b=k3HZyGRV08r6VEBWmacNi+1MCL/9znrVxrupOAtcKsk11dVG3BWEfoKdq9oi+/JxWII7 8gqopTV1UAkwLHpLrTI789t3CD0y6/Lfz9gqa7b8fLtVaNofo/8G7TDyv6rqGe6S5Jufm dMu+XFA6wrl4WVpdaEsWEdzXjBpbVKDpM8uV9qfFB2m8U5RkkqLY4ao/5+0qQbob6iVBR a+8mMl1BO6KNNkdUyybZGsxLhrkQzuWr14JAReGEbQQOulovAwaMDnb2oDOJYK/zUDVbD k2uGEi2CMjXv70elGHTeHW/I+oivLuXt8pgqQ1QoulPVisr1kyNNXydiLLC0usa6Wjg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793811285; h=Received:DKIM-Signature:Subject:To:Cc:From:Date:Message-ID: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=VialEgseVdJGdqQdgHTTinAJ0tOMevENhFMxL7pq0mI=; b=gG8+/wU/L3cQ0gvI5Jcjgbm7Nia1vkPmoyAJCwJ7aUgxYGSB8tzEaCIJpz/CCNIb+0CF +ZiknttdamO8Btcgbn/VvnGXEa291WTewoFTZ1VDT1MzJwxivtFpcN7Mh7B3rdoTPIw3h nnUUhM1ypJBFxrueKcmOZZvDpdEtqUMgZhEo/GOPZCHdBlHkjrlTF5aQqkuaUv57tpOWW oC+JEJ3MhxvPnR3Z/LIwmlhS+/xVEtYcXfZ2SLm7+Z6a441LmwdFANjIQFAMOlzatuFf/ ictlsGmYTuruhmVoiVLiuOdf/4BiYNwyTQHBpHMgOel56tnwyF8r3BZb6K7RlbGSsWA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=Fk6jny6q; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EF201606A31B for ; Wed, 4 Nov 2026 16:54:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=Fk6jny6q Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20B821F000C1; Wed, 4 Nov 2026 16:54:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793811284; bh=VialEgseVdJGdqQdgHTTinAJ0tOMevENhFMxL7pq0mI=; h=Subject:To:Cc:From:Date; b=Fk6jny6qbo0LBzgEj91ptLdErlUecck9m6JAea8DGjcDJYPUvRLSW6/JVnYv0v2tr elVrVA5gwH9ECp3JGOWAFJ7Ih2Scu7wSHk3ufsl95YxzzB/NsCzcZb/QMGAR9lvxm3 mnVbE1q38zor3DV6qoI0y0SARW/ASdU1a8SLWFMI= Subject: FAILED: patch "[PATCH] xfs: always report scrub errors in tracepoints" failed to apply to 6.6-stable tree To: djwong@kernel.org,cem@kernel.org,hch@lst.de Cc: From: Date: Wed, 04 Nov 2026 11:54:06 -0500 Message-ID: <2026110406-device-hangover-5a05@gregkh> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x 1ccc8f553d885d49c1bfe141ea1f331511940b3a # git commit -s git send-email --to '' --in-reply-to '2026110406-device-hangover-5a05@gregkh' --subject-prefix 'PATCH 6.6.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 1ccc8f553d885d49c1bfe141ea1f331511940b3a Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Mon, 12 Oct 2026 23:08:04 -0700 Subject: [PATCH] xfs: always report scrub errors in tracepoints LOLLM complains that the error processing functions in scrub will sometimes zero out *error before recording a tracepoint. This makes diagnosing problems harder, so let's fix that. Cc: stable@vger.kernel.org # v4.15 Fixes: 4700d22980d459 ("xfs: create helpers to record and deal with scrub problems") Signed-off-by: Darrick J. Wong Assisted-by: LOLLM # finding obvious bugs Reviewed-by: Christoph Hellwig Signed-off-by: Carlos Maiolino diff --git a/fs/xfs/scrub/btree.c b/fs/xfs/scrub/btree.c index 17bd8505be04..43a7ea7308ee 100644 --- a/fs/xfs/scrub/btree.c +++ b/fs/xfs/scrub/btree.c @@ -46,8 +46,14 @@ __xchk_btree_process_error( case -ENODATA: /* Note the badness but don't abort. */ sc->sm->sm_flags |= errflag; + if (cur->bc_ops->type == XFS_BTREE_TYPE_INODE) + trace_xchk_ifork_btree_op_error(sc, cur, level, + *error, ret_ip); + else + trace_xchk_btree_op_error(sc, cur, level, + *error, ret_ip); *error = 0; - fallthrough; + break; default: if (cur->bc_ops->type == XFS_BTREE_TYPE_INODE) trace_xchk_ifork_btree_op_error(sc, cur, level, diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c index e5233e31abb7..a61895872072 100644 --- a/fs/xfs/scrub/common.c +++ b/fs/xfs/scrub/common.c @@ -107,8 +107,9 @@ __xchk_process_error( case -ENODATA: /* Note the badness but don't abort. */ sc->sm->sm_flags |= errflag; + trace_xchk_op_error(sc, agno, bno, *error, ret_ip); *error = 0; - fallthrough; + break; default: trace_xchk_op_error(sc, agno, bno, *error, ret_ip); break; @@ -183,8 +184,10 @@ __xchk_fblock_process_error( case -ENODATA: /* Note the badness but don't abort. */ sc->sm->sm_flags |= errflag; + trace_xchk_file_op_error(sc, whichfork, offset, *error, + ret_ip); *error = 0; - fallthrough; + break; default: trace_xchk_file_op_error(sc, whichfork, offset, *error, ret_ip); diff --git a/fs/xfs/scrub/dabtree.c b/fs/xfs/scrub/dabtree.c index bbf6ece58828..02c8544d8918 100644 --- a/fs/xfs/scrub/dabtree.c +++ b/fs/xfs/scrub/dabtree.c @@ -49,8 +49,12 @@ xchk_da_process_error( case -ENODATA: /* Note the badness but don't abort. */ sc->sm->sm_flags |= XFS_SCRUB_OFLAG_CORRUPT; + trace_xchk_file_op_error(sc, ds->dargs.whichfork, + xfs_dir2_da_to_db(ds->dargs.geo, + ds->state->path.blk[level].blkno), + *error, __return_address); *error = 0; - fallthrough; + break; default: trace_xchk_file_op_error(sc, ds->dargs.whichfork, xfs_dir2_da_to_db(ds->dargs.geo,