From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 226BBA04C3 for ; Fri, 22 Nov 2019 15:42:25 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1A69A2BBB; Fri, 22 Nov 2019 15:42:25 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id C23A22BBB for ; Fri, 22 Nov 2019 15:42:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574433743; 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; bh=GGSwt5C9zAwu/3s2jus1FkrPqPoAYooIxQVIEZLFxLY=; b=bNGlrCNJ7haT+5rF+6eJGgU1z3JQbPMnKWEJ+IpYdCQVyiu5oEDYCfRNKg5DUM6Rj6f6qb qfB53wMnW+yssEnSfhnh7ws18TprVhjK+eE7GXi5zYk0ATrXDf1D+Ke/tBx0V21+/wgG65 gQRhMrPMlva102Gg+dY0q+7QvNKfIlI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-244-XNzL5ph0O_OmuRL1PhIFcg-1; Fri, 22 Nov 2019 09:42:19 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1D7B1DBA6; Fri, 22 Nov 2019 14:42:18 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7CE9F6E713; Fri, 22 Nov 2019 14:42:14 +0000 (UTC) From: Kevin Traynor To: Tiwei Bie Cc: Maxime Coquelin , dpdk stable Date: Fri, 22 Nov 2019 14:41:05 +0000 Message-Id: <20191122144131.21231-19-ktraynor@redhat.com> In-Reply-To: <20191122144131.21231-1-ktraynor@redhat.com> References: <20191122144131.21231-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: XNzL5ph0O_OmuRL1PhIFcg-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/virtio: remove remaining simple Tx related stuff' has been queued to LTS release 18.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/29/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/038f992817028b24cb= fd3e676ec6d3d61b779d72 Thanks. Kevin. --- >From 038f992817028b24cbfd3e676ec6d3d61b779d72 Mon Sep 17 00:00:00 2001 From: Tiwei Bie Date: Tue, 13 Aug 2019 10:07:25 +0800 Subject: [PATCH] net/virtio: remove remaining simple Tx related stuff [ upstream commit 1d2aa48b876148715680c9a1d69c195a929bad14 ] The simple Tx path in virtio has been removed in below commit. This patch removes an undefined function declaration of simple Tx and all related descriptions in the doc. Fixes: 57f818963d80 ("net/virtio: remove simple Tx path") Signed-off-by: Tiwei Bie Reviewed-by: Maxime Coquelin --- doc/guides/nics/virtio.rst | 15 ++------------- drivers/net/virtio/virtio_ethdev.h | 3 --- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/doc/guides/nics/virtio.rst b/doc/guides/nics/virtio.rst index 2ae875cb4..da9cd6ba6 100644 --- a/doc/guides/nics/virtio.rst +++ b/doc/guides/nics/virtio.rst @@ -202,5 +202,5 @@ Virtio PMD Rx/Tx Callbacks -------------------------- =20 -Virtio driver has 4 Rx callbacks and 3 Tx callbacks. +Virtio driver has 4 Rx callbacks and 2 Tx callbacks. =20 Rx callbacks: @@ -224,7 +224,4 @@ Tx callbacks: Regular version. =20 -#. ``virtio_xmit_pkts_simple``: - Vector version fixes the available ring indexes to optimize performance= . - #. ``virtio_xmit_pkts_inorder``: In-order version. @@ -240,10 +237,4 @@ By default, the non-vector callbacks are used: Vector callbacks will be used when: =20 -* ``txmode.offloads`` is set to ``0x0``, which implies: - - * Single segment is specified. - - * No offload support is needed. - * Mergeable Rx buffers is disabled. =20 @@ -252,11 +243,9 @@ The corresponding callbacks are: * For Rx: ``virtio_recv_pkts_vec``. =20 -* For Tx: ``virtio_xmit_pkts_simple``. - =20 Example of using the vector version of the virtio poll mode driver in ``testpmd``:: =20 - testpmd -l 0-2 -n 4 -- -i --tx-offloads=3D0x0 --rxq=3D1 --txq=3D1 --nb-= cores=3D1 + testpmd -l 0-2 -n 4 -- -i --rxq=3D1 --txq=3D1 --nb-cores=3D1 =20 In-order callbacks only work on simulated virtio user vdev. diff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio= _ethdev.h index 8eb866073..758f2309e 100644 --- a/drivers/net/virtio/virtio_ethdev.h +++ b/drivers/net/virtio/virtio_ethdev.h @@ -95,7 +95,4 @@ uint16_t virtio_recv_pkts_vec(void *rx_queue, struct rte_= mbuf **rx_pkts, =09=09uint16_t nb_pkts); =20 -uint16_t virtio_xmit_pkts_simple(void *tx_queue, struct rte_mbuf **tx_pkts= , -=09=09uint16_t nb_pkts); - int eth_virtio_dev_init(struct rte_eth_dev *eth_dev); =20 --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-11-22 14:36:56.247972042 +0000 +++ 0019-net-virtio-remove-remaining-simple-Tx-related-stuff.patch=092019-1= 1-22 14:36:55.188149479 +0000 @@ -1 +1 @@ -From 1d2aa48b876148715680c9a1d69c195a929bad14 Mon Sep 17 00:00:00 2001 +From 038f992817028b24cbfd3e676ec6d3d61b779d72 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1d2aa48b876148715680c9a1d69c195a929bad14 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -64 +65 @@ -index 20d331795..a10111758 100644 +index 8eb866073..758f2309e 100644 @@ -67 +68 @@ -@@ -104,7 +104,4 @@ uint16_t virtio_recv_pkts_vec(void *rx_queue, struct r= te_mbuf **rx_pkts, +@@ -95,7 +95,4 @@ uint16_t virtio_recv_pkts_vec(void *rx_queue, struct rte= _mbuf **rx_pkts,