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 840A243829 for ; Tue, 5 Mar 2024 16:36:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 95E3F42E7C; Tue, 5 Mar 2024 16:36:21 +0100 (CET) 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 E256542E64 for ; Tue, 5 Mar 2024 16:36:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652978; 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=MIhX6NtymNGXWHmisjvQUTeCGrquq5YqjWRVIo86rAs=; b=HqpIfpq5Fqz7c+/EwEGxH2r3KJMeMx7GobPpLuFcOUMmYooiYLn7GuxHo3D/RmPZ/O2VSL tM8hprzobTakNeCecFdD+yqfCuHC9IFzwUrenC8N6wnro8dQzoavbkyRlXKUObIzdBqxXQ vvnB26mZJCiUtt2Z+NxqBnjGYdHflpk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-116-iMc9dgiEMjelndtBDQf-iA-1; Tue, 05 Mar 2024 10:36:17 -0500 X-MC-Unique: iMc9dgiEMjelndtBDQf-iA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ED046856D22; Tue, 5 Mar 2024 15:36:16 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 32B062022EDB; Tue, 5 Mar 2024 15:36:15 +0000 (UTC) From: Kevin Traynor To: Weiguo Li Cc: Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: fix deadlock in ULP timer callback' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:34:36 +0000 Message-ID: <20240305153449.263666-63-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/24. 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/638141e6c51fb350f13924c7a26f3cb2039ee098 Thanks. Kevin --- >From 638141e6c51fb350f13924c7a26f3cb2039ee098 Mon Sep 17 00:00:00 2001 From: Weiguo Li Date: Sat, 4 Nov 2023 12:06:58 +0800 Subject: [PATCH] net/bnxt: fix deadlock in ULP timer callback [ upstream commit 81132be766f57ad39a7fe0ad86717b9618e60889 ] The function 'ulp_ha_mgr_timer_cb' acquires a lock on the context entry at the beginning with bnxt_ulp_cntxt_entry_acquire(). This lock is expected to be released by bnxt_ulp_cntxt_entry_release() at the end of the function. However, the second early return statement in the function could potentially bypass the lock release. To fix this issue, add bnxt_ulp_cntxt_entry_release() before the return statement. Fixes: 1993b267dbcb ("net/bnxt: cleanup ULP parser and mapper") Signed-off-by: Weiguo Li Acked-by: Ajit Khaparde --- drivers/net/bnxt/tf_ulp/ulp_ha_mgr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/bnxt/tf_ulp/ulp_ha_mgr.c b/drivers/net/bnxt/tf_ulp/ulp_ha_mgr.c index 0030a487f5..897410cc0a 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_ha_mgr.c +++ b/drivers/net/bnxt/tf_ulp/ulp_ha_mgr.c @@ -172,4 +172,5 @@ ulp_ha_mgr_timer_cb(void *arg) myclient_cnt = bnxt_ulp_cntxt_num_shared_clients_get(ulp_ctx); if (myclient_cnt == 0) { + bnxt_ulp_cntxt_entry_release(); BNXT_TF_DBG(ERR, "PANIC Client Count is zero kill timer\n."); -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:56.146016131 +0000 +++ 0063-net-bnxt-fix-deadlock-in-ULP-timer-callback.patch 2024-03-05 14:08:54.724520961 +0000 @@ -1 +1 @@ -From 81132be766f57ad39a7fe0ad86717b9618e60889 Mon Sep 17 00:00:00 2001 +From 638141e6c51fb350f13924c7a26f3cb2039ee098 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 81132be766f57ad39a7fe0ad86717b9618e60889 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index f3f5bda890..852deef3b4 100644 +index 0030a487f5..897410cc0a 100644 @@ -28 +29 @@ -@@ -254,4 +254,5 @@ ulp_ha_mgr_timer_cb(void *arg) +@@ -172,4 +172,5 @@ ulp_ha_mgr_timer_cb(void *arg)