Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp2292968ybc; Wed, 20 Nov 2019 11:49:37 -0800 (PST) X-Google-Smtp-Source: APXvYqwIvF5gXtd2LF80TwqF0rp+VRK0Fe7GSkvnnOkSpFBszpe44ZNZjtWGZkFZqRHuDFjESFET X-Received: by 2002:a17:906:4bd7:: with SMTP id x23mr7378301ejv.245.1574279377822; Wed, 20 Nov 2019 11:49:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574279377; cv=none; d=google.com; s=arc-20160816; b=zCM/eQ8VL0e8fL93yIDIOFI2jkXn+IYEkS6DbDi5fVnAdvT4+D0FZi31l0yOp5dfKc FTEH4lIn3qc6YNLjZP9YKUfycqtGKM7ITMczvdZf7b/Av4zbYdfsCOC7m+oYEjDILK8a Qr8qkWUg80PTnVhdlqDti7O3Taxtc7xava/S1KYi5UwEN4NH9WOD9Ie+qTJnvxaod+Lt CgwP1W19pJgYaIg0by1jwiOcCCr4PcvJozTQ5TgXk7US0TKYNBYQFeGZKHr91/iY3KTu NfwDv7m9dfH1iq10hWqsq5sFCns82IEEDrJfxykD5aiqwbMN9edsGLBqccLpTZgchySG 2odA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=sEesESEYpLIlatJUbLqzdyEqW5b7T2dYR2CSmmTIChk=; b=wzAqBo3G6nt9XmMFe9n9GRnSRwfO+NsO6B6lkCeCrAE38KC6+I64OGybONMLHWBTLc eAsOi4jDG/lg8+LAP1jPK27pzFwCn9JDHb8K/KtkHV3pLstFpI9zlEABnRUWa67wvRa1 +SJ4KqlaTUx22/YMHbPh6hsE9hZ/a7HF+mceMRPQm4ukm+Vked6YdPPjUpquwYwSukbm a3rRZH6SDuES9hzPZiywKA2ACJb9qXnIo0aljLEYa9zAVo0bV91DiYYyky8c73BKVNw6 l+zmQ4GXhLo3tdI9xx36vE00rLKMD1n/K/+Kr6zmw0HYzq+axDkPn08EQtovKCobDYct Ha6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2019-08-05 header.b=JVnKJLYE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i13si51754ejj.367.2019.11.20.11.49.13; Wed, 20 Nov 2019 11:49:37 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2019-08-05 header.b=JVnKJLYE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727615AbfKTTpZ (ORCPT + 99 others); Wed, 20 Nov 2019 14:45:25 -0500 Received: from aserp2120.oracle.com ([141.146.126.78]:51514 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726440AbfKTTpZ (ORCPT ); Wed, 20 Nov 2019 14:45:25 -0500 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id xAKJi655056805; Wed, 20 Nov 2019 19:45:14 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2019-08-05; bh=sEesESEYpLIlatJUbLqzdyEqW5b7T2dYR2CSmmTIChk=; b=JVnKJLYEP9tsUjMoNlXpAAtTlFMrRhANCKXk8fUIPxgqdHX/BFyOMg8r45ITyZYJ4Doh opj61ydHHGlR0pkPG0+KxWecCxCwGOStf56VKdsxisKN3O3EkTpwESIDLjvnINh1Al87 0zRFigvy0Ih2lGsljpdoPU8p41xgrAOqILEuA+DIuXppGFinAnQxCsZTEtZ+g/GOr4wv 3ku1YAi5G4YkNu3NErFOSHSIaHtlRxy0Q0lLwGEnYOkAov1n3sk+nsiwoUvgm5ZUAxpM LNUTlLvZZ8se+/LWGlBNRc16IMmMmPCfbuOn6JCOusf4aSpgBr3zeA81Os0C6vhMgOJC sg== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by aserp2120.oracle.com with ESMTP id 2wa92pyrus-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 20 Nov 2019 19:45:14 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id xAKJh2g7039918; Wed, 20 Nov 2019 19:45:14 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserp3020.oracle.com with ESMTP id 2wcemhhtgx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 20 Nov 2019 19:45:14 +0000 Received: from abhmp0004.oracle.com (abhmp0004.oracle.com [141.146.116.10]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id xAKJj9r6023179; Wed, 20 Nov 2019 19:45:09 GMT Received: from localhost (/10.159.246.236) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 20 Nov 2019 11:45:09 -0800 Date: Wed, 20 Nov 2019 11:45:07 -0800 From: "Darrick J. Wong" To: Evan Green Cc: Jens Axboe , Martin K Petersen , Gwendal Grignou , Christoph Hellwig , Ming Lei , Alexis Savery , Douglas Anderson , Bart Van Assche , Chaitanya Kulkarni , linux-block , LKML Subject: Re: [PATCH v7 2/2] loop: Better discard support for block devices Message-ID: <20191120194507.GW6235@magnolia> References: <20191114235008.185111-1-evgreen@chromium.org> <20191114154903.v7.2.I4d476bddbf41a61422ad51502f4361e237d60ad4@changeid> <20191120022518.GU6235@magnolia> <20191120191302.GV6235@magnolia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9447 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-1911200162 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9447 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-1911200162 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Nov 20, 2019 at 11:25:48AM -0800, Evan Green wrote: > On Wed, Nov 20, 2019 at 11:13 AM Darrick J. Wong > wrote: > > > > On Wed, Nov 20, 2019 at 10:56:30AM -0800, Evan Green wrote: > > > On Tue, Nov 19, 2019 at 6:25 PM Darrick J. Wong wrote: > > > > > > > > On Thu, Nov 14, 2019 at 03:50:08PM -0800, Evan Green wrote: > > > > > 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. > > (marking this spot for below) > > > > > > > > > > > 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); > > > > > > > > max_discard_sectors? > > > > > > I didn't plumb max_discard_sectors because for my scenario it never > > > ends up hitting the block device that way. > > > > > > The loop device either uses FL_ZERO_RANGE or FL_PUNCH_HOLE. When > > > backed by a block device, that ends up in blkdev_fallocate(), which > > > always translates both of those into blkdev_issue_zeroout(), not > > > blkdev_issue_discard(). So it's really the zeroing capabilities of the > > > block device that matters, even for loop discard operations. It seems > > > weird, but I think this is the right thing because it presents a > > > consistent interface to loop device users whether backed by a file > > > system file, or directly by a block device. That is, a previously > > > discarded range will read back as zeroes. > > > > Ah, right. Could you add this paragraph as a comment explaining why > > we're setting max_discard_sectors from max_write_zeroes_sectors? > > Sure. I put an explanation in the commit description (see spot I > marked above), but I agree a comment is probably also worthwhile. Sorry about the churn here. I have a strong preference towards documenting decisions like these directly in the code because (a) I suck at reading patch prologues, (b) someone reading the code after this gets committed will see it immediately and right next to the relevant code, and (c) spelunking through the git history of a file for commit messages is kind of clunky. Dunno if that's just my age showing (mmm, pre-bk linux) or what. :/ --D > > > > --D > > > > > -Evan