--- /dev/null
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <linux/kconfig.h>
+#include <linux/types.h>
+#include <linux/fault-inject.h>
+#include <linux/module.h>
+#include "ufs-fault-injection.h"
+
+static int ufs_fault_get(char *buffer, const struct kernel_param *kp);
+static int ufs_fault_set(const char *val, const struct kernel_param *kp);
+
+static const struct kernel_param_ops ufs_fault_ops = {
+       .get = ufs_fault_get,
+       .set = ufs_fault_set,
+};
+
+enum { FAULT_INJ_STR_SIZE = 80 };
+
+/*
+ * For more details about fault injection, please refer to
+ * Documentation/fault-injection/fault-injection.rst.
+ */
+static char g_trigger_eh_str[FAULT_INJ_STR_SIZE];
+module_param_cb(trigger_eh, &ufs_fault_ops, g_trigger_eh_str, 0644);
+MODULE_PARM_DESC(trigger_eh,
+       "Fault injection. trigger_eh=<interval>,<probability>,<space>,<times>");
+static DECLARE_FAULT_ATTR(ufs_trigger_eh_attr);
+
+static char g_timeout_str[FAULT_INJ_STR_SIZE];
+module_param_cb(timeout, &ufs_fault_ops, g_timeout_str, 0644);
+MODULE_PARM_DESC(timeout,
+       "Fault injection. timeout=<interval>,<probability>,<space>,<times>");
+static DECLARE_FAULT_ATTR(ufs_timeout_attr);
+
+static int ufs_fault_get(char *buffer, const struct kernel_param *kp)
+{
+       const char *fault_str = kp->arg;
+
+       return sysfs_emit(buffer, "%s\n", fault_str);
+}
+
+static int ufs_fault_set(const char *val, const struct kernel_param *kp)
+{
+       struct fault_attr *attr = NULL;
+
+       if (kp->arg == g_trigger_eh_str)
+               attr = &ufs_trigger_eh_attr;
+       else if (kp->arg == g_timeout_str)
+               attr = &ufs_timeout_attr;
+
+       if (WARN_ON_ONCE(!attr))
+               return -EINVAL;
+
+       if (!setup_fault_attr(attr, (char *)val))
+               return -EINVAL;
+
+       strlcpy(kp->arg, val, FAULT_INJ_STR_SIZE);
+
+       return 0;
+}
+
+bool ufs_trigger_eh(void)
+{
+       return should_fail(&ufs_trigger_eh_attr, 1);
+}
+
+bool ufs_fail_completion(void)
+{
+       return should_fail(&ufs_timeout_attr, 1);
+}
 
--- /dev/null
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#ifndef _UFS_FAULT_INJECTION_H
+#define _UFS_FAULT_INJECTION_H
+
+#include <linux/kconfig.h>
+#include <linux/types.h>
+
+#ifdef CONFIG_SCSI_UFS_FAULT_INJECTION
+bool ufs_trigger_eh(void);
+bool ufs_fail_completion(void);
+#else
+static inline bool ufs_trigger_eh(void)
+{
+       return false;
+}
+
+static inline bool ufs_fail_completion(void)
+{
+       return false;
+}
+#endif
+
+#endif /* _UFS_FAULT_INJECTION_H */
 
 #include "unipro.h"
 #include "ufs-sysfs.h"
 #include "ufs-debugfs.h"
+#include "ufs-fault-injection.h"
 #include "ufs_bsg.h"
 #include "ufshcd-crypto.h"
 #include "ufshpb.h"
        ufshcd_send_command(hba, tag);
 out:
        up_read(&hba->clk_scaling_lock);
+
+       if (ufs_trigger_eh())
+               scsi_schedule_eh(hba->host);
+
        return err;
 }
 
            !(hba->quirks & UFSHCI_QUIRK_SKIP_RESET_INTR_AGGR))
                ufshcd_reset_intr_aggr(hba);
 
+       if (ufs_fail_completion())
+               return IRQ_HANDLED;
+
        spin_lock_irqsave(&hba->outstanding_lock, flags);
        tr_doorbell = ufshcd_readl(hba, REG_UTP_TRANSFER_REQ_DOOR_BELL);
        completed_reqs = ~tr_doorbell & hba->outstanding_reqs;