From patchwork Thu Nov 14 23:50:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evan Green X-Patchwork-Id: 11244587 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B717C17E6 for ; Thu, 14 Nov 2019 23:50:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 973AB20725 for ; Thu, 14 Nov 2019 23:50:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="khW/Eiyt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727186AbfKNXub (ORCPT ); Thu, 14 Nov 2019 18:50:31 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:36327 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727152AbfKNXub (ORCPT ); Thu, 14 Nov 2019 18:50:31 -0500 Received: by mail-pl1-f195.google.com with SMTP id d7so3407809pls.3 for ; Thu, 14 Nov 2019 15:50:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xiAHPGc8Aj14Y5MdGFh9g/Het9kcprPusIL8MfH+JWo=; b=khW/Eiyte9ISt39PSZD+XyzsM8rumPfd6TQnOUOJhx0OMJAUC7Xvoinrf6RwwC+E9x KqvvKr9k0zjwX8wthQowSXO1EvojyovYbatrMlfGDM50J1UJ1bu2U/VIkyBkfXm+QHZH DUehIhiBlRTqy2NNG8NuZIk759/RsT4IDPWA4= 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:mime-version:content-transfer-encoding; bh=xiAHPGc8Aj14Y5MdGFh9g/Het9kcprPusIL8MfH+JWo=; b=BwuYh9IBuZ4CZKwVvM7SbHA/uEoQtqoAMmPtWkAeYzWzMhx3OTa+QWcJYpuSFeKsxM V2koIqqt7WO2aKPkpDpKCxnM/7/83oUlzY83rdPiZYT34E+hFhe0GoG+Cg9mQ2n2PK8U 11njoVh2idrk1ekpnqfkssl2/FrmwWcfE5h+hhczoofrk4qEz0rcFwldEMaji+/hhB3g 9GZ5Bn1sYizYc+7VLl2kKFAivwnl2w+HHHCzxOl8pbvZ+qnIsmtFo5txF8ayYhtdkBVq HTdDCDmto1e1QwJkoQDrdHrCAbYJgU0MzB3FZYAUhfk/C4yhzvlxRjS8oqMID0xTfcRr qCXA== X-Gm-Message-State: APjAAAX6ZRRa61WUxcbk0FbQS/TBGkDkISIvSDbKPNWZTJE/HI+RBv2d jqqtDuAFgsOja90mHPjoxBCo4A== X-Google-Smtp-Source: APXvYqyYi/SRj9gi6E7CV6msdyJoApX9Kf2sO6Ltr9WIuThT6DUA6wqm/Tylvd5TtFCqMKsxJkcYpw== X-Received: by 2002:a17:902:9a8e:: with SMTP id w14mr12617831plp.215.1573775430712; Thu, 14 Nov 2019 15:50:30 -0800 (PST) Received: from evgreen2.mtv.corp.google.com ([2620:15c:202:201:ffda:7716:9afc:1301]) by smtp.gmail.com with ESMTPSA id v63sm7904458pfb.181.2019.11.14.15.50.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Nov 2019 15:50:30 -0800 (PST) From: Evan Green To: Jens Axboe , Martin K Petersen Cc: Gwendal Grignou , Christoph Hellwig , Ming Lei , "Darrick J . Wong" , Alexis Savery , Douglas Anderson , Bart Van Assche , Evan Green , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 1/2] loop: Report EOPNOTSUPP properly Date: Thu, 14 Nov 2019 15:50:07 -0800 Message-Id: <20191114154903.v7.1.I0b2734bafaa1bd6831dec49cdb4730d04be60fc8@changeid> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191114235008.185111-1-evgreen@chromium.org> References: <20191114235008.185111-1-evgreen@chromium.org> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Properly plumb out EOPNOTSUPP from loop driver operations, which may get returned when for instance a discard operation is attempted but not supported by the underlying block device. Before this change, everything was reported in the log as an I/O error, which is scary and not helpful in debugging. Signed-off-by: Evan Green Reviewed-by: Gwendal Grignou Reviewed-by: Bart Van Assche --- Changes in v7: - Use errno_to_blk_status() (Christoph) Changes in v6: - Updated tags Changes in v5: None Changes in v4: None Changes in v3: - Updated tags Changes in v2: - Unnested error if statement (Bart) drivers/block/loop.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index ef6e251857c8..6a9fe1f9fe84 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -461,7 +461,7 @@ static void lo_complete_rq(struct request *rq) if (!cmd->use_aio || cmd->ret < 0 || cmd->ret == blk_rq_bytes(rq) || req_op(rq) != REQ_OP_READ) { if (cmd->ret < 0) - ret = BLK_STS_IOERR; + ret = errno_to_blk_status(cmd->ret); goto end_io; } @@ -1950,7 +1950,10 @@ static void loop_handle_cmd(struct loop_cmd *cmd) failed: /* complete non-aio request */ if (!cmd->use_aio || ret) { - cmd->ret = ret ? -EIO : 0; + if (ret == -EOPNOTSUPP) + cmd->ret = ret; + else + cmd->ret = ret ? -EIO : 0; blk_mq_complete_request(rq); } } From patchwork Thu Nov 14 23:50:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evan Green X-Patchwork-Id: 11244589 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6DBE313BD for ; Thu, 14 Nov 2019 23:50:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 45D2C20725 for ; Thu, 14 Nov 2019 23:50:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="L9a4l7NP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726767AbfKNXuk (ORCPT ); Thu, 14 Nov 2019 18:50:40 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:43195 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727222AbfKNXuk (ORCPT ); Thu, 14 Nov 2019 18:50:40 -0500 Received: by mail-pg1-f194.google.com with SMTP id l24so4777114pgh.10 for ; Thu, 14 Nov 2019 15:50:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3xLmV31uV8sM4q8H6KSowg3F9gbdl9L8XRHqhlyar5o=; b=L9a4l7NPquiUXQMobq4Dez8ZdS8/Czp02wJHySZBb3K6sNPls2tY42E7ruHtIfh2xr L8nurcUTaVZ8dRdBgXD3BJXmN253Z1asF35HHGVjECqF04SsSUF1X2QdKYYs1/PUXbxJ erq4OSjRdw9Z2+8Z+d46CvuzDPxhEt4f68nvY= 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:mime-version:content-transfer-encoding; bh=3xLmV31uV8sM4q8H6KSowg3F9gbdl9L8XRHqhlyar5o=; b=TaGKLzRxQiEuqrRkgugkB9QzixT5SFBsNvPmMdMVNo4UwcbNkMsrU0nwWlMAhxsAr/ 8tPNos/7KtWJdF7VZy18YqcUyBIz6uJSQrnJAbZxYgJKHiMX3XcNHLjR+3tnAyIjY0En LdtHdFy9wZei8PhiYJiIXUdi1QLdKUrS/td16se3BT2JPeWJ+cJmQv0YUWlf8YyXWHGX 1+fKsrdOfosTBuDWWqOigAD7+tFHPIaRdwWIIEbb3BKgBwjsNePOmZKJrulUjJTc/8iv GZfQvp9fWD1uQclUZc0DuGT5d1RtVk+ar3NarWxb2s4SUsKSPypLR9TdOA/KWDxdJF/B nCwQ== X-Gm-Message-State: APjAAAXDQtN/ccrrnSxCBlfrMOvZlW7S6mrUbE29dhVtyaI+nVL5pPVq Uwe5sz/Uwxi6uqcuSfDo9pkuiA== X-Google-Smtp-Source: APXvYqx/CkE8kDEbnpvc/CMHWAp1Q3s8BWqQN6XolX6NapCaW+yRtjLdNapPsB5aJiq/tjRdLabCKA== X-Received: by 2002:aa7:8dd0:: with SMTP id j16mr13544458pfr.58.1573775437840; Thu, 14 Nov 2019 15:50:37 -0800 (PST) Received: from evgreen2.mtv.corp.google.com ([2620:15c:202:201:ffda:7716:9afc:1301]) by smtp.gmail.com with ESMTPSA id v63sm7904458pfb.181.2019.11.14.15.50.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Nov 2019 15:50:37 -0800 (PST) From: Evan Green To: Jens Axboe , Martin K Petersen Cc: Gwendal Grignou , Christoph Hellwig , Ming Lei , "Darrick J . Wong" , Alexis Savery , Douglas Anderson , Bart Van Assche , Evan Green , Chaitanya Kulkarni , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 2/2] loop: Better discard support for block devices Date: Thu, 14 Nov 2019 15:50:08 -0800 Message-Id: <20191114154903.v7.2.I4d476bddbf41a61422ad51502f4361e237d60ad4@changeid> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191114235008.185111-1-evgreen@chromium.org> References: <20191114235008.185111-1-evgreen@chromium.org> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org If the backing device for a loop device is itself a block device, then mirror the "write zeroes" capabilities of the underlying block device into the loop device. Copy this capability into both max_write_zeroes_sectors and max_discard_sectors of the loop device. The reason for this is that REQ_OP_DISCARD on a loop device translates into blkdev_issue_zeroout(), rather than blkdev_issue_discard(). This presents a consistent interface for loop devices (that discarded data is zeroed), regardless of the backing device type of the loop device. There should be no behavior change for loop devices backed by regular files. This change fixes blktest block/003, and removes an extraneous error print in block/013 when testing on a loop device backed by a block device that does not support discard. Signed-off-by: Evan Green Reviewed-by: Gwendal Grignou Reviewed-by: Chaitanya Kulkarni --- Changes in v7: - Rebase on top of Darrick's patch - Tweak opening line of commit description (Darrick) Changes in v6: None Changes in v5: - Don't mirror discard if lo_encrypt_key_size is non-zero (Gwendal) Changes in v4: - Mirror blkdev's write_zeroes into loopdev's discard_sectors. Changes in v3: - Updated commit description Changes in v2: None drivers/block/loop.c | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 6a9fe1f9fe84..e8f23e4b78f7 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -427,11 +427,12 @@ static int lo_fallocate(struct loop_device *lo, struct request *rq, loff_t pos, * information. */ struct file *file = lo->lo_backing_file; + struct request_queue *q = lo->lo_queue; int ret; mode |= FALLOC_FL_KEEP_SIZE; - if ((!file->f_op->fallocate) || lo->lo_encrypt_key_size) { + if (!blk_queue_discard(q)) { ret = -EOPNOTSUPP; goto out; } @@ -862,6 +863,21 @@ static void loop_config_discard(struct loop_device *lo) struct file *file = lo->lo_backing_file; struct inode *inode = file->f_mapping->host; struct request_queue *q = lo->lo_queue; + struct request_queue *backingq; + + /* + * If the backing device is a block device, mirror its zeroing + * capability. REQ_OP_DISCARD translates to a zero-out even when backed + * by block devices to keep consistent behavior with file-backed loop + * devices. + */ + if (S_ISBLK(inode->i_mode) && !lo->lo_encrypt_key_size) { + backingq = bdev_get_queue(inode->i_bdev); + blk_queue_max_discard_sectors(q, + backingq->limits.max_write_zeroes_sectors); + + blk_queue_max_write_zeroes_sectors(q, + backingq->limits.max_write_zeroes_sectors); /* * We use punch hole to reclaim the free space used by the @@ -869,22 +885,24 @@ static void loop_config_discard(struct loop_device *lo) * encryption is enabled, because it may give an attacker * useful information. */ - if ((!file->f_op->fallocate) || - lo->lo_encrypt_key_size) { + } else if ((!file->f_op->fallocate) || lo->lo_encrypt_key_size) { q->limits.discard_granularity = 0; q->limits.discard_alignment = 0; blk_queue_max_discard_sectors(q, 0); blk_queue_max_write_zeroes_sectors(q, 0); - blk_queue_flag_clear(QUEUE_FLAG_DISCARD, q); - return; - } - q->limits.discard_granularity = inode->i_sb->s_blocksize; - q->limits.discard_alignment = 0; + } else { + q->limits.discard_granularity = inode->i_sb->s_blocksize; + q->limits.discard_alignment = 0; - blk_queue_max_discard_sectors(q, UINT_MAX >> 9); - blk_queue_max_write_zeroes_sectors(q, UINT_MAX >> 9); - blk_queue_flag_set(QUEUE_FLAG_DISCARD, q); + blk_queue_max_discard_sectors(q, UINT_MAX >> 9); + blk_queue_max_write_zeroes_sectors(q, UINT_MAX >> 9); + } + + if (q->limits.max_write_zeroes_sectors) + blk_queue_flag_set(QUEUE_FLAG_DISCARD, q); + else + blk_queue_flag_clear(QUEUE_FLAG_DISCARD, q); } static void loop_unprepare_queue(struct loop_device *lo)