From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 49AEEC43218 for ; Sat, 27 Apr 2019 01:44:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0FE89208CB for ; Sat, 27 Apr 2019 01:44:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556329468; bh=3fLqq164CDK6svTzsAMlRv0UIUiCywoc7a3q20ijcu8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=I6nLrHGzETcJBae6Ea1I8qMfw7yUv7ZJSeKJg2do3lzAhtCO1d0SIrm40F3d6GlWD EAFnmy4PwOyIHKUagmos1ckbirQCXcYKUe7AW4SM8o4P7QoLrKhoaZcXpMJuhmHiOo wlnge/BhOro2oskNSpF/boT+5ho8Kqs/Qsqz7GeU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729014AbfD0Bo0 (ORCPT ); Fri, 26 Apr 2019 21:44:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:48762 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728958AbfD0BoX (ORCPT ); Fri, 26 Apr 2019 21:44:23 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5B9F421537; Sat, 27 Apr 2019 01:44:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556329463; bh=3fLqq164CDK6svTzsAMlRv0UIUiCywoc7a3q20ijcu8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SqLmFQ4gpA90VrwNnAHoUBxI7RFh6wY+RMvWZjLiA4q7SRbrA3xNm0CyWhh1d/nLx sAeqKFwLYMpxSV4lQdGPny14FL3hTz8bTNgmlZRBtdJZj/lF00eAHpG1h4yaHv8Z+h tdfD7j2QAKKLtMeDieEDz7PQkjl/aXdB4qmCtbR8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Varun Prakash , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 3.18 6/8] scsi: csiostor: fix missing data copy in csio_scsi_err_handler() Date: Fri, 26 Apr 2019 21:44:09 -0400 Message-Id: <20190427014412.9091-6-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190427014412.9091-1-sashal@kernel.org> References: <20190427014412.9091-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Varun Prakash [ Upstream commit 5c2442fd78998af60e13aba506d103f7f43f8701 ] If scsi cmd sglist is not suitable for DDP then csiostor driver uses preallocated buffers for DDP, because of this data copy is required from DDP buffer to scsi cmd sglist before calling ->scsi_done(). Signed-off-by: Varun Prakash Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/csiostor/csio_scsi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c index 86103c8475d8..fbb2052bc412 100644 --- a/drivers/scsi/csiostor/csio_scsi.c +++ b/drivers/scsi/csiostor/csio_scsi.c @@ -1737,8 +1737,11 @@ csio_scsi_err_handler(struct csio_hw *hw, struct csio_ioreq *req) } out: - if (req->nsge > 0) + if (req->nsge > 0) { scsi_dma_unmap(cmnd); + if (req->dcopy && (host_status == DID_OK)) + host_status = csio_scsi_copy_to_sgl(hw, req); + } cmnd->result = (((host_status) << 16) | scsi_status); cmnd->scsi_done(cmnd); -- 2.19.1