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 9EF8E43829 for ; Tue, 5 Mar 2024 16:35:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9553F42D6A; Tue, 5 Mar 2024 16:35:10 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id F0C81427E1 for ; Tue, 5 Mar 2024 16:35:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652908; 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=gX1TB+7GglQ7Ib7aMjRhkdneOiH7k3ztExxFgMR5LT0=; b=Nb6rThktW48ZbiN6L+RF6mNtT0B4/QXq+7EUnqhiur4x9tZrOmTB4ZIkD0DPa/hM6/SQa+ rP3isA8cIol7lbVPQSj60bQIocpVMWBM61qoN6kWFEHjDQCY0EHa21roZ9TkvpHEPhBu2j dQWc1usjdyCyVSrSTen5owwZ1pNSj3k= 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-203-YZv0-EE-Muad72UTecVbzw-1; Tue, 05 Mar 2024 10:35:07 -0500 X-MC-Unique: YZv0-EE-Muad72UTecVbzw-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 A4D87856D23; Tue, 5 Mar 2024 15:35:06 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9EE3B2022EDB; Tue, 5 Mar 2024 15:35:05 +0000 (UTC) From: Kevin Traynor To: Qi Zhang Cc: Qiming Yang , dpdk stable Subject: patch 'net/ice: fix link update' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:33:39 +0000 Message-ID: <20240305153449.263666-6-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/78c0d6dd0bc3400e9013062f50311efa1f4393c7 Thanks. Kevin --- >From 78c0d6dd0bc3400e9013062f50311efa1f4393c7 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Thu, 14 Dec 2023 03:40:54 -0500 Subject: [PATCH] net/ice: fix link update [ upstream commit 4e5dc111464e83e9a55fa466d8f682f0027b721e ] The ice_aq_get_link_info function is not thread-safe. However, it is possible to simultaneous invocations during both the dev_start and the LSC interrupt handler, potentially leading to unexpected adminq errors. This patch addresses the issue by introducing a thread-safe wrapper that utilizes a spinlock. Fixes: cf911d90e366 ("net/ice: support link update") Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/ice_ethdev.c | 26 ++++++++++++++++++++------ drivers/net/ice/ice_ethdev.h | 4 ++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 5e84894e5f..0b7555cc55 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -1688,4 +1688,5 @@ ice_pf_setup(struct ice_pf *pf) pf->main_vsi = vsi; + rte_spinlock_init(&pf->link_lock); return 0; @@ -3477,8 +3478,23 @@ ice_rxq_intr_setup(struct rte_eth_dev *dev) } +static enum ice_status +ice_get_link_info_safe(struct ice_pf *pf, bool ena_lse, + struct ice_link_status *link) +{ + struct ice_hw *hw = ICE_PF_TO_HW(pf); + int ret; + + rte_spinlock_lock(&pf->link_lock); + + ret = ice_aq_get_link_info(hw->port_info, ena_lse, link, NULL); + + rte_spinlock_unlock(&pf->link_lock); + + return ret; +} + static void ice_get_init_link_status(struct rte_eth_dev *dev) { - struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private); struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private); bool enable_lse = dev->data->dev_conf.intr_conf.lsc ? true : false; @@ -3486,6 +3502,5 @@ ice_get_init_link_status(struct rte_eth_dev *dev) int ret; - ret = ice_aq_get_link_info(hw->port_info, enable_lse, - &link_status, NULL); + ret = ice_get_link_info_safe(pf, enable_lse, &link_status); if (ret != ICE_SUCCESS) { PMD_DRV_LOG(ERR, "Failed to get link info"); @@ -3842,5 +3857,5 @@ ice_link_update(struct rte_eth_dev *dev, int wait_to_complete) #define CHECK_INTERVAL 50 /* 50ms */ #define MAX_REPEAT_TIME 40 /* 2s (40 * 50ms) in total */ - struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private); struct ice_link_status link_status; struct rte_eth_link link, old; @@ -3856,6 +3871,5 @@ ice_link_update(struct rte_eth_dev *dev, int wait_to_complete) do { /* Get link status information from hardware */ - status = ice_aq_get_link_info(hw->port_info, enable_lse, - &link_status, NULL); + status = ice_get_link_info_safe(pf, enable_lse, &link_status); if (status != ICE_SUCCESS) { link.link_speed = RTE_ETH_SPEED_NUM_100M; diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index ac56c3cc60..6209575a9b 100644 --- a/drivers/net/ice/ice_ethdev.h +++ b/drivers/net/ice/ice_ethdev.h @@ -473,4 +473,8 @@ struct ice_pf { uint64_t supported_rxdid; /* bitmap for supported RXDID */ uint64_t rss_hf; + /* lock prevent race condition between lsc interrupt handler + * and link status update during dev_start. + */ + rte_spinlock_t link_lock; }; -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:54.890591393 +0000 +++ 0006-net-ice-fix-link-update.patch 2024-03-05 14:08:54.613520667 +0000 @@ -1 +1 @@ -From 4e5dc111464e83e9a55fa466d8f682f0027b721e Mon Sep 17 00:00:00 2001 +From 78c0d6dd0bc3400e9013062f50311efa1f4393c7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4e5dc111464e83e9a55fa466d8f682f0027b721e ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 3ccba4db80..1f8ab5158a 100644 +index 5e84894e5f..0b7555cc55 100644 @@ -26 +27 @@ -@@ -1805,4 +1805,5 @@ ice_pf_setup(struct ice_pf *pf) +@@ -1688,4 +1688,5 @@ ice_pf_setup(struct ice_pf *pf) @@ -32 +33 @@ -@@ -3622,8 +3623,23 @@ ice_rxq_intr_setup(struct rte_eth_dev *dev) +@@ -3477,8 +3478,23 @@ ice_rxq_intr_setup(struct rte_eth_dev *dev) @@ -57 +58 @@ -@@ -3631,6 +3647,5 @@ ice_get_init_link_status(struct rte_eth_dev *dev) +@@ -3486,6 +3502,5 @@ ice_get_init_link_status(struct rte_eth_dev *dev) @@ -65 +66 @@ -@@ -3997,5 +4012,5 @@ ice_link_update(struct rte_eth_dev *dev, int wait_to_complete) +@@ -3842,5 +3857,5 @@ ice_link_update(struct rte_eth_dev *dev, int wait_to_complete) @@ -72 +73 @@ -@@ -4011,6 +4026,5 @@ ice_link_update(struct rte_eth_dev *dev, int wait_to_complete) +@@ -3856,6 +3871,5 @@ ice_link_update(struct rte_eth_dev *dev, int wait_to_complete) @@ -81 +82 @@ -index abe6dcdc23..d607f028e0 100644 +index ac56c3cc60..6209575a9b 100644 @@ -84,3 +85,3 @@ -@@ -549,4 +549,8 @@ struct ice_pf { - struct ice_tm_conf tm_conf; - uint16_t outer_ethertype; +@@ -473,4 +473,8 @@ struct ice_pf { + uint64_t supported_rxdid; /* bitmap for supported RXDID */ + uint64_t rss_hf;