From patchwork Thu Dec 15 02:46:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kys@exchange.microsoft.com X-Patchwork-Id: 9475237 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2A54060825 for ; Thu, 15 Dec 2016 00:51:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C89328680 for ; Thu, 15 Dec 2016 00:51:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1066F286E5; Thu, 15 Dec 2016 00:51:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9108228680 for ; Thu, 15 Dec 2016 00:51:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754596AbcLOAuj (ORCPT ); Wed, 14 Dec 2016 19:50:39 -0500 Received: from p3plsmtps2ded03.prod.phx3.secureserver.net ([208.109.80.60]:45394 "EHLO p3plsmtps2ded03.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934580AbcLOAuY (ORCPT ); Wed, 14 Dec 2016 19:50:24 -0500 Received: from linuxonhyperv.com ([72.167.245.219]) by : HOSTING RELAY : with SMTP id HKEbce4ac9h5sHKEccLRxZ; Wed, 14 Dec 2016 17:49:23 -0700 x-originating-ip: 72.167.245.219 Received: by linuxonhyperv.com (Postfix, from userid 507) id 51B26190327; Wed, 14 Dec 2016 18:46:04 -0800 (PST) From: kys@exchange.microsoft.com To: linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, ohering@suse.com, linux-scsi@vger.kernel.org, apw@canonical.com, vkuznets@redhat.com, jasowang@redhat.com, martin.petersen@oracle.com, hare@suse.de, James.Bottomley@HansenPartnership.com Cc: Long Li , "K. Y. Srinivasan" , Subject: [PATCH 6/6] storvsc: properly set residual data length on errors Date: Wed, 14 Dec 2016 18:46:03 -0800 Message-Id: <1481769963-2069-6-git-send-email-kys@exchange.microsoft.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1481769963-2069-1-git-send-email-kys@exchange.microsoft.com> References: <1481769928-2026-1-git-send-email-kys@exchange.microsoft.com> <1481769963-2069-1-git-send-email-kys@exchange.microsoft.com> Reply-To: kys@microsoft.com X-CMAE-Envelope: MS4wfPag6oauIcII/RGRfvmRW+kS0z098Ruc64qIyBByQLx3Kl3WE6NfHTVbczyF/mqN9/OGMyTKjBqAtW4p/o5dldGeDTD1s+nhCTm+IjKyln1AQeyG4Fpy ZIXCTUq+HKOqkTAmI/rWLLdBvyegfNhAkLfd272Mn441yCZbZU+7dECD2FPRWliSZ26ZMK6YqY4yT/KfUpdR2MVooW4Aj2uCnArqfo0UHKOFl5nl+I57xWKL yQlJuJFE9bAnVXWDfGtFfQRqIb6xjx6fp4obBQhbopV3o1hJU9T87JMm50wuqJ4/gy7+pkjxdy9aVWoc4zqjLra4DLEQQUx1tu4+N7DJNKP6nlAYePIqXTnE dQOuMYD2XfLTiWoX4F9TqSNIrtOFSJk21+zwfU5y77fsR0vNFjsJr4Hp6v969cS5s91gKlYifwyu7QxHXRpi2RDFNOEX+SIM3SJMSp6w+T3HLkP79PQZObZa 1LfYXNjxQb99/Klqn6zEg+491uhKpcN2UIUYaFRSEjpyZn3XRzQNMTIWKAmvB6LUNpR7tXCs9W++V8AvGtrklzXmUOEfe79oNbMm6vbSaVkKapiWbL8Jc0FG xLxiiB3sQDBV0v5QrI1vbxse Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Long Li On I/O errors, the Windows driver doesn't set data_transfer_length on error conditions other than SRB_STATUS_DATA_OVERRUN. In these cases we need to set data_transfer_length to 0, indicating there is no data transferred. On SRB_STATUS_DATA_OVERRUN, data_transfer_length is set by the Windows driver to the actual data transferred. Reported-by: Shiva Krishna Signed-off-by: Long Li Reviewed-by: K. Y. Srinivasan Signed-off-by: K. Y. Srinivasan Cc: --- drivers/scsi/storvsc_drv.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c index 3c92dc2..888e16e 100644 --- a/drivers/scsi/storvsc_drv.c +++ b/drivers/scsi/storvsc_drv.c @@ -377,6 +377,7 @@ enum storvsc_request_type { #define SRB_STATUS_SUCCESS 0x01 #define SRB_STATUS_ABORTED 0x02 #define SRB_STATUS_ERROR 0x04 +#define SRB_STATUS_DATA_OVERRUN 0x12 #define SRB_STATUS(status) \ (status & ~(SRB_STATUS_AUTOSENSE_VALID | SRB_STATUS_QUEUE_FROZEN)) @@ -996,6 +997,7 @@ static void storvsc_command_completion(struct storvsc_cmd_request *cmd_request, struct scsi_cmnd *scmnd = cmd_request->cmd; struct scsi_sense_hdr sense_hdr; struct vmscsi_request *vm_srb; + u32 data_transfer_length; struct Scsi_Host *host; u32 payload_sz = cmd_request->payload_sz; void *payload = cmd_request->payload; @@ -1003,6 +1005,7 @@ static void storvsc_command_completion(struct storvsc_cmd_request *cmd_request, host = stor_dev->host; vm_srb = &cmd_request->vstor_packet.vm_srb; + data_transfer_length = vm_srb->data_transfer_length; scmnd->result = vm_srb->scsi_status; @@ -1016,13 +1019,20 @@ static void storvsc_command_completion(struct storvsc_cmd_request *cmd_request, &sense_hdr); } - if (vm_srb->srb_status != SRB_STATUS_SUCCESS) + if (vm_srb->srb_status != SRB_STATUS_SUCCESS) { storvsc_handle_error(vm_srb, scmnd, host, sense_hdr.asc, sense_hdr.ascq); + /* + * The Windows driver set data_transfer_length on + * SRB_STATUS_DATA_OVERRUN. On other errors, this value + * is untouched. In these cases we set it to 0. + */ + if (vm_srb->srb_status != SRB_STATUS_DATA_OVERRUN) + data_transfer_length = 0; + } scsi_set_resid(scmnd, - cmd_request->payload->range.len - - vm_srb->data_transfer_length); + cmd_request->payload->range.len - data_transfer_length); scmnd->scsi_done(scmnd);