From e2e063f5074e2e14a96875e5e5670314a41e1c34 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 26 Jul 2021 09:27:15 -0700 Subject: [PATCH] ANDROID: scsi: ufs: add vendor hook to override key reprogramming Some hardware has a way to restore all keyslots at once that is significantly faster than restoring each keyslot individually, as is done by blk_ksm_reprogram_all_keys(). Add a hook "android_rvh_ufs_reprogram_all_keys" that allows overriding the restoration of all keyslots after UFS reset. This may sleep, so this must be a "restricted" Android vendor hook rather than a regular one. Note that currently this functionality can't be upstreamed, as support for the hardware that needs it would need to be upstreamed first. Bug: 162257402 Bug: 181905172 Change-Id: I0b25393a5131941f085892560e08a64e63cd1369 Signed-off-by: Eric Biggers --- drivers/android/vendor_hooks.c | 1 + drivers/scsi/ufs/ufshcd-crypto.c | 12 ++++++++++-- include/trace/hooks/ufshcd.h | 4 ++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 70dcac4b81ee..0ae5d2f5e055 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -213,6 +213,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_filemap_fault_cache_page); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_enable_thermal_genl_check); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_thermal_pm_notify_suspend); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_fill_prdt); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_ufs_reprogram_all_keys); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_prepare_command); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_update_sysfs); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_send_command); diff --git a/drivers/scsi/ufs/ufshcd-crypto.c b/drivers/scsi/ufs/ufshcd-crypto.c index 734dd09ffb88..7604c0744746 100644 --- a/drivers/scsi/ufs/ufshcd-crypto.c +++ b/drivers/scsi/ufs/ufshcd-crypto.c @@ -6,6 +6,9 @@ #include "ufshcd.h" #include "ufshcd-crypto.h" +#undef CREATE_TRACE_POINTS +#include + /* Blk-crypto modes supported by UFS crypto */ static const struct ufs_crypto_alg_entry { enum ufs_crypto_alg ufs_alg; @@ -120,8 +123,13 @@ bool ufshcd_crypto_enable(struct ufs_hba *hba) return false; /* Reset might clear all keys, so reprogram all the keys. */ - if (hba->ksm.num_slots) - blk_ksm_reprogram_all_keys(&hba->ksm); + if (hba->ksm.num_slots) { + int err = -EOPNOTSUPP; + + trace_android_rvh_ufs_reprogram_all_keys(hba, &err); + if (err == -EOPNOTSUPP) + blk_ksm_reprogram_all_keys(&hba->ksm); + } if (hba->quirks & UFSHCD_QUIRK_BROKEN_CRYPTO_ENABLE) return false; diff --git a/include/trace/hooks/ufshcd.h b/include/trace/hooks/ufshcd.h index 362723ff50f2..ec8845a55076 100644 --- a/include/trace/hooks/ufshcd.h +++ b/include/trace/hooks/ufshcd.h @@ -19,6 +19,10 @@ DECLARE_HOOK(android_vh_ufs_fill_prdt, unsigned int segments, int *err), TP_ARGS(hba, lrbp, segments, err)); +DECLARE_RESTRICTED_HOOK(android_rvh_ufs_reprogram_all_keys, + TP_PROTO(struct ufs_hba *hba, int *err), + TP_ARGS(hba, err), 1); + DECLARE_HOOK(android_vh_ufs_prepare_command, TP_PROTO(struct ufs_hba *hba, struct request *rq, struct ufshcd_lrb *lrbp, int *err),