From nobody Sun Feb 8 13:17:20 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 CFAC52D12F5 for ; Mon, 29 Dec 2025 07:05:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766991917; cv=none; b=LTBksI0uPbcYWq9g1rfSpo+f1yryvqEJrneW/yfKHtEjJhYrWwI3uAdFIwzrkWRwUEQYDEeO1GFmqs+xQLNIs9cilGBdwfOvy61nW3OsYluOdREjQg7fY5hO8/lKsiwJA2J/HJZGZQKJzXVfHTM3zK9F/fwxW6oCtUYHbSipbTs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766991917; c=relaxed/simple; bh=tsFztX9gEc2qYYeX49Q49L1uZ0Dxc78+olPK+fSrLzo=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Uk2wYiF4S++Nl2laLhdfcP0Gjj57aoYBdHsWPYKOUm5Y2V8H35qMHUL1dLoXDSrHZjN6OEJ+lqp7rJ2S56ErUPQPT8XfOiUC4F7BAgS44yEwNwbh4T5MyK0v6n2ircHIeXtjBD1GfqD0IPrJUYsnt+uaKi08Lw8zq+MlfNIvKT4= 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=OyXjwZbA; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Ch2/PWJm; arc=none smtp.client-ip=205.220.180.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="OyXjwZbA"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Ch2/PWJm" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5BSMurVA013667 for ; Mon, 29 Dec 2025 07:05:14 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=qcppdkim1; bh=gBg+vwS6bT/IKJzeZSsPQYKE/6StGzo+IKI 7p0hUxe8=; b=OyXjwZbA99cxIhCncjnzzuL0k3+TwtvYv4n3p1tacf3RIJc0WqJ vNt35RbBauDxRb2xbtMhJRs0Z70dVCHbsyUe5HvCyMIgfX5Nayoo127JzQppXoi7 /kZiT3+6gjQcWduFPueyaKywhvXU3P6cESo0HuUP5zQ2XcxUuaC1Yfj2+cB834Bb iuDYDbfg9kk7r7jIie8y4uz5tki/2528S03BPTeBOpHSA2kJP8vTAQMuI8+X4JfF dgJctZS5pM5MUroMLSTEOFfm4fXVseHNj6FOKA7+2Lb6Netutu+0uWNdkwciyvEz gFBpVe0FAn3ZBqWssSuUJs0RiaLVzE1tycw== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ba7u5kkgr-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 29 Dec 2025 07:05:14 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2a377e15716so51343665ad.3 for ; Sun, 28 Dec 2025 23:05:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1766991914; x=1767596714; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=gBg+vwS6bT/IKJzeZSsPQYKE/6StGzo+IKI7p0hUxe8=; b=Ch2/PWJmhkStvVUH14yTbMnqBz6aKeef0b8Q5Z0H+I1w/iphW1otVO+qaIgxboV7Qb UltXOMJwuMIMUgFbiWMKHNapsjiiC1EFdcmr6Awq3PUQbRnT+lO/At7OqA+a+hZjeBhh DfhnGXrL75Y7lpO10iKfEif60jalQU718Qn4wWOzQ9mz4KZzNRce64dhmFJBoJKvudcs aLA/nY5RvvjGF4wLfuiraWp7LNVqKZgspnTjlB8z1quNMPgQDeCodi/5/XdXETnJi0Kn rXeNFzZIqLBVjdX8jkxloj+zlwHcc+uolv+wcB3VdxntDPg74mCBI9ru5v2Gp0Nc0dTU rauA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766991914; x=1767596714; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=gBg+vwS6bT/IKJzeZSsPQYKE/6StGzo+IKI7p0hUxe8=; b=jZOz9+k1KeTHHtXG1OjxlXn9pvE/m8caYGhTU5LED4/3ydrrazjhHnEWMeYiyfSVPB bAZ2o1HSZUKzk8YJluCBv/Sq0gASUrU04V0h47aCzClHMYcKeMOCPmdoMmx+agSw58DY YqIw1Bhpmd58eqeZUQApQEQnrsHAmI33p2mRNuE2OqCOJZVAd2T1rsy+B6s7yvn6dMIH d4oS0ORIavNAPVC71WeAycMrBjqISGfzmsiwjrvy/tdk0nMWRTesNLjB3figA6uiBlAX 3QEYJw59n42IXkIyqw45eYgnZwT/sGxL/rC1585Gi9eaSm5Hpx1ia5DK7Gx1EGbJkpbM KLYA== X-Forwarded-Encrypted: i=1; AJvYcCU5WnPknTpYB2fR7MmAd4MMwEqYEuP+QU7Z+2T1shP9+fzB7MuN/1G2PCMbzz1dJfBcNG/P98af5lntE/g=@vger.kernel.org X-Gm-Message-State: AOJu0YxEI96vkRa/t2+FplJZ7IndFm2tIznFxfck/u/5S07sGVAYN5lQ lqz6a0jWramQ6NacU7OuidEP6czUUvjEKLCUuXstvqVoVQI/ON6u1jF8HQheoQVb2g6efZWh8i8 6Cj/gks7gCCnzIhkfyX8C0RRsqV4MtiSMqWfatSydSS1JcD+ACp2U9VyYnQduqeEqS8E= X-Gm-Gg: AY/fxX7GikCcxQDM7KlNMWzDogSH4Nb4+oYZB34sC2JhXqpfzXbYbIZyt7gTgT7D0Nm JhmxnY8uICZ7cxW3pyplJuCazCIZG5dDr0XWdIduSMGoA3aev+nIyCe3hM1oiJomwcgZ+SeRjdx rKK215mJvQeA8P+XD1a0gwI7n4I4OnC5vWiT2aaEIXtlKpEZpWySug653FmU7wMCNo/9+upItdB PcaPIZ2LnROT+0h5ugEl/PR3H9/aKfQOd18W5YxbZliKqHPwcamAqm+tCmiyPWq8tWPR4h1nx/3 m1BdhboexNhCc3ejKBu7D9x9E0rYGvMG3Jr6WV0at1EPernbddBxZSIDEaLvfub7iCeEMeeg12y slCQBzq/yaG++blOfVmb50NDRu9WC5U3odOivA9OQ X-Received: by 2002:a05:6a21:6da9:b0:364:13e1:10f0 with SMTP id adf61e73a8af0-376aa4fa119mr28148886637.48.1766991913305; Sun, 28 Dec 2025 23:05:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IH0oUR2/eXukUaxEYuosMuR3RS3KAnsf8lMAv8AIZf3UkcmEgDx4FB2klCF4eSXw1j7Gwo8ig== X-Received: by 2002:a05:6a21:6da9:b0:364:13e1:10f0 with SMTP id adf61e73a8af0-376aa4fa119mr28148872637.48.1766991912821; Sun, 28 Dec 2025 23:05:12 -0800 (PST) Received: from hu-neersoni-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c1e7c5307c7sm24736860a12.28.2025.12.28.23.05.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Dec 2025 23:05:12 -0800 (PST) From: Neeraj Soni To: adrian.hunter@intel.com, ulf.hansson@linaro.org, ebiggers@kernel.org, abel.vesa@linaro.org Cc: linux-mmc@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, neeraj.soni@oss.qualcomm.com, Wenjia Zhang Subject: [PATCH v3] mmc: host: sdhci-msm: Add support for wrapped keys Date: Mon, 29 Dec 2025 12:35:07 +0530 Message-Id: <20251229070507.3322149-1-neeraj.soni@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: 2B8kTnBmFGi6SAhMhxK1d2DQJFP7gb9u X-Proofpoint-ORIG-GUID: 2B8kTnBmFGi6SAhMhxK1d2DQJFP7gb9u X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjI5MDA2MyBTYWx0ZWRfX5J0/YZLeDktc D711vVWbKxs7KHAThaNE5iyfQhFYr1dX9m+sm8MXtabbHtECFwWUk1vtC88TAXDPJRcu8wBSie2 YyWzgk5rgE4qmv5lDSjIEIgcxb/+VfmRTds08RC6XFcWB99vSN+I/4pE1Ts0SqIjsbh1qOf+BJe wZX+CtGQKx1eVffPXY5GNmoPxdPoRVvAjT1kH4is/vVAL1C5F1jLNmKQYc8jZXhUvwArpiarD+F GfJAEh8zQ+bXZKyU/XLh9EDZm+1OhfOIq5qzbHsOBRaQQJUw12ka+la8Unz/sy90ElgLcXpLJ+g bsB9hVV9MrSi9uJXrzHvSgAcaVYwSsCSnl/OWNq8vzMBycrrzjonrbzzUnf28ph654Fm6p40N1i pkogfi8Djl0ycwr/o0klIeDbjKGvUdYRa6CGdZ9f9bCxslxaR+x+D21FtvofDBRZEDtkkexKFlM 7KyW6DB7qy7R8K4zuFA== X-Authority-Analysis: v=2.4 cv=DptbOW/+ c=1 sm=1 tr=0 ts=6952282a cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=wP3pNCr1ah4A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=NEAV23lmAAAA:8 a=VwQbUJbxAAAA:8 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=qqNy_vziDfUGqepx9HcA:9 a=1OuFwYUASf3TG4hYMiVC:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-29_02,2025-12-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 adultscore=0 clxscore=1015 spamscore=0 priorityscore=1501 suspectscore=0 bulkscore=0 impostorscore=0 lowpriorityscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2512290063 Content-Type: text/plain; charset="utf-8" Add the wrapped key support for sdhci-msm by implementing the needed methods in struct blk_crypto_ll_ops and setting the appropriate flag in blk_crypto_profile::key_types_supported. Tested on SC7280 eMMC variant. How to test: Use the "wip-wrapped-keys-2024-12-09" tag from https://github.com/ebiggers/= fscryptctl and build fscryptctl that supports generating wrapped keys. Enable the following config options: CONFIG_BLK_INLINE_ENCRYPTION=3Dy CONFIG_QCOM_INLINE_CRYPTO_ENGINE=3Dy CONFIG_FS_ENCRYPTION_INLINE_CRYPT=3Dy CONFIG_MMC_CRYPTO=3Dy Enable "qcom_ice.use_wrapped_keys" via kernel command line. $ mkfs.ext4 -F -O encrypt,stable_inodes /dev/disk/by-partlabel/vm-data $ mount /dev/disk/by-partlabel/vm-data -o inlinecrypt /mnt $ fscryptctl generate_hw_wrapped_key /dev/disk/by-partlabel/vm-data > /mnt/= key.longterm $ fscryptctl prepare_hw_wrapped_key /dev/disk/by-partlabel/vm-data < /mnt/k= ey.longterm > /tmp/key.ephemeral $ KEYID=3D$(fscryptctl add_key --hw-wrapped-key < /tmp/key.ephemeral /mnt) $ rm -rf /mnt/dir $ mkdir /mnt/dir $ fscryptctl set_policy --iv-ino-lblk-32 "$KEYID" /mnt/dir $ dmesg > /mnt/dir/test.txt $ sync Reboot the board $ mount /dev/disk/by-partlabel/vm-data -o inlinecrypt /mnt $ ls /mnt/dir # File should be encrypted $ fscryptctl prepare_hw_wrapped_key /dev/disk/by-partlabel/vm-data < /mnt/k= ey.longterm > /tmp/key.ephemeral $ KEYID=3D$(fscryptctl add_key --hw-wrapped-key < /tmp/key.ephemeral /mnt) $ fscryptctl set_policy --iv-ino-lblk-32 "$KEYID" /mnt/dir $ cat /mnt/dir/test.txt # File should now be decrypted Tested-by: Wenjia Zhang Signed-off-by: Neeraj Soni Reviewed-by: Eric Biggers --- This is a reworked version of the patchset https://lore.kernel.org/all/20241101031539.13285-1-quic_spuppala@quicinc.co= m/ that was sent by Seshu Madhavi Puppala. My changes rebase it to use the custom crypto profile support. Changes in v3: - Updated commit message with test details and moved "Signed-off-by" above = the scissors line. Changes in v2: - Updated commit message for clarity. Changes in v1: - Added initial support for wrapped keys. --- drivers/mmc/host/sdhci-msm.c | 51 +++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 4e5edbf2fc9b..351f2a77068b 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -1911,11 +1911,6 @@ static int sdhci_msm_ice_init(struct sdhci_msm_host = *msm_host, if (IS_ERR_OR_NULL(ice)) return PTR_ERR_OR_ZERO(ice); =20 - if (qcom_ice_get_supported_key_type(ice) !=3D BLK_CRYPTO_KEY_TYPE_RAW) { - dev_warn(dev, "Wrapped keys not supported. Disabling inline encryption s= upport.\n"); - return 0; - } - msm_host->ice =3D ice; =20 /* Initialize the blk_crypto_profile */ @@ -1929,7 +1924,7 @@ static int sdhci_msm_ice_init(struct sdhci_msm_host *= msm_host, =20 profile->ll_ops =3D sdhci_msm_crypto_ops; profile->max_dun_bytes_supported =3D 4; - profile->key_types_supported =3D BLK_CRYPTO_KEY_TYPE_RAW; + profile->key_types_supported =3D qcom_ice_get_supported_key_type(ice); profile->dev =3D dev; =20 /* @@ -2009,9 +2004,53 @@ static int sdhci_msm_ice_keyslot_evict(struct blk_cr= ypto_profile *profile, return qcom_ice_evict_key(msm_host->ice, slot); } =20 +static int sdhci_msm_ice_derive_sw_secret(struct blk_crypto_profile *profi= le, + const u8 *eph_key, size_t eph_key_size, + u8 sw_secret[BLK_CRYPTO_SW_SECRET_SIZE]) +{ + struct sdhci_msm_host *msm_host =3D + sdhci_msm_host_from_crypto_profile(profile); + + return qcom_ice_derive_sw_secret(msm_host->ice, eph_key, eph_key_size, + sw_secret); +} + +static int sdhci_msm_ice_import_key(struct blk_crypto_profile *profile, + const u8 *raw_key, size_t raw_key_size, + u8 lt_key[BLK_CRYPTO_MAX_HW_WRAPPED_KEY_SIZE]) +{ + struct sdhci_msm_host *msm_host =3D + sdhci_msm_host_from_crypto_profile(profile); + + return qcom_ice_import_key(msm_host->ice, raw_key, raw_key_size, lt_key); +} + +static int sdhci_msm_ice_generate_key(struct blk_crypto_profile *profile, + u8 lt_key[BLK_CRYPTO_MAX_HW_WRAPPED_KEY_SIZE]) +{ + struct sdhci_msm_host *msm_host =3D + sdhci_msm_host_from_crypto_profile(profile); + + return qcom_ice_generate_key(msm_host->ice, lt_key); +} + +static int sdhci_msm_ice_prepare_key(struct blk_crypto_profile *profile, + const u8 *lt_key, size_t lt_key_size, + u8 eph_key[BLK_CRYPTO_MAX_HW_WRAPPED_KEY_SIZE]) +{ + struct sdhci_msm_host *msm_host =3D + sdhci_msm_host_from_crypto_profile(profile); + + return qcom_ice_prepare_key(msm_host->ice, lt_key, lt_key_size, eph_key); +} + static const struct blk_crypto_ll_ops sdhci_msm_crypto_ops =3D { .keyslot_program =3D sdhci_msm_ice_keyslot_program, .keyslot_evict =3D sdhci_msm_ice_keyslot_evict, + .derive_sw_secret =3D sdhci_msm_ice_derive_sw_secret, + .import_key =3D sdhci_msm_ice_import_key, + .generate_key =3D sdhci_msm_ice_generate_key, + .prepare_key =3D sdhci_msm_ice_prepare_key, }; =20 #else /* CONFIG_MMC_CRYPTO */ --=20 2.34.1