On Wed, Jun 29, 2022 at 09:14:54PM -0400, Kent Overstreet wrote:
> On Thu, Jun 30, 2022 at 08:47:13AM +0800, Ming Lei wrote:
> > Or if I misunderstood your point, please cook a patch and I am happy to
> > take a close look, and posting one very raw idea with random data
> > structure looks not helpful much for this discussion technically.
>
> Based it on your bio_rewind() patch - what do you think of this?
>
> -- >8 --
> From: Kent Overstreet <kent.overstreet@xxxxxxxxx>
> Subject: [PATCH] block: add bio_(get|set)_pos()
>
> Commit 7759eb23fd98 ("block: remove bio_rewind_iter()") removes
> the similar API because the following reasons:
>
> ```
> It is pointed that bio_rewind_iter() is one very bad API[1]:
>
> 1) bio size may not be restored after rewinding
>
> 2) it causes some bogus change, such as 5151842b9d8732 (block: reset
> bi_iter.bi_done after splitting bio)
>
> 3) rewinding really makes things complicated wrt. bio splitting
>
> 4) unnecessary updating of .bi_done in fast path
>
> [1] https://marc.info/?t=153549924200005&r=1&w=2
>
> So this patch takes Kent's suggestion to restore one bio into its original
> state via saving bio iterator(struct bvec_iter) in bio_integrity_prep(),
> given now bio_rewind_iter() is only used by bio integrity code.
> ```
>
> However, saving and restoring bi_iter isn't sufficient anymore, because
> of integrity and now per-bio crypt context.
>
> This patch implements the same functionality as bio_rewind(), based on a
> patch by Ming, but with a different (safer!) interface.
>
> - bio_get_pos() gets the current state of a a bio, i.e. how far it has
> been advanced and its current (remaining) size
> - bio_set_pos() restores a bio to a previous state, advancing or
> rewinding it as needed
>
> Co-authored-by: Ming Lei <ming.lei@xxxxxxxxxx>
> Signed-off-by: Kent Overstreet <kent.overstreet@xxxxxxxxx>
> ---
> block/bio-integrity.c | 19 +++++++++++++++++++
> block/bio.c | 26 ++++++++++++++++++++++++++
> block/blk-crypto-internal.h | 7 +++++++
> block/blk-crypto.c | 25 +++++++++++++++++++++++++
> include/linux/bio.h | 22 ++++++++++++++++++++++
> include/linux/blk_types.h | 19 +++++++++++++++++++
> include/linux/bvec.h | 36 +++++++++++++++++++++++++++++++++++-
> 7 files changed, 153 insertions(+), 1 deletion(-)
>
> diff --git a/block/bio-integrity.c b/block/bio-integrity.c
> index 32929c89ba..06c2fe81fd 100644
> --- a/block/bio-integrity.c
> +++ b/block/bio-integrity.c
> @@ -378,6 +378,25 @@ void bio_integrity_advance(struct bio *bio, unsigned int bytes_done)
> bvec_iter_advance(bip->bip_vec, &bip->bip_iter, bytes);
> }
>
> +/**
> + * bio_integrity_rewind - Rewind integrity vector
> + * @bio: bio whose integrity vector to update
> + * @bytes_done: number of data bytes to rewind
> + *
> + * Description: This function calculates how many integrity bytes the
> + * number of completed data bytes correspond to and rewind the
> + * integrity vector accordingly.
> + */
> +void bio_integrity_rewind(struct bio *bio, unsigned int bytes_done)
> +{
> + struct bio_integrity_payload *bip = bio_integrity(bio);
> + struct blk_integrity *bi = blk_get_integrity(bio->bi_bdev->bd_disk);
> + unsigned bytes = bio_integrity_bytes(bi, bytes_done >> 9);
> +
> + bip->bip_iter.bi_sector -= bio_integrity_intervals(bi, bytes_done >> 9);
> + bvec_iter_rewind(bip->bip_vec, &bip->bip_iter, bytes);
> +}
> +
> /**
> * bio_integrity_trim - Trim integrity vector
> * @bio: bio whose integrity vector to update
> diff --git a/block/bio.c b/block/bio.c
> index b2425b8d88..bbf8aa4e62 100644
> --- a/block/bio.c
> +++ b/block/bio.c
> @@ -1329,6 +1329,32 @@ void __bio_advance(struct bio *bio, unsigned bytes)
> }
> EXPORT_SYMBOL(__bio_advance);
>
> +/**
> + * bio_set_pos - restore a bio to a previous state, after having been iterated
> + * or trimmed
> + * @bio: bio to reset
> + * @pos: pos to reset it to, from bio_get_pos()
> + */
> +void bio_set_pos(struct bio *bio, struct bio_pos pos)
> +{
> + int delta = bio->bi_iter.bi_done - pos.bi_done;
> +
> + if (delta > 0) {
> + if (bio_integrity(bio))
> + bio_integrity_rewind(bio, delta);
> + bio_crypt_rewind(bio, delta);
> + bio_rewind_iter(bio, &bio->bi_iter, delta);
> + } else {
> + bio_advance(bio, -delta);
> + }
> +
> + bio->bi_iter.bi_size = pos.bi_size;
> +
> + if (bio_integrity(bio))
> + bio_integrity_trim(bio);
> +}
> +EXPORT_SYMBOL(bio_set_pos);
> +
> void bio_copy_data_iter(struct bio *dst, struct bvec_iter *dst_iter,
> struct bio *src, struct bvec_iter *src_iter)
> {
> diff --git a/block/blk-crypto-internal.h b/block/blk-crypto-internal.h
> index e6818ffadd..b723599bbf 100644
> --- a/block/blk-crypto-internal.h
> +++ b/block/blk-crypto-internal.h
> @@ -114,6 +114,13 @@ static inline void bio_crypt_advance(struct bio *bio, unsigned int bytes)
> __bio_crypt_advance(bio, bytes);
> }
>
> +void __bio_crypt_rewind(struct bio *bio, unsigned int bytes);
> +static inline void bio_crypt_rewind(struct bio *bio, unsigned int bytes)
> +{
> + if (bio_has_crypt_ctx(bio))
> + __bio_crypt_rewind(bio, bytes);
> +}
> +
> void __bio_crypt_free_ctx(struct bio *bio);
> static inline void bio_crypt_free_ctx(struct bio *bio)
> {
> diff --git a/block/blk-crypto.c b/block/blk-crypto.c
> index a496aaef85..e3584b5a68 100644
> --- a/block/blk-crypto.c
> +++ b/block/blk-crypto.c
> @@ -134,6 +134,23 @@ void bio_crypt_dun_increment(u64 dun[BLK_CRYPTO_DUN_ARRAY_SIZE],
> }
> }
>
> +/* Decrements @dun by @dec, treating @dun as a multi-limb integer. */
> +void bio_crypt_dun_decrement(u64 dun[BLK_CRYPTO_DUN_ARRAY_SIZE],
> + unsigned int dec)
> +{
> + int i;
> +
> + for (i = 0; dec && i < BLK_CRYPTO_DUN_ARRAY_SIZE; i++) {
> + u64 prev = dun[i];
> +
> + dun[i] -= dec;
> + if (dun[i] > prev)
> + dec = 1;
> + else
> + dec = 0;
> + }
> +}
> +
> void __bio_crypt_advance(struct bio *bio, unsigned int bytes)
> {
> struct bio_crypt_ctx *bc = bio->bi_crypt_context;
> @@ -142,6 +159,14 @@ void __bio_crypt_advance(struct bio *bio, unsigned int bytes)
> bytes >> bc->bc_key->data_unit_size_bits);
> }
>
> +void __bio_crypt_rewind(struct bio *bio, unsigned int bytes)
> +{
> + struct bio_crypt_ctx *bc = bio->bi_crypt_context;
> +
> + bio_crypt_dun_decrement(bc->bc_dun,
> + bytes >> bc->bc_key->data_unit_size_bits);
> +}
> +
> /*
> * Returns true if @bc->bc_dun plus @bytes converted to data units is equal to
> * @next_dun, treating the DUNs as multi-limb integers.
> diff --git a/include/linux/bio.h b/include/linux/bio.h
> index c11103a872..5fff008913 100644
> --- a/include/linux/bio.h
> +++ b/include/linux/bio.h
> @@ -105,6 +105,19 @@ static inline void bio_advance_iter(const struct bio *bio,
> /* TODO: It is reasonable to complete bio with error here. */
> }
>
> +static inline void bio_rewind_iter(const struct bio *bio,
> + struct bvec_iter *iter, unsigned int bytes)
> +{
> + iter->bi_sector -= bytes >> 9;
> +
> + /* No advance means no rewind */
> + if (bio_no_advance_iter(bio))
> + iter->bi_size += bytes;
> + else
> + bvec_iter_rewind(bio->bi_io_vec, iter, bytes);
> + /* TODO: It is reasonable to complete bio with error here. */
> +}
> +
> /* @bytes should be less or equal to bvec[i->bi_idx].bv_len */
> static inline void bio_advance_iter_single(const struct bio *bio,
> struct bvec_iter *iter,
> @@ -133,6 +146,8 @@ void __bio_advance(struct bio *, unsigned bytes);
> */
> static inline void bio_advance(struct bio *bio, unsigned int nbytes)
> {
> + bio->bi_iter.bi_done += nbytes;
Why do we need to pay the cost(4 bytes added to bio and the updating
in absolutely fast path) if rewind isn't used? So far, only dm requeue
needs it, and it is one very unusual event.
Assuming fixed bio end sector should cover most of cases, especially
if bio_rewind is only for dm or driver.
I'd suggest to not take this way until turning out bio_rewind() is not
enough for new requirement or usages.
Thanks
Ming
