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 42EA4A0032 for ; Fri, 24 Jun 2022 18:10:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3B3B040A89; Fri, 24 Jun 2022 18:10:29 +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 909B4400EF for ; Fri, 24 Jun 2022 18:10:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656087027; 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=QQ1FhU+odxGYA68qTa4uxM+HGPkixan+ablBSkiyGcM=; b=SEiMo4QEmpF/tZOgd79oSJnXfboXFSXG5OaKhF7ffmenPw6mKXtBw7PxNIWujCecQJO3Aw WczLclMBtr7Eu+Y/GppB/EqTYGMnjodoTMCdL2mwJ5UlNm58Mx5hctW7O6fP5lDFMgwvfj rwL1dRFuZe4Hrc2RYf9TmFmTmJthDtA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-533--X6m4fzuPjeSQMRA5JJDTw-1; Fri, 24 Jun 2022 12:10:26 -0400 X-MC-Unique: -X6m4fzuPjeSQMRA5JJDTw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B8240101E986; Fri, 24 Jun 2022 16:10:25 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B41640334F; Fri, 24 Jun 2022 16:10:24 +0000 (UTC) From: Kevin Traynor To: Harman Kalra Cc: dpdk stable Subject: patch 'net/octeontx: fix port close' has been queued to stable release 21.11.2 Date: Fri, 24 Jun 2022 17:10:04 +0100 Message-Id: <20220624161016.1881349-2-ktraynor@redhat.com> In-Reply-To: <20220624161016.1881349-1-ktraynor@redhat.com> References: <20220624161016.1881349-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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/614cd42ac083ec72e1f425976bfd7d36f6a39f74 Thanks. Kevin --- >From 614cd42ac083ec72e1f425976bfd7d36f6a39f74 Mon Sep 17 00:00:00 2001 From: Harman Kalra Date: Tue, 24 May 2022 14:12:26 +0530 Subject: [PATCH] net/octeontx: fix port close [ upstream commit 39e07170331f869c581ce4d3cdc0360f7b6b444a ] Segmentation fault has been observed while closing the ethernet port. Reason for the segfault is, eth port close also shuts down event device while other ethernet port is still using the event device. Fixes: da6c687471a3 ("net/octeontx: add start and stop support") Signed-off-by: Harman Kalra --- drivers/net/octeontx/octeontx_ethdev.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c index b47472ebbd..f879a0c9fc 100644 --- a/drivers/net/octeontx/octeontx_ethdev.c +++ b/drivers/net/octeontx/octeontx_ethdev.c @@ -27,4 +27,9 @@ #include "octeontx_logs.h" +/* Useful in stopping/closing event device if no of + * eth ports are using it. + */ +uint16_t evdev_refcnt; + struct evdev_priv_data { OFFLOAD_FLAGS; /*Sequence should not be changed */ @@ -492,5 +497,9 @@ octeontx_dev_close(struct rte_eth_dev *dev) return 0; - rte_event_dev_close(nic->evdev); + /* Stopping/closing event device once all eth ports are closed. */ + if (__atomic_sub_fetch(&evdev_refcnt, 1, __ATOMIC_ACQUIRE) == 0) { + rte_event_dev_stop(nic->evdev); + rte_event_dev_close(nic->evdev); + } octeontx_dev_flow_ctrl_fini(dev); @@ -672,6 +681,4 @@ octeontx_dev_stop(struct rte_eth_dev *dev) PMD_INIT_FUNC_TRACE(); - rte_event_dev_stop(nic->evdev); - ret = octeontx_port_stop(nic); if (ret < 0) { @@ -1335,4 +1342,5 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev, nic->port_id = port; nic->evdev = evdev; + __atomic_add_fetch(&evdev_refcnt, 1, __ATOMIC_ACQUIRE); res = octeontx_port_open(nic); @@ -1584,4 +1592,5 @@ octeontx_probe(struct rte_vdev_device *dev) } + __atomic_store_n(&evdev_refcnt, 0, __ATOMIC_RELEASE); /* * Do 1:1 links for ports & queues. All queues would be mapped to -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-24 16:54:05.649230070 +0100 +++ 0002-net-octeontx-fix-port-close.patch 2022-06-24 16:54:05.520164992 +0100 @@ -1 +1 @@ -From 39e07170331f869c581ce4d3cdc0360f7b6b444a Mon Sep 17 00:00:00 2001 +From 614cd42ac083ec72e1f425976bfd7d36f6a39f74 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 39e07170331f869c581ce4d3cdc0360f7b6b444a ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index f5ea9de8ef..6469fd0a96 100644 +index b47472ebbd..f879a0c9fc 100644 @@ -51 +52 @@ -@@ -1334,4 +1341,5 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev, +@@ -1335,4 +1342,5 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev, @@ -57 +58 @@ -@@ -1583,4 +1591,5 @@ octeontx_probe(struct rte_vdev_device *dev) +@@ -1584,4 +1592,5 @@ octeontx_probe(struct rte_vdev_device *dev)