From patchwork Tue Sep 21 18:46:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kashyap Desai X-Patchwork-Id: 12508641 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,MIME_HEADER_CTYPE_ONLY, SPF_HELO_NONE,SPF_PASS,T_TVD_MIME_NO_HEADERS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23ECCC433F5 for ; Tue, 21 Sep 2021 18:47:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0EE9261211 for ; Tue, 21 Sep 2021 18:47:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231474AbhIUSsg (ORCPT ); Tue, 21 Sep 2021 14:48:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233885AbhIUSr4 (ORCPT ); Tue, 21 Sep 2021 14:47:56 -0400 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D065C061574 for ; Tue, 21 Sep 2021 11:46:27 -0700 (PDT) Received: by mail-pj1-x102c.google.com with SMTP id me1so243600pjb.4 for ; Tue, 21 Sep 2021 11:46:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NJ+nWZCFIY/UOj9FMrU5Kq1nXYZWQms7K1BB/RcYtYs=; b=NQlI8ywFm2lKKwW1lXcBAzlXaR2nKntnR2hTGVI/NiEeM7g5x4EO3yvclT3GaCxO44 n+1IaIw36pw84Hx/9OBRGTVfPUbpRF9f/wv/pEdcSL8L3Wv1OnFmkM3rMOb0hn5cW55C hPEEnOJJR8C+9tM2Wffef8csmqO0ZIHuR3EHA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NJ+nWZCFIY/UOj9FMrU5Kq1nXYZWQms7K1BB/RcYtYs=; b=CwFdSlf007VoJdJTjzW0n0wO7zYaZHDZKsfVwE+HeCVQIigXQW6z5rtghSg7rqhG7+ YCYSrQ04Dt/0vavg+J7xo+q80QuBQuELi5wXVKhKthyEreCmiUnBF0in7YSetCTSxxLy 3A2JrGlEVpqRCWNYQElpac8sqrU7aRdyyEQlqY97MSFg+Fi32Hkr1GDT8xsFlKBpSSnK suA/TImJ+a/7NOqSK9/qzfhjRsDDkBhnRopM4PnbJUuTw+w4CsE6+4xngWTZ+Dt9Aa0R l7rLuJKgGuUUh4u1TD/UbkuSxFlcsE1uco8CGGfDJRlqnI1ULZvTldLieMcYUYD1uacL /+5A== X-Gm-Message-State: AOAM530rmLyc99qlT+BtkVDJquGdXbKKDIDidlGXpY0bCGY+tdvE0URW PP5i/kF3FbW5Xc8Qv4PrE34Pfr5Fstiw7PUe9ORd/eiEgxei2kcoANEBlJVEcpfU2VNyl85WgWZ W2PJgYb3+rHpbiwZqz7n4yM4FILzIY18e8EawP+SX26ucQmvBIVSUIex29RoOu4QuhPnDlCeviw GhbG7MP53j X-Google-Smtp-Source: ABdhPJylyVbzOZf+r4xNlA46vkA+XFLxN2H/YR8klN9gAexxgxtnl0zQws0DvVp2f/JrOtte+S5GTg== X-Received: by 2002:a17:90a:ba0e:: with SMTP id s14mr6996811pjr.213.1632249986510; Tue, 21 Sep 2021 11:46:26 -0700 (PDT) Received: from drv-bst-rhel8.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id f144sm18258897pfa.24.2021.09.21.11.46.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 11:46:26 -0700 (PDT) From: Kashyap Desai To: linux-scsi@vger.kernel.org Cc: jejb@linux.ibm.com, martin.petersen@oracle.com, steve.hagan@broadcom.com, mpi3mr-linuxdrv.pdl@broadcom.com, Kashyap Desai , sathya.prakash@broadcom.com Subject: [PATCH 7/7] mpi3mr: task management for pass through command Date: Wed, 22 Sep 2021 00:16:00 +0530 Message-Id: <20210921184600.64427-8-kashyap.desai@broadcom.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20210921184600.64427-1-kashyap.desai@broadcom.com> References: <20210921184600.64427-1-kashyap.desai@broadcom.com> Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Signed-off-by: Kashyap Desai Cc: sathya.prakash@broadcom.com --- drivers/scsi/mpi3mr/mpi3mr.h | 4 ++++ drivers/scsi/mpi3mr/mpi3mr_app.c | 23 +++++++++++++++++++---- drivers/scsi/mpi3mr/mpi3mr_os.c | 2 +- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/mpi3mr/mpi3mr.h b/drivers/scsi/mpi3mr/mpi3mr.h index 289aaaec7ee2..db3de78a979c 100644 --- a/drivers/scsi/mpi3mr/mpi3mr.h +++ b/drivers/scsi/mpi3mr/mpi3mr.h @@ -953,6 +953,10 @@ void mpi3mr_stop_watchdog(struct mpi3mr_ioc *mrioc); int mpi3mr_soft_reset_handler(struct mpi3mr_ioc *mrioc, u32 reset_reason, u8 snapdump); +int mpi3mr_issue_tm(struct mpi3mr_ioc *mrioc, u8 tm_type, + u16 handle, uint lun, u16 htag, ulong timeout, + struct mpi3mr_drv_cmd *drv_cmd, + u8 *resp_code, struct scmd_priv *cmd_priv); int mpi3mr_diagfault_reset_handler(struct mpi3mr_ioc *mrioc, u32 reset_reason); void mpi3mr_ioc_disable_intr(struct mpi3mr_ioc *mrioc); diff --git a/drivers/scsi/mpi3mr/mpi3mr_app.c b/drivers/scsi/mpi3mr/mpi3mr_app.c index 0ecdf02c10c5..c45d722a7f2a 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_app.c +++ b/drivers/scsi/mpi3mr/mpi3mr_app.c @@ -931,7 +931,7 @@ static long mpi3mr_ioctl_process_mpt_cmds(struct file *file, struct mpi3_status_reply_descriptor *status_desc; struct mpi3mr_ioctl_reply_buf *ioctl_reply_buf = NULL; u8 *mpi_req = NULL, *sense_buff_k = NULL; - u8 count, bufcnt, din_cnt = 0, dout_cnt = 0, nvme_fmt; + u8 count, bufcnt, din_cnt = 0, dout_cnt = 0, nvme_fmt, resp_code; u8 erb_offset = 0xFF, reply_offset = 0xFF, sg_entries = 0; bool invalid_be = false, is_rmcb = false, is_rmrb = false; u32 tmplen; @@ -1165,10 +1165,25 @@ static long mpi3mr_ioctl_process_mpt_cmds(struct file *file, (karg.timeout * HZ)); if (!(mrioc->ioctl_cmds.state & MPI3MR_CMD_COMPLETE)) { mrioc->ioctl_cmds.is_waiting = 0; - dbgprint(mrioc, "%s command timed out\n", __func__); + if (mrioc->ioctl_cmds.state & MPI3MR_CMD_RESET) { + rval = -EAGAIN; + goto out_unlock; + } rval = -EFAULT; - mpi3mr_soft_reset_handler(mrioc, - MPI3MR_RESET_FROM_IOCTL_TIMEOUT, 1); + dbgprint(mrioc, + "%s: ioctl request timedout after %d seconds\n", + __func__, karg.timeout); + if ((mpi_header->function == MPI3_FUNCTION_NVME_ENCAPSULATED) || + (mpi_header->function == MPI3_FUNCTION_SCSI_IO)) + mpi3mr_issue_tm(mrioc, + MPI3_SCSITASKMGMT_TASKTYPE_TARGET_RESET, + mpi_header->function_dependent, 0, + MPI3MR_HOSTTAG_BLK_TMS, MPI3MR_RESETTM_TIMEOUT, + &mrioc->host_tm_cmds, &resp_code, NULL); + if (!(mrioc->ioctl_cmds.state & MPI3MR_CMD_COMPLETE) && + !(mrioc->ioctl_cmds.state & MPI3MR_CMD_RESET)) + mpi3mr_soft_reset_handler(mrioc, + MPI3MR_RESET_FROM_IOCTL_TIMEOUT, 1); goto out_unlock; } diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c index 149ba3fdfceb..c82cb3c2fe4b 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_os.c +++ b/drivers/scsi/mpi3mr/mpi3mr_os.c @@ -2606,7 +2606,7 @@ static void mpi3mr_print_response_code(struct mpi3mr_ioc *mrioc, u8 resp_code) * * Return: 0 on success, non-zero on errors */ -static int mpi3mr_issue_tm(struct mpi3mr_ioc *mrioc, u8 tm_type, +int mpi3mr_issue_tm(struct mpi3mr_ioc *mrioc, u8 tm_type, u16 handle, uint lun, u16 htag, ulong timeout, struct mpi3mr_drv_cmd *drv_cmd, u8 *resp_code, struct scmd_priv *cmd_priv)