This new version reports the translation ASID. Needed so the device can support it.
Signed-off-by: Eugenio Pérez <epere...@redhat.com> --- drivers/vdpa/vdpa_user/vduse_dev.c | 14 ++++++++++---- include/uapi/linux/vduse.h | 7 +++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c index d51e4f26fe72..151c6d133e76 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -317,7 +317,7 @@ static int vduse_dev_set_status(struct vduse_dev *dev, u8 status) return vduse_dev_msg_sync(dev, &msg); } -static int vduse_dev_update_iotlb(struct vduse_dev *dev, +static int vduse_dev_update_iotlb(struct vduse_dev *dev, u32 asid, u64 start, u64 last) { struct vduse_dev_msg msg = { 0 }; @@ -326,8 +326,14 @@ static int vduse_dev_update_iotlb(struct vduse_dev *dev, return -EINVAL; msg.req.type = VDUSE_UPDATE_IOTLB; - msg.req.iova.start = start; - msg.req.iova.last = last; + if (dev->api_version < VDUSE_API_VERSION_1) { + msg.req.iova.start = start; + msg.req.iova.last = last; + } else { + msg.req.iova_v2.start = start; + msg.req.iova_v2.last = last; + msg.req.iova_v2.asid = asid; + } return vduse_dev_msg_sync(dev, &msg); } @@ -818,7 +824,7 @@ static int vduse_vdpa_set_map(struct vdpa_device *vdpa, if (ret) return ret; - ret = vduse_dev_update_iotlb(dev, 0ULL, ULLONG_MAX); + ret = vduse_dev_update_iotlb(dev, asid, 0ULL, ULLONG_MAX); if (ret) { vduse_domain_clear_map(dev->domain[asid], iotlb); return ret; diff --git a/include/uapi/linux/vduse.h b/include/uapi/linux/vduse.h index 3a17a0b4e938..a7c979591b2e 100644 --- a/include/uapi/linux/vduse.h +++ b/include/uapi/linux/vduse.h @@ -349,6 +349,12 @@ struct vduse_iova_range { __u64 last; }; +struct vduse_iova_range_v2 { + __u64 start; + __u64 last; + __u32 asid; +}; + /** * struct vduse_dev_request - control request * @type: request type @@ -369,6 +375,7 @@ struct vduse_dev_request { struct vduse_vq_state vq_state; struct vduse_dev_status s; struct vduse_iova_range iova; + struct vduse_iova_range_v2 iova_v2; struct vduse_vq_group vq_group; /* Only if vduse api version >= 1 */ /* Only if vduse api version >= 1 */ struct vduse_vq_group_asid vq_group_asid; -- 2.49.0