From: Christoph Hellwig <hch@infradead.org>
To: Caleb Sander Mateos <csander@purestorage.com>
Cc: Jens Axboe <axboe@kernel.dk>, Keith Busch <kbusch@kernel.org>,
linux-block@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] block/t10-pi: deduplicate blk_reftag_remap_{prepare,complete}()
Date: Fri, 20 Nov 2026 08:00:09 -0800 [thread overview]
Message-ID: <awBuiVyOQj_YHCZD@infradead.org> (raw)
In-Reply-To: <20261120064806.752251-1-csander@purestorage.com>
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
prev parent reply other threads:[~2026-11-20 16:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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=awBuiVyOQj_YHCZD@infradead.org \
--to=hch@infradead.org \
--cc=axboe@kernel.dk \
--cc=csander@purestorage.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox