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 3B40EA0540 for ; Thu, 7 Jul 2022 09:57:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3694A406B4; Thu, 7 Jul 2022 09:57:50 +0200 (CEST) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 06618406B4 for ; Thu, 7 Jul 2022 09:57:49 +0200 (CEST) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (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 smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id BD9673F6FC for ; Thu, 7 Jul 2022 07:57:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180668; bh=iRAIuXmJmZexCT1WbEAIYBc90AjRuKhTtjXxCVxWWVM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TujLZtAiHk0p7Mcd5cYglZuHi8zP2CfjAe5nL5MUDnJYJIXmqgd99LJolmcgj2Kb3 GckwRD1gSFcJLsmheOtilbQ9skHWoUwk/fdK5bz/rLXUfZNfSdJZvGbhVpnyfx89Pp GBlgVr/D+rLEzzBVzUD5FckzkpXYqUfIVzCsXEFDUjN9S5RickM2yjbY91VzFaZWgk l3Aue6n7uFly4hL1FOMc1mihS52UMmE5PGTYz/PZkgxhNVHPCoU/zWDJ4dzWit58Uk 1RIbIBzrRGbSt87LVoOKAnbLROJgiMjYGE4NIYivGSsYZhIR6X/yh7hYRLohODF3cl 88TBHF6ZrTZwQ== Received: by mail-ed1-f72.google.com with SMTP id v16-20020a056402349000b00435a1c942a9so13478534edc.15 for ; Thu, 07 Jul 2022 00:57:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iRAIuXmJmZexCT1WbEAIYBc90AjRuKhTtjXxCVxWWVM=; b=LvngUaCL73qDKxgUs/xqdSsfo3tb3BRofOU6tI0msZUJdTzLNCSlzxw+lSulbb05HJ W6o1TI9JxL0FxZQszRXTHA9fKFj5d935njzrKLPH8vw6YGpGLbQuk08a4c6a0085y2YL SnOBnvk0qFG6c36Qil4NNMx3TqqrYYihv8Fsh3dO/+2s9/kr8f+/MWEFw1MX8orJjgHH 6BeYMF62XcrDZ8JjvVvpRV+feoS3WifMV6gxUH15EWSIgL+AMFkIjrStpTn020Nm6ByI WSv8W2gF2zUqWVR7KrXPU/pWeLY0WFvTmW5Yxv3IVU4OmaTW8PHo+Gtvf8SD6LKOviQO 21lw== X-Gm-Message-State: AJIora8qBlxNRLyj9x4cpMbLeVQZldlaTULD7wnLY8Cc56ci3DaCzzZN Mfni8MEK5RmHm8fKRksSJqOMNewCPSR19uW6GGUQqLSQPHTwuTJDRivzsf5hi4yN0JfgCZBIId5 GTLCrFSKMosDDFsp1Q4QhKZIv X-Received: by 2002:a05:6402:3707:b0:437:61f9:57a9 with SMTP id ek7-20020a056402370700b0043761f957a9mr59203459edb.1.1657180668285; Thu, 07 Jul 2022 00:57:48 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sU01j0tCQf+EJky32g8egAUZ2M5qcdfYFgNu0LTpiIzSBxATN+YrbcgTrBeEG83J6R14ppvw== X-Received: by 2002:a05:6402:3707:b0:437:61f9:57a9 with SMTP id ek7-20020a056402370700b0043761f957a9mr59203445edb.1.1657180668081; Thu, 07 Jul 2022 00:57:48 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id d1-20020a056402516100b0043a09f6fc24sm11385793ede.47.2022.07.07.00.57.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:57:47 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Wenjun Wu Cc: Qi Zhang , dpdk stable Subject: patch 'net/ice/base: fix getting sched node from ID type' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:54:42 +0200 Message-Id: <20220707075522.194223-47-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.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 19.11.13 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/09/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/9b6b361ea7c87bdecd4ff6e783442097763333eb Thanks. Christian Ehrhardt --- >From 9b6b361ea7c87bdecd4ff6e783442097763333eb Mon Sep 17 00:00:00 2001 From: Wenjun Wu Date: Tue, 17 May 2022 13:09:26 +0800 Subject: [PATCH] net/ice/base: fix getting sched node from ID type [ upstream commit 8f7a83e19325be26207e4cb2f11856f0fe3dbeca ] The function ice_sched_get_node_by_id_type needs to be called with the scheduler lock held. However, the function ice_sched_get_node also requests the scheduler lock. It will cause the dead lock issue. This patch replaces function ice_sched_get_node with function ice_sched_find_node_by_teid to solve this problem. Fixes: 93e84b1bfc92 ("net/ice/base: add basic Tx scheduler") Signed-off-by: Wenjun Wu Acked-by: Qi Zhang --- drivers/net/ice/base/ice_sched.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/base/ice_sched.c b/drivers/net/ice/base/ice_sched.c index 3669688bd8..5b1f3d1b3a 100644 --- a/drivers/net/ice/base/ice_sched.c +++ b/drivers/net/ice/base/ice_sched.c @@ -4759,12 +4759,12 @@ ice_sched_get_node_by_id_type(struct ice_port_info *pi, u32 id, case ICE_AGG_TYPE_Q: /* The current implementation allows single queue to modify */ - node = ice_sched_get_node(pi, id); + node = ice_sched_find_node_by_teid(pi->root, id); break; case ICE_AGG_TYPE_QG: /* The current implementation allows single qg to modify */ - child_node = ice_sched_get_node(pi, id); + child_node = ice_sched_find_node_by_teid(pi->root, id); if (!child_node) break; node = child_node->parent; -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:13.164431348 +0200 +++ 0047-net-ice-base-fix-getting-sched-node-from-ID-type.patch 2022-07-07 09:54:10.933824419 +0200 @@ -1 +1 @@ -From 8f7a83e19325be26207e4cb2f11856f0fe3dbeca Mon Sep 17 00:00:00 2001 +From 9b6b361ea7c87bdecd4ff6e783442097763333eb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8f7a83e19325be26207e4cb2f11856f0fe3dbeca ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 2620892c9e..e697c579be 100644 +index 3669688bd8..5b1f3d1b3a 100644 @@ -27 +28 @@ -@@ -4774,12 +4774,12 @@ ice_sched_get_node_by_id_type(struct ice_port_info *pi, u32 id, +@@ -4759,12 +4759,12 @@ ice_sched_get_node_by_id_type(struct ice_port_info *pi, u32 id,