From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: ARC-Seal: i=1; a=rsa-sha256; t=1527038326; cv=none; d=google.com; s=arc-20160816; b=ivOrCz1NyUe1FLnL4qHsecmRV8KHd3kovOY5gAj6p2yBdZSApcdrsZp0sHxgVqgPbg j9e2B9oyCF9+WvMg7lrLft8s2/T8s+PXCXtbzmuAK6NA+rvTvdwq5iuPwP3cX3HmqcF5 wIHsJP/4jZnCElZ+wERxfyBRSpbLYa5Xwuiec9SxEvdnn+P4xXtEsPIg2hgaQ4jvry9x uYjf+tEoHVYMcHGPrwbFP+svMSiZMEw4b8haFzW0CvMbGFXyEvljcNTd7bhFnkShWO/N gsovZMn+48AFmxhWdetYwCVI4Pj/2+8zni9FxmrUr5L7HGDXKvluYxpddwEdQ81+AqEx 2RyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=aAylj390SzpurFM70TLaaWr6yaijN8/amlAfF5yOrvQ=; b=BvGGXEciVQnUl9D5wKYH0nBOaz8BQZB0ncdEfbFWhWng9lGWB/ZynHjni20VKa2g1N tEb8XDSkWRaUmFr6mgVpoNEm8MdlvbqMCfKwO38ifJYsHE13nmH9BDbXcMQ8P4ESqQyA lDJmcmwkp217vm3keow/SqTCEO2GIzvtBQCDcbX3eUzV36vnt0e06AbhJEIJ7dO3c3BR zxq3+6vChiwceWtVzty/qY/6E8jJaMV71nZE0MoFo3HVgM8KPhWMoP1kKgeDzNgDZJW2 KuG19q5Fj7VnWdclAz7yIOMbXFBT346nqG4Eo6Wu9IuuAjqvZ+VqchGTdAyGTLlC7/LA Q+Bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=FiWvqlct; spf=pass (google.com: domain of kent.overstreet@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=kent.overstreet@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=FiWvqlct; spf=pass (google.com: domain of kent.overstreet@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=kent.overstreet@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com X-Google-Smtp-Source: AB8JxZpT+riuVqsulHp1BPRApa7t1nRlJ9zVG0TEf0M0RjONNVL9K+rCfS2mqBo9fs3bpfHRDXe11Q== From: Kent Overstreet To: linux-kernel@vger.kernel.org, viro@zeniv.linux.org.uk, akpm@linux-foundation.org, willy@infradead.org, gregkh@linuxfoundation.org, linux-security-module@vger.kernel.org, selinux@tycho.nsa.gov, dev@openvswitch.org, shli@kernel.org, linux-raid@vger.kernel.org Cc: Kent Overstreet Subject: [PATCH 3/6] md: convert to genradix Date: Tue, 22 May 2018 21:18:18 -0400 Message-Id: <20180523011821.12165-3-kent.overstreet@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180523011821.12165-1-kent.overstreet@gmail.com> References: <20180523011821.12165-1-kent.overstreet@gmail.com> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1601215739753654643?= X-GMAIL-MSGID: =?utf-8?q?1601215739753654643?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: the new generic radix trees have a simpler API and implementation, and no limitations on number of elements, so all flex_array users are being converted Signed-off-by: Kent Overstreet --- drivers/md/raid5-ppl.c | 5 ++- drivers/md/raid5.c | 77 ++++++++++++++++++++---------------------- drivers/md/raid5.h | 4 ++- 3 files changed, 42 insertions(+), 44 deletions(-) diff --git a/drivers/md/raid5-ppl.c b/drivers/md/raid5-ppl.c index 42890a0837..ffb4ae0679 100644 --- a/drivers/md/raid5-ppl.c +++ b/drivers/md/raid5-ppl.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include "md.h" @@ -165,7 +164,7 @@ ops_run_partial_parity(struct stripe_head *sh, struct raid5_percpu *percpu, struct dma_async_tx_descriptor *tx) { int disks = sh->disks; - struct page **srcs = flex_array_get(percpu->scribble, 0); + struct page **srcs = __genradix_ptr(&percpu->scribble, 0); int count = 0, pd_idx = sh->pd_idx, i; struct async_submit_ctl submit; @@ -196,7 +195,7 @@ ops_run_partial_parity(struct stripe_head *sh, struct raid5_percpu *percpu, } init_async_submit(&submit, ASYNC_TX_FENCE|ASYNC_TX_XOR_ZERO_DST, tx, - NULL, sh, flex_array_get(percpu->scribble, 0) + NULL, sh, __genradix_ptr(&percpu->scribble, 0) + sizeof(struct page *) * (sh->disks + 2)); if (count == 1) diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index b5d2601483..31f88db83c 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -54,7 +54,6 @@ #include #include #include -#include #include #include @@ -1396,7 +1395,9 @@ static addr_conv_t *to_addr_conv(struct stripe_head *sh, { void *addr; - addr = flex_array_get(percpu->scribble, i); + addr = __genradix_ptr(&percpu->scribble, + __idx_to_offset(i, percpu->scribble_obj_size)); + return addr + sizeof(struct page *) * (sh->disks + 2); } @@ -1405,7 +1406,8 @@ static struct page **to_addr_page(struct raid5_percpu *percpu, int i) { void *addr; - addr = flex_array_get(percpu->scribble, i); + addr = __genradix_ptr(&percpu->scribble, + __idx_to_offset(i, percpu->scribble_obj_size)); return addr; } @@ -2235,21 +2237,21 @@ static int grow_stripes(struct r5conf *conf, int num) * calculate over all devices (not just the data blocks), using zeros in place * of the P and Q blocks. */ -static struct flex_array *scribble_alloc(int num, int cnt, gfp_t flags) +static int scribble_alloc(struct raid5_percpu *percpu, + int num, int cnt, gfp_t flags) { - struct flex_array *ret; - size_t len; + size_t obj_size = + sizeof(struct page *) * (num+2) + + sizeof(addr_conv_t) * (num+2); + int ret; - len = sizeof(struct page *) * (num+2) + sizeof(addr_conv_t) * (num+2); - ret = flex_array_alloc(len, cnt, flags); - if (!ret) - return NULL; - /* always prealloc all elements, so no locking is required */ - if (flex_array_prealloc(ret, 0, cnt, flags)) { - flex_array_free(ret); - return NULL; - } - return ret; + ret = __genradix_prealloc(&percpu->scribble, + __idx_to_offset(cnt + 1, obj_size), flags); + if (ret) + return ret; + + percpu->scribble_obj_size = obj_size; + return 0; } static int resize_chunks(struct r5conf *conf, int new_disks, int new_sectors) @@ -2267,23 +2269,18 @@ static int resize_chunks(struct r5conf *conf, int new_disks, int new_sectors) return 0; mddev_suspend(conf->mddev); get_online_cpus(); + for_each_present_cpu(cpu) { struct raid5_percpu *percpu; - struct flex_array *scribble; percpu = per_cpu_ptr(conf->percpu, cpu); - scribble = scribble_alloc(new_disks, - new_sectors / STRIPE_SECTORS, - GFP_NOIO); - - if (scribble) { - flex_array_free(percpu->scribble); - percpu->scribble = scribble; - } else { - err = -ENOMEM; + err = scribble_alloc(percpu, new_disks, + new_sectors / STRIPE_SECTORS, + GFP_NOIO); + if (err) break; - } } + put_online_cpus(); mddev_resume(conf->mddev); if (!err) { @@ -6716,25 +6713,25 @@ raid5_size(struct mddev *mddev, sector_t sectors, int raid_disks) static void free_scratch_buffer(struct r5conf *conf, struct raid5_percpu *percpu) { safe_put_page(percpu->spare_page); - if (percpu->scribble) - flex_array_free(percpu->scribble); percpu->spare_page = NULL; - percpu->scribble = NULL; + __genradix_free(&percpu->scribble); } static int alloc_scratch_buffer(struct r5conf *conf, struct raid5_percpu *percpu) { - if (conf->level == 6 && !percpu->spare_page) + if (conf->level == 6 && !percpu->spare_page) { percpu->spare_page = alloc_page(GFP_KERNEL); - if (!percpu->scribble) - percpu->scribble = scribble_alloc(max(conf->raid_disks, - conf->previous_raid_disks), - max(conf->chunk_sectors, - conf->prev_chunk_sectors) - / STRIPE_SECTORS, - GFP_KERNEL); - - if (!percpu->scribble || (conf->level == 6 && !percpu->spare_page)) { + if (!percpu->spare_page) + return -ENOMEM; + } + + if (scribble_alloc(percpu, + max(conf->raid_disks, + conf->previous_raid_disks), + max(conf->chunk_sectors, + conf->prev_chunk_sectors) + / STRIPE_SECTORS, + GFP_KERNEL)) { free_scratch_buffer(conf, percpu); return -ENOMEM; } diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h index 3f8da26032..2c39bfce32 100644 --- a/drivers/md/raid5.h +++ b/drivers/md/raid5.h @@ -4,6 +4,7 @@ #include #include +#include /* * @@ -637,10 +638,11 @@ struct r5conf { /* per cpu variables */ struct raid5_percpu { struct page *spare_page; /* Used when checking P/Q in raid6 */ - struct flex_array *scribble; /* space for constructing buffer + struct __genradix scribble; /* space for constructing buffer * lists and performing address * conversions */ + int scribble_obj_size; } __percpu *percpu; int scribble_disks; int scribble_sectors; -- 2.17.0