[dpdk-dev] vhost: fix vDPA set features

Message ID 20180425021827.28240-1-xiao.w.wang@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Maxime Coquelin
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Xiao Wang April 25, 2018, 2:18 a.m. UTC
  We should call set_features callback after setting features in virtio_net
structure, otherwise vDPA driver cannot get the right features.

Fixes: 07718b4f87aa ("vhost: adapt library for selective datapath")

Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>
---
 lib/librte_vhost/vhost_user.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
  

Comments

Zhihong Wang April 26, 2018, 5:51 a.m. UTC | #1
> -----Original Message-----
> From: Wang, Xiao W
> Sent: Wednesday, April 25, 2018 10:18 AM
> To: maxime.coquelin@redhat.com
> Cc: Tan, Jianfeng <jianfeng.tan@intel.com>; Wang, Zhihong
> <zhihong.wang@intel.com>; dev@dpdk.org; Wang, Xiao W
> <xiao.w.wang@intel.com>
> Subject: [PATCH] vhost: fix vDPA set features
> 
> We should call set_features callback after setting features in virtio_net
> structure, otherwise vDPA driver cannot get the right features.
> 
> Fixes: 07718b4f87aa ("vhost: adapt library for selective datapath")
> 
> Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>

Acked-by: Zhihong Wang <zhihong.wang@intel.com>

Thanks for fixing it!
  
Maxime Coquelin April 26, 2018, 8:07 a.m. UTC | #2
On 04/25/2018 04:18 AM, Xiao Wang wrote:
> We should call set_features callback after setting features in virtio_net
> structure, otherwise vDPA driver cannot get the right features.
> 
> Fixes: 07718b4f87aa ("vhost: adapt library for selective datapath")
> 
> Signed-off-by: Xiao Wang<xiao.w.wang@intel.com>
> ---
>   lib/librte_vhost/vhost_user.c | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)

Reiewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Thanks!
Maxime
  
Ferruh Yigit April 27, 2018, 2:54 p.m. UTC | #3
On 4/26/2018 9:07 AM, Maxime Coquelin wrote:
> 
> 
> On 04/25/2018 04:18 AM, Xiao Wang wrote:
>> We should call set_features callback after setting features in virtio_net
>> structure, otherwise vDPA driver cannot get the right features.
>>
>> Fixes: 07718b4f87aa ("vhost: adapt library for selective datapath")
>>
>> Signed-off-by: Xiao Wang<xiao.w.wang@intel.com>
>> ---
>>   lib/librte_vhost/vhost_user.c | 10 +++++-----
>>   1 file changed, 5 insertions(+), 5 deletions(-)
> 

Acked-by: Zhihong Wang <zhihong.wang@intel.com>

> Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Applied to dpdk-next-net/master, thanks.
  

Patch

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 90194bf09..7244e1c06 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -214,11 +214,6 @@  vhost_user_set_features(struct virtio_net *dev, uint64_t features)
 			dev->notify_ops->features_changed(dev->vid, features);
 	}
 
-	did = dev->vdpa_dev_id;
-	vdpa_dev = rte_vdpa_get_device(did);
-	if (vdpa_dev && vdpa_dev->ops->set_features)
-		vdpa_dev->ops->set_features(dev->vid);
-
 	dev->features = features;
 	if (dev->features &
 		((1 << VIRTIO_NET_F_MRG_RXBUF) | (1ULL << VIRTIO_F_VERSION_1))) {
@@ -252,6 +247,11 @@  vhost_user_set_features(struct virtio_net *dev, uint64_t features)
 		}
 	}
 
+	did = dev->vdpa_dev_id;
+	vdpa_dev = rte_vdpa_get_device(did);
+	if (vdpa_dev && vdpa_dev->ops->set_features)
+		vdpa_dev->ops->set_features(dev->vid);
+
 	return 0;
 }