From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id D8203A046B for ; Mon, 24 Jun 2019 17:26:13 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CC61D1BCD4; Mon, 24 Jun 2019 17:26:13 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 2ACF41BCD4 for ; Mon, 24 Jun 2019 17:26:12 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A1666B2DC5 for ; Mon, 24 Jun 2019 15:26:11 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-250.ams2.redhat.com [10.36.116.250]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F75019723; Mon, 24 Jun 2019 15:26:02 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Jens Freimann , Maxime Coquelin , dpdk stable Date: Mon, 24 Jun 2019 16:24:37 +0100 Message-Id: <20190624152525.19349-13-ktraynor@redhat.com> In-Reply-To: <20190624152525.19349-1-ktraynor@redhat.com> References: <20190624152525.19349-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 24 Jun 2019 15:26:11 +0000 (UTC) Subject: [dpdk-stable] patch 'net/virtio: remove useless check on mempool' has been queued to LTS release 18.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/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 rebasing (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/7bdd00ecf5e811ea56bd7a6824329e2d6bacff59 Thanks. Kevin Traynor --- >From 7bdd00ecf5e811ea56bd7a6824329e2d6bacff59 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 9 May 2019 10:03:48 +0200 Subject: [PATCH] net/virtio: remove useless check on mempool [ upstream commit 711b07ce6e2d6b2ac674fad909b5e2f7249bc7a3 ] This .rx_queue_setup devop is called after ethdev already dereferenced the mempool pointer. No need to check and we can remove this rte_exit. Fixes: 48cec290a3d2 ("net/virtio: move queue configure code to proper place") Signed-off-by: David Marchand Reviewed-by: Jens Freimann Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_rxtx.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index 7f7562ddc..98282dcff 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -574,9 +574,4 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, rxvq->queue_id = queue_idx; rxvq->mpool = mp; - if (rxvq->mpool == NULL) { - rte_exit(EXIT_FAILURE, - "Cannot allocate mbufs for rx virtqueue"); - } - dev->data->rx_queues[queue_idx] = rxvq; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-24 16:18:55.772438092 +0100 +++ 0013-net-virtio-remove-useless-check-on-mempool.patch 2019-06-24 16:18:54.985432309 +0100 @@ -1 +1 @@ -From 711b07ce6e2d6b2ac674fad909b5e2f7249bc7a3 Mon Sep 17 00:00:00 2001 +From 7bdd00ecf5e811ea56bd7a6824329e2d6bacff59 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 711b07ce6e2d6b2ac674fad909b5e2f7249bc7a3 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 1de28540c..4333c10a9 100644 +index 7f7562ddc..98282dcff 100644 @@ -24 +25 @@ -@@ -891,9 +891,4 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, +@@ -574,9 +574,4 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,