* [PATCH] block/t10-pi: deduplicate blk_reftag_remap_{prepare,complete}()
@ 2026-11-20 6:48 Caleb Sander Mateos
2026-11-20 16:00 ` Christoph Hellwig
0 siblings, 1 reply; 4+ messages in thread
From: Caleb Sander Mateos @ 2026-11-20 6:48 UTC (permalink / raw)
To: Jens Axboe; +Cc: Keith Busch, Caleb Sander Mateos, linux-block, linux-kernel
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] block/t10-pi: deduplicate blk_reftag_remap_{prepare,complete}()
2026-11-20 6:48 [PATCH] block/t10-pi: deduplicate blk_reftag_remap_{prepare,complete}() Caleb Sander Mateos
@ 2026-11-20 16:00 ` Christoph Hellwig
2026-11-20 18:29 ` Caleb Sander Mateos
0 siblings, 1 reply; 4+ messages in thread
From: Christoph Hellwig @ 2026-11-20 16:00 UTC (permalink / raw)
To: Caleb Sander Mateos; +Cc: Jens Axboe, Keith Busch, linux-block, linux-kernel
Good idea. But I think the new function name is a bit misleading and the
double ternary operators on a single initialization line obfuscate the
code compared to the old if/else.
Can we do something like this instead?
diff --git a/block/t10-pi.c b/block/t10-pi.c
index a19b4e102a83..f24ededd70a8 100644
--- a/block/t10-pi.c
+++ b/block/t10-pi.c
@@ -436,69 +436,32 @@ 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_tuple_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);
@@ -524,9 +487,9 @@ static void __blk_reftag_remap(struct bio *bio, struct blk_integrity *bi,
ptuple = blk_tuple_remap_begin(&tuple, bi, bip, &iter);
if (prep)
- blk_reftag_remap_prepare(bi, ptuple, virt, *ref);
+ blk_tuple_remap(bi, ptuple, virt, *ref);
else
- blk_reftag_remap_complete(bi, ptuple, virt, *ref);
+ blk_tuple_remap(bi, ptuple, *ref, virt);
blk_tuple_remap_end(&tuple, ptuple, bi, bip, &iter);
(*intervals)--;
--
2.53.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] block/t10-pi: deduplicate blk_reftag_remap_{prepare,complete}()
2026-11-20 16:00 ` Christoph Hellwig
@ 2026-11-20 18:29 ` Caleb Sander Mateos
2026-11-21 0:18 ` Christoph Hellwig
0 siblings, 1 reply; 4+ messages in thread
From: Caleb Sander Mateos @ 2026-11-20 18:29 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: Jens Axboe, Keith Busch, linux-block, linux-kernel
On Fri, Nov 20, 2026 at 8:00 AM Christoph Hellwig <hch@infradead.org> wrote:
>
> Good idea. But I think the new function name is a bit misleading and the
> double ternary operators on a single initialization line obfuscate the
> code compared to the old if/else.
>
> Can we do something like this instead?
>
> diff --git a/block/t10-pi.c b/block/t10-pi.c
> index a19b4e102a83..f24ededd70a8 100644
> --- a/block/t10-pi.c
> +++ b/block/t10-pi.c
> @@ -436,69 +436,32 @@ 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_tuple_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);
> @@ -524,9 +487,9 @@ static void __blk_reftag_remap(struct bio *bio, struct blk_integrity *bi,
> ptuple = blk_tuple_remap_begin(&tuple, bi, bip, &iter);
>
> if (prep)
> - blk_reftag_remap_prepare(bi, ptuple, virt, *ref);
> + blk_tuple_remap(bi, ptuple, virt, *ref);
> else
> - blk_reftag_remap_complete(bi, ptuple, virt, *ref);
> + blk_tuple_remap(bi, ptuple, *ref, virt);
Sure, happy to switch to an if statement instead of the ternaries to
initialize from and to. However, the code generation is worse with the
2 calls to blk_reftag_remap()/blk_tuple_remap(). The compiler doesn't
notice that the calls are identical except for the swapped arguments
and emits 2 out-of-line calls to the function instead of inlining it.
Best,
Caleb
>
> blk_tuple_remap_end(&tuple, ptuple, bi, bip, &iter);
> (*intervals)--;
> --
> 2.53.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] block/t10-pi: deduplicate blk_reftag_remap_{prepare,complete}()
2026-11-20 18:29 ` Caleb Sander Mateos
@ 2026-11-21 0:18 ` Christoph Hellwig
0 siblings, 0 replies; 4+ messages in thread
From: Christoph Hellwig @ 2026-11-21 0:18 UTC (permalink / raw)
To: Caleb Sander Mateos
Cc: Christoph Hellwig, Jens Axboe, Keith Busch, linux-block,
linux-kernel
On Fri, Nov 20, 2026 at 10:29:18AM -0800, Caleb Sander Mateos wrote:
> Sure, happy to switch to an if statement instead of the ternaries to
> initialize from and to. However, the code generation is worse with the
> 2 calls to blk_reftag_remap()/blk_tuple_remap(). The compiler doesn't
> notice that the calls are identical except for the swapped arguments
> and emits 2 out-of-line calls to the function instead of inlining it.
Add a __force_inline tag to blk_tuple_remap and see if that fixes it?
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-11-21 0:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-20 6:48 [PATCH] block/t10-pi: deduplicate blk_reftag_remap_{prepare,complete}() Caleb Sander Mateos
2026-11-20 16:00 ` Christoph Hellwig
2026-11-20 18:29 ` Caleb Sander Mateos
2026-11-21 0:18 ` Christoph Hellwig
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.