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 D1A0F43C60 for ; Thu, 7 Mar 2024 02:37:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C83E842F01; Thu, 7 Mar 2024 02:37:18 +0100 (CET) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id EEB9342F21 for ; Thu, 7 Mar 2024 02:37:16 +0100 (CET) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-33e2268ed96so256471f8f.3 for ; Wed, 06 Mar 2024 17:37:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775436; x=1710380236; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jGhi1H8XuBbTNhd/1yaDObN4yfxT+D07RJVcrfzFtss=; b=AQIlWcygAfOaxhzKNffxxzsGuZk/plX/dHH8rNWSa0hjiJuu5IuovmAMaEJPPyApHD aZYG3ObiD6g9P/6SifgcbFu//9FsTY2rgd8dSjuRM0qVvjcYzQhc0lMxuc0iguYVWw5u UdbbBaITRN31jDkl+O1+CFEI1DpRplUVceFs29moNNJR6q9ZjMWZW10yk/Cf7Dmj61wl /yVguS57kSU3q/MWnKltxMic5iGC1syYRZAvwJJJFAx5GK4TF7WvX1ID1EwfnTHnoC6y faUFRyvQrhZ3axe2FqA+WCao5UklRQtzacG7o3OL/WReiha11QPMhO5aKTLWhJi4muRS /DtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775436; x=1710380236; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jGhi1H8XuBbTNhd/1yaDObN4yfxT+D07RJVcrfzFtss=; b=M1Ckhua7VvJW4oHCvrvtEjDmBI+DKhQJDGvBiGZ5bne8/rcMbGrvLo7Y9O1plu6gek /+JWIW/qF82rJLFylvGXcDmRLQidMzqaUZg/58RP84ZEQVECex40hR79D5bR30fHw/sg B6rWVx1rqv77gQn1dyVq2Ws4w51B/rTQjPK/cvLT1Ko3rhyb8/Kz7X9XQ07yc2NaSQDa qggTLD4CzqLuPADQNJjgNgabSDaYJyKlXuetQDLheqW8Mw7RN7XFsWPezt35CLQI45QB oGFXjJGZGeGK8ZrOgpxazYNorGotJNxnA+hh3sqKVeqU4I5S7jPaBXTvCUpJ30QX9sKY 4txQ== X-Forwarded-Encrypted: i=1; AJvYcCUGc4W3FjE+bIJ+GfSDPKf5qbpXSho49g2C/NQA4VHm7Ms7lgzE+PP+5//zzqCjcPAK/IQdx2c+mt4BUZWmPow= X-Gm-Message-State: AOJu0Yxn9G0H0GNC6ptLXYm+TeIK9Y4Uh8P6noVh6SKLMmMtA4ZzAJv5 lhYeYpPD+ZNGVOFPx92Hwh4IpI6+9yzBaj6VPe/0A1tShd3M5RSd X-Google-Smtp-Source: AGHT+IH1rVj3+8misuTQLzR9CCSjh0F+TP9kOrYi9OHQv7fMIC0TudA21cRsTQyOz3lp/XU9VKPEhQ== X-Received: by 2002:adf:fa86:0:b0:33e:3e92:257e with SMTP id h6-20020adffa86000000b0033e3e92257emr7477371wrr.68.1709775436370; Wed, 06 Mar 2024 17:37:16 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id b12-20020a05600003cc00b0033e451a9b64sm7567359wrg.61.2024.03.06.17.37.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:37:15 -0800 (PST) From: luca.boccassi@gmail.com To: Weiguo Li Cc: Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: fix deadlock in ULP timer callback' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:31:47 +0000 Message-Id: <20240307013159.1735343-90-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.5 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/09/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/51f2cd1ff7be6810f1b459aa8653b7c8611ffd2f Thanks. Luca Boccassi --- >From 51f2cd1ff7be6810f1b459aa8653b7c8611ffd2f 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 @@ -171,6 +171,7 @@ 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."); return; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:42.380702285 +0000 +++ 0090-net-bnxt-fix-deadlock-in-ULP-timer-callback.patch 2024-03-07 01:05:34.990944091 +0000 @@ -1 +1 @@ -From 81132be766f57ad39a7fe0ad86717b9618e60889 Mon Sep 17 00:00:00 2001 +From 51f2cd1ff7be6810f1b459aa8653b7c8611ffd2f 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 @@ -@@ -253,6 +253,7 @@ ulp_ha_mgr_timer_cb(void *arg) +@@ -171,6 +171,7 @@ ulp_ha_mgr_timer_cb(void *arg)