patches for DPDK stable branches
 help / color / Atom feed
* [dpdk-stable] [PATCH] vhost: add protocol feature check
@ 2019-12-25 14:24 Jin Yu
  2020-01-13  2:52 ` Tiwei Bie
  0 siblings, 1 reply; 2+ messages in thread
From: Jin Yu @ 2019-12-25 14:24 UTC (permalink / raw)
  To: Maxime Coquelin, Tiwei Bie, Zhihong Wang; +Cc: dev, Jin Yu, stable

Add VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD check in
getting inflight ring functions.

Fixes: 4d891f77ddfa ("vhost: add APIs to get inflight ring")
Cc: stable@dpdk.org

Signed-off-by: Jin Yu <jin.yu@intel.com>
---
 lib/librte_vhost/vhost.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index 1cbe948f7..dfb71732b 100644
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -862,6 +862,10 @@ rte_vhost_get_vhost_ring_inflight(int vid, uint16_t vring_idx,
 	if (unlikely(!dev))
 		return -1;
 
+	if (unlikely(!(dev->protocol_features &
+	    (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))))
+		return 0;
+
 	if (vring_idx >= VHOST_MAX_VRING)
 		return -1;
 
@@ -1431,6 +1435,10 @@ rte_vhost_get_vring_base_from_inflight(int vid,
 	if (dev == NULL || last_avail_idx == NULL || last_used_idx == NULL)
 		return -1;
 
+	if (unlikely(!(dev->protocol_features &
+	    (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))))
+		return 0;
+
 	if (!vq_is_packed(dev))
 		return -1;
 
-- 
2.17.2


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [dpdk-stable] [PATCH] vhost: add protocol feature check
  2019-12-25 14:24 [dpdk-stable] [PATCH] vhost: add protocol feature check Jin Yu
@ 2020-01-13  2:52 ` Tiwei Bie
  0 siblings, 0 replies; 2+ messages in thread
From: Tiwei Bie @ 2020-01-13  2:52 UTC (permalink / raw)
  To: Jin Yu; +Cc: Maxime Coquelin, Zhihong Wang, dev, stable

On Wed, Dec 25, 2019 at 10:24:45PM +0800, Jin Yu wrote:
> Add VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD check in
> getting inflight ring functions.
> 
> Fixes: 4d891f77ddfa ("vhost: add APIs to get inflight ring")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Jin Yu <jin.yu@intel.com>
> ---
>  lib/librte_vhost/vhost.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
> index 1cbe948f7..dfb71732b 100644
> --- a/lib/librte_vhost/vhost.c
> +++ b/lib/librte_vhost/vhost.c
> @@ -862,6 +862,10 @@ rte_vhost_get_vhost_ring_inflight(int vid, uint16_t vring_idx,
>  	if (unlikely(!dev))
>  		return -1;
>  
> +	if (unlikely(!(dev->protocol_features &
> +	    (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))))
> +		return 0;

Why this is needed?
The caller needs to know whether _INFLIGHT_SHMFD is negotiated or
not anyway. Even if rte_vhost_get_vhost_ring_inflight() returns
success, the inflight info returned is still invalid.


> +
>  	if (vring_idx >= VHOST_MAX_VRING)
>  		return -1;
>  
> @@ -1431,6 +1435,10 @@ rte_vhost_get_vring_base_from_inflight(int vid,
>  	if (dev == NULL || last_avail_idx == NULL || last_used_idx == NULL)
>  		return -1;
>  
> +	if (unlikely(!(dev->protocol_features &
> +	    (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))))
> +		return 0;
> +
>  	if (!vq_is_packed(dev))
>  		return -1;
>  
> -- 
> 2.17.2
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-25 14:24 [dpdk-stable] [PATCH] vhost: add protocol feature check Jin Yu
2020-01-13  2:52 ` Tiwei Bie

patches for DPDK stable branches

Archives are clonable:
	git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable


Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/ public-inbox