From patchwork Wed Oct 4 15:03:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 9984875 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 2A2D360291 for ; Wed, 4 Oct 2017 15:03:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1B21A28B13 for ; Wed, 4 Oct 2017 15:03:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0FDE128B18; Wed, 4 Oct 2017 15:03:32 +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.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 9455228B13 for ; Wed, 4 Oct 2017 15:03:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752203AbdJDPDb (ORCPT ); Wed, 4 Oct 2017 11:03:31 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:38743 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752440AbdJDPDa (ORCPT ); Wed, 4 Oct 2017 11:03:30 -0400 Received: by mail-wr0-f193.google.com with SMTP id f12so2227823wra.5 for ; Wed, 04 Oct 2017 08:03:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=A5BBB8iZdnmrShFSY2PvqRTDeO/T8NKaX6DVDgyAPFM=; b=JGUCqv4htsfE+cWIuUrSI+7JMqV6sLCRtpMBDNm25Bu8gdZVL7gjk5Mvp/9E67gv2v SlA0u/026mXAnVywsQIjN3e38BjN3q4SKGqHlnPdBS32bu4r8rnqjVa6xEOY7HMz2ci8 /BzXRhsztrDXqwFCbCxoiLb07VmaI1yQ4plZsKt9/naGilEWSHAeDmkctnlrUc2E2dEs DwkJB7D6Dq6COAc/NGZj3nee3tMGUpXIkxfuvMVEAqDkfrou9nDm1ytrbc8uB0r7mGQB wCjFIe6d+oNcOyx6xiJMbNanIo9Q3TbBrYP70xLiDhq2fufjYMzdNUcLvdVXJglp2MvW CJ0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=A5BBB8iZdnmrShFSY2PvqRTDeO/T8NKaX6DVDgyAPFM=; b=lRTgwekkioxlfDNfx3F2y907gtURxgdebtKTNU/C2wOO6Ho7cy295w4OxGELBQ5RDm n5Gbiz2Zetet20fwScpTYdpmhWW4gadlZfjVVGqY8pSxZNZq0TyCvm2ehrYk5drOndF/ Vb07ct3mx4gV2NPol9/wn3e115b7ApcchM4JxMqaX1dR053oF7uwDiCFh4+YrvHMvGCQ DHp1d2v6mXoIfOgzwnTJS6GbUp1Z7elzDG285kVcLZIBeMsr3j+FKVAVIkhQUlURU4F6 yBvhVyWFZOXTymogTqlb7aP7BiidHKkpRRCGrXoArF3CcCq87ZtfaRkTm0H6Y+5/bipK djzQ== X-Gm-Message-State: AMCzsaVN8tuuE3AI2rhx8nE/+sypIzOfgl5CoPM8mJzO5IkE3Rt4ZIak HPr5bWRdi7c2bOQOWWoAWMJhYlFS X-Google-Smtp-Source: AOwi7QDe/UGDZP/bLNb8rK8MM/Y18e2Z45FtviXBi86WUI4SbPKf4kDSQ53cOCqZFhJBSA/rCMojNw== X-Received: by 10.223.157.45 with SMTP id k45mr1418695wre.94.1507129408987; Wed, 04 Oct 2017 08:03:28 -0700 (PDT) Received: from orange.brq.redhat.com. (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id r1sm9620808wrr.56.2017.10.04.08.03.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Oct 2017 08:03:28 -0700 (PDT) From: Ilya Dryomov To: Christoph Hellwig Cc: "Martin K. Petersen" , Hannes Reinecke , Jens Axboe , linux-block@vger.kernel.org Subject: [PATCH v2 2/2] block: cope with WRITE ZEROES failing in blkdev_issue_zeroout() Date: Wed, 4 Oct 2017 17:03:16 +0200 Message-Id: <1507129396-20458-3-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1507129396-20458-1-git-send-email-idryomov@gmail.com> References: <1507129396-20458-1-git-send-email-idryomov@gmail.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP sd_config_write_same() ignores ->max_ws_blocks == 0 and resets it to permit trying WRITE SAME on older SCSI devices, unless ->no_write_same is set. Because REQ_OP_WRITE_ZEROES is implemented in terms of WRITE SAME, blkdev_issue_zeroout() may fail with -EREMOTEIO: $ fallocate -zn -l 1k /dev/sdg fallocate: fallocate failed: Remote I/O error $ fallocate -zn -l 1k /dev/sdg # OK $ fallocate -zn -l 1k /dev/sdg # OK The following calls succeed because sd_done() sets ->no_write_same in response to a sense that would become BLK_STS_TARGET/-EREMOTEIO, causing __blkdev_issue_zeroout() to fall back to generating ZERO_PAGE bios. This means blkdev_issue_zeroout() must cope with WRITE ZEROES failing and fall back to manually zeroing, unless BLKDEV_ZERO_NOFALLBACK is specified. For BLKDEV_ZERO_NOFALLBACK case, return -EOPNOTSUPP if sd_done() has just set ->no_write_same thus indicating lack of offload support. Fixes: c20cfc27a473 ("block: stop using blkdev_issue_write_same for zeroing") Cc: Christoph Hellwig Cc: "Martin K. Petersen" Cc: Hannes Reinecke Signed-off-by: Ilya Dryomov --- block/blk-lib.c | 41 +++++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/block/blk-lib.c b/block/blk-lib.c index 9d2ab8bba52a..17494275673e 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -321,12 +321,6 @@ static int __blkdev_issue_zero_pages(struct block_device *bdev, * Zero-fill a block range, either using hardware offload or by explicitly * writing zeroes to the device. * - * Note that this function may fail with -EOPNOTSUPP if the driver signals - * zeroing offload support, but the device fails to process the command (for - * some devices there is no non-destructive way to verify whether this - * operation is actually supported). In this case the caller should call - * retry the call to blkdev_issue_zeroout() and the fallback path will be used. - * * If a device is using logical block provisioning, the underlying space will * not be released if %flags contains BLKDEV_ZERO_NOUNMAP. * @@ -370,18 +364,45 @@ EXPORT_SYMBOL(__blkdev_issue_zeroout); int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector, sector_t nr_sects, gfp_t gfp_mask, unsigned flags) { - int ret; - struct bio *bio = NULL; + int ret = 0; + sector_t bs_mask; + struct bio *bio; struct blk_plug plug; + bool try_write_zeroes = !!bdev_write_zeroes_sectors(bdev); + + bs_mask = (bdev_logical_block_size(bdev) >> 9) - 1; + if ((sector | nr_sects) & bs_mask) + return -EINVAL; +retry: + bio = NULL; blk_start_plug(&plug); - ret = __blkdev_issue_zeroout(bdev, sector, nr_sects, gfp_mask, - &bio, flags); + if (try_write_zeroes) { + ret = __blkdev_issue_write_zeroes(bdev, sector, nr_sects, + gfp_mask, &bio, flags); + } else if (!(flags & BLKDEV_ZERO_NOFALLBACK)) { + ret = __blkdev_issue_zero_pages(bdev, sector, nr_sects, + gfp_mask, &bio); + } else if (!bdev_write_zeroes_sectors(bdev)) { + /* + * Manual zeroout is not allowed and either: + * - no zeroing offload support + * - zeroing offload support was indicated, but the device + * reported ILLEGAL REQUEST (for some devices there is no + * non-destructive way to verify whether WRITE ZEROES is + * actually supported) + */ + ret = -EOPNOTSUPP; + } if (ret == 0 && bio) { ret = submit_bio_wait(bio); bio_put(bio); } blk_finish_plug(&plug); + if (ret && try_write_zeroes) { + try_write_zeroes = false; + goto retry; + } return ret; }