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 5A365C43218 for ; Sat, 27 Apr 2019 01:45:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 251F4215EA for ; Sat, 27 Apr 2019 01:45:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556329515; bh=tKn4AUdtoPl3Mzelmn2vZiOws0MMHvT705n0+j6uPWs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bJCzmMV4T1p3q+A52kVejEDMujCdCq8cN9Sapzjb3tfSRXDVRJadX5BpXPv9VY1A5 gqgWFTM5Wmz6a8uoWwJ10n25B/D/sdrAbR68vMNZuPYUmWke2vVSPl72r9h1yHCEz4 r3ev60hf6gGzkAU2mgLQugjStjeYBSiqgaWyFRho= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728380AbfD0BpO (ORCPT ); Fri, 26 Apr 2019 21:45:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:48486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728940AbfD0BoJ (ORCPT ); Fri, 26 Apr 2019 21:44:09 -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 A95BC215EA; Sat, 27 Apr 2019 01:44:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556329448; bh=tKn4AUdtoPl3Mzelmn2vZiOws0MMHvT705n0+j6uPWs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WXzhBVkV4m6bFxev9dhHr7/IzXrfxE3eQ7SDLeADz5eaF6y/FRFo3R0nmfgxZhwni Q+KTsG7h7E9P2/Ngre7sxWhX3V/TsV+onueHWdX7RdhJAZVis1pzoHc3tjc4nAtXsf lrjmBI+ONtGDcrvmVGwF5aSA/GgszMdjl+MpqJdk= 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 4.4 7/9] scsi: csiostor: fix missing data copy in csio_scsi_err_handler() Date: Fri, 26 Apr 2019 21:43:52 -0400 Message-Id: <20190427014356.8940-7-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190427014356.8940-1-sashal@kernel.org> References: <20190427014356.8940-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 c2a6f9f29427..ddbdaade654d 100644 --- a/drivers/scsi/csiostor/csio_scsi.c +++ b/drivers/scsi/csiostor/csio_scsi.c @@ -1713,8 +1713,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