From patchwork Wed May 19 09:49:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matt Wang X-Patchwork-Id: 12266789 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=-16.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,SPF_HELO_NONE, URIBL_BLOCKED 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 CFD4CC433ED for ; Wed, 19 May 2021 09:49:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A804460FE8 for ; Wed, 19 May 2021 09:49:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230516AbhESJvB (ORCPT ); Wed, 19 May 2021 05:51:01 -0400 Received: from mail-mw2nam10on2086.outbound.protection.outlook.com ([40.107.94.86]:57504 "EHLO NAM10-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229470AbhESJux (ORCPT ); Wed, 19 May 2021 05:50:53 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EYAbRGks0Wvz9NYRDFrGgNnhaGdb2Fc/5XQ1+pT2NIEi5auwpmAa1WStDCoQr6QXOpqi18qosw0yX1Yp5C5uu7WC3c6Tcs/CHjqv3OYUsWxi0VIcHrFRWCjNQGT4/s5iUVP/Ee9tvlyTrY93qoff0ZwxOBArXKWC/U2eKMtdqyGFMnXOGEmz/kw2BmF9J6j8Vd0mCFMGOdsF0u2/n0y7Z7OHvatxm9ePsLQV5W2Hcsiu10xbWv6qe1GbO9Oc9C2c5IvUhmajIl2BSZvMMSN12oHzt7IukLwimkix1QbrGG0W3EwxcrBQkfZImReHDXLAMgoJEagYnuzbXQzo7XL87A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bpP+dKxiLgAODHXDDdWWgWiLPRl+M7TGIaYRdb9YMaE=; b=FP3TYh3GuBckLE10ZXFE/EB1/fluTTY00+eAHeZ5L0PyJRjvtlf1uFLNIuuS0lSVPijiVzL9naVUXOsv0AzBwY13AOfoJNCW2RuTB/fc8iJ3Fbg/Dg1qxRSfaT2MvISt4VOQm+yPDFqZA2SMidqfd6PmlHCquw6aK6e2ft7eC56hwIZJbKjM7tluuQ2X/7gRoZICmf7igCVy7sfu8jPBA8e9u3pD8q8htjz6PyQxvHvwsPwzaggheUkoA2Oa0g7vEWJFRT0y64uaLXT/5zSI8wsoCcrqwg8gQgduq/utqCpD5BQKQyeJvZ5IBBF3L2Nj8+mm3Sg2u8IScVWAlq27cg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vmware.com; dmarc=pass action=none header.from=vmware.com; dkim=pass header.d=vmware.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vmware.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bpP+dKxiLgAODHXDDdWWgWiLPRl+M7TGIaYRdb9YMaE=; b=R8y4JLUuK4ieUwVry2BCJWHPGA6oBiEoHx3k5TKOu4Pm7/6Q1sOdGMQj8W9UlZ2dxU7egLcISxwjy+aESOVFPew5lyf5flv3NszZUZC67xeKF3DUCNZ2CFze128KPdxRfOvVafmASJKJXU5ghSGiDfIoyqBbbOlZwuxyLoFp6hU= Received: from SA1PR05MB8609.namprd05.prod.outlook.com (2603:10b6:806:1c2::16) by SA1PR05MB8456.namprd05.prod.outlook.com (2603:10b6:806:1db::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.11; Wed, 19 May 2021 09:49:32 +0000 Received: from SA1PR05MB8609.namprd05.prod.outlook.com ([fe80::45b5:ce95:e86d:4fe7]) by SA1PR05MB8609.namprd05.prod.outlook.com ([fe80::45b5:ce95:e86d:4fe7%6]) with mapi id 15.20.4150.019; Wed, 19 May 2021 09:49:32 +0000 From: Matt Wang To: Vishal Bhakta CC: Elaine Zhao , Pv-drivers , "linux-scsi@vger.kernel.org" Subject: [PATCH] Set correct transferred data length for PVSCSI Thread-Topic: [PATCH] Set correct transferred data length for PVSCSI Thread-Index: AQHXTJREU/9HVwM3VUiC7yNrCeCMcw== Date: Wed, 19 May 2021 09:49:32 +0000 Message-ID: <03C41093-B62E-43A2-913E-CFC92F1C70C3@vmware.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: vmware.com; dkim=none (message not signed) header.d=none;vmware.com; dmarc=none action=none header.from=vmware.com; x-originating-ip: [114.250.227.248] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 17389f2a-aeb5-4b52-847b-08d91aab6730 x-ms-traffictypediagnostic: SA1PR05MB8456: x-ld-processed: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:158; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: oPo7kjJ+R2MmQ3O/LOvrW/1C94WuORKailV1v/hy3XHVOKFIibwelGlepsCfjJi070mnpCWErv2BOsVEtGFCI/+7/f87+NEpaxbfYGtrcq2ThiwBoQKxpmcHcdZANSmrPbl1UgYneHnDF0RE38RubroWpXw9eBOimQq0468SMSOYFZGeZn6kbX25Zn2DWV2P+kBfuC3809OFMx7c+dFVyRWIT7JwrP8ge8Fa5iJWlRhE07M7DT0vMdB0HvBNR+pVZ5gOGohCY4av/p/c5tpdsOhAK95E67TTPNAV/3HyjmUnl7Ayx8+WAkwGSCZrbJTBE7G255GQzlVvUaJ7EREMiV0AH5lS3BLPfzmNz9NasE3JZUcAUmfi4We6+QAKe+dArP29yuOXRv1OCrNlxI34wrgrwBJuna64Ex0lhg6RnyYIc0rTfDffge59L8KkIj+oJn7UU4NV2Hsa9j0iWjLPOTjShXlyBMU+EoWU/s0Cle3shgnmoDdvFa4mF+DMCMx4nfKCUcZmH7ygp74TMuOoiMGLBoruk6cXcUWS2QmY4xq5+84uif+sRUooyn+DxX6vjX1umr8UkRahh6ffTLwoqhjd4RRzzx2mpkg9dA0vLs32XH5MjwHdsVF7JX45QfaHYw67G75BZyilaX7njwe85iBvxiAiSTd7KR4oYLk/KdCzYnxJ6w1gxPAlCH+zBkYY x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SA1PR05MB8609.namprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(366004)(39860400002)(376002)(136003)(346002)(316002)(2616005)(6636002)(8936002)(478600001)(6862004)(4326008)(5660300002)(36756003)(83380400001)(6486002)(6512007)(26005)(4743002)(2906002)(122000001)(186003)(8676002)(38100700002)(6506007)(71200400001)(33656002)(91956017)(37006003)(66476007)(76116006)(66446008)(64756008)(86362001)(66556008)(54906003)(66946007)(45980500001)(505234006);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: =?utf-8?q?2e2JHXl2UNh6iShQmo9PxyFdNS1Z0f?= =?utf-8?q?ea2J8jdFiv8KY9ExFKs7WXcF0xstni8fkiO1dLI48b89SR/d16zMZMni3emwXnCVh?= =?utf-8?q?ZqQcYbgCLXn1Lxe1gdBkF+tOk364PDFjxiKEwH/eXqx89n+rWUsrxbwbrzfzzON7J?= =?utf-8?q?z7x2O+kbGrCrORVVXtYFJJhK9MCjVYvz7ue8+zo/xpMagy11FCb8m05muuUpQzDiA?= =?utf-8?q?FuT8Aq3oQ82l35e+kk1k10bkz6lEB0ULs/qFscwSdfYavt3bxBi4N988HhrOOpvzy?= =?utf-8?q?7PykdN0zsKsf01BjJec7gTm5mCKJ7IsQCTLJ5QQVo6k/v3IpRfuQjvY/3jogPqUyk?= =?utf-8?q?pcKo5Yw7JeLA3nrpzyRDUwDLv7jjtLpCevUvGyFbt3wwaEienXuV5wYd/ujBhNWgZ?= =?utf-8?q?/N7G0rljmlfKRILpoGhtLMPzJIuEkkBv0iEfQ91pE9j9LUgf0JNfwA2kP95X9LmB6?= =?utf-8?q?SA2I8S2FZHePk2WfXf8kxVzQi7Ml293O2ihVCInd80d9L3OThpUkdKE2Wad73OjYr?= =?utf-8?q?xJT/B70iQV6i6n4X81fZX16wNe5phFj77PEEfxoBqflZJ4bULFC3YXg5mNAJ/eHvT?= =?utf-8?q?gGCimshyQ6vxyIa+fdLEUy20flWyMtITq2W4tPXaaHux3lIvSkPsVTqsvo86knUHd?= =?utf-8?q?ZjTsjxnyD0dUo+H+LmO5mfA6eTMnKxvCl+TLb3nlbn2jdeI38x3KRXnJaTOEHx80D?= =?utf-8?q?KbTbz9Z5tB9fiWpDk70H1yrx/Kgddh5Mw5WxnyoQx3cHu7BklQ/xLASyCe/7nFmcb?= =?utf-8?q?bb26xq/PHd4EEmr2T9XQgdNk1EBzgC6TzPlxt4KuggGWJ5Vo7UEs2xJpajolEOXKr?= =?utf-8?q?h31OukJqPbkhhaheLRNgI0jWe6JJskJHVyd/AL7HLXe9SsrGurgwLMSzKzlk2piMv?= =?utf-8?q?CO9d6bMIAc89Rn/C/ngBt1d/QnajJin1F3hCAWx1gxHilCqx+lKyOy6O8LtDf+h4K?= =?utf-8?q?i0FC4dTmqnHj6Z//T6j33XazllW+pkH6g/KIxW2p2GmT+r3fsb0bB60XeCK8iJP5I?= =?utf-8?q?NI5dccgQa8eBIhiWB5mWd51y+kWwGjd7S5rtUL52pY4Yiq0D1X+G9ghyVjWYf9UXu?= =?utf-8?q?18gXDlwjYmWWTmBbNoIMrnaFAtrkcIq8J6Q5R21ARIN5c9hsSjN4Mm9WRhbyfAfZe?= =?utf-8?q?yZWghSUb5Cl4pf6PTM4g18UFuLjjH+rqk8V/EVhk4f2RyGzJSKshNL0ozhhIQQJLC?= =?utf-8?q?13OVfkQnk5skvaXDQ80or85lpEP7tXsmDYWEEL8Hb++zg1PsyNSULSRBpU8Dkqmjt?= =?utf-8?q?4TjBVSGOCdjieK?= Content-ID: <30FDC38FB7CF6B40AA6168CAADAD2BCE@namprd05.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SA1PR05MB8609.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 17389f2a-aeb5-4b52-847b-08d91aab6730 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 May 2021 09:49:32.1493 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: CpsTY50X51zKgbLOOZDkJLdLjtI/b4EvjqeqX3kq8YWEAAJTZZqCKPBpJPC7d9f0vqqRPp+oU6IQ1iDujPACnw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR05MB8456 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Some commands like INQUIRY VPD pages may return bytes less than commands data buffer. To avoid conducting useless information, set right residual count to make upper layer aware of this. Before (INQUIRY PAGE 0xB0 with 128B buffer): sg_raw -r 128 /dev/sda 12 01 B0 00 80 00 SCSI Status: Good Received 128 bytes of data: 00 00 b0 00 3c 01 00 00 00 00 00 00 00 00 00 00 00 ...<............ 10 00 00 00 00 00 01 00 00 00 00 00 40 00 00 08 00 ...........@.... 20 80 00 00 00 00 00 00 00 00 00 20 00 00 00 00 00 .......... ..... 30 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 40 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 50 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 60 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 70 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ After: sg_raw -r 128 /dev/sda 12 01 B0 00 80 00 SCSI Status: Good Received 64 bytes of data: 00 00 b0 00 3c 01 00 00 00 00 00 00 00 00 00 00 00 ...<............ 10 00 00 00 00 00 01 00 00 00 00 00 40 00 00 08 00 ...........@.... 20 80 00 00 00 00 00 00 00 00 00 20 00 00 00 00 00 .......... ..... 30 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ……………. Signed-off-by: Matt Wang --- drivers/scsi/vmw_pvscsi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c index 8a79605d9652..73cba0ec41ae 100644 --- a/drivers/scsi/vmw_pvscsi.c +++ b/drivers/scsi/vmw_pvscsi.c @@ -585,7 +585,13 @@ static void pvscsi_complete_request(struct pvscsi_adapter *adapter, case BTSTAT_SUCCESS: case BTSTAT_LINKED_COMMAND_COMPLETED: case BTSTAT_LINKED_COMMAND_COMPLETED_WITH_FLAG: - /* If everything went fine, let's move on.. */ + /* + * If everything went fine, let's move on. + * Some commands like INQUIRY VPD pages may transfer + * less bytes than bufflen, set residual count + * correspondingly to make upper layer aware of this. + */ + scsi_set_resid(cmd, scsi_bufflen(cmd) - e->dataLen); cmd->result = (DID_OK << 16); break;