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 33703A0032 for ; Fri, 24 Jun 2022 17:02:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2FD9B4069D; Fri, 24 Jun 2022 17:02:26 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 5F3A64069D for ; Fri, 24 Jun 2022 17:02:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656082943; 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=+3BmWlsKjKDjI/8MPw5nXX5PJy+3GAK7O6Kkkj91gts=; b=ExXFUSqLkcWAyy3Pce7OrlLhWxedhs5wPWOf+iW9FPVj4fjpzdL3uwA3BXe2ekFfSFwHqO AA+g/8ZWGx2chx57nKPzORL3E4iA5P4hVIE2TDFQDNqjAsloU6c9az4TsHPVbK74dZ+LNZ IDFzrFxn+JptK9FaJKAywpxalP/WI8I= 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-63-nuClcomJNMCOOHeroEGaZw-1; Fri, 24 Jun 2022 11:02:22 -0400 X-MC-Unique: nuClcomJNMCOOHeroEGaZw-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 6BF403801EC6; Fri, 24 Jun 2022 15:02:22 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id ACD2418EAC; Fri, 24 Jun 2022 15:02:21 +0000 (UTC) From: Kevin Traynor To: Harman Kalra Cc: Pavan Nikhilesh , dpdk stable Subject: patch 'event/octeontx: fix SSO fast path' has been queued to stable release 21.11.2 Date: Fri, 24 Jun 2022 16:01:25 +0100 Message-Id: <20220624150148.1855580-17-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/d2c3d326d001605c8ba05ac61f8ce656754dc36f Thanks. Kevin --- >From d2c3d326d001605c8ba05ac61f8ce656754dc36f Mon Sep 17 00:00:00 2001 From: Harman Kalra Date: Tue, 24 May 2022 14:12:25 +0530 Subject: [PATCH] event/octeontx: fix SSO fast path [ upstream commit d430b921a4d7c5449f6e99b5ba40671b27d87adb ] Segmentation fault is observed as soon as any application with ethdev event is launched as ev->mbuf was not set properly. Fixing sub event type violation as in OCTEONTX event device sub_event_type is used to store the ethernet port identifier when work is received from OCTEONTX ethernet device. This violates the event device spec as sub_event_type should be 0 in the initial receive stage. Setting sub_event_type to 0 after copying the port id in single workslot mode. Fixes: 44a2cebbd489 ("crypto/octeontx: add crypto adapter data path") Signed-off-by: Harman Kalra Signed-off-by: Pavan Nikhilesh --- drivers/event/octeontx/ssovf_worker.h | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/event/octeontx/ssovf_worker.h b/drivers/event/octeontx/ssovf_worker.h index e6ee292688..57be476394 100644 --- a/drivers/event/octeontx/ssovf_worker.h +++ b/drivers/event/octeontx/ssovf_worker.h @@ -180,14 +180,20 @@ ssows_get_work(struct ssows *ws, struct rte_event *ev, const uint16_t flag) if (get_work1) { - if (ev->event_type == RTE_EVENT_TYPE_ETHDEV) - get_work1 = (uintptr_t)ssovf_octeontx_wqe_to_pkt( - get_work1, (ev->event >> 20) & 0x7F, flag, - ws->lookup_mem); - else if (ev->event_type == RTE_EVENT_TYPE_CRYPTODEV) + if (ev->event_type == RTE_EVENT_TYPE_ETHDEV) { + uint16_t port = (ev->event >> 20) & 0x7F; + + ev->sub_event_type = 0; + ev->mbuf = ssovf_octeontx_wqe_to_pkt( + get_work1, port, flag, ws->lookup_mem); + } else if (ev->event_type == RTE_EVENT_TYPE_CRYPTODEV) { get_work1 = otx_crypto_adapter_dequeue(get_work1); - ev->u64 = get_work1; - } else if (unlikely((get_work0 & 0xFFFFFFFF) == 0xFFFFFFFF)) { - ssovf_octeontx_wqe_free(get_work1); - return 0; + ev->u64 = get_work1; + } else { + if (unlikely((get_work0 & 0xFFFFFFFF) == 0xFFFFFFFF)) { + ssovf_octeontx_wqe_free(get_work1); + return 0; + } + ev->u64 = get_work1; + } } -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-24 15:51:09.554392156 +0100 +++ 0022-event-octeontx-fix-SSO-fast-path.patch 2022-06-24 15:51:08.886984122 +0100 @@ -1 +1 @@ -From d430b921a4d7c5449f6e99b5ba40671b27d87adb Mon Sep 17 00:00:00 2001 +From d2c3d326d001605c8ba05ac61f8ce656754dc36f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d430b921a4d7c5449f6e99b5ba40671b27d87adb ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org