vringh: use bvec_kmap_local
authorChristoph Hellwig <hch@lst.de>
Thu, 1 May 2025 14:22:30 +0000 (09:22 -0500)
committerMichael S. Tsirkin <mst@redhat.com>
Tue, 27 May 2025 14:27:53 +0000 (10:27 -0400)
Use the bvec_kmap_local helper rather than digging into the bvec
internals.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Message-Id: <20250501142244.2888227-1-hch@lst.de>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
drivers/vhost/vringh.c

index 93735fc..bbce654 100644 (file)
@@ -1290,11 +1290,10 @@ static inline int getu16_iotlb(const struct vringh *vrh,
                if (ret)
                        return ret;
        } else {
-               void *kaddr = kmap_local_page(ivec.iov.bvec[0].bv_page);
-               void *from = kaddr + ivec.iov.bvec[0].bv_offset;
+               __virtio16 *from = bvec_kmap_local(&ivec.iov.bvec[0]);
 
-               tmp = READ_ONCE(*(__virtio16 *)from);
-               kunmap_local(kaddr);
+               tmp = READ_ONCE(*from);
+               kunmap_local(from);
        }
 
        *val = vringh16_to_cpu(vrh, tmp);
@@ -1329,11 +1328,10 @@ static inline int putu16_iotlb(const struct vringh *vrh,
                if (ret)
                        return ret;
        } else {
-               void *kaddr = kmap_local_page(ivec.iov.bvec[0].bv_page);
-               void *to = kaddr + ivec.iov.bvec[0].bv_offset;
+               __virtio16 *to = bvec_kmap_local(&ivec.iov.bvec[0]);
 
-               WRITE_ONCE(*(__virtio16 *)to, tmp);
-               kunmap_local(kaddr);
+               WRITE_ONCE(*to, tmp);
+               kunmap_local(to);
        }
 
        return 0;