From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maxime Coquelin <maxime.coquelin@redhat.com>
Subject: Re: [PATCH v5 2/6] vhost: rewrite enqueue
Date: Thu, 15 Sep 2016 18:35:35 +0200
Message-ID: <272ec2b8-70f5-e32b-62f4-45c53c121630@redhat.com>
References: <1471319402-112998-1-git-send-email-zhihong.wang@intel.com>
 <1473392368-84903-1-git-send-email-zhihong.wang@intel.com>
 <1473392368-84903-3-git-send-email-zhihong.wang@intel.com>
 <2cc970ca-ea2c-8e3b-069a-9f1ec1182b03@redhat.com>
 <8F6C2BD409508844A0EFC19955BE09414E70FB1C@SHSMSX103.ccr.corp.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Cc: "yuanhan.liu@linux.intel.com" <yuanhan.liu@linux.intel.com>,
 "thomas.monjalon@6wind.com" <thomas.monjalon@6wind.com>
To: "Wang, Zhihong" <zhihong.wang@intel.com>, "dev@dpdk.org" <dev@dpdk.org>
Return-path: <dev-bounces@dpdk.org>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28])
 by dpdk.org (Postfix) with ESMTP id EDB242B97
 for <dev@dpdk.org>; Thu, 15 Sep 2016 18:35:39 +0200 (CEST)
In-Reply-To: <8F6C2BD409508844A0EFC19955BE09414E70FB1C@SHSMSX103.ccr.corp.intel.com>
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

Hi,
On 09/14/2016 10:20 AM, Wang, Zhihong wrote:
>>> +				desc_current =
>>> +					vq->avail->ring[(vq->last_used_idx)
>> &
>>> +					(vq->size - 1)];
>>> +				desc_chain_head = desc_current;
>>> +				desc = &vq->desc[desc_current];
>>> +				desc_addr = gpa_to_vva(dev, desc->addr);
>>> +				if (unlikely(!desc_addr))
>>> +					goto error;
>>>
>>> -			desc = &vq->desc[desc->next];
>>> -			desc_addr = gpa_to_vva(dev, desc->addr);
>>> -			if (unlikely(!desc_addr))
>>> -				return -1;
>>> -
>>> -			desc_offset = 0;
>>> -			desc_avail  = desc->len;
>>> +				desc_chain_len = 0;
>>> +				desc_offset = 0;
>> As I commented on v3, there is code duplication between next flag, and
>> mrg buf cases:
>> desc_offset = 0;
>>
>> and:
>>
>> desc = &vq->desc[desc_current];
>> desc_addr = gpa_to_vva(dev, desc->addr);
>> if (unlikely(!desc_addr))
>>      goto error;
>>
>
> Do you mean to add something like:
>
> static inline int __attribute__((always_inline))
> get_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
>                 uint32_t desc_idx, struct vring_desc **desc,
>                 uint64_t *desc_addr)
> {
>         *desc = &vq->desc[desc_idx];
>         *desc_addr = gpa_to_vva(dev, (*desc)->addr);
>         if (unlikely(!(*desc_addr)))
>                 return -1;
>
>         return 0;
> }

I meant, move this code after the if/else.
You can do it in a function if it is done elsewhere in the file.