From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 678D72139C9; Thu, 28 May 2026 20:40:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780000815; cv=none; b=nSG8bfktXKXXnBp6KVg8/2lFy43cd9GlccK2qYoEExwDHhuNH6E/2kR6dBWREhd6k//VMSv3RpwctqfJfzeznu3b8+PnX4rJsvPmUzY39wOvIcG4jZyXAFkARLNMtAahz9TRNp/xtwkaJUWistR0vKRXEV5QpGr/bXS+nxV+8+w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780000815; c=relaxed/simple; bh=qlRt0SOF0X3sYX0SSXWjGSwivq26Mrd+n9E8PSRXkTQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cD1DBmRqkUVn6SMSfjAIHrP8KDiMlLLXV1I0N9378DLRqJ0AUR42MQbVWVxR1+mO4p4rpMfmmLZ+vQ8VloKlKj/CplG4aqJjZIJZGG1OjUv1M79pOIgd6uOmw5JI+afrhF7gKsOMdzxYIe7HH/5j/HFPvXCdjLW4bvD6WTnKuAk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2OlemF32; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="2OlemF32" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CCA831F000E9; Thu, 28 May 2026 20:40:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780000814; bh=O2y/BkihebkSwMy9E5GPSRBdMdgg2mK8WSoqCiSxKv4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=2OlemF32fJ5nL3wHJroAYmoyB4KOdxjlOUW07Sjj0eGwfQtQtCzethbpE9PnRi1dY v3k/3SVQ4boD0mORef+xX5320IycigY1ObT8ugnVKDDmxvO3+CRxpT48KQ2KoHtA30 rIW/fn3pOXSiTg5sf5JH6jv8QwGjgaNhtj91icJg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, intel-wired-lan@lists.osuosl.org, Bart Van Assche , Aleksandr Loktionov , Przemek Kitszel , Arpana Arland , Jacob Keller , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.12 179/272] ice: fix locking in ice_dcb_rebuild() Date: Thu, 28 May 2026 21:49:13 +0200 Message-ID: <20260528194634.313466631@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194629.379955525@linuxfoundation.org> References: <20260528194629.379955525@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Bart Van Assche [ Upstream commit 0ded1f36ba4021cba50513e80be6b6e173710168 ] Move the mutex_lock() call up to prevent that DCB settings change after the first ice_query_port_ets() call. The second ice_query_port_ets() call in ice_dcb_rebuild() is already protected by pf->tc_mutex. This also fixes a bug in an error path, as before taking the first "goto dcb_error" in the function jumped over mutex_lock() to mutex_unlock(). This bug has been detected by the clang thread-safety analyzer. Cc: intel-wired-lan@lists.osuosl.org Fixes: 242b5e068b25 ("ice: Fix DCB rebuild after reset") Signed-off-by: Bart Van Assche Reviewed-by: Aleksandr Loktionov Reviewed-by: Przemek Kitszel Tested-by: Arpana Arland Signed-off-by: Jacob Keller Link: https://patch.msgid.link/20260506-jk-iwl-net-2026-05-04-v2-6-a5ea4dc837a9@intel.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c index a7c5108328240..d185b1aba7a47 100644 --- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c @@ -537,14 +537,14 @@ void ice_dcb_rebuild(struct ice_pf *pf) struct ice_dcbx_cfg *err_cfg; int ret; + mutex_lock(&pf->tc_mutex); + ret = ice_query_port_ets(pf->hw.port_info, &buf, sizeof(buf), NULL); if (ret) { dev_err(dev, "Query Port ETS failed\n"); goto dcb_error; } - mutex_lock(&pf->tc_mutex); - if (!pf->hw.port_info->qos_cfg.is_sw_lldp) ice_cfg_etsrec_defaults(pf->hw.port_info); -- 2.53.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 43FCFCD5BD5 for ; Thu, 28 May 2026 20:40:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 0117340AA4; Thu, 28 May 2026 20:40:19 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id vCvx0_SQzwnL; Thu, 28 May 2026 20:40:18 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 378A540A9D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1780000818; bh=O2y/BkihebkSwMy9E5GPSRBdMdgg2mK8WSoqCiSxKv4=; h=From:To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=JJTa/bleOyRUv+tu3qoRtnKleBWDwoa2i7mGqme3Wf61dbalF+meluTRsqNKvVKpL xjEM/+Kmnw5MLOJl4Mx5YRnyAR8gDqU5wLiyG94y934bxUrlK6gJmgzQwKH8S0nP4X 8hAPhcTx9j8BF71lNhVhRh6Wgy6R/nqyMXH1PsZwjPcgKIG/Len7RgGnrDa3kUJfYi E/9pB9GuzSH7Nnj8ol/PwlD5xF5N2iNsT0fry8YDst7DEEwCMIGUXUS8NdrCJe8ORC nS6BPJoMsMTQGJUQY8UkscrNKbsftrQNDj8KtUrQW9GV0SEbPsM1bt5+smiAoXmTDd 2o/kTHEUnOSSw== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp4.osuosl.org (Postfix) with ESMTP id 378A540A9D; Thu, 28 May 2026 20:40:18 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists1.osuosl.org (Postfix) with ESMTP id 0AE5FD3 for ; Thu, 28 May 2026 20:40:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id EF04D60767 for ; Thu, 28 May 2026 20:40:16 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Zm39DNj7-dE0 for ; Thu, 28 May 2026 20:40:16 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=172.105.4.254; helo=tor.source.kernel.org; envelope-from=gregkh@linuxfoundation.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 1140960765 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 1140960765 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by smtp3.osuosl.org (Postfix) with ESMTPS id 1140960765 for ; Thu, 28 May 2026 20:40:15 +0000 (UTC) Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id 98D7D601F9; Thu, 28 May 2026 20:40:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CCA831F000E9; Thu, 28 May 2026 20:40:13 +0000 (UTC) From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, intel-wired-lan@lists.osuosl.org, Bart Van Assche , Aleksandr Loktionov , Przemek Kitszel , Arpana Arland , Jacob Keller , Jakub Kicinski , Sasha Levin Date: Thu, 28 May 2026 21:49:13 +0200 Message-ID: <20260528194634.313466631@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194629.379955525@linuxfoundation.org> References: <20260528194629.379955525@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780000814; bh=O2y/BkihebkSwMy9E5GPSRBdMdgg2mK8WSoqCiSxKv4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=2OlemF32fJ5nL3wHJroAYmoyB4KOdxjlOUW07Sjj0eGwfQtQtCzethbpE9PnRi1dY v3k/3SVQ4boD0mORef+xX5320IycigY1ObT8ugnVKDDmxvO3+CRxpT48KQ2KoHtA30 rIW/fn3pOXSiTg5sf5JH6jv8QwGjgaNhtj91icJg= X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=2OlemF32 Subject: [Intel-wired-lan] [PATCH 6.12 179/272] ice: fix locking in ice_dcb_rebuild() X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Bart Van Assche [ Upstream commit 0ded1f36ba4021cba50513e80be6b6e173710168 ] Move the mutex_lock() call up to prevent that DCB settings change after the first ice_query_port_ets() call. The second ice_query_port_ets() call in ice_dcb_rebuild() is already protected by pf->tc_mutex. This also fixes a bug in an error path, as before taking the first "goto dcb_error" in the function jumped over mutex_lock() to mutex_unlock(). This bug has been detected by the clang thread-safety analyzer. Cc: intel-wired-lan@lists.osuosl.org Fixes: 242b5e068b25 ("ice: Fix DCB rebuild after reset") Signed-off-by: Bart Van Assche Reviewed-by: Aleksandr Loktionov Reviewed-by: Przemek Kitszel Tested-by: Arpana Arland Signed-off-by: Jacob Keller Link: https://patch.msgid.link/20260506-jk-iwl-net-2026-05-04-v2-6-a5ea4dc837a9@intel.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c index a7c5108328240..d185b1aba7a47 100644 --- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c @@ -537,14 +537,14 @@ void ice_dcb_rebuild(struct ice_pf *pf) struct ice_dcbx_cfg *err_cfg; int ret; + mutex_lock(&pf->tc_mutex); + ret = ice_query_port_ets(pf->hw.port_info, &buf, sizeof(buf), NULL); if (ret) { dev_err(dev, "Query Port ETS failed\n"); goto dcb_error; } - mutex_lock(&pf->tc_mutex); - if (!pf->hw.port_info->qos_cfg.is_sw_lldp) ice_cfg_etsrec_defaults(pf->hw.port_info); -- 2.53.0