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 9E7F7A05D3 for ; Thu, 25 Apr 2019 17:41:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 96F711B5C4; Thu, 25 Apr 2019 17:41:47 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 7DA471B5C4 for ; Thu, 25 Apr 2019 17:41:46 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E838119D05E; Thu, 25 Apr 2019 15:41:45 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.116.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1955A5D9C6; Thu, 25 Apr 2019 15:41:44 +0000 (UTC) From: Kevin Traynor To: Harry van Haaren Cc: dpdk stable Date: Thu, 25 Apr 2019 16:40:14 +0100 Message-Id: <20190425154037.28778-39-ktraynor@redhat.com> In-Reply-To: <20190425154037.28778-1-ktraynor@redhat.com> References: <20190425154037.28778-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 25 Apr 2019 15:41:45 +0000 (UTC) Subject: [dpdk-stable] patch 'event/sw: fix enqueue checks in self-test' has been queued to LTS release 18.11.2 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/01/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 can be viewed on the 18.11 branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From 6edb65026561ffa27ba441f4c2d3e135124d5664 Mon Sep 17 00:00:00 2001 From: Harry van Haaren Date: Wed, 27 Mar 2019 18:45:46 +0000 Subject: [PATCH] event/sw: fix enqueue checks in self-test [ upstream commit 1b03e2929114d4ebfc7a2159d0d45f0a3e9a7ba6 ] This patch fixes a number of instances of the same return value mis-check, where previously we checked for a negative return value as error, however the API returns an unsigned integer, so these return value checks are invalid. The rte_event_enqueue_burst() API returns the number of events enqueued, so in order to identify the error case, we must check for != the number of intended enqueues. Fixes: cd1a9e3eab55 ("test/eventdev: add SW tests for load balancing") Signed-off-by: Harry van Haaren --- drivers/event/sw/sw_evdev_selftest.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/event/sw/sw_evdev_selftest.c b/drivers/event/sw/sw_evdev_selftest.c index d00d5de61..38c21fa0f 100644 --- a/drivers/event/sw/sw_evdev_selftest.c +++ b/drivers/event/sw/sw_evdev_selftest.c @@ -386,5 +386,5 @@ run_prio_packet_test(struct test *t) }; err = rte_event_enqueue_burst(evdev, t->port[0], &ev, 1); - if (err < 0) { + if (err != 1) { printf("%d: error failed to enqueue\n", __LINE__); return -1; @@ -478,5 +478,5 @@ test_single_directed_packet(struct test *t) /* generate pkt and enqueue */ err = rte_event_enqueue_burst(evdev, rx_enq, &ev, 1); - if (err < 0) { + if (err != 1) { printf("%d: error failed to enqueue\n", __LINE__); return -1; @@ -547,5 +547,5 @@ test_directed_forward_credits(struct test *t) for (i = 0; i < 1000; i++) { err = rte_event_enqueue_burst(evdev, 0, &ev, 1); - if (err < 0) { + if (err != 1) { printf("%d: error failed to enqueue\n", __LINE__); return -1; @@ -708,5 +708,5 @@ burst_packets(struct test *t) /* generate pkt and enqueue */ err = rte_event_enqueue_burst(evdev, t->port[rx_port], &ev, 1); - if (err < 0) { + if (err != 1) { printf("%d: Failed to enqueue\n", __LINE__); return -1; @@ -796,5 +796,5 @@ abuse_inflights(struct test *t) /* Enqueue op only */ err = rte_event_enqueue_burst(evdev, t->port[rx_enq], &release_ev, 1); - if (err < 0) { + if (err != 1) { printf("%d: Failed to enqueue\n", __LINE__); return -1; @@ -2027,5 +2027,5 @@ load_balancing(struct test *t) /* generate pkt and enqueue */ err = rte_event_enqueue_burst(evdev, t->port[rx_enq], &ev, 1); - if (err < 0) { + if (err != 1) { printf("%d: Failed to enqueue\n", __LINE__); return -1; @@ -2126,5 +2126,5 @@ load_balancing_history(struct test *t) arp->hash.rss = flows1[i]; err = rte_event_enqueue_burst(evdev, t->port[rx_enq], &ev, 1); - if (err < 0) { + if (err != 1) { printf("%d: Failed to enqueue\n", __LINE__); return -1; @@ -2176,5 +2176,5 @@ load_balancing_history(struct test *t) err = rte_event_enqueue_burst(evdev, t->port[rx_enq], &ev, 1); - if (err < 0) { + if (err != 1) { printf("%d: Failed to enqueue\n", __LINE__); return -1; @@ -2286,5 +2286,5 @@ invalid_qid(struct test *t) /* generate pkt and enqueue */ err = rte_event_enqueue_burst(evdev, t->port[rx_enq], &ev, 1); - if (err < 0) { + if (err != 1) { printf("%d: Failed to enqueue\n", __LINE__); return -1; @@ -2373,5 +2373,5 @@ single_packet(struct test *t) err = rte_event_enqueue_burst(evdev, t->port[rx_enq], &ev, 1); - if (err < 0) { + if (err != 1) { printf("%d: Failed to enqueue\n", __LINE__); return -1; @@ -2417,5 +2417,5 @@ single_packet(struct test *t) rte_pktmbuf_free(ev.mbuf); err = rte_event_enqueue_burst(evdev, t->port[wrk_enq], &release_ev, 1); - if (err < 0) { + if (err != 1) { printf("%d: Failed to enqueue\n", __LINE__); return -1; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-25 16:37:48.434918540 +0100 +++ 0039-event-sw-fix-enqueue-checks-in-self-test.patch 2019-04-25 16:37:46.749294858 +0100 @@ -1 +1 @@ -From 1b03e2929114d4ebfc7a2159d0d45f0a3e9a7ba6 Mon Sep 17 00:00:00 2001 +From 6edb65026561ffa27ba441f4c2d3e135124d5664 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1b03e2929114d4ebfc7a2159d0d45f0a3e9a7ba6 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org