From patchwork Wed May 9 01:33:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Overstreet X-Patchwork-Id: 10387989 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 1BF6B602D8 for ; Wed, 9 May 2018 01:36:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E3A06285F0 for ; Wed, 9 May 2018 01:36:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D7C5B28FF6; Wed, 9 May 2018 01:36:08 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable 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 89EAF285F0 for ; Wed, 9 May 2018 01:36:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933502AbeEIBeZ (ORCPT ); Tue, 8 May 2018 21:34:25 -0400 Received: from mail-qt0-f193.google.com ([209.85.216.193]:41122 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933134AbeEIBeW (ORCPT ); Tue, 8 May 2018 21:34:22 -0400 Received: by mail-qt0-f193.google.com with SMTP id g13-v6so43669912qth.8; Tue, 08 May 2018 18:34:21 -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=082D6fl4jnpWcLDn3aqLAByCiMCFTeMFbF7D74xpw+g=; b=asX2pP9DebnBa7myhkI94xUDNnqdR/cytDWhkL+9UmewilVxkHF6qO7whj0J3oqci3 FlxW8RMAVP6zvxctmigv7pgpjMXvEgqHxCMTspQPiVS4rpQ+WdY0Es6PTSnkC2Z7afb9 66P9dHI8hfKRIbOesoQnOldRn8x2q65qKGsK0Op8XrIqyY8PMxKCjsLgcASyrMkN8Vf9 9S1EfwPop9tQiLA2cKFQklDHGgTfvSKuxVOeSQedW4csoPf9zI6sjxfPOsEQyivwrI8D TalFbmGQKBfKOvMAFUGHh1YcQ8ZAd0SU906fKrZm1XmIUHIsX9G41OphpSoMBr3WyI0Q 4f1w== 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=082D6fl4jnpWcLDn3aqLAByCiMCFTeMFbF7D74xpw+g=; b=ZAw4CrIxWQf9ccQpDHFIAim0MQpaUwB6oIpU41KUirZO3dzqBNl9s+zsrp+rmZWOiq 6c5A5gDisOkqYcmOdNdaBogZ8G5zw3q9LuZpM+joLeTuvS8o1JIx/wP4WPRxJXvJ+Flh dq2GAO+8eajkDIsoGZTG21qTN7ksK04gXFS0f8zralnZ9WOLIbPoZFnT4Uka1wNhD3qD rkbhm/ou2gkmSpZDEatd8ZhMBgTrIG8p+ebFUYfpenV5rAhw+EusKVg53PDuqDbJ+AgY O46VUua8VgjKqOxGqndPhOqJfsIhGfz7mFdvgBr4jlYLTcbaPRUYd00p/07tayvNG6UO EX8g== X-Gm-Message-State: ALQs6tC/On03O2xPFxBJf1eKE1yKCSXHs9VQpCfpK9pHL4yCLuVdD2Wt in2upFJpnsVkzIcc4E+kTxnAxEDtBA== X-Google-Smtp-Source: AB8JxZpzcrx3S8i3m6gJ1lG7zVGBhhvIC2fXt0gO+0yTa3yIzlym7R5O2a+QYl3CG6VZt+i7VQjucQ== X-Received: by 2002:ac8:4141:: with SMTP id e1-v6mr38357633qtm.324.1525829661030; Tue, 08 May 2018 18:34:21 -0700 (PDT) Received: from localhost.localdomain (c-71-234-172-214.hsd1.vt.comcast.net. [71.234.172.214]) by smtp.gmail.com with ESMTPSA id x28-v6sm23719003qtx.95.2018.05.08.18.34.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 May 2018 18:34:20 -0700 (PDT) From: Kent Overstreet To: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-mm@kvack.org, Jens Axboe , Ingo Molnar Cc: Kent Overstreet Subject: [PATCH 04/10] block: Use bioset_init() for fs_bio_set Date: Tue, 8 May 2018 21:33:52 -0400 Message-Id: <20180509013358.16399-5-kent.overstreet@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180509013358.16399-1-kent.overstreet@gmail.com> References: <20180509013358.16399-1-kent.overstreet@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 Minor optimization - remove a pointer indirection when using fs_bio_set. Signed-off-by: Kent Overstreet --- block/bio.c | 7 +++---- block/blk-core.c | 2 +- drivers/target/target_core_iblock.c | 2 +- include/linux/bio.h | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/block/bio.c b/block/bio.c index 980befd919..b7cdad6fc4 100644 --- a/block/bio.c +++ b/block/bio.c @@ -53,7 +53,7 @@ static struct biovec_slab bvec_slabs[BVEC_POOL_NR] __read_mostly = { * fs_bio_set is the bio_set containing bio and iovec memory pools used by * IO code that does not need private memory pools. */ -struct bio_set *fs_bio_set; +struct bio_set fs_bio_set; EXPORT_SYMBOL(fs_bio_set); /* @@ -2055,11 +2055,10 @@ static int __init init_bio(void) bio_integrity_init(); biovec_init_slabs(); - fs_bio_set = bioset_create(BIO_POOL_SIZE, 0, BIOSET_NEED_BVECS); - if (!fs_bio_set) + if (bioset_init(&fs_bio_set, BIO_POOL_SIZE, 0, BIOSET_NEED_BVECS)) panic("bio: can't allocate bios\n"); - if (bioset_integrity_create(fs_bio_set, BIO_POOL_SIZE)) + if (bioset_integrity_create(&fs_bio_set, BIO_POOL_SIZE)) panic("bio: can't create integrity pool\n"); return 0; diff --git a/block/blk-core.c b/block/blk-core.c index 6d82c4f7fa..66f24798ef 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -3409,7 +3409,7 @@ int blk_rq_prep_clone(struct request *rq, struct request *rq_src, struct bio *bio, *bio_src; if (!bs) - bs = fs_bio_set; + bs = &fs_bio_set; __rq_for_each_bio(bio_src, rq_src) { bio = bio_clone_fast(bio_src, gfp_mask, bs); diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c index 07c814c426..c969c01c7c 100644 --- a/drivers/target/target_core_iblock.c +++ b/drivers/target/target_core_iblock.c @@ -164,7 +164,7 @@ static int iblock_configure_device(struct se_device *dev) goto out_blkdev_put; } pr_debug("IBLOCK setup BIP bs->bio_integrity_pool: %p\n", - bs->bio_integrity_pool); + &bs->bio_integrity_pool); } dev->dev_attrib.hw_pi_prot_type = dev->dev_attrib.pi_prot_type; } diff --git a/include/linux/bio.h b/include/linux/bio.h index fa3cf94a50..91b02520e2 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -423,11 +423,11 @@ extern void __bio_clone_fast(struct bio *, struct bio *); extern struct bio *bio_clone_fast(struct bio *, gfp_t, struct bio_set *); extern struct bio *bio_clone_bioset(struct bio *, gfp_t, struct bio_set *bs); -extern struct bio_set *fs_bio_set; +extern struct bio_set fs_bio_set; static inline struct bio *bio_alloc(gfp_t gfp_mask, unsigned int nr_iovecs) { - return bio_alloc_bioset(gfp_mask, nr_iovecs, fs_bio_set); + return bio_alloc_bioset(gfp_mask, nr_iovecs, &fs_bio_set); } static inline struct bio *bio_kmalloc(gfp_t gfp_mask, unsigned int nr_iovecs)