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 9A1C6A0555 for ; Thu, 9 Jun 2022 13:38:32 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9164340689; Thu, 9 Jun 2022 13:38:32 +0200 (CEST) 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 9D3E940220 for ; Thu, 9 Jun 2022 13:38:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774710; 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=YuUck6QuO8yAbZ0pQczpsSp+YamRP92jcT4DeRXHepU=; b=ZC4l1FKilHsQr68KLbahUYoVlppzjr6m5VbAh7fU20JofkE0QoAoLF1moYnInte9llMPNH 5Qud0CKjIvjwPNOAZhA8719ztzecFEKOwfLWSIx58hdU6cPqw4fDQSPsJsNkr7f/umhBXz T0GwylNbk4AhB1NR0pznYaOpYIHoVi8= 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-346-lBdyKzqFNKKB9-RfjPhFOQ-1; Thu, 09 Jun 2022 07:38:29 -0400 X-MC-Unique: lBdyKzqFNKKB9-RfjPhFOQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C1D15101AA4D; Thu, 9 Jun 2022 11:38:28 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id D9C1918EA3; Thu, 9 Jun 2022 11:38:27 +0000 (UTC) From: Kevin Traynor 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 21.11.2 Date: Thu, 9 Jun 2022 12:36:44 +0100 Message-Id: <20220609113701.386938-57-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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/13/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/447908e781e826b2f679a983ce95e09407898320 Thanks. Kevin --- >From 447908e781e826b2f679a983ce95e09407898320 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 2620892c9e..e697c579be 100644 --- a/drivers/net/ice/base/ice_sched.c +++ b/drivers/net/ice/base/ice_sched.c @@ -4775,10 +4775,10 @@ 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; -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:31.073321522 +0100 +++ 0057-net-ice-base-fix-getting-sched-node-from-ID-type.patch 2022-06-09 12:34:29.780980700 +0100 @@ -1 +1 @@ -From 8f7a83e19325be26207e4cb2f11856f0fe3dbeca Mon Sep 17 00:00:00 2001 +From 447908e781e826b2f679a983ce95e09407898320 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8f7a83e19325be26207e4cb2f11856f0fe3dbeca ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org