From: Caleb Sander Mateos <csander@purestorage.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: Keith Busch <kbusch@kernel.org>,
Caleb Sander Mateos <csander@purestorage.com>,
linux-block@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] block/t10-pi: deduplicate blk_reftag_remap_{prepare,complete}()
Date: Thu, 19 Nov 2026 23:48:05 -0700 [thread overview]
Message-ID: <20261120064806.752251-1-csander@purestorage.com> (raw)
blk_set_{t10,ext}_map_ref() and blk_set_{t10,ext}_unmap_ref() are
identical except that one updates the PI ref tag from virt to ref_tag
and the other does the opposite. And since blk_reftag_remap_prepare()
and blk_reftag_remap_complete() just dispatch to the corresponding
map/unmap functions based on the PI tuple format, they too are identical
except for the ref tag update direction.
Combine blk_set_{t10,ext}_{un,}map_ref() into new functions
blk_set_{t10,ext}_remap_ref() taking arguments "from" and "to". Also
combine blk_reftag_remap_prepare() and blk_reftag_remap_complete() into
a new function blk_reftag_remap(). In __blk_reftag_remap(), use the
value of prep to select which value to pass as "from" and "to" to
blk_reftag_remap().
blk_set_ext_unmap_ref()'s check to skip setting already correct ref tags
also had an extra lower_48_bits() that blk_set_ext_map_ref() lacked.
Either approach is correct since the check is purely an optimization.
blk_set_ext_unmap_ref()'s tighter condition would skip more redundant
put_unaligned_be48() calls on a theoretical block device with more than
2 ** 48 integrity intervals. So keep that tighter check in the combined
blk_set_ext_remap_ref().
Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
---
block/t10-pi.c | 66 ++++++++++----------------------------------------
1 file changed, 13 insertions(+), 53 deletions(-)
diff --git a/block/t10-pi.c b/block/t10-pi.c
index a19b4e102a83..5aebe582d09b 100644
--- a/block/t10-pi.c
+++ b/block/t10-pi.c
@@ -434,73 +434,36 @@ static void blk_tuple_remap_end(union pi_tuple *tuple, void *ptuple,
}
bvec_iter_advance(bip->bip_vec, iter, len);
}
-static void blk_set_ext_unmap_ref(struct crc64_pi_tuple *pi, u64 virt,
- u64 ref_tag)
+static void blk_set_ext_remap_ref(struct crc64_pi_tuple *pi, u64 from, u64 to)
{
u64 ref = get_unaligned_be48(&pi->ref_tag);
- if (ref == lower_48_bits(ref_tag) && ref != lower_48_bits(virt))
- put_unaligned_be48(virt, pi->ref_tag);
+ if (ref == lower_48_bits(from) && ref != lower_48_bits(to))
+ put_unaligned_be48(to, pi->ref_tag);
}
-static void blk_set_t10_unmap_ref(struct t10_pi_tuple *pi, u32 virt,
- u32 ref_tag)
+static void blk_set_t10_remap_ref(struct t10_pi_tuple *pi, u32 from, u32 to)
{
u32 ref = get_unaligned_be32(&pi->ref_tag);
- if (ref == ref_tag && ref != virt)
- put_unaligned_be32(virt, &pi->ref_tag);
+ if (ref == from && ref != to)
+ put_unaligned_be32(to, &pi->ref_tag);
}
-static void blk_reftag_remap_complete(struct blk_integrity *bi,
- union pi_tuple *tuple, u64 virt, u64 ref)
+static void blk_reftag_remap(struct blk_integrity *bi, union pi_tuple *tuple,
+ u64 from, u64 to)
{
switch (bi->csum_type) {
case BLK_INTEGRITY_CSUM_CRC64:
- blk_set_ext_unmap_ref(&tuple->crc64_pi, virt, ref);
+ blk_set_ext_remap_ref(&tuple->crc64_pi, from, to);
break;
case BLK_INTEGRITY_CSUM_CRC:
case BLK_INTEGRITY_CSUM_IP:
- blk_set_t10_unmap_ref(&tuple->t10_pi, virt, ref);
- break;
- default:
- WARN_ON_ONCE(1);
- break;
- }
-}
-
-static void blk_set_ext_map_ref(struct crc64_pi_tuple *pi, u64 virt,
- u64 ref_tag)
-{
- u64 ref = get_unaligned_be48(&pi->ref_tag);
-
- if (ref == lower_48_bits(virt) && ref != ref_tag)
- put_unaligned_be48(ref_tag, pi->ref_tag);
-}
-
-static void blk_set_t10_map_ref(struct t10_pi_tuple *pi, u32 virt, u32 ref_tag)
-{
- u32 ref = get_unaligned_be32(&pi->ref_tag);
-
- if (ref == virt && ref != ref_tag)
- put_unaligned_be32(ref_tag, &pi->ref_tag);
-}
-
-static void blk_reftag_remap_prepare(struct blk_integrity *bi,
- union pi_tuple *tuple,
- u64 virt, u64 ref)
-{
- switch (bi->csum_type) {
- case BLK_INTEGRITY_CSUM_CRC64:
- blk_set_ext_map_ref(&tuple->crc64_pi, virt, ref);
- break;
- case BLK_INTEGRITY_CSUM_CRC:
- case BLK_INTEGRITY_CSUM_IP:
- blk_set_t10_map_ref(&tuple->t10_pi, virt, ref);
+ blk_set_t10_remap_ref(&tuple->t10_pi, from, to);
break;
default:
WARN_ON_ONCE(1);
break;
}
@@ -519,17 +482,14 @@ static void __blk_reftag_remap(struct bio *bio, struct blk_integrity *bi,
*ref += bio->bi_iter.bi_size >> bi->interval_exp;
return;
}
while (iter.bi_size && *intervals) {
- ptuple = blk_tuple_remap_begin(&tuple, bi, bip, &iter);
-
- if (prep)
- blk_reftag_remap_prepare(bi, ptuple, virt, *ref);
- else
- blk_reftag_remap_complete(bi, ptuple, virt, *ref);
+ u64 from = prep ? virt : *ref, to = prep ? *ref : virt;
+ ptuple = blk_tuple_remap_begin(&tuple, bi, bip, &iter);
+ blk_reftag_remap(bi, ptuple, from, to);
blk_tuple_remap_end(&tuple, ptuple, bi, bip, &iter);
(*intervals)--;
(*ref)++;
virt++;
}
base-commit: 6e6d4b23e92742a9f56008beb35c20ed4902611b
--
2.56.1
next reply other threads:[~2026-11-20 6:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-20 6:48 Caleb Sander Mateos [this message]
2026-11-20 16:00 ` [PATCH] block/t10-pi: deduplicate blk_reftag_remap_{prepare,complete}() Christoph Hellwig
2026-11-20 18:29 ` Caleb Sander Mateos
2026-11-21 0:18 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261120064806.752251-1-csander@purestorage.com \
--to=csander@purestorage.com \
--cc=axboe@kernel.dk \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.