From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EDB0B185B67 for ; Sat, 18 Oct 2025 14:51:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760799093; cv=none; b=m+J30PdgdyRIo+cDovJ9oWcOrfai9Yo+xWAL9A0WSuX+PHmIxvqSYoiLXHDqhLXPT1ArDUEmhxoxgo74w4d2Od8dbLooeIchtXhR5gV2RuYOnnCF3cWeoAYxLwdQrtnGuiZWDyan34k0LTupImDgeaCL2u7rRQ0yiygNSxb4g/g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760799093; c=relaxed/simple; bh=E9LrDr+bFvomIu5wJ7hqk4+KJUcmPCsa8Bog+JQ2jxw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PzzhiJsDo+bYf+yD3StAOLjaYPi557tVsWeuarhV4TfNbe0OrzPfd+Gpb+u6nwXCjQnkUHxuoI2cScKNL2epTknwdfQai/T10MIYe/rBCxsYBnT6z+Ri6ZpGEg/knWhEtevJOJ0dPJ453GUfhBhusFxOakmzsLKWSPhIpVlX7HA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UqTFCzoU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="UqTFCzoU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD3B7C4CEF8; Sat, 18 Oct 2025 14:51:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760799092; bh=E9LrDr+bFvomIu5wJ7hqk4+KJUcmPCsa8Bog+JQ2jxw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UqTFCzoUXouwa3vnXFnzp2q887x7zO7EOmSm+xcqIvvqogInNAIfwmLgRMcUvkW2A s+nQ+pBV3pzvFH+ricFPE887+rGgRINao9p4Kb59I1onV8WZXbnsw3OyK90N4OdFUf mSLzL2urkR9aYYINExog2K9B8mLgUGV43f/HP+7JIDEdKO/p58ZTtGpUAopXEz3Pmv nRwiFlTWBynT6diX7avKJuCTwHmsUAd6njCJt5O5itMuVsGbMlIzSKymf7g/J/oGTH wKCaeDHoz+/VZzZM4srDwnJvxhgVygALMPSXVZhN5arqBpCDqyty9XUVlDuCx9y0rV 3TOs/WA+efMYA== From: Sasha Levin To: stable@vger.kernel.org Cc: Yu Kuai , Bart Van Assche , Christoph Hellwig , Jens Axboe , Sasha Levin Subject: [PATCH 5.15.y] blk-crypto: fix missing blktrace bio split events Date: Sat, 18 Oct 2025 10:51:29 -0400 Message-ID: <20251018145130.791122-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2025101656-curdle-duration-949d@gregkh> References: <2025101656-curdle-duration-949d@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Yu Kuai [ Upstream commit 06d712d297649f48ebf1381d19bd24e942813b37 ] trace_block_split() is missing, resulting in blktrace inability to catch BIO split events and making it harder to analyze the BIO sequence. Cc: stable@vger.kernel.org Fixes: 488f6682c832 ("block: blk-crypto-fallback for Inline Encryption") Signed-off-by: Yu Kuai Reviewed-by: Bart Van Assche Reviewed-by: Christoph Hellwig Signed-off-by: Jens Axboe [ changed blk_crypto_fallback_split_bio_if_needed() to blk_crypto_split_bio_if_needed() ] Signed-off-by: Sasha Levin --- block/blk-crypto-fallback.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/block/blk-crypto-fallback.c b/block/blk-crypto-fallback.c index c322176a1e099..e47716fe289dd 100644 --- a/block/blk-crypto-fallback.c +++ b/block/blk-crypto-fallback.c @@ -18,6 +18,7 @@ #include #include #include +#include #include "blk-crypto-internal.h" @@ -231,7 +232,9 @@ static bool blk_crypto_split_bio_if_needed(struct bio **bio_ptr) bio->bi_status = BLK_STS_RESOURCE; return false; } + bio_chain(split_bio, bio); + trace_block_split(split_bio, bio->bi_iter.bi_sector); submit_bio_noacct(bio); *bio_ptr = split_bio; } -- 2.51.0