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 79FC5A0518 for ; Fri, 24 Jul 2020 14:05:58 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 722601C0C6; Fri, 24 Jul 2020 14:05:58 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id D691E1C0C6 for ; Fri, 24 Jul 2020 14:05:56 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id j18so7740073wmi.3 for ; Fri, 24 Jul 2020 05:05:56 -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=uTh41ttbwXcfBMXCE6vdecKbnZVnynV5Mzb0HVpIWWA=; b=Y3Sx91kO5rMhcdv8t5gDnlY9X1YqIaY+r+WoIXarFuyj12XDCncfXMXNpZ31vwAsgK W/U+PDDUdXt2ztMNJiosD9gNvzjx12/px5mmq0XM73og8Oo+69GsRkZKQNQ1+RgrGdKL H8gpeLQtqsiRDBSTDRVs+cRYYJI4Y/HLcwr4qWDlOQnrbTuAGlhzWUsbd5duSfy9K4c4 MFK34x2y3RJYdMixe9AxRIR8WpxQszvhBXiVMSeMEu3tckgWOHnnLi/hA4KJGbkoQRbm /M3KBGFuiDCpA1Qs36KCZ+t/9nnmuCB26vaM7IPiJFsJ/gmdbiYItOV+CBdjj5K5IEt5 90Rg== 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=uTh41ttbwXcfBMXCE6vdecKbnZVnynV5Mzb0HVpIWWA=; b=Rk9c0HK8wuZdndWumMLxMhA6bNhiZQ1u0ZwuT1bkOj1g3L95ajbkiUc6jFXraK4FmS Po6amSAQ3sE6kLh7FQ0KZyTy4fGJw6c9TAdPM51LcsyM4N8lmK9BpjlCYjJgeCsx8iIZ XAcYBY8Jkv2NPAAxu1qj1+rpfhoQjv/F4j0JdAxs7OxsPRvn510AVhHmnHtVrfQ/5O/X L+dSSzako75P3ics1dXPPAmXcBHuFJhZ6hOx1ZDSj88b30//cDAPJhe2YmBZCVvVErXq zo65eu0h3C304pYT5pTMD22lH5kltVhNs3CEWAjNikxvoJuOhU4ozKT+pfgXz04+s19C GNpg== X-Gm-Message-State: AOAM5309L/1p6veodQJn6+wmsIRwKwmiSaRXyc+r8D+piwpaZKKx75Oe ws3tWBk76ML8zntCdJVrk0AxYer0Xb2OOw== X-Google-Smtp-Source: ABdhPJwQUQB0AzFtQmMYhtxG5W14q1n7wLXmYHap8HwtaE8l6kHf3KO4Eyrn9dxiDaZBHJYCsW3aSg== X-Received: by 2002:a1c:7f17:: with SMTP id a23mr8167465wmd.28.1595592356607; Fri, 24 Jul 2020 05:05:56 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id w14sm1161802wrt.55.2020.07.24.05.05.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:05:56 -0700 (PDT) From: luca.boccassi@gmail.com To: Pavan Nikhilesh Cc: dpdk stable Date: Fri, 24 Jul 2020 12:58:34 +0100 Message-Id: <20200724120030.1863487-76-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'event/octeontx2: fix sub event type' has been queued to stable release 19.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/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 f2e1decce9f0d3fae23a206c587a3cba8485eaa0 Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Mon, 29 Jun 2020 07:03:27 +0530 Subject: [PATCH] event/octeontx2: fix sub event type [ upstream commit 3c1a1c43cd93fa7c73a460d6f88ca5de7ca1e9c0 ] In OCTEONTX2 event device we use sub_event_type to store the ethernet port identifier when we receive work from OCTEONTX2 ethernet device. This violates the event device spec as sub_event_type should be 0 in the initial receive stage. Set sub_event_type to 0 after copying the port id. Fixes: 0fe4accd8ec8 ("event/octeontx2: add Rx adapter fastpath ops") Signed-off-by: Pavan Nikhilesh --- drivers/event/octeontx2/otx2_worker_dual.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/event/octeontx2/otx2_worker_dual.h b/drivers/event/octeontx2/otx2_worker_dual.h index 5134e3d52..fb6a8cd0d 100644 --- a/drivers/event/octeontx2/otx2_worker_dual.h +++ b/drivers/event/octeontx2/otx2_worker_dual.h @@ -69,8 +69,11 @@ otx2_ssogws_dual_get_work(struct otx2_ssogws_state *ws, if (event.sched_type != SSO_TT_EMPTY && event.event_type == RTE_EVENT_TYPE_ETHDEV) { - otx2_wqe_to_mbuf(get_work1, mbuf, event.sub_event_type, - (uint32_t) event.get_work0, flags, lookup_mem); + uint8_t port = event.sub_event_type; + + event.sub_event_type = 0; + otx2_wqe_to_mbuf(get_work1, mbuf, port, + event.flow_id, flags, lookup_mem); /* Extracting tstamp, if PTP enabled. CGX will prepend the * timestamp at starting of packet data and it can be derieved * from WQE 9 dword which corresponds to SG iova. -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:51.501030484 +0100 +++ 0076-event-octeontx2-fix-sub-event-type.patch 2020-07-24 12:53:48.299006683 +0100 @@ -1,8 +1,10 @@ -From 3c1a1c43cd93fa7c73a460d6f88ca5de7ca1e9c0 Mon Sep 17 00:00:00 2001 +From f2e1decce9f0d3fae23a206c587a3cba8485eaa0 Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Mon, 29 Jun 2020 07:03:27 +0530 Subject: [PATCH] event/octeontx2: fix sub event type +[ upstream commit 3c1a1c43cd93fa7c73a460d6f88ca5de7ca1e9c0 ] + In OCTEONTX2 event device we use sub_event_type to store the ethernet port identifier when we receive work from OCTEONTX2 ethernet device. This violates the event device spec as sub_event_type should be 0 in @@ -10,7 +12,6 @@ Set sub_event_type to 0 after copying the port id. Fixes: 0fe4accd8ec8 ("event/octeontx2: add Rx adapter fastpath ops") -Cc: stable@dpdk.org Signed-off-by: Pavan Nikhilesh --- @@ -18,10 +19,10 @@ 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/event/octeontx2/otx2_worker_dual.h b/drivers/event/octeontx2/otx2_worker_dual.h -index c88420eb4..60aa14cca 100644 +index 5134e3d52..fb6a8cd0d 100644 --- a/drivers/event/octeontx2/otx2_worker_dual.h +++ b/drivers/event/octeontx2/otx2_worker_dual.h -@@ -65,8 +65,11 @@ otx2_ssogws_dual_get_work(struct otx2_ssogws_state *ws, +@@ -69,8 +69,11 @@ otx2_ssogws_dual_get_work(struct otx2_ssogws_state *ws, if (event.sched_type != SSO_TT_EMPTY && event.event_type == RTE_EVENT_TYPE_ETHDEV) {