From patchwork Fri May 22 18:18:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lin X-Patchwork-Id: 6467141 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 585279F318 for ; Fri, 22 May 2015 18:22:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 42DFC204A7 for ; Fri, 22 May 2015 18:22:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EA6A20437 for ; Fri, 22 May 2015 18:22:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757464AbbEVST2 (ORCPT ); Fri, 22 May 2015 14:19:28 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:10116 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757185AbbEVSTZ (ORCPT ); Fri, 22 May 2015 14:19:25 -0400 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NOR0082FK8A8A40@mailout3.samsung.com>; Sat, 23 May 2015 03:19:22 +0900 (KST) X-AuditID: cbfee61b-f79416d0000014c0-f0-555f732a14a7 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 7A.B7.05312.A237F555; Sat, 23 May 2015 03:19:22 +0900 (KST) Received: from localhost.localdomain ([105.128.33.253]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NOR00J2FK7W6U50@mmp1.samsung.com>; Sat, 23 May 2015 03:19:22 +0900 (KST) From: Ming Lin To: linux-kernel@vger.kernel.org Cc: Christoph Hellwig , Kent Overstreet , Jens Axboe , Dongsu Park , Ming Lin , Chris Mason , Josef Bacik , linux-btrfs@vger.kernel.org Subject: [PATCH v4 04/11] btrfs: remove bio splitting and merge_bvec_fn() calls Date: Fri, 22 May 2015 11:18:36 -0700 Message-id: <1432318723-18829-5-git-send-email-mlin@kernel.org> X-Mailer: git-send-email 1.9.1 In-reply-to: <1432318723-18829-1-git-send-email-mlin@kernel.org> References: <1432318723-18829-1-git-send-email-mlin@kernel.org> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrMLMWRmVeSWpSXmKPExsVy+t9jAV2t4vhQg71blSxW3+1ns5jUP4Pd YseMp0wWK1cfZbL4u3Mhi8WRpiqLS49XsFtc3jWHzeL8tpOsDpweE5vfsXvsnHWX3ePy2VKP Tas62Tx232xg83h8+CS7x+dNcgHsUVw2Kak5mWWpRfp2CVwZ63+aFryQqfjesI61gbFLvIuR k0NCwETi4P3PbBC2mMSFe+vBbCGBRYwSf7dpdTFyAdk/GSXOLb7FDJJgE1CQOLhuAxOILQJk b+59xgpSxCzQyiTx5/9TsG5hAX+JE4d2sXQxcnCwCKhKrJ2UCRLmFbCXePvgLivEMjmJk8cm s4KUcAo4SOze5QGx115i3bq5jBMYeRcwMqxiFE0tSC4oTkrPNdIrTswtLs1L10vOz93ECA66 Z9I7GFc1WBxiFOBgVOLhNTgYFyrEmlhWXJl7iFGCg1lJhFfXLz5UiDclsbIqtSg/vqg0J7X4 EKM0B4uSOO/JfJ9QIYH0xJLU7NTUgtQimCwTB6dUA6Nkna3yyg/sjQf+hXNIe1dl/BCM9llx 2/jPRmHtVX+vBy1Y/uiUp8CrRf5nJzZtvzthyw/z3W/ieRSWPbe8VLfigtxGM7OTx9XkHljO 5F5/quHVu+UqzL+cubmkM66ZrbRPmbXxwNS3nVdTc37YpUXPP3G779eaB2s53vUd6lvlu/X2 m2XLVdi7lViKMxINtZiLihMBEeRyJDYCAAA= Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kent Overstreet Btrfs has been doing bio splitting from btrfs_map_bio(), by checking device limits as well as calling ->merge_bvec_fn() etc. That is not necessary any more, because generic_make_request() is now able to handle arbitrarily sized bios. So clean up unnecessary code paths. Cc: Chris Mason Cc: Josef Bacik Cc: linux-btrfs@vger.kernel.org Signed-off-by: Kent Overstreet Signed-off-by: Chris Mason [dpark: add more description in commit message] Signed-off-by: Dongsu Park Signed-off-by: Ming Lin --- fs/btrfs/volumes.c | 72 ------------------------------------------------------ 1 file changed, 72 deletions(-) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 96aebf3..c616aba 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -5715,34 +5715,6 @@ static noinline void btrfs_schedule_bio(struct btrfs_root *root, &device->work); } -static int bio_size_ok(struct block_device *bdev, struct bio *bio, - sector_t sector) -{ - struct bio_vec *prev; - struct request_queue *q = bdev_get_queue(bdev); - unsigned int max_sectors = queue_max_sectors(q); - struct bvec_merge_data bvm = { - .bi_bdev = bdev, - .bi_sector = sector, - .bi_rw = bio->bi_rw, - }; - - if (WARN_ON(bio->bi_vcnt == 0)) - return 1; - - prev = &bio->bi_io_vec[bio->bi_vcnt - 1]; - if (bio_sectors(bio) > max_sectors) - return 0; - - if (!q->merge_bvec_fn) - return 1; - - bvm.bi_size = bio->bi_iter.bi_size - prev->bv_len; - if (q->merge_bvec_fn(q, &bvm, prev) < prev->bv_len) - return 0; - return 1; -} - static void submit_stripe_bio(struct btrfs_root *root, struct btrfs_bio *bbio, struct bio *bio, u64 physical, int dev_nr, int rw, int async) @@ -5776,38 +5748,6 @@ static void submit_stripe_bio(struct btrfs_root *root, struct btrfs_bio *bbio, btrfsic_submit_bio(rw, bio); } -static int breakup_stripe_bio(struct btrfs_root *root, struct btrfs_bio *bbio, - struct bio *first_bio, struct btrfs_device *dev, - int dev_nr, int rw, int async) -{ - struct bio_vec *bvec = first_bio->bi_io_vec; - struct bio *bio; - int nr_vecs = bio_get_nr_vecs(dev->bdev); - u64 physical = bbio->stripes[dev_nr].physical; - -again: - bio = btrfs_bio_alloc(dev->bdev, physical >> 9, nr_vecs, GFP_NOFS); - if (!bio) - return -ENOMEM; - - while (bvec <= (first_bio->bi_io_vec + first_bio->bi_vcnt - 1)) { - if (bio_add_page(bio, bvec->bv_page, bvec->bv_len, - bvec->bv_offset) < bvec->bv_len) { - u64 len = bio->bi_iter.bi_size; - - atomic_inc(&bbio->stripes_pending); - submit_stripe_bio(root, bbio, bio, physical, dev_nr, - rw, async); - physical += len; - goto again; - } - bvec++; - } - - submit_stripe_bio(root, bbio, bio, physical, dev_nr, rw, async); - return 0; -} - static void bbio_error(struct btrfs_bio *bbio, struct bio *bio, u64 logical) { atomic_inc(&bbio->error); @@ -5882,18 +5822,6 @@ int btrfs_map_bio(struct btrfs_root *root, int rw, struct bio *bio, continue; } - /* - * Check and see if we're ok with this bio based on it's size - * and offset with the given device. - */ - if (!bio_size_ok(dev->bdev, first_bio, - bbio->stripes[dev_nr].physical >> 9)) { - ret = breakup_stripe_bio(root, bbio, first_bio, dev, - dev_nr, rw, async_submit); - BUG_ON(ret); - continue; - } - if (dev_nr < total_devs - 1) { bio = btrfs_bio_clone(first_bio, GFP_NOFS); BUG_ON(!bio); /* -ENOMEM */