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 A82E545D5D for ; Thu, 21 Nov 2024 00:43:49 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8BFFC40296; Thu, 21 Nov 2024 00:43:49 +0100 (CET) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mails.dpdk.org (Postfix) with ESMTP id 8E0B540296 for ; Thu, 21 Nov 2024 00:43:48 +0100 (CET) Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-382026ba43eso154365f8f.1 for ; Wed, 20 Nov 2024 15:43:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732146228; x=1732751028; 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=laoPT3hwnADLc5JM9KBOCWPqaWMe6DmHRxdXL2uMfD8=; b=kiqrkLU41g0iGqIvHhpiC3nhh8DUyRk6kxtB8OkGp/SDEw+DwATjlaH9/1GTopLmgT Rg2Fklj5oDddDtK0mv3E5mYETdiywvyQjejV6WubtQtSP9HGsqeS/OOBGktjcp+4fK3T smqXFix8OC0elZgPPhitezVNgkIV3fZZ12oQx2BIK7SArH5L8ePlPi28vc2I/8mb4FM2 yvcUO7PF/NszTyAeICfsRnM7E7vY0jklkCH5BcHXBw79lz1kKVIFgoqIltwYjYkT9wdB bHyFUlF7WDwdMYm5chTzKYXvuSQdhXetCCDxKpx9hSnslXgRB0+1CmxmPNnnmn4UOeNT NOrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732146228; x=1732751028; 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=laoPT3hwnADLc5JM9KBOCWPqaWMe6DmHRxdXL2uMfD8=; b=GqP/dZx8pjdAPd9C6quY5b+SWRmdUDx2Hah2JJnkMpWtHt+jbVrLSm2pSr0Y2AFG10 OghqOtUa3DFI1NqcSpeBhrSplJKErzy6US2mkCFH0okUhqXeKtIVURgT9/zKzIWpyVjE nbRK1mPirtL/ExCsxyR8GJHkkbsidLNhALgp336T7pes4WMUeX2LmVAbbrB5f3+c81dy RuCdcCnS6mNPPL16fG0bPq/odWdItgv349Ki3w4DdCjZQpGwPNEPBcodpBs/8G9O0sW5 JZeqXCfQP0SgW7TSs04xDAv36kt+9V9JkwwoEErKiBo8B+uzYGMWbTH98UzG/wl8CD9u QAPA== X-Gm-Message-State: AOJu0YyMB/ECyjxVJkUu9vcA7xCdRXXxmoOgeBqIJleDq/a+PTKdI1lL Gq2pa5W/7Hp1CubK0Ma4wRV3OX2Ve8JfOXwtZfSHG8pu3n5x/m81RQfCWYvZ X-Google-Smtp-Source: AGHT+IG/cI7L5l5+owbpVfXpZq84/okaVt9S76s48Pb/iT8ZArnIS8Sk1is1nYsdgtaduwmgHBwwpQ== X-Received: by 2002:a5d:6d05:0:b0:382:42c3:83e4 with SMTP id ffacd0b85a97d-38254afac58mr3486531f8f.33.1732146228164; Wed, 20 Nov 2024 15:43:48 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3825491017fsm3321334f8f.44.2024.11.20.15.43.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 15:43:47 -0800 (PST) From: luca.boccassi@gmail.com To: Hemant Agrawal Cc: dpdk stable Subject: patch 'bus/dpaa: fix lock condition during error handling' has been queued to stable release 22.11.7 Date: Wed, 20 Nov 2024 23:41:47 +0000 Message-ID: <20241120234215.233355-22-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241120234215.233355-1-luca.boccassi@gmail.com> References: <20241112220754.666489-40-luca.boccassi@gmail.com> <20241120234215.233355-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.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 11/22/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/cc3d964ab6cd086011eb5377870b30d0c03c5b48 Thanks. Luca Boccassi --- >From cc3d964ab6cd086011eb5377870b30d0c03c5b48 Mon Sep 17 00:00:00 2001 From: Hemant Agrawal Date: Thu, 14 Nov 2024 13:14:35 +0530 Subject: [PATCH] bus/dpaa: fix lock condition during error handling [ upstream commit c7c3a329750b81bdaeb3f7ceffac0ec3a65f61f8 ] The error handling is missing FQ unlock code. Detected by pvs-studio Bug 89-93: very suspicious synchronization The analyzer issued a pack of V1020 warnings that a resource might remain blocked. Fixes: c47ff048b99a ("bus/dpaa: add QMAN driver core routines") Signed-off-by: Hemant Agrawal --- drivers/bus/dpaa/base/qbman/qman.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/bus/dpaa/base/qbman/qman.c b/drivers/bus/dpaa/base/qbman/qman.c index f06992ca48..3a1a843ba0 100644 --- a/drivers/bus/dpaa/base/qbman/qman.c +++ b/drivers/bus/dpaa/base/qbman/qman.c @@ -2169,8 +2169,10 @@ int qman_set_vdq(struct qman_fq *fq, u16 num, uint32_t vdqcr_flags) if (!p->vdqcr_owned) { FQLOCK(fq); - if (fq_isset(fq, QMAN_FQ_STATE_VDQCR)) + if (fq_isset(fq, QMAN_FQ_STATE_VDQCR)) { + FQUNLOCK(fq); goto escape; + } fq_set(fq, QMAN_FQ_STATE_VDQCR); FQUNLOCK(fq); p->vdqcr_owned = fq; @@ -2203,8 +2205,10 @@ int qman_volatile_dequeue(struct qman_fq *fq, u32 flags __maybe_unused, if (!p->vdqcr_owned) { FQLOCK(fq); - if (fq_isset(fq, QMAN_FQ_STATE_VDQCR)) + if (fq_isset(fq, QMAN_FQ_STATE_VDQCR)) { + FQUNLOCK(fq); goto escape; + } fq_set(fq, QMAN_FQ_STATE_VDQCR); FQUNLOCK(fq); p->vdqcr_owned = fq; -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-20 23:41:23.493009101 +0000 +++ 0022-bus-dpaa-fix-lock-condition-during-error-handling.patch 2024-11-20 23:41:22.748195468 +0000 @@ -1 +1 @@ -From c7c3a329750b81bdaeb3f7ceffac0ec3a65f61f8 Mon Sep 17 00:00:00 2001 +From cc3d964ab6cd086011eb5377870b30d0c03c5b48 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c7c3a329750b81bdaeb3f7ceffac0ec3a65f61f8 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 9c90ee25a6..c48fa3e073 100644 +index f06992ca48..3a1a843ba0 100644 @@ -24 +25 @@ -@@ -2138,8 +2138,10 @@ int qman_set_vdq(struct qman_fq *fq, u16 num, uint32_t vdqcr_flags) +@@ -2169,8 +2169,10 @@ int qman_set_vdq(struct qman_fq *fq, u16 num, uint32_t vdqcr_flags) @@ -36 +37 @@ -@@ -2172,8 +2174,10 @@ int qman_volatile_dequeue(struct qman_fq *fq, u32 flags __maybe_unused, +@@ -2203,8 +2205,10 @@ int qman_volatile_dequeue(struct qman_fq *fq, u32 flags __maybe_unused,