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 F315AA0093 for ; Fri, 22 May 2020 11:40:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B999B1D966; Fri, 22 May 2020 11:40:31 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 997901D966 for ; Fri, 22 May 2020 11:40:30 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id h17so9496682wrc.8 for ; Fri, 22 May 2020 02:40:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KCjpPvQ/JcMpY1+4JY7ar64zoA7+LET/9zDcRqR7yO0=; b=KcfVDAU0TxWqschid/II19wLzBxM/0skhspYlbCGN1JnK/NDDs71GcOavK4gFIiwOT 75l/hzDRo1VJck3dmdYFQN14Pgot6083tutFxnrExHuQbMJ+RiwffmCVxCcB7sXcff38 3C1Uggtba8QgS6cD8Z60DECyVB5Rjmi0sDg9kew5uriMlGh5u4kTUjzdwwkeSM0QfpuG Q/ESeiNxI1A0m+X9MXae//Ksukq6muj8mbTL45PvDznzeDbcfnr7FagKzK6gh77xuCH4 qLItumeWUZlk07e3nPRXERipCKfYl9brAqHfWAspZqXwM1C6c0xXGH3ls0hq65SXVNvu Ss8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KCjpPvQ/JcMpY1+4JY7ar64zoA7+LET/9zDcRqR7yO0=; b=Q1RdHMr5/YM/6b74qsLlnLG0G/z4Stz22o6UY3O+ZI572u22vocJDiYd5+7s+dj0of zoGPyl0x8en823iMhKzMDwxjYBL95BdQiESux/L8xfbeFNHS3tfZ19icPMLvqrYxqs0E CX0PPgEmgLhKDCiRnW0qGHWPEQHuxWCwLVTFf1ztPyX8tnexU3ARDgiMGSqkZLip6sMY CfX7R/1ObWNRtbUJnhgbiDzPFZQ290FjYdUH+atKQPPvTyX6XvjxCUdfmFLuUTZ5+SMc sw1vG4PYzScL/knVGMjkQEkkNxh5njqOtvFVP0qCrQlH/fBFDEiQekr2aejpjqgWrxZd 36EA== X-Gm-Message-State: AOAM533gq1g7bP/MHMdyAkGbZuCho7zUbxTPx4Qv1SFRyCSHqC6Qos2h o0hZWeTbol3Z9B6GJapz7SM= X-Google-Smtp-Source: ABdhPJydN7aDs8saZj3SdsX3UtxZwMqT2Dpm90GWb16d6brzlgZHNZWNIGoJz9x1gwBzI38uxXbT4g== X-Received: by 2002:adf:9545:: with SMTP id 63mr1472977wrs.303.1590140430189; Fri, 22 May 2020 02:40:30 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id y185sm9220112wmy.11.2020.05.22.02.40.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 02:40:29 -0700 (PDT) From: luca.boccassi@gmail.com To: Yuri Chipchev Cc: Liron Himi , =?UTF-8?q?Mattias=20R=C3=B6nnblom?= , dpdk stable Date: Fri, 22 May 2020 10:39:40 +0100 Message-Id: <20200522094022.1025696-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-214-luca.boccassi@gmail.com> References: <20200519130549.112823-214-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'event/dsw: fix enqueue burst return value' has been queued to stable release 19.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 stable release 19.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 05/24/20. 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. Thanks. Luca Boccassi --- >From a23ef1c188a9ab83a0a8e2fc188789b2795e49fd Mon Sep 17 00:00:00 2001 From: Yuri Chipchev Date: Wed, 6 May 2020 23:18:37 +0300 Subject: [PATCH] event/dsw: fix enqueue burst return value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 1c4975d6dfa244cf52a2836ca267ba4a7b3ec75e ] The returned number from rte_event_enqueue_*() wouldn't include events marked with RTE_EVENT_OP_RELEASE. Fixes: 1c8e3caa3 ("event/dsw: add event scheduling and device start/stop") Signed-off-by: Yuri Chipchev Reviewed-by: Liron Himi Acked-by: Mattias Rönnblom --- drivers/event/dsw/dsw_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/event/dsw/dsw_event.c b/drivers/event/dsw/dsw_event.c index f3873c54e5..0df9209e4f 100644 --- a/drivers/event/dsw/dsw_event.c +++ b/drivers/event/dsw/dsw_event.c @@ -1097,7 +1097,7 @@ dsw_event_enqueue_burst_generic(struct dsw_port *source_port, DSW_LOG_DP_PORT(DEBUG, source_port->id, "%d non-release events " "accepted.\n", num_non_release); - return num_non_release; + return (num_non_release + num_release); } uint16_t -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-22 10:37:39.300834212 +0100 +++ 0001-event-dsw-fix-enqueue-burst-return-value.patch 2020-05-22 10:37:39.048411280 +0100 @@ -1,4 +1,4 @@ -From 1c4975d6dfa244cf52a2836ca267ba4a7b3ec75e Mon Sep 17 00:00:00 2001 +From a23ef1c188a9ab83a0a8e2fc188789b2795e49fd Mon Sep 17 00:00:00 2001 From: Yuri Chipchev Date: Wed, 6 May 2020 23:18:37 +0300 Subject: [PATCH] event/dsw: fix enqueue burst return value @@ -6,11 +6,12 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +[ upstream commit 1c4975d6dfa244cf52a2836ca267ba4a7b3ec75e ] + The returned number from rte_event_enqueue_*() wouldn't include events marked with RTE_EVENT_OP_RELEASE. Fixes: 1c8e3caa3 ("event/dsw: add event scheduling and device start/stop") -Cc: stable@dpdk.org Signed-off-by: Yuri Chipchev Reviewed-by: Liron Himi @@ -20,10 +21,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/event/dsw/dsw_event.c b/drivers/event/dsw/dsw_event.c -index e5e3597aae..611b36781f 100644 +index f3873c54e5..0df9209e4f 100644 --- a/drivers/event/dsw/dsw_event.c +++ b/drivers/event/dsw/dsw_event.c -@@ -1231,7 +1231,7 @@ dsw_event_enqueue_burst_generic(struct dsw_port *source_port, +@@ -1097,7 +1097,7 @@ dsw_event_enqueue_burst_generic(struct dsw_port *source_port, DSW_LOG_DP_PORT(DEBUG, source_port->id, "%d non-release events " "accepted.\n", num_non_release);