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 941C435DA67; Thu, 28 May 2026 20:24:07 +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=1779999848; cv=none; b=flb3WpfIJf8vdCn97bakAjluzAE4+ZltvPyHR3Mzf8I2PzMe1vuFXXiaZKysPZhH412S72az8NgSLkgTqT1IVnZKqY/EFtJVaJn/BqA/DR8FsXT9PZ9FsFKQ7l+hag6GVVI6nkQ8AKNWP5XKRnirJGNXaYnkVKniBM0qLkjl+zY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779999848; c=relaxed/simple; bh=QnNRnCMCz3PI0t5rqe5x3R/kMwZb22oQpPMPH4uV8Cs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QJ7mmcwe1105bdHQtDCnSnccnshDwdMaqLweFnHV1TWL6aaB2Cg8rP9Bh4mQSF9WAIsgE5ws5E0qgyGO3htcdMbmicCh3vN5WTSC1zYkhIFjfaCIkxSSbhELgOo1lZr7YtVQKKATea1uoJ6uaMie7fEAktTNmDnpH2FeHS8PoP0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1pad1rmO; 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="1pad1rmO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C025C1F00A3D; Thu, 28 May 2026 20:24:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779999847; bh=f+buzPHP/yFGPxo5y7pttiRm4CAr4PHQWonzd0GLfQU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=1pad1rmO/t2vM1y6R/tLhp10GORt2E5xCAU7SGfqEbAkzEEHpzXDZBUb3RiVoyyeq O08X/7d2vdHnUWxoKiGEsX6fKBCQAYZPqzdgOk/McHSRkTuciehm9iv2hqlLMUA4Wn 7rk0CPN9G6276RMJi9SYjnWfZudsO6SVkgIXm5Jc= 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.18 212/377] ice: fix locking in ice_dcb_rebuild() Date: Thu, 28 May 2026 21:47:30 +0200 Message-ID: <20260528194644.539441066@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194638.371537336@linuxfoundation.org> References: <20260528194638.371537336@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.18-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 9fc8681cc58ea..270f5a00ece3a 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