On Mon, Jun 03, 2019 at 07:29:41PM +0200, Christoph Hellwig wrote:
> The xfs_buf structure is basically used as a glorified container for
> a memory allocation in the log recovery code. Replace it with a
> call to kmem_alloc_large and a simple abstraction to read into or
> write from it synchronously using chained bios.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
....
> +int
> +xfs_rw_bdev(
> + struct block_device *bdev,
> + sector_t sector,
> + unsigned int count,
> + char *data,
> + unsigned int op)
> +
> +{
> + unsigned int is_vmalloc = is_vmalloc_addr(data);
> + unsigned int left = count;
> + int error;
> + struct bio *bio;
> +
> + if (is_vmalloc && op == REQ_OP_READ)
> + flush_kernel_vmap_range(data, count);
That should be REQ_OP_WRITE. i.e. the data the CPU has written to
the aliased vmap address has to be flushed back to the physical page
before the DMA from the physical page to the storage device occurs.
> + bio = bio_alloc(GFP_KERNEL, bio_max_vecs(left));
> + bio_set_dev(bio, bdev);
> + bio->bi_iter.bi_sector = sector;
> + bio->bi_opf = op | REQ_META | REQ_SYNC;
> +
> + do {
> + struct page *page = kmem_to_page(data);
> + unsigned int off = offset_in_page(data);
> + unsigned int len = min_t(unsigned, left, PAGE_SIZE - off);
> +
> + while (bio_add_page(bio, page, len, off) != len) {
> + struct bio *prev = bio;
> +
> + bio = bio_alloc(GFP_KERNEL, bio_max_vecs(left));
> + bio_copy_dev(bio, prev);
> + bio->bi_iter.bi_sector = bio_end_sector(prev);
> + bio->bi_opf = prev->bi_opf;
> + bio_chain(bio, prev);
> +
> + submit_bio(prev);
> + }
> +
> + data += len;
> + left -= len;
> + } while (left > 0);
> +
> + error = submit_bio_wait(bio);
> + bio_put(bio);
> +
> + if (is_vmalloc && op == REQ_OP_WRITE)
> + invalidate_kernel_vmap_range(data, count);
And this should be REQ_OP_READ - to invalidate anything aliased in
the CPU cache before the higher layers try to read the new data in
the physical page...
Otherwise looks good.
Cheers,
Dave.
--
Dave Chinner
david@xxxxxxxxxxxxx
