From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 634C64602E; Thu, 16 Jan 2025 10:51:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F04D240613; Thu, 16 Jan 2025 10:51:05 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id C4F4B4025F for ; Thu, 16 Jan 2025 10:51:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1737021064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=VG/HEUuve2wtjvQTEXBhCGd5jL5FcLwGI8o0b6reDxE=; b=RCsEGvD4EGplyQW9Y1plSCK05KIcHMrU3k2mn3wyiq08FYvjkEPHR6mLafdD60G1PO5t/C sF58ENCJCKPzdrbfri7rM+BBxUxl2UZY0LcoWzcXiP1CtIAxBnDwF4HvkgVJn+sHyWR+hL DF6m7OQQQkeSEKDBD+trVUgtB7bZfqY= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-125-WABttd7qNUiyBYP7zY2keg-1; Thu, 16 Jan 2025 04:50:59 -0500 X-MC-Unique: WABttd7qNUiyBYP7zY2keg-1 X-Mimecast-MFC-AGG-ID: WABttd7qNUiyBYP7zY2keg Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C698D19560B2; Thu, 16 Jan 2025 09:50:58 +0000 (UTC) Received: from [10.39.208.25] (unknown [10.39.208.25]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 96941195E3D9; Thu, 16 Jan 2025 09:50:57 +0000 (UTC) Message-ID: Date: Thu, 16 Jan 2025 10:50:53 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 4/4] vhost: improve RARP handling in dequeue paths To: David Marchand Cc: dev@dpdk.org, chenbox@nvidia.com References: <20250115125938.2699577-1-maxime.coquelin@redhat.com> <20250115125938.2699577-5-maxime.coquelin@redhat.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= In-Reply-To: X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: gxEyl7Aohx6u2YXaGwbieYhlHqwPEO4rQ8ufiMJu69E_1737021058 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org On 1/15/25 5:46 PM, David Marchand wrote: > On Wed, Jan 15, 2025 at 1:59 PM Maxime Coquelin > wrote: >> >> With previous refactoring, we can now simplify the RARP >> packet injection handling in both the sync and async >> dequeue paths. >> >> Signed-off-by: Maxime Coquelin >> --- >> lib/vhost/virtio_net.c | 42 ++++++++++++++++++------------------------ >> 1 file changed, 18 insertions(+), 24 deletions(-) >> >> diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c >> index 59ea2d16a5..fab45ebd54 100644 >> --- a/lib/vhost/virtio_net.c >> +++ b/lib/vhost/virtio_net.c >> @@ -3662,21 +3662,23 @@ rte_vhost_dequeue_burst(int vid, uint16_t queue_id, >> * learning table will get updated first. >> */ >> pkts[0] = rarp_mbuf; > > Well, ideally it would be pkts[nb_rx], but see comment below. > >> - vhost_queue_stats_update(dev, vq, pkts, 1); >> - pkts++; >> - count -= 1; >> + nb_rx += 1; >> } > > With this change, the rarp_mbuf variable is unneeded. > You can store to pkts[nb_rx] when calling rte_net_make_rarp_packet() > (and at the same time, move the comment about injecting the packet to > the head of the array). I agree with this further simplification. Thanks, Maxime > > > >> >> if (vq_is_packed(dev)) { >> if (dev->flags & VIRTIO_DEV_LEGACY_OL_FLAGS) >> - nb_rx = virtio_dev_tx_packed_legacy(dev, vq, mbuf_pool, pkts, count); >> + nb_rx += virtio_dev_tx_packed_legacy(dev, vq, mbuf_pool, >> + pkts + nb_rx, count - nb_rx); >> else >> - nb_rx = virtio_dev_tx_packed_compliant(dev, vq, mbuf_pool, pkts, count); >> + nb_rx += virtio_dev_tx_packed_compliant(dev, vq, mbuf_pool, >> + pkts + nb_rx, count - nb_rx); >> } else { >> if (dev->flags & VIRTIO_DEV_LEGACY_OL_FLAGS) >> - nb_rx = virtio_dev_tx_split_legacy(dev, vq, mbuf_pool, pkts, count); >> + nb_rx += virtio_dev_tx_split_legacy(dev, vq, mbuf_pool, >> + pkts + nb_rx, count - nb_rx); >> else >> - nb_rx = virtio_dev_tx_split_compliant(dev, vq, mbuf_pool, pkts, count); >> + nb_rx += virtio_dev_tx_split_compliant(dev, vq, mbuf_pool, >> + pkts + nb_rx, count - nb_rx); >> } >> >> vhost_queue_stats_update(dev, vq, pkts, nb_rx); >> @@ -3687,9 +3689,6 @@ rte_vhost_dequeue_burst(int vid, uint16_t queue_id, >> out_access_unlock: >> rte_rwlock_read_unlock(&vq->access_lock); >> >> - if (unlikely(rarp_mbuf != NULL)) >> - nb_rx += 1; >> - >> out_no_unlock: >> return nb_rx; >> } >> @@ -4285,25 +4284,23 @@ rte_vhost_async_try_dequeue_burst(int vid, uint16_t queue_id, >> * learning table will get updated first. >> */ >> pkts[0] = rarp_mbuf; >> - vhost_queue_stats_update(dev, vq, pkts, 1); >> - pkts++; >> - count -= 1; >> + nb_rx += 1; >> } > > Idem. > >> >> if (vq_is_packed(dev)) { >> if (dev->flags & VIRTIO_DEV_LEGACY_OL_FLAGS) >> - nb_rx = virtio_dev_tx_async_packed_legacy(dev, vq, mbuf_pool, >> - pkts, count, dma_id, vchan_id); >> + nb_rx += virtio_dev_tx_async_packed_legacy(dev, vq, mbuf_pool, >> + pkts + nb_rx, count - nb_rx, dma_id, vchan_id); >> else >> - nb_rx = virtio_dev_tx_async_packed_compliant(dev, vq, mbuf_pool, >> - pkts, count, dma_id, vchan_id); >> + nb_rx += virtio_dev_tx_async_packed_compliant(dev, vq, mbuf_pool, >> + pkts + nb_rx, count - nb_rx, dma_id, vchan_id); >> } else { >> if (dev->flags & VIRTIO_DEV_LEGACY_OL_FLAGS) >> - nb_rx = virtio_dev_tx_async_split_legacy(dev, vq, mbuf_pool, >> - pkts, count, dma_id, vchan_id); >> + nb_rx += virtio_dev_tx_async_split_legacy(dev, vq, mbuf_pool, >> + pkts + nb_rx, count - nb_rx, dma_id, vchan_id); >> else >> - nb_rx = virtio_dev_tx_async_split_compliant(dev, vq, mbuf_pool, >> - pkts, count, dma_id, vchan_id); >> + nb_rx += virtio_dev_tx_async_split_compliant(dev, vq, mbuf_pool, >> + pkts + nb_rx, count - nb_rx, dma_id, vchan_id); >> } >> >> *nr_inflight = vq->async->pkts_inflight_n; >> @@ -4315,9 +4312,6 @@ rte_vhost_async_try_dequeue_burst(int vid, uint16_t queue_id, >> out_access_unlock: >> rte_rwlock_read_unlock(&vq->access_lock); >> >> - if (unlikely(rarp_mbuf != NULL)) >> - nb_rx += 1; >> - >> out_no_unlock: >> return nb_rx; >> } >> -- >> 2.47.1 >> > >