From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by dpdk.space (Postfix) with ESMTP id 12398A05D3
for <public@inbox.dpdk.org>; Fri, 24 May 2019 15:50:33 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id C5ABB1DB9;
Fri, 24 May 2019 15:50:31 +0200 (CEST)
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28])
by dpdk.org (Postfix) with ESMTP id E91121D7
for <dev@dpdk.org>; Fri, 24 May 2019 15:50:29 +0200 (CEST)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
[10.5.11.22])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id 4E82BC05D275;
Fri, 24 May 2019 13:50:29 +0000 (UTC)
Received: from [10.36.112.42] (ovpn-112-42.ams2.redhat.com [10.36.112.42])
by smtp.corp.redhat.com (Postfix) with ESMTPS id 5D604100200D;
Fri, 24 May 2019 13:50:22 +0000 (UTC)
To: Tiwei Bie <tiwei.bie@intel.com>
Cc: dev@dpdk.org, jfreimann@redhat.com, zhihong.wang@intel.com,
bruce.richardson@intel.com, konstantin.ananyev@intel.com,
david.marchand@redhat.com
References: <20190517150613.13310-1-maxime.coquelin@redhat.com>
<20190517150613.13310-4-maxime.coquelin@redhat.com>
<20190520055132.GA19612@___>
From: Maxime Coquelin <maxime.coquelin@redhat.com>
Message-ID: <a7003808-d7fa-bf6b-cc35-4862eadb940d@redhat.com>
Date: Fri, 24 May 2019 15:50:21 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
Thunderbird/60.6.1
MIME-Version: 1.0
In-Reply-To: <20190520055132.GA19612@___>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
(mx1.redhat.com [10.5.110.31]); Fri, 24 May 2019 13:50:29 +0000 (UTC)
Subject: Re: [dpdk-dev] [PATCH v2 3/5] vhost: do not inline unlikely
fragmented buffers code
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
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 5/20/19 7:51 AM, Tiwei Bie wrote:
> On Fri, May 17, 2019 at 05:06:11PM +0200, Maxime Coquelin wrote:
> [...]
>>
>> +static void
>> +copy_vnet_hdr_from_desc(struct virtio_net_hdr *hdr,
>> + struct buf_vector *buf_vec)
>> +{
>> + uint64_t len;
>> + uint64_t remain = sizeof(struct virtio_net_hdr);
>> + uint64_t src;
>> + uint64_t dst = (uint64_t)(uintptr_t)&hdr;
>
> typo: s/&hdr/hdr/
Nice catch! It wasn't spotted at build time due to the cast.
>> +
>> + /*
>> + * No luck, the virtio-net header doesn't fit
>> + * in a contiguous virtual area.
>> + */
>> + while (remain) {
>> + len = RTE_MIN(remain, buf_vec->buf_len);
>> + src = buf_vec->buf_addr;
>> + rte_memcpy((void *)(uintptr_t)dst,
>> + (void *)(uintptr_t)src, len);
>> +
>> + remain -= len;
>> + dst += len;
>> + buf_vec++;
>> + }
>> +}
>> +
>> static __rte_always_inline int
>> copy_desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq,
>> struct buf_vector *buf_vec, uint16_t nr_vec,
>> @@ -1094,28 +1126,7 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq,
>>
>> if (virtio_net_with_host_offload(dev)) {
>> if (unlikely(buf_len < sizeof(struct virtio_net_hdr))) {
>> - uint64_t len;
>> - uint64_t remain = sizeof(struct virtio_net_hdr);
>> - uint64_t src;
>> - uint64_t dst = (uint64_t)(uintptr_t)&tmp_hdr;
>> - uint16_t hdr_vec_idx = 0;
>> -
>> - /*
>> - * No luck, the virtio-net header doesn't fit
>> - * in a contiguous virtual area.
>> - */
>
> It's better to not move above comments.
Right, I will revert it back here.
>
> For the rest,
> Reviewed-by: Tiwei Bie <tiwei.bie@intel.com>
Thanks,
Maxime
>
>> - while (remain) {
>> - len = RTE_MIN(remain,
>> - buf_vec[hdr_vec_idx].buf_len);
>> - src = buf_vec[hdr_vec_idx].buf_addr;
>> - rte_memcpy((void *)(uintptr_t)dst,
>> - (void *)(uintptr_t)src, len);
>> -
>> - remain -= len;
>> - dst += len;
>> - hdr_vec_idx++;
>> - }
>> -
>> + copy_vnet_hdr_from_desc(&tmp_hdr, buf_vec);
>> hdr = &tmp_hdr;
>> } else {
>> hdr = (struct virtio_net_hdr *)((uintptr_t)buf_addr);
>> --
>> 2.21.0
>>