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 0E6B3A00E6 for ; Tue, 14 May 2019 16:45:14 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 047F55B2A; Tue, 14 May 2019 16:45:14 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id DDA625B2A for ; Tue, 14 May 2019 16:45:12 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 506BB3082A28; Tue, 14 May 2019 14:45:12 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-124.ams2.redhat.com [10.36.116.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id 449E2608A7; Tue, 14 May 2019 14:45:11 +0000 (UTC) From: Kevin Traynor To: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= Cc: Gage Eads , dpdk stable Date: Tue, 14 May 2019 15:44:04 +0100 Message-Id: <20190514144406.7526-20-ktraynor@redhat.com> In-Reply-To: <20190514144406.7526-1-ktraynor@redhat.com> References: <20190514144406.7526-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 14 May 2019 14:45:12 +0000 (UTC) Subject: [dpdk-stable] patch 'event/dsw: ignore scheduling type for single-link queues' 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/20/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/c8a8ccd7f1bfbe2696be4dbdb967aa4e4f65f3ce Thanks. Kevin Traynor --- >From c8a8ccd7f1bfbe2696be4dbdb967aa4e4f65f3ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= Date: Fri, 10 May 2019 14:18:16 +0200 Subject: [PATCH] event/dsw: ignore scheduling type for single-link queues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 7e192bdb0c55745a81e7f5e0eaf2b7a911aeadd4 ] The scheduling type parameter is not applicable for single link queues. DSW would, at the time of rte_event_queue_setup(), erroneously verify that scheduling type was one of the supported types, and returned -ENOTSUP in case of RTE_SCHED_TYPE_ORDERED. Fixes: 4540ee9c68 ("event/dsw: add device and queue configuration") Signed-off-by: Mattias Rönnblom Acked-by: Gage Eads --- drivers/event/dsw/dsw_evdev.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/event/dsw/dsw_evdev.c b/drivers/event/dsw/dsw_evdev.c index 4157d130c..9387d4149 100644 --- a/drivers/event/dsw/dsw_evdev.c +++ b/drivers/event/dsw/dsw_evdev.c @@ -103,7 +103,4 @@ dsw_queue_setup(struct rte_eventdev *dev, uint8_t queue_id, return -ENOTSUP; - if (conf->schedule_type == RTE_SCHED_TYPE_ORDERED) - return -ENOTSUP; - /* SINGLE_LINK is better off treated as TYPE_ATOMIC, since it * avoid the "fake" TYPE_PARALLEL flow_id assignment. Since @@ -114,6 +111,10 @@ dsw_queue_setup(struct rte_eventdev *dev, uint8_t queue_id, if (RTE_EVENT_QUEUE_CFG_SINGLE_LINK & conf->event_queue_cfg) queue->schedule_type = RTE_SCHED_TYPE_ATOMIC; - else /* atomic or parallel */ + else { + if (conf->schedule_type == RTE_SCHED_TYPE_ORDERED) + return -ENOTSUP; + /* atomic or parallel */ queue->schedule_type = conf->schedule_type; + } queue->num_serving_ports = 0; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-14 15:39:08.265832781 +0100 +++ 0020-event-dsw-ignore-scheduling-type-for-single-link-que.patch 2019-05-14 15:39:07.322558631 +0100 @@ -1 +1 @@ -From 7e192bdb0c55745a81e7f5e0eaf2b7a911aeadd4 Mon Sep 17 00:00:00 2001 +From c8a8ccd7f1bfbe2696be4dbdb967aa4e4f65f3ce Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 7e192bdb0c55745a81e7f5e0eaf2b7a911aeadd4 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org