From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794063403; b=u7BxaNM9p02XJBfrLkjdqo9vt/MQ69X4yfzWZHZVRMBMla487PRApmNeGR3zZzlzHwAf Yrp83xJTRBqse0AHlZtMRILRs88KJSenBLrDcjWApFGEd/uR9NgX81hmQYX+XHEFh5R9w rwH5oeLoEwcHsvIQXt/pT5EeqnN1h5vezXNJCZAu2lkvRCberWoIkDHSTzbqTc+EHMwt3 16uQobDKhBjsAcULfO9itoskbmrU+Xk6MifmmC/mQn0Rsx9xpxqkGdbx+GHAYbd7F+Kgk nLZxi4lT03FZuRYDLTOghnp0qyceoat332QztS446nh/hL4sv6b/PiOlkPy/mX8yIXA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794063403; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=xcyolctEdmti4DygMY+j1yC2r6R8guaFX+2KeX3EZ8k=; b=hI6og1pBefIIg1uiBkCRC99hmi3qPgKLuLUiZhTQkfF0GkrT3YkxKI6mJHt/dvSGJaEx MpRrfx2WORaZ+S6HZd/H/bh9qK+Q4N1e5t4YCS51owr4czpEa8T71JcfVW2dJI7umZp9O 8VYehosr2iiomnc+MvKH8GFCUR6yCyte0uqVMGRNajExj6cNpRePhHKRFJdmcaoH2tEBi spe0YuNGRlPqkpjVVl0FuRcD2+vkN1Kj8QAK3aYFULgyGz0T1ITLk9Ht4I8sYHzh32b9v DrMX0yLDWnx0QmXL4qDBnnV1BNuE3HYgFOwbqhbk2EPYClg1HQcGkhSmj1gBJAflL5w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=adYaIziQ; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 23235606D830; Sat, 7 Nov 2026 14:56:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=adYaIziQ Received: by smtp.kernel.org (Postfix) with ESMTPSA id B25E11F008A4; Sat, 7 Nov 2026 14:56:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794063403; bh=xcyolctEdmti4DygMY+j1yC2r6R8guaFX+2KeX3EZ8k=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=adYaIziQvlj3gKgDigw1sDXKq3hYIaIgYobEGEF6Z38uPndScBNCdHxiimrHu3dp6 GRLoU+rvZVcMsfCEYXuHf+r+XAMylgCvySYNFaKbLdkr4jULXculZlgE/pAMJVDQHa ujCd447OwVkVmJPuxhe719vf+yLKjUASNfP8HEk4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ahsan Atta , Giovanni Cabiddu , Herbert Xu , Sasha Levin Subject: [PATCH 6.18 574/869] crypto: qat - initialise state_lock on every path in adf_devmgr_add_dev() Date: Sat, 7 Nov 2026 08:54:16 -0500 Message-ID: <20261107134912.682479693@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134852.069646174@linuxfoundation.org> References: <20261107134852.069646174@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ahsan Atta [ Upstream commit 4ad7c1bd5f3dcd3fd6efbb068d6ee2a68dddfece ] state_lock is initialised at the end of adf_devmgr_add_dev(), but the VF on host path whose id mapping already exists returns earlier via 'goto unlock'. That mapping outlives the VF, so this path is taken every time a VF is recreated on a BDF that already hosted one, e.g.: echo 0 > sriov_numvfs echo 32 > sriov_numvfs accel_dev is freshly allocated on each probe, so state_lock is left zeroed and adf_dev_up() takes an uninitialised mutex. With CONFIG_DEBUG_MUTEXES this is reported on a dh895xcc with 32 host-bound VFs: DEBUG_LOCKS_WARN_ON(lock->magic != lock) WARNING: kernel/locking/mutex.c:159 at mutex_lock+0x171/0x1c0 Call Trace: adf_dev_up+0x27/0xe0 [intel_qat] adf_probe+0x700/0xa80 [qat_dh895xccvf] local_pci_probe+0xd5/0x190 The same happens on teardown when adf_dev_down() locks it again. Initialise the lock next to the other per-device state, before the tables are updated, so it is done on every path. Fixes: 1bdc85550a2b ("crypto: qat - fix concurrency issue when device state changes") Cc: stable@vger.kernel.org Signed-off-by: Ahsan Atta Reviewed-by: Giovanni Cabiddu Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c b/drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c index 81dd22d2083ff..680e6557fc946 100644 --- a/drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c +++ b/drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c @@ -137,6 +137,7 @@ int adf_devmgr_add_dev(struct adf_accel_dev *accel_dev, mutex_lock(&table_lock); atomic_set(&accel_dev->ref_count, 0); + mutex_init(&accel_dev->state_lock); /* PF on host or VF on guest - optimized to remove redundant is_vf */ if (!accel_dev->is_vf || !pf) { @@ -210,7 +211,6 @@ int adf_devmgr_add_dev(struct adf_accel_dev *accel_dev, map->attached = true; list_add_tail(&map->list, &vfs_table); } - mutex_init(&accel_dev->state_lock); unlock: mutex_unlock(&table_lock); return ret; -- 2.53.0