From patchwork Mon Apr 24 07:51:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 9695775 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 C461D601E9 for ; Mon, 24 Apr 2017 07:51:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0EFA267EC for ; Mon, 24 Apr 2017 07:51:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A5D5926E16; Mon, 24 Apr 2017 07:51:38 +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,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham 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 3AA5B267EC for ; Mon, 24 Apr 2017 07:51:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1166254AbdDXHvh (ORCPT ); Mon, 24 Apr 2017 03:51:37 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:12707 "EHLO esa4.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1166215AbdDXHve (ORCPT ); Mon, 24 Apr 2017 03:51:34 -0400 X-IronPort-AV: E=Sophos;i="5.37,243,1488816000"; d="scan'208";a="13405415" Received: from mail-dm3nam03lp0016.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.16]) by ob1.hgst.iphmx.com with ESMTP; 24 Apr 2017 15:51:34 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=9ZI6iRQvQYVkJeBGSThTljw0AGBWB/YFyIb4+ASMsPU=; b=XRt4QPxe8irr86Fhe1Tvu5wI49Kg2v6PfKww2t8IDkxZTC7AOGy/ZcfmUj+xgkSGpddJDHM8pnz31gAqH97YlESXVSPfsUsESDvIr1EvETzDft8QMvAsd5vIVOSFXqQZqzdsg8zS2/2CJbJXuWOpFJKlZt+jEpICkU0iitCl158= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=wdc.com; Received: from washi.fujisawa.hgst.com (199.255.44.173) by CY1PR04MB1980.namprd04.prod.outlook.com (10.166.191.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.13; Mon, 24 Apr 2017 07:51:29 +0000 From: damien.lemoal@wdc.com To: linux-scsi@vger.kernel.org, "Martin K . Petersen" Cc: Bart Van Assche , Hannes Reinecke , Christoph Hellwig , Damien Le Moal Subject: [PATCH v2 2/7] sd: Improve sd_completed_bytes Date: Mon, 24 Apr 2017 16:51:10 +0900 Message-Id: <20170424075115.30337-3-damien.lemoal@wdc.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170424075115.30337-1-damien.lemoal@wdc.com> References: <20170424075115.30337-1-damien.lemoal@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.173] X-ClientProxiedBy: BN6PR1401CA0004.namprd14.prod.outlook.com (10.174.237.142) To CY1PR04MB1980.namprd04.prod.outlook.com (10.166.191.16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 40749424-1a60-409a-182a-08d48ae6b902 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:CY1PR04MB1980; X-Microsoft-Exchange-Diagnostics: 1; CY1PR04MB1980; 3:tWObTaH284A/dm9ucHh7GElnrd84P4xFwKtAWwF0niZBwDVqzGwdHlCCrbhtNe9zik2kigVjgX/aLwH2HoedqYBmBoPYIJtZqOAIRY6gcnN4UfnFCnXlkdaHOjGK5MmeWifeAtDtUeJuwP+Kf0SbqAJIfK9BogGXXEEG1ZhVLhuPpKqtlZep9BpMD/z5tj0QIzZUWuff6JjY/+sJxuKneAduqKGDzPpLQU3FmBzUsjlvu1+watkGOVOOmoiHtPJPCIw3NLf7ujq1tTaJBwx5gfnBMF3SBzKxbkq4jzBqQPikw920EWESVQIwogA9gB4Eas3nimUdKv2jljiytcdzkpTYuWE24YaJhBLBmzH5Bbc=; 25:zXB+UzRSM1rhfKuduIJmyCvaaW26AMNU2xnXV7YU0Dia2q90SQzPL+PX7XI8isU2Li9SoOFrzcc3gGuUWrGRlWSDkBt9zbt0fYOP8/DJxFKDOmoj1fLYRpez2F+cyJEa+cd6jeg4QILflkr6GZk4ss3zmJdN8X1K/prfFvOTdzut7HdpnY18v8uLP8fv+6jirZAbbxytC4owpN91EKDtmbF+X8oGWVboBECyHygVE9Lgh32LkGTkPAd7ISc8rI9Bfxaia9p63qEtsWMxX/CyaLMYr2N3Fd2pdshVU9OHSoT0KkyHIoE5pK+L+7uvCN/Sej7sP8lSlGBjssAJV2OidlRQDGUg3mw+QtZElL1TWtR9E+tuN+D3HrtCljjVlDij0RFGtO33hbHEVUS1nPG8Gnp424lvwjuiMo2uiiLDRsr4UttzKhrboIcQ9V6mKdl+1wXTUO1ORxO7Y9FwPwPjRQ== X-Microsoft-Exchange-Diagnostics: 1; CY1PR04MB1980; 31:zAsKhL/E16SZuT8smPF7ygf/JoVdtyAbvGXffdf1upoW97C9l/2KvpxskUQxU2Y2+avy2k8HwVcXZ+1q7mtkDQC8dmIrFTeGntUfFWS01hAdjV/m24JJt+UDnhHWipTMB7V3TrYGY+W4uETcyH8IUJ28zAtnBwbHMYR3k8+ovUk15VpbqyynFgIkMCx1c5KlTO3bvuYxw9V+O0eBhRVV7lFSKLAH6/B0PgpXWtiTXtMmRuz3QRHeCcMmR1kUSoQm; 20:I4XXwlRNIxFCImXB/KpUtue3qxAUD42XYkYtNT/jbjLr3l9EoOr6CsBlRk+t5cBeZgVUAnfvRdf9mULrdU0F/MITW9S2kBJrOP1L/0eKsSF4oJoDbBBdWRfYTdIWZK0Y2bBisW2W0MMNEDVVbKyIBP2bYQq0ZYt9H9m4ZdIlM2FSJX/NuDPE4KfAwsoALDGKaNZmkRFbeWG+yjqLDXLsh07w9/ZyjdPNyfxylbzri/BS50+RZBdxFVpo8kZ4BT/0+iNBjS4DRY8N8miik1iWePDAxwU5sB64qqwa2KmmhKsb/JD0OexQm2Pzh1N6I2Eu3CkC8TrJW2tHZ5+L4T9PpYHNQD/Nm/G8Lsb2ZGwYwyFga2xNeqLImjNPdfSnwMhqBCG2PaoB8huQa1oGYH2vCob7jfPu0QgnO+bD3pYGXJczYDQ4KIrQ+KIdUe5244peBmwDrdRg5U9b7oCfQJZZqDGtZrHYvV2eKLZ1fr2EN9CMIKGpBKCWXDu5JUOphs/R WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(20161123564025)(20161123560025)(20161123555025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(6072148); SRVR:CY1PR04MB1980; BCL:0; PCL:0; RULEID:; SRVR:CY1PR04MB1980; X-Microsoft-Exchange-Diagnostics: 1; CY1PR04MB1980; 4:88mi+hrtbBqD+rrQLhEpzIv70MdnXQvep103u9UhTNkost1b0KfaQWKf9FXQV6QArPTYfZNuooIKdZbG3Sd/2yOUPb+ARMHVHpGZJg9ZxD1ySQe/ek+y7pQcwvLG6vlnNFOxSiIqUKqT2TPbJABtaPKfMU+hggw0Y8XRRcjjHLwajNMvUEajIk3TbSBgUJgMJR/MLYxqBJNLTvkSyubQ3sdeQbxqc56zUr4q8uPWNzwpdiCNqIzrm0lvcxaxoYIUbBFxN+tAuPJoDQuBDRN6I5sRNjDaoxRcFEvbN/AZfHWE5ucOyxAd4RlNfKcEMlaPGC3RLEebCiXDRuht4A9Zha01H/RYcPub29WHcBadFnF45dMoGMTzkWKjDxToG0W16qj7o24acOB0YD7dZ0GJohbmIOKbsw2Ek9JveyIK94VkRdiyY/3h5o8ifH5NytPCe8d/fcpShlzh6v5vBGo4LlkYzyUc/XDRDgMDubHw6VjE+4YRD8Bw2LIsRiaLrlCI1y0HzuR27FpLVW/zdho9/88/0axIDmy5zbYGAGFOV8CvEXeQSO9jxDR20bsZRZv06EQ6GX0z6iCOIRwhloAih2PKl0QTy20vaNDM1M80SoctR4BpgUTPX4MW94xeoMifM6ppRfuAm6gEtynVJvkNJtVdB2YOxX/Bi3+7SyS3itylQJc0mvfx+JrV/jINSmgbTlkPiVHJgnJHZjHWpAM9zIby07hJce5o2STfVL0I0v4D/UM5mwLgh61MVZrvJgOfYWFX/HrbIXimMCSt02Vw2w== X-Forefront-PRVS: 0287BBA78D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(39450400003)(39840400002)(39410400002)(39850400002)(39400400002)(39860400002)(33646002)(6512007)(9686003)(6666003)(81166006)(66066001)(8676002)(76176999)(7736002)(50986999)(305945005)(189998001)(50466002)(42186005)(6486002)(2950100002)(6916009)(47776003)(48376002)(54906002)(4326008)(2906002)(38730400002)(110136004)(5003940100001)(53936002)(25786009)(36756003)(86362001)(50226002)(1076002)(6116002)(3846002)(5660300001)(85782001)(85772001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR04MB1980; H:washi.fujisawa.hgst.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR04MB1980; 23:cnypjHVmQUgVhbZSrVvUaWKQgPLQHaQW4kLN3pdTR?= =?us-ascii?Q?2t7z2G7WFAY3bBWihDsbERBXUrAQvvDbROmWTGL3C4NoZKCF1s7VLcP9bVpu?= =?us-ascii?Q?6eLqxIZywSItLVs1YrUYbmhEtsG2sJvr1MweZraxS4pP9oxnM0ZkTPkmcaLu?= =?us-ascii?Q?cBl7vQYLZj9TpTM/plJDh0By5OM8FbJ6lH6Aar/+D4SjaFR8KDuHcGj6mF8t?= =?us-ascii?Q?Oskm9UOVdOrYHQwiCjir0nnOq6uoPnJqIe1oAq+66BOtdTTzJG/WkWWKyWVR?= =?us-ascii?Q?AewSMNLq7j7Ds2FBf3MqWbCcRGH4rVhnp4hCsYy1hHVik032rBDr5xuR+2q7?= =?us-ascii?Q?NTFssq23TdT7wMGHdIFDK6p63UV3b1EtfpEwbKYAzJZ6ZM3yJXIhUQekHzgP?= =?us-ascii?Q?DZ3VsSwDqL4l45892fMURpr5e6LOKrkyJ0S6n4o5DPcpN/LMluFICfeO0tiQ?= =?us-ascii?Q?UsTfDVn5LLkABtcJR7vYvlN8HPmqA7nlGDUFdSaglX/GH/BonRlWGrTSSgeC?= =?us-ascii?Q?0kZPJbCEsC4EdQNspTAEprPc7tFzrQ6+gFgG06HGWKvFeBiW6KGyYxDmnPRs?= =?us-ascii?Q?r7qb4Mpfg5uwKvP0c4XxSohp+h8mXd/KgqkCvUMjJ1EFokKfj2vR4MWNVaci?= =?us-ascii?Q?vFO/h4ZzBL+hhqqhxhPRmimzQkTuSvV12vfzoPJ8EA3R80e4iLhcuVfeLvM+?= =?us-ascii?Q?wQWjlYjvbv3hsRN06gMauaobNwJZipK6g7zgncHhw+TBJYg8wGOTZNDiiU1t?= =?us-ascii?Q?xSixsSin11/Ber+1XKc2Ke1hw6yR5iNFk7r0aEFMA76Hlve7gIClIw6U7SHJ?= =?us-ascii?Q?+61IofkYFhGG9IXQmmvQp3I+lIaEfc3uO5pTB26Hr+OrhopVI7gGxpuqTKbj?= =?us-ascii?Q?TxE05CHfyOpk+AH2heZi9drBObVJYSExMtGcdIxsOxWtiNSqHRMmbQ4noDul?= =?us-ascii?Q?oz9qq3EYnHpwA6WtdsXzVaVGFQ+58LlcwXevPLJQEYR8GWkxBasc40SVV1r7?= =?us-ascii?Q?NCzV5gn3tPIOZvqWD1x7avVp9PxhOAPsHxr6TJC7GBjfVc1UfsERXMiEwtbS?= =?us-ascii?Q?VDHCcBkOa05Wn+6K+VJNZFsAsulyn9tJkGJ0eHJ1sj7LqdfvW9YeTJP3eFNH?= =?us-ascii?Q?jz0IxaiTR8=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR04MB1980; 6:dNyMlCkompBQHtebzh2UCLzjO+aMx3vOk8W3kJ7sETos+fRxZ9jk1Qp5QjYJKySh88sZ2R4U6Uwj4OpsakkyDBv31usd0/x7JsxRiMTPj9HpikiiskFN3IyyWO+RW5+YH3gI6wwzOPSczCMlg6qKrbEYbH07A65/NfnTq/z4Q+PjtaDfPLdb4ZKc7d6Mj7Qw9FFUyNEaUHwRebsuOLCQcBK04INbFOArOLtivOlhslG4oMerB0r3YrmOsgk6/lqbBA42nAFAcA3CFozNX7ICHA2ppMq7xvTAtPptCngjOL10a2mz6KZtho0RbP2wCNs4szsmQXsOo32kBD9u0JAM0k+5qaz7Fh4/P5fA8OmxNZbpjwuYIAWuT0rI+VVXRUfOQM9DOUkbZllNYF+axYOVwdmDEjxS187ZNxVtGHmNA4HglI0SNNktzXzDO/9B/QWUOmh2almokLBISxss5zWIIm5rKHfjv6ZQpFk1UGTSGpc+JI4vjYFNrviiaGAjtTVk/bO+Y59ROBKkbzZvrxa6zmgbw8BXpGKaINLsLZYU/z8=; 5:sCFjGpNCTLKNgAd+9F9BoCrsOxOg+oCG5lTKUwyCbop7xeiJFqotTK7xaZRcp9tZSVBhbmiZyfo34o3fS3HuyPsGOxZ5yyby/qxMocvlyKwSjUKKZeYeE6RNS6QeeAcCPpow9axoGC2o9kJMaghy7Q==; 24:j3NIgbozlSvwbRNiyoDaYhNy99JJUXkccPFV4gSATmMysdBy+vQTKttRiK0VheM8C+RtOQo5Dzw4UUJIqdGrutbvgPP7jD3BOGVxmcmZbU0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR04MB1980; 7:HZsEwEh1P3gtbnEW+nxpqMtUKzLgU+WFaFeLshuyDTp8lS7bJA80I2ED0Ky0D/EP5Q1SnpbEw6wEN15syS7lVsaKBMaPWKKSorpEYZN6dYB+IOoDe+yVPx6xjBDpDSy7EQC1gGaVysaUqucvBxbiR7DkOcTvtifdTiyQWfJAEqQ1AOGPmro3bBxjFu9PpBPqIluiAdhDSfubCNvSCmSwK+V7SJouBpvb0LiAGLZurH4R/W4OtzcBitvtO8geLf9edKlLxBsAXnz08h6Cdn++yZwXJuOeMaAHyfOtLYoyjPobQdkXwZJaZo87lkpkg8GYEqvAL8f5F0aWkfGcAZl8wA==; 20:TsM9O3Wk0hBuyJ0BVEvlGYEDA7omula8E3OZO8jTzh9FJ75Xb7hWSvGGZjd7O79Y/VONObm4SI8j0+n90y8vuXflvZ9BEOQaS2/E0gnRYrT3ERTX1MjFaiMfV6tLHfyelLmlqhUWxvTnCrF8+A+b5PWIdPB1Bgq0YeaYOUo5YXc= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2017 07:51:29.5928 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR04MB1980 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: Damien Le Moal Re-shuffle the code to be more efficient by not initializing variables upfront (i.e. do it only when necessary). Also replace the do_div calls with calls to sectors_to_logical(). No functional change is introduced by this patch. Signed-off-by: Damien Le Moal Reviewed-by: Christoph Hellwig --- drivers/scsi/sd.c | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index ce62d2c..10c7657 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -1758,41 +1758,45 @@ static int sd_eh_action(struct scsi_cmnd *scmd, int eh_disp) static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd) { - u64 start_lba = blk_rq_pos(scmd->request); - u64 end_lba = blk_rq_pos(scmd->request) + (scsi_bufflen(scmd) / 512); - u64 factor = scmd->device->sector_size / 512; - u64 bad_lba; - int info_valid; + struct request *req = scmd->request; + struct scsi_device *sdev = scmd->device; + unsigned int transferred, good_bytes; + u64 start_lba, end_lba, bad_lba; + /* - * resid is optional but mostly filled in. When it's unused, - * its value is zero, so we assume the whole buffer transferred + * Some commands have a payload smaller than the device logical + * block size (e.g. INQUIRY on a 4K disk). */ - unsigned int transferred = scsi_bufflen(scmd) - scsi_get_resid(scmd); - unsigned int good_bytes; - - info_valid = scsi_get_sense_info_fld(scmd->sense_buffer, - SCSI_SENSE_BUFFERSIZE, - &bad_lba); - if (!info_valid) + if (scsi_bufflen(scmd) <= sdev->sector_size) return 0; - if (scsi_bufflen(scmd) <= scmd->device->sector_size) + /* Check if we have a 'bad_lba' information */ + if (!scsi_get_sense_info_fld(scmd->sense_buffer, + SCSI_SENSE_BUFFERSIZE, + &bad_lba)) return 0; - /* be careful ... don't want any overflows */ - do_div(start_lba, factor); - do_div(end_lba, factor); - - /* The bad lba was reported incorrectly, we have no idea where + /* + * If the bad lba was reported incorrectly, we have no idea where * the error is. */ - if (bad_lba < start_lba || bad_lba >= end_lba) + start_lba = sectors_to_logical(sdev, blk_rq_pos(req)); + end_lba = sectors_to_logical(sdev, + blk_rq_pos(req) + (scsi_bufflen(scmd) >> 9)); + if (bad_lba < start_lba || bad_lba >= end_lba) return 0; + /* + * resid is optional but mostly filled in. When it's unused, + * its value is zero, so we assume the whole buffer transferred + */ + transferred = scsi_bufflen(scmd) - scsi_get_resid(scmd); + /* This computation should always be done in terms of * the resolution of the device's medium. */ - good_bytes = (bad_lba - start_lba) * scmd->device->sector_size; + good_bytes = logical_to_bytes(sdev, bad_lba - start_lba); + return min(good_bytes, transferred); }