From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maxime Coquelin <maxime.coquelin@redhat.com>
Subject: Re: [PATCH] vhost: fix double read of descriptor flags
Date: Tue, 11 Dec 2018 19:33:48 +0100
Message-ID: <c33ede76-05d2-dcfe-2759-de35d082bf2f@redhat.com>
References: <CGME20181205150935eucas1p11698df8ed58ff02a4326dd5780af4470@eucas1p1.samsung.com>
 <20181205150926.4895-1-i.maximets@samsung.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Tiwei Bie <tiwei.bie@intel.com>, Zhihong Wang <zhihong.wang@intel.com>,
 jfreimann@redhat.com, stable@dpdk.org
To: Ilya Maximets <i.maximets@samsung.com>, dev@dpdk.org
Return-path: <dev-bounces@dpdk.org>
In-Reply-To: <20181205150926.4895-1-i.maximets@samsung.com>
Content-Language: en-US
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>



On 12/5/18 4:09 PM, Ilya Maximets wrote:
> Flags could be updated in a separate process leading to the
> inconsistent check.
> 
> Additionally, read marked as 'volatile' to highlight the shared
> nature of the variable and avoid such issues in the future.
> 
> Fixes: d3211c98c456 ("vhost: add helpers for packed virtqueues")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
> ---
>   lib/librte_vhost/vhost.h | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
> index 5218f1b12..84cbee2b6 100644
> --- a/lib/librte_vhost/vhost.h
> +++ b/lib/librte_vhost/vhost.h
> @@ -393,8 +393,10 @@ vq_is_packed(struct virtio_net *dev)
>   static inline bool
>   desc_is_avail(struct vring_packed_desc *desc, bool wrap_counter)
>   {
> -	return wrap_counter == !!(desc->flags & VRING_DESC_F_AVAIL) &&
> -		wrap_counter != !!(desc->flags & VRING_DESC_F_USED);
> +	uint16_t flags = *((volatile uint16_t *) &desc->flags);
> +
> +	return wrap_counter == !!(flags & VRING_DESC_F_AVAIL) &&
> +		wrap_counter != !!(flags & VRING_DESC_F_USED);
>   }
>   
>   #define VHOST_LOG_PAGE	4096
> 

Applied to dpdk-next-virtio.

Thanks,
Maxime