From mboxrd@z Thu Jan 1 00:00:00 1970 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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 DABD2C433E3 for ; Sun, 26 Jul 2020 15:33:04 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 901E420714 for ; Sun, 26 Jul 2020 15:33:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="gAQdwoJR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 901E420714 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 375056B000C; Sun, 26 Jul 2020 11:33:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2FF3F6B000D; Sun, 26 Jul 2020 11:33:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C4D96B000E; Sun, 26 Jul 2020 11:33:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0218.hostedemail.com [216.40.44.218]) by kanga.kvack.org (Postfix) with ESMTP id 05BE06B000C for ; Sun, 26 Jul 2020 11:33:04 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id ED4571802EFDD for ; Sun, 26 Jul 2020 15:33:02 +0000 (UTC) X-FDA: 77080620204.20.glass30_610fad226f59 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin20.hostedemail.com (Postfix) with ESMTP id 7E7EC1831ABC2 for ; Sun, 26 Jul 2020 15:04:04 +0000 (UTC) X-HE-Tag: glass30_610fad226f59 X-Filterd-Recvd-Size: 8684 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Sun, 26 Jul 2020 15:04:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=kHUw0UuZXh62UTS5LwOFYLvTBhGcGjgSBKOEDgrpN1Q=; b=gAQdwoJR0RwHOOzUGKf5gRuKJH SUHUWWRDGtONpRgQ4GZ4DRENEY2n8zVX1HjkTyAgEofsK4HmtKj2KHmPDE1ygITYavbkbsvnLBMs5 yRjBCNEB3LOCz0uXj0StMTJRp32PF7cH8kFGGa/JtdJ+BO+uLBlU8BuhBn+fnfBVNb3FYtxDOICB/ frWV31IhoAKW5wiAcoyYaW1UASRXQXd0S8deBEwbmU3FX1thsFs6lxu7Pt122QpewuVu2hHLFjTiW RITnYd5c1tkt9i4bTwV3Oj+vAwOQYgMmHKazvZBZfqGDKVhaIUuzPorP0ehEaiQHdNIEDX60PimrU m3wB6QpQ==; Received: from [2001:4bb8:18c:2acc:2375:88ff:9f84:118d] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jziBr-0005hl-Nc; Sun, 26 Jul 2020 15:03:52 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Song Liu , Hans de Goede , Richard Weinberger , Minchan Kim , linux-mtd@lists.infradead.org, dm-devel@redhat.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, drbd-dev@lists.linbit.com, linux-raid@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org Subject: [PATCH 10/14] bdi: remove BDI_CAP_SYNCHRONOUS_IO Date: Sun, 26 Jul 2020 17:03:29 +0200 Message-Id: <20200726150333.305527-11-hch@lst.de> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200726150333.305527-1-hch@lst.de> References: <20200726150333.305527-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html X-Rspamd-Queue-Id: 7E7EC1831ABC2 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: BDI_CAP_SYNCHRONOUS_IO is only checked in the swap code, and used to decided if ->rw_page can be used on a block device. Just check up for the method instead. The only complication is that zram needs a second set of block_device_operations as it can switch between modes that actually support ->rw_page and those who don't. Signed-off-by: Christoph Hellwig --- drivers/block/brd.c | 1 - drivers/block/zram/zram_drv.c | 19 +++++++++++++------ drivers/nvdimm/btt.c | 2 -- drivers/nvdimm/pmem.c | 1 - include/linux/backing-dev.h | 9 --------- mm/swapfile.c | 2 +- 6 files changed, 14 insertions(+), 20 deletions(-) diff --git a/drivers/block/brd.c b/drivers/block/brd.c index 2723a70eb85593..cc49a921339f77 100644 --- a/drivers/block/brd.c +++ b/drivers/block/brd.c @@ -403,7 +403,6 @@ static struct brd_device *brd_alloc(int i) disk->flags =3D GENHD_FL_EXT_DEVT; sprintf(disk->disk_name, "ram%d", i); set_capacity(disk, rd_size * 2); - brd->brd_queue->backing_dev_info->capabilities |=3D BDI_CAP_SYNCHRONOUS= _IO; =20 /* Tell the block layer that this is not a rotational device */ blk_queue_flag_set(QUEUE_FLAG_NONROT, brd->brd_queue); diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.= c index 9100ac36670afc..d73ddf018fa65f 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -52,6 +52,9 @@ static unsigned int num_devices =3D 1; */ static size_t huge_class_size; =20 +static const struct block_device_operations zram_devops; +static const struct block_device_operations zram_wb_devops; + static void zram_free_page(struct zram *zram, size_t index); static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec, u32 index, int offset, struct bio *bio); @@ -408,8 +411,7 @@ static void reset_bdev(struct zram *zram) zram->backing_dev =3D NULL; zram->old_block_size =3D 0; zram->bdev =3D NULL; - zram->disk->queue->backing_dev_info->capabilities |=3D - BDI_CAP_SYNCHRONOUS_IO; + zram->disk->fops =3D &zram_devops; kvfree(zram->bitmap); zram->bitmap =3D NULL; } @@ -528,8 +530,7 @@ static ssize_t backing_dev_store(struct device *dev, * freely but in fact, IO is going on so finally could cause * use-after-free when the IO is really done. */ - zram->disk->queue->backing_dev_info->capabilities &=3D - ~BDI_CAP_SYNCHRONOUS_IO; + zram->disk->fops =3D &zram_wb_devops; up_write(&zram->init_lock); =20 pr_info("setup backing device %s\n", file_name); @@ -1819,6 +1820,13 @@ static const struct block_device_operations zram_d= evops =3D { .owner =3D THIS_MODULE }; =20 +static const struct block_device_operations zram_wb_devops =3D { + .open =3D zram_open, + .submit_bio =3D zram_submit_bio, + .swap_slot_free_notify =3D zram_slot_free_notify, + .owner =3D THIS_MODULE +}; + static DEVICE_ATTR_WO(compact); static DEVICE_ATTR_RW(disksize); static DEVICE_ATTR_RO(initstate); @@ -1946,8 +1954,7 @@ static int zram_add(void) if (ZRAM_LOGICAL_BLOCK_SIZE =3D=3D PAGE_SIZE) blk_queue_max_write_zeroes_sectors(zram->disk->queue, UINT_MAX); =20 - zram->disk->queue->backing_dev_info->capabilities |=3D - (BDI_CAP_STABLE_WRITES | BDI_CAP_SYNCHRONOUS_IO); + zram->disk->queue->backing_dev_info->capabilities |=3D BDI_CAP_STABLE_W= RITES; device_add_disk(NULL, zram->disk, zram_disk_attr_groups); =20 strlcpy(zram->compressor, default_compressor, sizeof(zram->compressor))= ; diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c index 412d21d8f64351..b4184dc9b41eb4 100644 --- a/drivers/nvdimm/btt.c +++ b/drivers/nvdimm/btt.c @@ -1540,8 +1540,6 @@ static int btt_blk_init(struct btt *btt) btt->btt_disk->private_data =3D btt; btt->btt_disk->queue =3D btt->btt_queue; btt->btt_disk->flags =3D GENHD_FL_EXT_DEVT; - btt->btt_disk->queue->backing_dev_info->capabilities |=3D - BDI_CAP_SYNCHRONOUS_IO; =20 blk_queue_logical_block_size(btt->btt_queue, btt->sector_size); blk_queue_max_hw_sectors(btt->btt_queue, UINT_MAX); diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 94790e6e0e4ce1..436b83fb24ad61 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -478,7 +478,6 @@ static int pmem_attach_disk(struct device *dev, disk->queue =3D q; disk->flags =3D GENHD_FL_EXT_DEVT; disk->private_data =3D pmem; - disk->queue->backing_dev_info->capabilities |=3D BDI_CAP_SYNCHRONOUS_IO= ; nvdimm_namespace_disk_name(ndns, disk->disk_name); set_capacity(disk, (pmem->size - pmem->pfn_pad - pmem->data_offset) / 512); diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h index 52583b6f2ea05d..860ea33571bce5 100644 --- a/include/linux/backing-dev.h +++ b/include/linux/backing-dev.h @@ -122,9 +122,6 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, u= nsigned int max_ratio); * BDI_CAP_NO_WRITEBACK: Don't write pages back * BDI_CAP_NO_ACCT_WB: Don't automatically account writeback pages * BDI_CAP_STRICTLIMIT: Keep number of dirty pages below bdi threshol= d. - * - * BDI_CAP_SYNCHRONOUS_IO: Device is so fast that asynchronous IO would = be - * inefficient. */ #define BDI_CAP_NO_ACCT_DIRTY 0x00000001 #define BDI_CAP_NO_WRITEBACK 0x00000002 @@ -132,7 +129,6 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, u= nsigned int max_ratio); #define BDI_CAP_STABLE_WRITES 0x00000008 #define BDI_CAP_STRICTLIMIT 0x00000010 #define BDI_CAP_CGROUP_WRITEBACK 0x00000020 -#define BDI_CAP_SYNCHRONOUS_IO 0x00000040 =20 #define BDI_CAP_NO_ACCT_AND_WRITEBACK \ (BDI_CAP_NO_WRITEBACK | BDI_CAP_NO_ACCT_DIRTY | BDI_CAP_NO_ACCT_WB) @@ -174,11 +170,6 @@ static inline int wb_congested(struct bdi_writeback = *wb, int cong_bits) long congestion_wait(int sync, long timeout); long wait_iff_congested(int sync, long timeout); =20 -static inline bool bdi_cap_synchronous_io(struct backing_dev_info *bdi) -{ - return bdi->capabilities & BDI_CAP_SYNCHRONOUS_IO; -} - static inline bool bdi_cap_stable_pages_required(struct backing_dev_info= *bdi) { return bdi->capabilities & BDI_CAP_STABLE_WRITES; diff --git a/mm/swapfile.c b/mm/swapfile.c index 6c26916e95fd4a..18eac97b10e502 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3230,7 +3230,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specia= lfile, int, swap_flags) if (bdi_cap_stable_pages_required(inode_to_bdi(inode))) p->flags |=3D SWP_STABLE_WRITES; =20 - if (bdi_cap_synchronous_io(inode_to_bdi(inode))) + if (p->bdev && p->bdev->bd_disk->fops->rw_page) p->flags |=3D SWP_SYNCHRONOUS_IO; =20 if (p->bdev && blk_queue_nonrot(bdev_get_queue(p->bdev))) { --=20 2.27.0