add a bvec_virt helper
Subsystems (17)
Christoph Hellwig
maintainerHi Jens,
this series adds a bvec_virt helper to return the virtual address of the data in bvec to replace the open coded calculation, and as a reminder that generall bio/bvec data can be in high memory unless it is caller controller or in an architecture specific driver where highmem is impossible.
_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
Christoph Hellwig
maintainerPATCH 1/15 bvec: add a bvec_virt helper
Add a helper to get the virtual address for a bvec. This avoids that all callers need to know about the page + offset representation.
--- include/linux/bvec.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
include/linux/bvec.h +12 -0
@@ -229,4 +229,16 @@ static inline void memzero_bvec(struct bio_vec *bvec) memzero_page(bvec->bv_page, bvec->bv_offset, bvec->bv_len); } +/** +* bvec_virt - return the virtual address for a bvec +* @bvec: bvec to return the virtual address for +* +* Note: the caller must ensure that @bvec->bv_page is not a highmem page. +*/ +static inline void *bvec_virt (struct bio_vec *bvec) +{ +WARN_ON_ONCE (PageHighMem (bvec->bv_page)); +return page_address (bvec->bv_page) + bvec->bv_offset; +} +#endif /* __LINUX_BVEC_H */
Signature · 7 lines
2.30.2 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Re: [PATCH 01/15] bvec: add a bvec_virt helper
Quoted 4 lines · Christoph Hellwig
Add a helper to get the virtual address for a bvec. This avoids that all callers need to know about the page + offset representation.
Signed-off-by Christoph Hellwig<[email protected]>
Looks good.
Signature · 6 lines
-ck _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Re: [PATCH 01/15] bvec: add a bvec_virt helper
In reply to Christoph HellwigChristoph,
Quoted 2 lines
Add a helper to get the virtual address for a bvec. This avoids that all callers need to know about the page + offset representation.
Signature · 6 lines
Martin K. Petersen Oracle Linux Engineering _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Christoph Hellwig
maintainerPATCH 2/15 block: use bvec_virt in bio_integrity_{process,free}
In reply to Christoph HellwigUse the bvec_virt helper to clean up the bio integrity processing a little bit.
--- block/bio-integrity.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
block/bio-integrity.c +2 -5
@@ -104,8 +104,7 @@ void bio_integrity_free(struct bio *bio)struct bio_set *bs = bio->bi_pool;if (bip->bip_flags &BIP_BLOCK_INTEGRITY ) -kfree (page_address (bip->bip_vec->bv_page) + - bip->bip_vec->bv_offset); +kfree (bvec_virt (bip->bip_vec));__bio_integrity_free (bs, bip); bio->bi_integrity =NULL ;
@@ -163,13 +162,11 @@ static blk_status_t bio_integrity_process(struct bio *bio,struct bio_vec bv;struct bio_integrity_payload *bip =bio_integrity (bio);blk_status_t ret =BLK_STS_OK ; -void *prot_buf =page_address (bip->bip_vec->bv_page) + - bip->bip_vec->bv_offset; iter.disk_name = bio->bi_bdev->bd_disk->disk_name; iter.interval =1 << bi->interval_exp; iter.seed = proc_iter->bi_sector; - iter.prot_buf = prot_buf; + iter.prot_buf =bvec_virt (bip->bip_vec);__bio_for_each_segment (bv, bio, bviter, *proc_iter) {void *kaddr =bvec_kmap_local (&bv);
Signature · 7 lines
2.30.2 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Re: [PATCH 02/15] block: use bvec_virt in bio_integrity_{process,free}
Quoted 4 lines · Christoph Hellwig
Use the
bvec_virthelper to clean up the bio integrity processing a little bit.Signed-off-by Christoph Hellwig<[email protected]>
Looks good.
Signature · 6 lines
-ck _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Re: [PATCH 02/15] block: use bvec_virt in bio_integrity_{process,free}
In reply to Christoph HellwigChristoph,
Quoted 2 lines
Use the
bvec_virthelper to clean up the bio integrity processing a little bit.
Signature · 6 lines
Martin K. Petersen Oracle Linux Engineering _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Christoph Hellwig
maintainerPATCH 3/15 dm: make EBS depend on !HIGHMEM
In reply to Christoph Hellwig__ebs_rw_bvec use page_address on the submitted bios data, and thus can't deal with highmem. Disable the target on highmem configs.
--- drivers/md/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/Kconfig +1 -1
@@ -340,7 +340,7 @@ config DM_WRITECACHE config DM_EBS tristate "Emulated block size target (EXPERIMENTAL)" - depends on BLK_DEV_DM + depends on BLK_DEV_DM && !HIGHMEM select DM_BUFIO help dm-ebs emulates smaller logical block size on backing devices
Signature · 7 lines
2.30.2 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Christoph Hellwig
maintainerPATCH 4/15 dm-ebs: use bvec_virt
In reply to Christoph HellwigUse bvec_virt instead of open coding it.
--- drivers/md/dm-ebs-target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-ebs-target.c +1 -1
@@ -74,7 +74,7 @@ static int __ebs_rw_bvec(struct ebs_c *ec, int rw, struct bio_vec *bv, struct bvif (unlikely (!bv->bv_page || !bv_len))return -EIO ; - pa =page_address (bv->bv_page) + bv->bv_offset; + pa =bvec_virt (bv);/* Handle overlapping page <-> blocks */ while (bv_len) {
Signature · 7 lines
2.30.2 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Christoph Hellwig
maintainerPATCH 5/15 dm-integrity: use bvec_virt
In reply to Christoph HellwigUse bvec_virt instead of open coding it.
--- drivers/md/dm-integrity.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/md/dm-integrity.c +2 -2
@@ -1819,7 +1819,7 @@ static void integrity_metadata(struct work_struct *w)unsigned this_len;BUG_ON (PageHighMem (biv.bv_page)); - tag =lowmem_page_address (biv.bv_page) + biv.bv_offset; + tag =bvec_virt (&biv); this_len =min (biv.bv_len, data_to_process); r =dm_integrity_rw_tag (ic, tag, &dio->metadata_block, &dio->metadata_offset, this_len, dio->op ==REQ_OP_READ ?TAG_READ :TAG_WRITE );
@@ -2006,7 +2006,7 @@ static bool __journal_read_write(struct dm_integrity_io *dio, struct bio *bio,unsigned tag_now =min (biv.bv_len, tag_todo);char *tag_addr;BUG_ON (PageHighMem (biv.bv_page)); - tag_addr =lowmem_page_address (biv.bv_page) + biv.bv_offset; + tag_addr =bvec_virt (&biv);if (likely (dio->op ==REQ_OP_WRITE ))memcpy (tag_ptr, tag_addr, tag_now);else
Signature · 7 lines
2.30.2 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Christoph Hellwig
maintainerPATCH 6/15 squashfs: use bvec_virt
In reply to Christoph HellwigUse bvec_virt instead of open coding it.
--- fs/squashfs/block.c | 7 +++---- fs/squashfs/lz4_wrapper.c | 2 +- fs/squashfs/lzo_wrapper.c | 2 +- fs/squashfs/xz_wrapper.c | 2 +- fs/squashfs/zlib_wrapper.c | 2 +- fs/squashfs/zstd_wrapper.c | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-)
fs/squashfs/block.c +3 -4
@@ -49,8 +49,7 @@ static int copy_bio_to_actor(struct bio *bio, bytes_to_copy =min_t (int, bytes_to_copy, req_length - copied_bytes); -memcpy (actor_addr + actor_offset, -page_address (bvec->bv_page) + bvec->bv_offset + offset, +memcpy (actor_addr + actor_offset,bvec_virt (bvec) + offset, bytes_to_copy); actor_offset += bytes_to_copy;
@@ -177,7 +176,7 @@ int squashfs_read_data(struct super_block *sb, u64 index, int length, goto out_free_bio; }/* Extract the length of the metadata block */ - data =page_address (bvec->bv_page) + bvec->bv_offset; + data =bvec_virt (bvec); length = data[offset];if (offset < bvec->bv_len -1 ) { length |= data[offset +1 ] <<8 ;
@@ -186,7 +185,7 @@ int squashfs_read_data(struct super_block *sb, u64 index, int length, res = -EIO ; goto out_free_bio; } - data =page_address (bvec->bv_page) + bvec->bv_offset; + data =bvec_virt (bvec); length |= data[0 ] <<8 ; }bio_free_pages (bio);
fs/squashfs/lz4_wrapper.c +1 -1
@@ -101,7 +101,7 @@ static int lz4_uncompress(struct squashfs_sb_info *msblk, void *strm,while (bio_next_segment (bio, &iter_all)) {int avail =min (bytes, ((int )bvec->bv_len) - offset); - data =page_address (bvec->bv_page) + bvec->bv_offset; + data =bvec_virt (bvec);memcpy (buff, data + offset, avail); buff += avail; bytes -= avail;
fs/squashfs/lzo_wrapper.c +1 -1
@@ -76,7 +76,7 @@ static int lzo_uncompress(struct squashfs_sb_info *msblk, void *strm,while (bio_next_segment (bio, &iter_all)) {int avail =min (bytes, ((int )bvec->bv_len) - offset); - data =page_address (bvec->bv_page) + bvec->bv_offset; + data =bvec_virt (bvec);memcpy (buff, data + offset, avail); buff += avail; bytes -= avail;
fs/squashfs/xz_wrapper.c +1 -1
@@ -146,7 +146,7 @@ static int squashfs_xz_uncompress(struct squashfs_sb_info *msblk, void *strm, } avail =min (length, ((int )bvec->bv_len) - offset); - data =page_address (bvec->bv_page) + bvec->bv_offset; + data =bvec_virt (bvec); length -= avail; stream->buf.in = data + offset; stream->buf.in_size = avail;
fs/squashfs/zlib_wrapper.c +1 -1
@@ -76,7 +76,7 @@ static int zlib_uncompress(struct squashfs_sb_info *msblk, void *strm, } avail =min (length, ((int )bvec->bv_len) - offset); - data =page_address (bvec->bv_page) + bvec->bv_offset; + data =bvec_virt (bvec); length -= avail; stream->next_in = data + offset; stream->avail_in = avail;
fs/squashfs/zstd_wrapper.c +1 -1
@@ -94,7 +94,7 @@ static int zstd_uncompress(struct squashfs_sb_info *msblk, void *strm, } avail =min (length, ((int )bvec->bv_len) - offset); - data =page_address (bvec->bv_page) + bvec->bv_offset; + data =bvec_virt (bvec); length -= avail; in_buf.src = data + offset; in_buf.size = avail;
Signature · 7 lines
2.30.2 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Christoph Hellwig
maintainerPATCH 7/15 rbd: use bvec_virt
In reply to Christoph HellwigUse bvec_virt instead of open coding it.
--- drivers/block/rbd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/block/rbd.c +1 -2
@@ -2986,8 +2986,7 @@ static bool is_zero_bvecs(struct bio_vec *bvecs, u32 bytes) };ceph_bvec_iter_advance_step (&it, bytes, ({ -if (memchr_inv (page_address (bv.bv_page) + bv.bv_offset,0 , - bv.bv_len)) +if (memchr_inv (bvec_virt (&bv),0 , bv.bv_len))return false; }));return true;
Signature · 7 lines
2.30.2 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Re: [PATCH 07/15] rbd: use bvec_virt
Quoted 12 lines · Christoph Hellwig
Use
bvec_virtinstead of open coding it.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/block/rbd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/block/rbd.c +0
-0
drivers/block/rbd.c static bool is_zero_bvecs(struct bio_vec *bvecs, u32 bytes) · line 2992
Quoted 9 lines
drivers/block/rbd.c +1
-2@@ -2986,8 +2986,7 @@ static bool is_zero_bvecs(struct bio_vec *bvecs, u32 bytes) };ceph_bvec_iter_advance_step (&it, bytes, ({ -if (memchr_inv (page_address (bv.bv_page) + bv.bv_offset,0 , - bv.bv_len)) +if (memchr_inv (bvec_virt (&bv),0 , bv.bv_len))return false; }));return true;
LGTM
_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
Christoph Hellwig
maintainerPATCH 8/15 virtio_blk: use bvec_virt
In reply to Christoph HellwigUse bvec_virt instead of open coding it.
--- drivers/block/virtio_blk.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/block/virtio_blk.c +2 -5
@@ -166,11 +166,8 @@ static inline void virtblk_request_done(struct request *req) {struct virtblk_req *vbr =blk_mq_rq_to_pdu (req); -if (req->rq_flags &RQF_SPECIAL_PAYLOAD ) { -kfree (page_address (req->special_vec.bv_page) + - req->special_vec.bv_offset); - } - +if (req->rq_flags &RQF_SPECIAL_PAYLOAD ) +kfree (bvec_virt (&req->special_vec));blk_mq_end_request (req,virtblk_result (vbr)); }
Signature · 7 lines
2.30.2 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Re: [PATCH 08/15] virtio_blk: use bvec_virt
Quoted 6 lines · Christoph Hellwig
Use
bvec_virtinstead of open coding it.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/block/virtio_blk.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
Christoph Hellwig
maintainerPATCH 9/15 bcache: use bvec_virt
In reply to Christoph HellwigUse bvec_virt instead of open coding it. Note that the existing code is fine despite ignoring bv_offset as the bio is known to contain exactly one page from the page allocator per bio_vec.
--- drivers/md/bcache/btree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/bcache/btree.c +1 -1
@@ -378,7 +378,7 @@ static void do_btree_node_write(struct btree *b)struct bvec_iter_all iter_all;bio_for_each_segment_all (bv, b->bio, iter_all) { -memcpy (page_address (bv->bv_page), addr,PAGE_SIZE ); +memcpy (bvec_virt (bv), addr,PAGE_SIZE ); addr +=PAGE_SIZE ; }
Signature · 7 lines
2.30.2 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Re: [PATCH 09/15] bcache: use bvec_virt
Quoted 5 lines · Christoph Hellwig
Use
bvec_virtinstead of open coding it. Note that the existing code is fine despite ignoringbv_offsetas the bio is known to contain exactly one page from the page allocator perbio_vec.Signed-off-by Christoph Hellwig <[email protected]>
Looks good to me.
Thanks.
Coly Li
Quoted 9 lines
--- drivers/md/bcache/btree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/md/bcache/btree.c +0
-0
drivers/md/bcache/btree.c static void do_btree_node_write(struct btree *b) · line 384
Quoted 8 lines
drivers/md/bcache/btree.c +1
-1@@ -378,7 +378,7 @@ static void do_btree_node_write(struct btree *b)struct bvec_iter_all iter_all;bio_for_each_segment_all (bv, b->bio, iter_all) { -memcpy (page_address (bv->bv_page), addr,PAGE_SIZE ); +memcpy (bvec_virt (bv), addr,PAGE_SIZE ); addr +=PAGE_SIZE ; }
_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
Christoph Hellwig
maintainerPATCH 10/15 sd: use bvec_virt
In reply to Christoph HellwigUse bvec_virt instead of open coding it.
--- drivers/scsi/sd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/sd.c +1 -1
@@ -886,7 +886,7 @@ static blk_status_t sd_setup_unmap_cmnd(struct scsi_cmnd *cmd) cmd->cmnd[0 ] =UNMAP ; cmd->cmnd[8 ] =24 ; - buf =page_address (rq->special_vec.bv_page); + buf =bvec_virt (&rq->special_vec);put_unaligned_be16 (6 +16 , &buf[0 ]);put_unaligned_be16 (16 , &buf[2 ]);put_unaligned_be64 (lba, &buf[8 ]);
Signature · 7 lines
2.30.2 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Re: [PATCH 10/15] sd: use bvec_virt
Quoted 3 lines · Christoph Hellwig
Use
bvec_virtinstead of open coding it.Signed-off-by Christoph Hellwig<[email protected]>
Looks good.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [dm-devel] [PATCH 10/15] sd: use bvec_virt
In reply to Christoph HellwigQuoted 12 lines · Christoph Hellwig
Use
bvec_virtinstead of open coding it.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/scsi/sd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/scsi/sd.c +0
-0
drivers/scsi/sd.c static blk_status_t sd_setup_unmap_cmnd(struct scsi_cmnd *cmd) · line 892
Quoted 8 lines
drivers/scsi/sd.c +1
-1@@ -886,7 +886,7 @@ static blk_status_t sd_setup_unmap_cmnd(struct scsi_cmnd *cmd) cmd->cmnd[0 ] =UNMAP ; cmd->cmnd[8 ] =24 ; - buf =page_address (rq->special_vec.bv_page); + buf =bvec_virt (&rq->special_vec);put_unaligned_be16 (6 +16 , &buf[0 ]);put_unaligned_be16 (16 , &buf[2 ]);put_unaligned_be64 (lba, &buf[8 ]);
The patch description is not correct. The above patch involves a functional change while the patch description suggests that no functionality has been changed.
Although the above patch looks fine to me, why has page_address() been changed into bvec_virt() in the sd driver? My understanding is that the sd driver always sets bv_offset to zero.
Thanks,
Bart.
_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
Re: [PATCH 10/15] sd: use bvec_virt
In reply to Christoph HellwigChristoph,
Quoted 1 line
Use
bvec_virtinstead of open coding it.
bv_offset is set to 0 right above but I'm OK with bvec_virt() for the sake of consistency.
Signature · 6 lines
Martin K. Petersen Oracle Linux Engineering _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Christoph Hellwig
maintainerPATCH 11/15 ubd: use bvec_virt
In reply to Christoph HellwigUse bvec_virt instead of open coding it.
--- arch/um/drivers/ubd_kern.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/um/drivers/ubd_kern.c +1 -2
@@ -1268,8 +1268,7 @@ static void ubd_map_req(struct ubd *dev, struct io_thread_req *io_req,rq_for_each_segment (bvec, req, iter) {BUG_ON (i >= io_req->desc_cnt); - io_req->io_desc[i].buffer = -page_address (bvec.bv_page) + bvec.bv_offset; + io_req->io_desc[i].buffer =bvec_virt (&bvec); io_req->io_desc[i].length = bvec.bv_len; i++; }
Signature · 7 lines
2.30.2 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Re: [PATCH 11/15] ubd: use bvec_virt
Quoted 13 lines · Christoph Hellwig
Use
bvec_virtinstead of open coding it.Signed-off-by Christoph Hellwig <[email protected]>--- arch/um/drivers/ubd_kern.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)arch/um/drivers/ubd_kern.c +0
-0
arch/um/drivers/ubd_kern.c static void ubd_map_req(struct ubd *dev, struct io_thread_req *io_req, · line 1274
Quoted 9 lines
arch/um/drivers/ubd_kern.c +1
-2@@ -1268,8 +1268,7 @@ static void ubd_map_req(struct ubd *dev, struct io_thread_req *io_req,rq_for_each_segment (bvec, req, iter) {BUG_ON (i >= io_req->desc_cnt); - io_req->io_desc[i].buffer = -page_address (bvec.bv_page) + bvec.bv_offset; + io_req->io_desc[i].buffer =bvec_virt (&bvec); io_req->io_desc[i].length = bvec.bv_len; i++; }
Signature · 8 lines
Anton R. Ivanov Cambridgegreys Limited. Registered in England. Company Number 10273661 https://www.cambridgegreys.com/ _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Christoph Hellwig
maintainerPATCH 12/15 ps3vram: use bvec_virt
In reply to Christoph HellwigUse bvec_virt instead of open coding it.
--- drivers/block/ps3vram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/ps3vram.c +1 -1
@@ -541,7 +541,7 @@ static struct bio *ps3vram_do_bio(struct ps3_system_bus_device *dev,bio_for_each_segment (bvec, bio, iter) {/* PS3 is ppc64, so we don't handle highmem */ -char *ptr =page_address (bvec.bv_page) + bvec.bv_offset; +char *ptr =bvec_virt (&bvec);size_t len = bvec.bv_len, retlen; dev_dbg(&dev->core, " %s %zu bytes at offset %llu\n", op,
Signature · 7 lines
2.30.2 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Christoph Hellwig
maintainerPATCH 13/15 dasd: use bvec_virt
In reply to Christoph HellwigUse bvec_virt instead of open coding it.
--- drivers/s390/block/dasd_diag.c | 2 +- drivers/s390/block/dasd_eckd.c | 14 +++++++------- drivers/s390/block/dasd_fba.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-)
drivers/s390/block/dasd_diag.c +1 -1
@@ -552,7 +552,7 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev, dbio = dreq->bio; recid = first_rec;rq_for_each_segment (bv, req, iter) { - dst =page_address (bv.bv_page) + bv.bv_offset; + dst =bvec_virt (&bv);for (off =0 ; off < bv.bv_len; off += blksize) {memset (dbio,0 ,sizeof (struct dasd_diag_bio )); dbio->type = rw_cmd;
drivers/s390/block/dasd_eckd.c +7 -7
@@ -3267,7 +3267,7 @@ static int dasd_eckd_ese_read(struct dasd_ccw_req *cqr, struct irb *irb) end_blk = (curr_trk +1 ) * recs_per_trk;rq_for_each_segment (bv, req, iter) { - dst =page_address (bv.bv_page) + bv.bv_offset; + dst =bvec_virt (&bv);for (off =0 ; off < bv.bv_len; off += blksize) {if (first_blk + blk_count >= end_blk) { cqr->proc_bytes = blk_count * blksize;
@@ -3999,7 +3999,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_single( last_rec - recid + 1, cmd, basedev, blksize); }rq_for_each_segment (bv, req, iter) { - dst =page_address (bv.bv_page) + bv.bv_offset; + dst =bvec_virt (&bv);if (dasd_page_cache) {char *copy =kmem_cache_alloc (dasd_page_cache,GFP_DMA | __GFP_NOWARN);
@@ -4166,7 +4166,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_track( idaw_dst =NULL ; idaw_len =0 ;rq_for_each_segment (bv, req, iter) { - dst =page_address (bv.bv_page) + bv.bv_offset; + dst =bvec_virt (&bv); seg_len = bv.bv_len;while (seg_len) {if (new_track) {
@@ -4509,7 +4509,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track( new_track =1 ; recid = first_rec;rq_for_each_segment (bv, req, iter) { - dst =page_address (bv.bv_page) + bv.bv_offset; + dst =bvec_virt (&bv); seg_len = bv.bv_len;while (seg_len) {if (new_track) {
@@ -4542,7 +4542,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track( } }else {rq_for_each_segment (bv, req, iter) { - dst =page_address (bv.bv_page) + bv.bv_offset; + dst =bvec_virt (&bv); last_tidaw =itcw_add_tidaw (itcw,0x00 , dst, bv.bv_len);if (IS_ERR (last_tidaw)) {
@@ -4778,7 +4778,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_raw(struct dasd_device *startdev, idaws =idal_create_words (idaws, rawpadpage,PAGE_SIZE ); }rq_for_each_segment (bv, req, iter) { - dst =page_address (bv.bv_page) + bv.bv_offset; + dst =bvec_virt (&bv); seg_len = bv.bv_len;if (cmd ==DASD_ECKD_CCW_READ_TRACK )memset (dst,0 , seg_len);
@@ -4839,7 +4839,7 @@ dasd_eckd_free_cp(struct dasd_ccw_req *cqr, struct request *req)if (private->uses_cdl ==0 || recid >2 *blk_per_trk) ccw++;rq_for_each_segment (bv, req, iter) { - dst =page_address (bv.bv_page) + bv.bv_offset; + dst =bvec_virt (&bv);for (off =0 ; off < bv.bv_len; off += blksize) {/* Skip locate record. */ if (private->uses_cdl && recid <=2 *blk_per_trk)
drivers/s390/block/dasd_fba.c +2 -2
@@ -501,7 +501,7 @@ static struct dasd_ccw_req *dasd_fba_build_cp_regular( } recid = first_rec;rq_for_each_segment (bv, req, iter) { - dst =page_address (bv.bv_page) + bv.bv_offset; + dst =bvec_virt (&bv);if (dasd_page_cache) {char *copy =kmem_cache_alloc (dasd_page_cache,GFP_DMA | __GFP_NOWARN);
@@ -583,7 +583,7 @@ dasd_fba_free_cp(struct dasd_ccw_req *cqr, struct request *req)if (private->rdc_data.mode.bits.data_chain !=0 ) ccw++;rq_for_each_segment (bv, req, iter) { - dst =page_address (bv.bv_page) + bv.bv_offset; + dst =bvec_virt (&bv);for (off =0 ; off < bv.bv_len; off += blksize) {/* Skip locate record. */ if (private->rdc_data.mode.bits.data_chain ==0 )
Signature · 7 lines
2.30.2 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Re: [PATCH 13/15] dasd: use bvec_virt
Am 04.08.21 um 11:56 schrieb Christoph Hellwig:
Quoted 3 lines
Use
bvec_virtinstead of open coding it.Signed-off-by Christoph Hellwig <[email protected]>
Looks good.
_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
Christoph Hellwig
maintainerPATCH 14/15 dcssblk: use bvec_virt
In reply to Christoph HellwigUse bvec_virt instead of open coding it.
--- drivers/s390/block/dcssblk.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/s390/block/dcssblk.c +1 -2
@@ -892,8 +892,7 @@ dcssblk_submit_bio(struct bio *bio) index = (bio->bi_iter.bi_sector >>3 );bio_for_each_segment (bvec, bio, iter) { - page_addr = (unsigned long ) -page_address (bvec.bv_page) + bvec.bv_offset; + page_addr = (unsigned long )bvec_virt (&bvec); source_addr = dev_info->start + (index<<12 ) + bytes_done;if (unlikely ((page_addr &4095 ) !=0 ) || (bvec.bv_len &4095 ) !=0 )// More paranoia.
Signature · 7 lines
2.30.2 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Christoph Hellwig
maintainerPATCH 15/15 nvme: use bvec_virt
In reply to Christoph HellwigUse bvec_virt instead of open coding it.
--- drivers/nvme/host/core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/nvme/host/core.c +2 -3
@@ -968,12 +968,11 @@ void nvme_cleanup_cmd(struct request *req) {if (req->rq_flags &RQF_SPECIAL_PAYLOAD ) {struct nvme_ctrl *ctrl =nvme_req (req)->ctrl; -struct page *page = req->special_vec.bv_page; -if (page == ctrl->discard_page) +if (req->special_vec.bv_page == ctrl->discard_page)clear_bit_unlock (0 , &ctrl->discard_page_busy);else -kfree (page_address (page) + req->special_vec.bv_offset); +kfree (bvec_virt (&req->special_vec)); } }EXPORT_SYMBOL_GPL (nvme_cleanup_cmd);
Signature · 7 lines
2.30.2 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Re: [PATCH 15/15] nvme: use bvec_virt
Quoted 16 lines · Christoph Hellwig
Use
bvec_virtinstead of open coding it.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/nvme/host/core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/nvme/host/core.c +0
-1@@ -968,12 +968,11 @@ void nvme_cleanup_cmd(struct request *req) {if (req->rq_flags &RQF_SPECIAL_PAYLOAD ) {struct nvme_ctrl *ctrl =nvme_req (req)->ctrl; -struct page *page = req->special_vec.bv_page;
drivers/nvme/host/core.c void nvme_cleanup_cmd(struct request *req) · line 978
Quoted 10 lines
drivers/nvme/host/core.c +2
-2-if (page == ctrl->discard_page) +if (req->special_vec.bv_page == ctrl->discard_page)clear_bit_unlock (0 , &ctrl->discard_page_busy);else -kfree (page_address (page) + req->special_vec.bv_offset); +kfree (bvec_virt (&req->special_vec)); } }EXPORT_SYMBOL_GPL (nvme_cleanup_cmd);
Looks good.
_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
Chaitanya Kulkarni
Reviewed-byRe: [PATCH 15/15] nvme: use bvec_virt
Quoted 4 lines · Keith Busch
Quoted 3 lines · Christoph Hellwig
Use
bvec_virtinstead of open coding it.Signed-off-by Christoph Hellwig<[email protected]>
Looks good.
Signature · 6 lines
-ck _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Christoph Hellwig
maintainerping.
Quoted 7 lines · Christoph Hellwig
Hi Jens,
this series adds a
bvec_virthelper to return the virtual address of the data in bvec to replace the open coded calculation, and as a reminder that generall bio/bvec data can be in high memory unless it is caller controller or in an architecture specific driver where highmem is impossible.
---end quoted text---
_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
Quoted 7 lines · Christoph Hellwig
Hi Jens,
this series adds a
bvec_virthelper to return the virtual address of the data in bvec to replace the open coded calculation, and as a reminder that generall bio/bvec data can be in high memory unless it is caller controller or in an architecture specific driver where highmem is impossible.
Applied, thanks.
Signature · 7 lines
Jens Axboe _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um