From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id AC238A0032 for ; Fri, 24 Jun 2022 17:02:32 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A777D40A8A; Fri, 24 Jun 2022 17:02:32 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 6401D4069D for ; Fri, 24 Jun 2022 17:02:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656082950; 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=ffZ7viYvclmzeVrI5GMUi9VkexTP4tYY4AAu19hWLXs=; b=EU3MZbkYgQRcBF4vtGoapLjaqvGDVQBVzQoRh5+JaCRjnim93Eiz4U2SgzZ75/It4I2QwA cWvHfyWEAlY4RQfWYfNu6kHYi/gmcNQX59SiWyPkB0M2u5CFZo9SXZ0ARo1+RUeHxIYy9U iCB/ictcibaTkB2IbLNORxxTSdxpMIo= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-96-GnT3OKYJMm2mJ4ng6Y9RZA-1; Fri, 24 Jun 2022 11:02:26 -0400 X-MC-Unique: GnT3OKYJMm2mJ4ng6Y9RZA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8B1442919EA7; Fri, 24 Jun 2022 15:02:26 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id D07909D63; Fri, 24 Jun 2022 15:02:25 +0000 (UTC) From: Kevin Traynor To: Pavan Nikhilesh Cc: dpdk stable Subject: patch 'event/cnxk: fix Tx adapter enqueue return for CN10K' has been queued to stable release 21.11.2 Date: Fri, 24 Jun 2022 16:01:29 +0100 Message-Id: <20220624150148.1855580-21-ktraynor@redhat.com> In-Reply-To: <20220624150148.1855580-1-ktraynor@redhat.com> References: <20220624150148.1855580-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.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 06/27/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/f7b34f357ccc0c73038172c9341805bdef9a00f8 Thanks. Kevin --- >From f7b34f357ccc0c73038172c9341805bdef9a00f8 Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Wed, 18 May 2022 19:34:11 +0530 Subject: [PATCH] event/cnxk: fix Tx adapter enqueue return for CN10K [ upstream commit 7344c7db5d270d650fd8afb9f4293b683e0e222b ] The `rte_event_eth_tx_adapter_enqueue()` function expects driver layer to return the total number of events successfully transmitted. Fix cn10k driver returning the number of packets transmitted in a event vector instead of number of events. Fixes: 761a321acf91 ("event/cnxk: support vectorized Tx event fast path") Signed-off-by: Pavan Nikhilesh --- drivers/event/cnxk/cn10k_worker.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/event/cnxk/cn10k_worker.h b/drivers/event/cnxk/cn10k_worker.h index 340708aae5..f67c36f888 100644 --- a/drivers/event/cnxk/cn10k_worker.h +++ b/drivers/event/cnxk/cn10k_worker.h @@ -525,5 +525,5 @@ cn10k_sso_hws_event_tx(struct cn10k_sso_hws *ws, struct rte_event *ev, } rte_mempool_put(rte_mempool_from_obj(ev->vec), ev->vec); - return (meta & 0xFFFF); + return 1; } -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-24 15:51:09.648502191 +0100 +++ 0026-event-cnxk-fix-Tx-adapter-enqueue-return-for-CN10K.patch 2022-06-24 15:51:08.893984141 +0100 @@ -1 +1 @@ -From 7344c7db5d270d650fd8afb9f4293b683e0e222b Mon Sep 17 00:00:00 2001 +From f7b34f357ccc0c73038172c9341805bdef9a00f8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7344c7db5d270d650fd8afb9f4293b683e0e222b ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 034f508dd8..0915f404e0 100644 +index 340708aae5..f67c36f888 100644 @@ -23 +24,2 @@ -@@ -652,5 +652,5 @@ cn10k_sso_hws_event_tx(struct cn10k_sso_hws *ws, struct rte_event *ev, +@@ -525,5 +525,5 @@ cn10k_sso_hws_event_tx(struct cn10k_sso_hws *ws, struct rte_event *ev, + } @@ -25 +26,0 @@ - rte_prefetch0(ws);