Received: by 10.192.165.148 with SMTP id m20csp4961126imm; Tue, 8 May 2018 18:37:11 -0700 (PDT) X-Google-Smtp-Source: AB8JxZouw9RGLi3POZxjrKUfHgoxCJgSqIhoG3FCeJx059VK6DSyqHaz9juf6qiIzKjtZkPObk5f X-Received: by 2002:a65:4648:: with SMTP id k8-v6mr35344472pgr.47.1525829831484; Tue, 08 May 2018 18:37:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525829831; cv=none; d=google.com; s=arc-20160816; b=nPkj4RHCcIJVbnAS0yr1SY7NtmzPR1x7AGtE6wfI97O7ER45sFPTEiy/kvpERra9E/ xRQ5kVezJWePItyY4d/0eFVTtzocAxENqGsWTjcAxr5gyiT8eJiVEs/qfbL17gLEfUOg R1wliS0BcVHDcco+DoIUxeWooWUIq6YXzYuFdpp3ApLipQJI2uxDXtzGEcr0xYoZPXXA 7vLbVIT1wvnsxNTpj7EJi9DrJI1CMEYjXwzpJK4iKRc21FKbihOX+GPahYcZIDAGWQDX Vk4uaC+ILF3hL95tVsxmRZqUYtBi+i8ak+RhUn5gXHzi/H/p4agb8x5UXoTxEqa2YG3T VACA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=/emOH7XvSPPri8tVw+ICyBNrOlNcFdAXg+itT4xycEc=; b=q81Bv5cREFnwWk4CiuabPnD2knEesWw3CaprEV0DovgX5U3Ot5AMfWAQCHWopGqL5U kvrAh8mvudy1srW4Ut1XqKBKG1nBnK/EXfLVOXw+32OcfctsT1AD0WW2qecMReGrSnvR BV3nIC1zTQ+vt+lN8Z107SgKOpsyX/sGU/uEGu/JGPw/oOd61Bc4OdcS3IB39Jq3wIFN +vvZKNnMqsOTi4lolEIhwtShHItG3xtDekX+76rdufzAU1M1j9gY36TuPhkk4DuElRTz eWfXR++sc/MWJooncpljjqvLPDseF9SVOLXVAmsMl2YCtfmgClyM6x3D3pS8+gncjqRK S2mA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=C/00x1Eh; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g3-v6si24460742pld.309.2018.05.08.18.36.57; Tue, 08 May 2018 18:37:11 -0700 (PDT) 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=@gmail.com header.s=20161025 header.b=C/00x1Eh; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933491AbeEIBeV (ORCPT + 99 others); Tue, 8 May 2018 21:34:21 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:37831 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933134AbeEIBeS (ORCPT ); Tue, 8 May 2018 21:34:18 -0400 Received: by mail-qt0-f194.google.com with SMTP id q13-v6so42891840qtp.4; Tue, 08 May 2018 18:34:18 -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=/emOH7XvSPPri8tVw+ICyBNrOlNcFdAXg+itT4xycEc=; b=C/00x1EhVpru7GtswN8r3piGKOum4Qk4lQ3is/AITaI4YFD8TRW9G6yxc9gK+zAu5n sQFwTxywxjNvHkdSIMRZ+Fb5KRQPqrqws6sksbpAahbZ0XPqZhKiU6BBxMa4GmEpv5ck /xTQWI1o87BttrHD3M5GjTpHB3xmMwv/7ZsoefKD2zB1i67BMN4MX/6KLMwMhWocijV9 KPIWK7GLxZg9Eb4Br3Y0BaihjYAYZdauWwg+JsSKVEV7tNlFRiiuHHoB5Epps1u4/DAJ TERHLIUsD//yi3W1IgOfdqg5s/iP8nZApX9b8ekEUWiYrGYvcrNCadIeeSsq8PHJjtCz Wf/w== 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=/emOH7XvSPPri8tVw+ICyBNrOlNcFdAXg+itT4xycEc=; b=coGAYlDb1/kT/3duPnuVMpDCoV5IJGiS4wdaaIWs7sVXj6j/tUVfTR9XgUrwmYKoaY cD1ssO6NPQFU5FeaJN657VD7t1eQcGLuFNuRs2aGaZv5blo8DV9aExtmGxVRVMbLDlc9 NT9Vp/85KNWVs0JMc7teKqA81LHLF5LiF7lgLlN6BLVyJo4kPLpjPWZ8ZZ4UCVD/UScI T6JNqdMaJgR1oNDwt34kO8EYRlXTK8wLjMLQDdr0xJnOUWCAV2E8pJveUbsy59n4i/rI MIkkWMqAXpPWxoWHtrTcucAeIzwVrHZIdT33qwVN8H+elH0JEVs4WDzBerxvjWZcwRRT uJpw== X-Gm-Message-State: ALQs6tDbeE3OIXr5mVspfEqfdWow7aGmyq9J9Bi/61fsZ9vXhvlQZ2gb QddLMJJIFHc+wBG/WmMMq/OYuINTZQ== X-Received: by 2002:aed:3a46:: with SMTP id n64-v6mr30336394qte.118.1525829657203; Tue, 08 May 2018 18:34:17 -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.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 May 2018 18:34:16 -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 02/10] block: Convert bio_set to mempool_init() Date: Tue, 8 May 2018 21:33:50 -0400 Message-Id: <20180509013358.16399-3-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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Minor performance improvement by getting rid of pointer indirections from allocation/freeing fastpaths. Signed-off-by: Kent Overstreet --- block/bio-integrity.c | 29 ++++++++++++++--------------- block/bio.c | 36 +++++++++++++++++------------------- include/linux/bio.h | 10 +++++----- 3 files changed, 36 insertions(+), 39 deletions(-) diff --git a/block/bio-integrity.c b/block/bio-integrity.c index 9cfdd6c83b..add7c7c853 100644 --- a/block/bio-integrity.c +++ b/block/bio-integrity.c @@ -56,12 +56,12 @@ struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio, struct bio_set *bs = bio->bi_pool; unsigned inline_vecs; - if (!bs || !bs->bio_integrity_pool) { + if (!bs || !mempool_initialized(&bs->bio_integrity_pool)) { bip = kmalloc(sizeof(struct bio_integrity_payload) + sizeof(struct bio_vec) * nr_vecs, gfp_mask); inline_vecs = nr_vecs; } else { - bip = mempool_alloc(bs->bio_integrity_pool, gfp_mask); + bip = mempool_alloc(&bs->bio_integrity_pool, gfp_mask); inline_vecs = BIP_INLINE_VECS; } @@ -74,7 +74,7 @@ struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio, unsigned long idx = 0; bip->bip_vec = bvec_alloc(gfp_mask, nr_vecs, &idx, - bs->bvec_integrity_pool); + &bs->bvec_integrity_pool); if (!bip->bip_vec) goto err; bip->bip_max_vcnt = bvec_nr_vecs(idx); @@ -90,7 +90,7 @@ struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio, return bip; err: - mempool_free(bip, bs->bio_integrity_pool); + mempool_free(bip, &bs->bio_integrity_pool); return ERR_PTR(-ENOMEM); } EXPORT_SYMBOL(bio_integrity_alloc); @@ -111,10 +111,10 @@ static void bio_integrity_free(struct bio *bio) kfree(page_address(bip->bip_vec->bv_page) + bip->bip_vec->bv_offset); - if (bs && bs->bio_integrity_pool) { - bvec_free(bs->bvec_integrity_pool, bip->bip_vec, bip->bip_slab); + if (bs && mempool_initialized(&bs->bio_integrity_pool)) { + bvec_free(&bs->bvec_integrity_pool, bip->bip_vec, bip->bip_slab); - mempool_free(bip, bs->bio_integrity_pool); + mempool_free(bip, &bs->bio_integrity_pool); } else { kfree(bip); } @@ -465,16 +465,15 @@ EXPORT_SYMBOL(bio_integrity_clone); int bioset_integrity_create(struct bio_set *bs, int pool_size) { - if (bs->bio_integrity_pool) + if (mempool_initialized(&bs->bio_integrity_pool)) return 0; - bs->bio_integrity_pool = mempool_create_slab_pool(pool_size, bip_slab); - if (!bs->bio_integrity_pool) + if (mempool_init_slab_pool(&bs->bio_integrity_pool, + pool_size, bip_slab)) return -1; - bs->bvec_integrity_pool = biovec_create_pool(pool_size); - if (!bs->bvec_integrity_pool) { - mempool_destroy(bs->bio_integrity_pool); + if (biovec_init_pool(&bs->bvec_integrity_pool, pool_size)) { + mempool_exit(&bs->bio_integrity_pool); return -1; } @@ -484,8 +483,8 @@ EXPORT_SYMBOL(bioset_integrity_create); void bioset_integrity_free(struct bio_set *bs) { - mempool_destroy(bs->bio_integrity_pool); - mempool_destroy(bs->bvec_integrity_pool); + mempool_exit(&bs->bio_integrity_pool); + mempool_exit(&bs->bvec_integrity_pool); } EXPORT_SYMBOL(bioset_integrity_free); diff --git a/block/bio.c b/block/bio.c index e1708db482..360e9bcea5 100644 --- a/block/bio.c +++ b/block/bio.c @@ -254,7 +254,7 @@ static void bio_free(struct bio *bio) bio_uninit(bio); if (bs) { - bvec_free(bs->bvec_pool, bio->bi_io_vec, BVEC_POOL_IDX(bio)); + bvec_free(&bs->bvec_pool, bio->bi_io_vec, BVEC_POOL_IDX(bio)); /* * If we have front padding, adjust the bio pointer before freeing @@ -262,7 +262,7 @@ static void bio_free(struct bio *bio) p = bio; p -= bs->front_pad; - mempool_free(p, bs->bio_pool); + mempool_free(p, &bs->bio_pool); } else { /* Bio was allocated by bio_kmalloc() */ kfree(bio); @@ -454,7 +454,8 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, unsigned int nr_iovecs, inline_vecs = nr_iovecs; } else { /* should not use nobvec bioset for nr_iovecs > 0 */ - if (WARN_ON_ONCE(!bs->bvec_pool && nr_iovecs > 0)) + if (WARN_ON_ONCE(!mempool_initialized(&bs->bvec_pool) && + nr_iovecs > 0)) return NULL; /* * generic_make_request() converts recursion to iteration; this @@ -483,11 +484,11 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, unsigned int nr_iovecs, bs->rescue_workqueue) gfp_mask &= ~__GFP_DIRECT_RECLAIM; - p = mempool_alloc(bs->bio_pool, gfp_mask); + p = mempool_alloc(&bs->bio_pool, gfp_mask); if (!p && gfp_mask != saved_gfp) { punt_bios_to_rescuer(bs); gfp_mask = saved_gfp; - p = mempool_alloc(bs->bio_pool, gfp_mask); + p = mempool_alloc(&bs->bio_pool, gfp_mask); } front_pad = bs->front_pad; @@ -503,11 +504,11 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, unsigned int nr_iovecs, if (nr_iovecs > inline_vecs) { unsigned long idx = 0; - bvl = bvec_alloc(gfp_mask, nr_iovecs, &idx, bs->bvec_pool); + bvl = bvec_alloc(gfp_mask, nr_iovecs, &idx, &bs->bvec_pool); if (!bvl && gfp_mask != saved_gfp) { punt_bios_to_rescuer(bs); gfp_mask = saved_gfp; - bvl = bvec_alloc(gfp_mask, nr_iovecs, &idx, bs->bvec_pool); + bvl = bvec_alloc(gfp_mask, nr_iovecs, &idx, &bs->bvec_pool); } if (unlikely(!bvl)) @@ -524,7 +525,7 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, unsigned int nr_iovecs, return bio; err_free: - mempool_free(p, bs->bio_pool); + mempool_free(p, &bs->bio_pool); return NULL; } EXPORT_SYMBOL(bio_alloc_bioset); @@ -1848,11 +1849,11 @@ EXPORT_SYMBOL_GPL(bio_trim); * create memory pools for biovec's in a bio_set. * use the global biovec slabs created for general use. */ -mempool_t *biovec_create_pool(int pool_entries) +int biovec_init_pool(mempool_t *pool, int pool_entries) { struct biovec_slab *bp = bvec_slabs + BVEC_POOL_MAX; - return mempool_create_slab_pool(pool_entries, bp->slab); + return mempool_init_slab_pool(pool, pool_entries, bp->slab); } void bioset_free(struct bio_set *bs) @@ -1860,8 +1861,8 @@ void bioset_free(struct bio_set *bs) if (bs->rescue_workqueue) destroy_workqueue(bs->rescue_workqueue); - mempool_destroy(bs->bio_pool); - mempool_destroy(bs->bvec_pool); + mempool_exit(&bs->bio_pool); + mempool_exit(&bs->bvec_pool); bioset_integrity_free(bs); bio_put_slab(bs); @@ -1913,15 +1914,12 @@ struct bio_set *bioset_create(unsigned int pool_size, return NULL; } - bs->bio_pool = mempool_create_slab_pool(pool_size, bs->bio_slab); - if (!bs->bio_pool) + if (mempool_init_slab_pool(&bs->bio_pool, pool_size, bs->bio_slab)) goto bad; - if (flags & BIOSET_NEED_BVECS) { - bs->bvec_pool = biovec_create_pool(pool_size); - if (!bs->bvec_pool) - goto bad; - } + if ((flags & BIOSET_NEED_BVECS) && + biovec_init_pool(&bs->bvec_pool, pool_size)) + goto bad; if (!(flags & BIOSET_NEED_RESCUER)) return bs; diff --git a/include/linux/bio.h b/include/linux/bio.h index ce547a25e8..720f7261d0 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -412,7 +412,7 @@ enum { BIOSET_NEED_RESCUER = BIT(1), }; extern void bioset_free(struct bio_set *); -extern mempool_t *biovec_create_pool(int pool_entries); +extern int biovec_init_pool(mempool_t *pool, int pool_entries); extern struct bio *bio_alloc_bioset(gfp_t, unsigned int, struct bio_set *); extern void bio_put(struct bio *); @@ -722,11 +722,11 @@ struct bio_set { struct kmem_cache *bio_slab; unsigned int front_pad; - mempool_t *bio_pool; - mempool_t *bvec_pool; + mempool_t bio_pool; + mempool_t bvec_pool; #if defined(CONFIG_BLK_DEV_INTEGRITY) - mempool_t *bio_integrity_pool; - mempool_t *bvec_integrity_pool; + mempool_t bio_integrity_pool; + mempool_t bvec_integrity_pool; #endif /* -- 2.17.0