From nobody Fri Dec 19 22:01:56 2025 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 51BFF156F42; Sun, 24 Mar 2024 23:11:46 +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=1711321907; cv=none; b=nmX7vHW2o8rN2T6rzxVZBjQFZsBDjTszIxERZ1vJMBic5lYYuFlYriLmvd1IXnZkvUu77yjvU+r/LgwtzKJwSFFlEAc/xHH85sCDrRewBZ3vQcka5Kd4yXS6cDkShTi7t0HfON2uvDsmqbGttF5mvFGS+S/Y9dZMaofUmINnRLY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321907; c=relaxed/simple; bh=tXFAWqv6MhFIQ98BBI18+hDNN0x8isGTpay6NA+WcEI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Bmz8WKQ57oxUw+Ttq4yEy1CNVb+8fezvSNWRR0hl06A6ohBvaUuhm0o7a3ZW7f1O9bh7vyQ3QuI7E+xyvqDKZbawWy6OTNZjHTgnWSpaS0xAP6PM6onoh2cDcySF9tT/RmHk0P9YVf6kHYawDhW/zhkgWDSeofRtFnacn3sH+OE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gts48/zJ; 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="gts48/zJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90B98C433C7; Sun, 24 Mar 2024 23:11:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321906; bh=tXFAWqv6MhFIQ98BBI18+hDNN0x8isGTpay6NA+WcEI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gts48/zJuI8+zTvFUprBFAd0VlY0I9qW9efPxNWz8SCSXms8DRNddzqzrNjtIrP2/ CxwmXR737zJIH40THFZwYOOkesPAlyT2LahosXHjHiyfjU8Spv1Ql/EBLk6XDUiTOY ommjAbhmKykDOqS4uFfY8btRnMzfFfxcWPKv46A2V3tgLB5XoMN+El+ClwtgLgdfw5 rsOYrLCQR2UHAAQ3gkc7jDHWhS/x8rRJMeIipCAM98Xzu9GyIBIivO/rSdF5EsFm3C Z3s6Uti+RlYqNYievKeKOL3lCIF2V3gahIlWDhnC0+8r9TbKc4tR6Zxrzry7QrqzQE D/ytWgw5bLyFQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mikulas Patocka , Mike Snitzer , Sasha Levin Subject: [PATCH 6.6 635/638] dm-integrity: align the outgoing bio in integrity_recheck Date: Sun, 24 Mar 2024 19:01:12 -0400 Message-ID: <20240324230116.1348576-636-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324230116.1348576-1-sashal@kernel.org> References: <20240324230116.1348576-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Mikulas Patocka [ Upstream commit b4d78cfeb30476239cf08f4f40afc095c173d6e3 ] It is possible to set up dm-integrity with smaller sector size than the logical sector size of the underlying device. In this situation, dm-integrity guarantees that the outgoing bios have the same alignment as incoming bios (so, if you create a filesystem with 4k block size, dm-integrity would send 4k-aligned bios to the underlying device). This guarantee was broken when integrity_recheck was implemented. integrity_recheck sends bio that is aligned to ic->sectors_per_block. So if we set up integrity with 512-byte sector size on a device with logical block size 4k, we would be sending unaligned bio. This triggered a bug in one of our internal tests. This commit fixes it by determining the actual alignment of the incoming bio and then makes sure that the outgoing bio in integrity_recheck has the same alignment. Fixes: c88f5e553fe3 ("dm-integrity: recheck the integrity tag after a failu= re") Signed-off-by: Mikulas Patocka Signed-off-by: Mike Snitzer Signed-off-by: Sasha Levin --- drivers/md/dm-integrity.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c index 71c3b891c4df5..e7cd27e387df1 100644 --- a/drivers/md/dm-integrity.c +++ b/drivers/md/dm-integrity.c @@ -1709,7 +1709,6 @@ static noinline void integrity_recheck(struct dm_inte= grity_io *dio, char *checks struct bio_vec bv; sector_t sector, logical_sector, area, offset; struct page *page; - void *buffer; =20 get_area_and_offset(ic, dio->range.logical_sector, &area, &offset); dio->metadata_block =3D get_metadata_sector_and_offset(ic, area, offset, @@ -1718,13 +1717,14 @@ static noinline void integrity_recheck(struct dm_in= tegrity_io *dio, char *checks logical_sector =3D dio->range.logical_sector; =20 page =3D mempool_alloc(&ic->recheck_pool, GFP_NOIO); - buffer =3D page_to_virt(page); =20 __bio_for_each_segment(bv, bio, iter, dio->bio_details.bi_iter) { unsigned pos =3D 0; =20 do { + sector_t alignment; char *mem; + char *buffer =3D page_to_virt(page); int r; struct dm_io_request io_req; struct dm_io_region io_loc; @@ -1737,6 +1737,14 @@ static noinline void integrity_recheck(struct dm_int= egrity_io *dio, char *checks io_loc.sector =3D sector; io_loc.count =3D ic->sectors_per_block; =20 + /* Align the bio to logical block size */ + alignment =3D dio->range.logical_sector | bio_sectors(bio) | (PAGE_SIZE= >> SECTOR_SHIFT); + alignment &=3D -alignment; + io_loc.sector =3D round_down(io_loc.sector, alignment); + io_loc.count +=3D sector - io_loc.sector; + buffer +=3D (sector - io_loc.sector) << SECTOR_SHIFT; + io_loc.count =3D round_up(io_loc.count, alignment); + r =3D dm_io(&io_req, 1, &io_loc, NULL, IOPRIO_DEFAULT); if (unlikely(r)) { dio->bi_status =3D errno_to_blk_status(r); --=20 2.43.0