Skip to contentSkip to conversation

vdpa/vdpa_sim: Use the negotiated features when calling vringh_init_iotlb

PATCH In review Eli Cohen 2 participants 3 messages Jul 19, 2021 – Jul 20, 2021 virtio core

lore
Share & tools
lore

Eli Cohen

author
#0 lore raw

PATCH 1/1 vdpa/vdpa_sim: Use the negotiated features when calling vringh_init_iotlb

When calling vringh_init_iotlb(), use the negotiated features which might be different than the supported features.

Fixes 011c35bac5ef ("vdpa_sim: add supported_features field in vdpasim_dev_attr)
---
 drivers/vdpa/vdpa_sim/vdpa_sim.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +2 -2
index 14e024de5cbf..89a474c7a096 100644
@@ -66,7 +66,7 @@ static void vdpasim_queue_ready(struct vdpasim *vdpasim, unsigned int idx)
 {
 	struct vdpasim_virtqueue *vq = &vdpasim->vqs[idx];
 
-	vringh_init_iotlb(&vq->vring, vdpasim->dev_attr.supported_features,
+	vringh_init_iotlb(&vq->vring, vdpasim->features,
 			  VDPASIM_QUEUE_MAX, false,
 			  (struct vring_desc *)(uintptr_t)vq->desc_addr,
 			  (struct vring_avail *)
@@ -86,7 +86,7 @@ static void vdpasim_vq_reset(struct vdpasim *vdpasim,
 	vq->device_addr = 0;
 	vq->cb = NULL;
 	vq->private = NULL;
-	vringh_init_iotlb(&vq->vring, vdpasim->dev_attr.supported_features,
+	vringh_init_iotlb(&vq->vring, vdpasim->features,
 			  VDPASIM_QUEUE_MAX, false, NULL, NULL, NULL);
 
 	vq->vring.notify = NULL;
Signature · 1 line
2.30.1
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Eli Cohen

When calling vringh_init_iotlb(), use the negotiated features which might be different than the supported features.

Fixes 011c35bac5ef ("vdpa_sim: add supported_features field in vdpasim_dev_attr)

As Stefano said.

It should be 2c53d0f64c06f ("vdpasim: vDPA device simulator")

Other than this

Quoted 19 lines
---
  drivers/vdpa/vdpa_sim/vdpa_sim.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +1 -1
index 14e024de5cbf..89a474c7a096 100644
@@ -66,7 +66,7 @@ static void vdpasim_queue_ready(struct vdpasim *vdpasim, unsigned int idx)
  {
  	struct vdpasim_virtqueue *vq = &vdpasim->vqs[idx];
 
-	vringh_init_iotlb(&vq->vring, vdpasim->dev_attr.supported_features,
+	vringh_init_iotlb(&vq->vring, vdpasim->features,
  			  VDPASIM_QUEUE_MAX, false,
  			  (struct vring_desc *)(uintptr_t)vq->desc_addr,
  			  (struct vring_avail *)

drivers/vdpa/vdpa_sim/vdpa_sim.c static void vdpasim_vq_reset(struct vdpasim *vdpasim, · line 92

Quoted 8 lines
drivers/vdpa/vdpa_sim/vdpa_sim.c +1 -1
@@ -86,7 +86,7 @@ static void vdpasim_vq_reset(struct vdpasim *vdpasim,
  	vq->device_addr = 0;
  	vq->cb = NULL;
  	vq->private = NULL;
-	vringh_init_iotlb(&vq->vring, vdpasim->dev_attr.supported_features,
+	vringh_init_iotlb(&vq->vring, vdpasim->features,
  			  VDPASIM_QUEUE_MAX, false, NULL, NULL, NULL);
 
  	vq->vring.notify = NULL;

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

author
#2 lore raw
Quoted 11 lines · Jason Wang
Quoted 4 lines · Eli Cohen

When calling vringh_init_iotlb(), use the negotiated features which might be different than the supported features.

Fixes 011c35bac5ef ("vdpa_sim: add supported_features field in vdpasim_dev_attr)

As Stefano said.

It should be 2c53d0f64c06f ("vdpasim: vDPA device simulator")

Makes sense. Though I haven't got Stefano's message. I will post another one.

Quoted 32 lines

Other than this

Quoted 25 lines
---
  drivers/vdpa/vdpa_sim/vdpa_sim.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +2 -2
index 14e024de5cbf..89a474c7a096 100644
@@ -66,7 +66,7 @@ static void vdpasim_queue_ready(struct vdpasim *vdpasim, unsigned int idx)
  {
  	struct vdpasim_virtqueue *vq = &vdpasim->vqs[idx];
-	vringh_init_iotlb(&vq->vring, vdpasim->dev_attr.supported_features,
+	vringh_init_iotlb(&vq->vring, vdpasim->features,
  			  VDPASIM_QUEUE_MAX, false,
  			  (struct vring_desc *)(uintptr_t)vq->desc_addr,
  			  (struct vring_avail *)
@@ -86,7 +86,7 @@ static void vdpasim_vq_reset(struct vdpasim *vdpasim,
  	vq->device_addr = 0;
  	vq->cb = NULL;
  	vq->private = NULL;
-	vringh_init_iotlb(&vq->vring, vdpasim->dev_attr.supported_features,
+	vringh_init_iotlb(&vq->vring, vdpasim->features,
  			  VDPASIM_QUEUE_MAX, false, NULL, NULL, NULL);
  	vq->vring.notify = NULL;