From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 09DCB47D45D for ; Thu, 27 Aug 2026 16:08:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787846919; cv=none; b=UYiS8y6vkF6H6QVpNzIm5uEOT2DWQpaXOK/huLQoutYApbnElVZQDzshca8gCMhoE6WwBX/lw1aQwa2OWBWeHbWI4cARMb9OnwxE7/kqM1wurMKaRMIvG4Sp/4O7qZtaBPFMZA1LuhqitTKpeT/CM9x8sz6bIum2qjxsTO31wYk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787846919; c=relaxed/simple; bh=64JBdKFV0k5ypJWDkUZi9BoAaRy3vj5flkXzPsq15+c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ird4nLCscD52lwmQ9T9F5/IyCK6NWa/Zcd1TXLH8kh9ku/RlziPTuEhvDhwX0eK2AnGBZN3GT/jXWMzLnhGag3ln7OjcUDvSr5hHPTXIJzNhjg8zx1rQF0vIyTqbaozjANyVIjpdBkey50ba25CbYvNmLNAm4NM0no7kWMNT0vI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=pPF1CI7o; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=JYWDEmWH; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="pPF1CI7o"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="JYWDEmWH" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67RFcWMM3360499 for ; Thu, 27 Aug 2026 16:08:35 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=LltqfmvyZbe c4Bgt7eBZwrXubHQDa7pvwd5LerJQc3I=; b=pPF1CI7opY3gmcOEv1Jilno3v2i VEBF+as3yqfzBh2zg2eYzZiFmFnDo+X6GsLvOvU9SiT4WmrOfQn5cd5TmzH/Coad 26DWBpSBcoxynbm9jm2Z/6zxi16RlVDGJkDYtLkCqKJkef2JOLzhoE8jvzBmCxX+ yxe/HWSTuXXi0lIK8SXphg2qG4dGFy1XZFUoDhLHpVFklJbwQuUrGSVHC7uwxYIz mSKLBkCac+xDJ7N12ZlLJUt58yo7UZ28bF58nk5Jfit+2BHfwFaiMuEGZPNK931j zNMO0o/W/+OZ4keC04GduHPzR580l37NTVf/9210ndWufByfzcqn+ES0lDw== Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gab7t39ek-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 27 Aug 2026 16:08:35 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-38dbf293831so120931a91.3 for ; Thu, 27 Aug 2026 09:08:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1787846915; x=1788451715; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=LltqfmvyZbec4Bgt7eBZwrXubHQDa7pvwd5LerJQc3I=; b=JYWDEmWHlRL+Qb1Rcs+Av2z4Em6v1OOBCQm1HmzDhlrUlH5bIem6+U5WrYRWpSgy83 kinxNXz6o5vvMB4nhRjVrMcXXol14A3iywXqi/cE3cISBm1vCKZ5rOcPx0UcbvgchXvS REMvo2BwieN1CFBxO2x3Uq1tUxKm3eUfkHc47d8hXd3Jf/gqA15Z3Gqob0kPrf2lXFLO s9IPut1gD74U4Xjcr8S50H4haSUYTJTw+fjvHmJXIVtcxL+4t0fol8YAY2+BvskWvIv5 Jx+eyx0B0el7YuyUpgiDvIX0w0/hyRsdO3gUfLdEgOF9C0a5qbTHTDajsfjxy4ZcTE62 OQ0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787846915; x=1788451715; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=LltqfmvyZbec4Bgt7eBZwrXubHQDa7pvwd5LerJQc3I=; b=XelNbKvH12Cr6cy3SvcW7IAb6j1ZpgPC2ekVBTu1lHsgJmG+0wMo6noMAJyWZfLFgy BBGXn46NdG+Pf/NWWjzV4DeML46QfPZB2KT79Ab1NOhf2jXvcIwwe33nNT5ilVcUoLOn gDgE/SyJHFgQa/ey3Jk+beq/t4SSxKnTWrzoyTljpjm2s6Sg1kfi+4euFen9HUMG8Muk xJyp5UnGRN8RL/4rXNrmGE361qsaA6hNYUOjw6SkoUxDMRcDRHMiz6MaBdyeHHAMs7nw 8JQ0t0FBigEa2G5bHpnv1slbgdlBc37cDEhwDuKCWTXwnA1wGeR2mYgNm/poUdbGnu6h L2QA== X-Forwarded-Encrypted: i=1; AHgh+RpJ2gJZH0QH9jCK5Cf5E6GZle4bbKjImd52Yozn+6oIApGs8nLpmOXPw9fFARU7eduQvgOT0vt9BxKk2HU=@vger.kernel.org X-Gm-Message-State: AFuF++mT0YXIbJhXO5m/ng8yIqqpjX4cHmZamusAMOHzQfhrn4DBTQFo 7eMVuIlAerXsDGZMR5XsdEpBikkXqSYY8WLLdkEx4+bOO2Nzt12TunUR3nOtNNUz4OAh4/fwYoi ImaU3oX1sfappvMNb56G4EMvQ+04gKbyA7DendmzGpXslpJLaBqz86DLn5G9xIoxbRzQ= X-Gm-Gg: AR+sD11WD7/gVvn7/qKsUTIoOE0BaCblKnaFoA45kWA85uZ31OPonfs2m9gZ9Rybf0K yKPxSJxkaC3cYmEnCnPDV3UHXZX8YN/VvsCdwt/4KvS6H90/en5Bj7NYUAdR8olk1j/2tkmt3MD jYBe9uXn6kgtEzBZGLzi4RgZrhjjf97jJRXZjOJ/UTEEJAdUfOL+YeubY/ZNkoVwGoXvvuyWzi/ Zl+ORD6gqjRH2+OVtOnvsr6DYwIJ0cVGqbx9zsiKyL0aOlo+q38B6zhSCRsuRH676MBYTxTZqB/ 4NH98HyfHmWg97oMuMGfVjWMOlLym8hR8JFxuLxI5ESSZHR5+DQfXHsucKKHZvaih7KVHWHJ54M 1E+etqu+woW/Xy9sH3zQOoWE0Z4NhODVrQKmertIlPYbe6JDga86ivXbiXSM= X-Received: by 2002:a17:90b:4fcc:b0:38d:ef48:b04 with SMTP id 98e67ed59e1d1-396d0f8fbfemr510639a91.10.1787846914820; Thu, 27 Aug 2026 09:08:34 -0700 (PDT) X-Received: by 2002:a17:90b:4fcc:b0:38d:ef48:b04 with SMTP id 98e67ed59e1d1-396d0f8fbfemr510461a91.10.1787846914243; Thu, 27 Aug 2026 09:08:34 -0700 (PDT) Received: from u24-san1p10108.qualcomm.com (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-396b0fd9085sm3245892a91.12.2026.08.27.09.08.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Aug 2026 09:08:33 -0700 (PDT) From: Linlin Zhang To: ebiggers@kernel.org, axboe@kernel.dk, mst@redhat.com, jasowangio@gmail.com, James.Bottomley@HansenPartnership.com, martin.petersen@oracle.com, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, linux-block@vger.kernel.org, linux-crypto@vger.kernel.org, linux-scsi@vger.kernel.org, virtualization@lists.linux.dev, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: neeraj.soni@oss.qualcomm.com, gaurav.kashyap@oss.qualcomm.com, mani@kernel.org, andersson@kernel.org, konradybcio@kernel.org, bvanassche@acm.org, alim.akhtar@samsung.com, avri.altman@sandisk.com, stefanha@redhat.com, pbonzini@redhat.com, eperezma@redhat.com, xuanzhuo@linux.alibaba.com, linux-kernel@vger.kernel.org Subject: [PATCH v1 06/11] scsi: ufs: core: add slot path to ufshcd_prepare_lrbp_crypto Date: Thu, 27 Aug 2026 09:07:15 -0700 Message-ID: <20260827160806.1295313-7-linlin.zhang@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260827160806.1295313-1-linlin.zhang@oss.qualcomm.com> References: <20260827160806.1295313-1-linlin.zhang@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authority-Analysis: v=2.4 cv=X6Bi7mTe c=1 sm=1 tr=0 ts=6a906103 cx=c_pps a=vVfyC5vLCtgYJKYeQD43oA==:117 a=JYp8KDb2vCoCEuGobkYCKw==:17 a=Sv0fKeRqtYgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=UfCYJ6Unc3kZa_kcAOwA:9 a=rl5im9kqc5Lf4LNbBjHf:22 X-Proofpoint-ORIG-GUID: MF7r4x-aonq_fwWktsFP-ZkjQSsZUYcW X-Proofpoint-Spam-Info: AW1haW4tMjYwODI3MDEzNiBTYWx0ZWRfX0k+IrrNZIQOY 2aytGk9acgesOnebozHyaGpNzHWN/ekWb+Gul5WLxNAaAvbus+QLBwb/VPe0jltmKpjOBY73iMG HFWakIFX02fcX5gKGBmI0qObEDlWrck= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI3MDEzNiBTYWx0ZWRfXxZznmLxMXhR8 8f5ZQiY6EWhZRd/z69Be/UjSBKnLn8mJnWcb+Atzs5J9+Al2BHQdo1tL1M2DwyP8PA+caOMsHs5 bVmiFbj18NVFYnzIO6bCMaKymlV49+d2ZjujGj/wDWKtQG73IlPYw4oWHzP34HwWGIvX0ZyscYx H19oyZy4U+G9UPLh90R1WHNUnjF0WNWEv1geHUrWh7Mq987AYxiaHv/2sfrjy8Wi/EuSwrzIRry HgWqMXLK+cxdATXH48j+KLXIP4afaELMeTpJHIDYQzvwKm15XlkoLIctVUDxFAt71m7v0bFeyZ1 Uh4oMKAvfsYVjMeY4x3ESXli0ikDF6A4GmAaosSr/YxUthTGc7RXFQ9oGigJyWjD3xVmLlF0p/b CoDr04i/kn0lKcXTgTuajgbgdTubPACEy+nJUR89v34vkiOa+7neBHC0Z+iBqoDQe7b05rPsCBv 2IY8FVp0+yY9tlC3p6A== X-Proofpoint-GUID: MF7r4x-aonq_fwWktsFP-ZkjQSsZUYcW X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-27_07,2026-08-27_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 adultscore=0 clxscore=1015 priorityscore=1501 suspectscore=0 spamscore=0 phishscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608270136 From: linlzhan ufshcd_prepare_lrbp_crypto() programs crypto_key_slot in the LRB from rq->crypt_keyslot. With the blk-crypto slot path a bio can carry a pre-programmed physical ICE keyslot index in crypt_ctx->bc_slot rather than a blk_crypto_key pointer. In that case rq->crypt_keyslot is NULL and the existing code incorrectly falls through to the "no encryption" path, leaving crypto_key_slot as -1. Extend the function to handle both cases: when rq->crypt_keyslot is set, derive the slot index via blk_crypto_keyslot_index() as before; when bc_slot.data_unit_size_bits is non-zero, read crypto_key_slot directly from bc_slot.phy_slot. Signed-off-by: linlzhan --- drivers/ufs/core/ufshcd-crypto.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/ufs/core/ufshcd-crypto.h b/drivers/ufs/core/ufshcd-crypto.h index 8f66db94e179..2fc5601c0f76 100644 --- a/drivers/ufs/core/ufshcd-crypto.h +++ b/drivers/ufs/core/ufshcd-crypto.h @@ -15,13 +15,21 @@ static inline void ufshcd_prepare_lrbp_crypto(struct request *rq, struct ufshcd_lrb *lrbp) { - if (!rq || !rq->crypt_keyslot) { + if (!rq) { lrbp->crypto_key_slot = -1; return; } - lrbp->crypto_key_slot = blk_crypto_keyslot_index(rq->crypt_keyslot); - lrbp->data_unit_num = rq->crypt_ctx->bc_dun[0]; + if (rq->crypt_keyslot) { + lrbp->crypto_key_slot = blk_crypto_keyslot_index(rq->crypt_keyslot); + lrbp->data_unit_num = rq->crypt_ctx->bc_dun[0]; + } else if (rq->crypt_ctx && rq->crypt_ctx->bc_slot.data_unit_size_bits) { + lrbp->crypto_key_slot = rq->crypt_ctx->bc_slot.phy_slot; + lrbp->data_unit_num = rq->crypt_ctx->bc_dun[0]; + } else { + lrbp->crypto_key_slot = -1; + } + } static inline void -- 2.34.1