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=-8.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham 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 B2191C43382 for ; Wed, 26 Sep 2018 09:00:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 65056208E4 for ; Wed, 26 Sep 2018 09:00:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="BetNj9ER" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 65056208E4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=163.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728045AbeIZPMu (ORCPT ); Wed, 26 Sep 2018 11:12:50 -0400 Received: from m12-18.163.com ([220.181.12.18]:42881 "EHLO m12-18.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727157AbeIZPMu (ORCPT ); Wed, 26 Sep 2018 11:12:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=FzuyxddxuSEz2Ue8cg D1H9/eJvNO9KMY98y5FtyDF/8=; b=BetNj9ER/s6yLMPyolr2VYMuhX4tnr87QH rJK0zy9ETFOg8hrPYFcIJE+gwB3JxNLOXAlqun1wirmMJictMfeMD7LQnVAgkgvL q4jjKQ6tx4b85++GlPyk3HongT2l5bNA34gf8IufRzw99TWJKgZQQGuIagocOc8u WisV4NVTQ= Received: from localhost.localdomain (unknown [117.136.0.141]) by smtp14 (Coremail) with SMTP id EsCowABnEhC8Sqtbx_jvUg--.46255S4; Wed, 26 Sep 2018 17:00:45 +0800 (CST) From: Dongbo Cao To: colyli@suse.de Cc: kent.overstreet@gmail.com, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, Dongbo Cao Subject: [PATCH] split if-condition code in bch_cache_set_alloc Date: Wed, 26 Sep 2018 17:00:32 +0800 Message-Id: <20180926090032.1881-1-cdbdyx@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: EsCowABnEhC8Sqtbx_jvUg--.46255S4 X-Coremail-Antispam: 1Uf129KBjvJXoWxWr1fuw1DKrW3tFWrWF13CFg_yoWrtFW5pF W7u343ArWrXw4akr15Cr4v9F95C3y09ayUW3y3X34rZws0kr95Kr1vvryUZryrAFZrGa13 CFs5Ka48ur1DGaUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jAKsUUUUUU= X-Originating-IP: [117.136.0.141] X-CM-SenderInfo: xfgev5r06rljoofrz/1tbiMAvN3FWBiq3yOwAAsQ Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org rebase my local code and commit it again. Signed-off-by: Dongbo Cao --- drivers/md/bcache/super.c | 114 +++++++++++++++++++++++++++++++------- 1 file changed, 93 insertions(+), 21 deletions(-) diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index a2cc354c..03099c4c 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -1691,10 +1691,13 @@ void bch_cache_set_unregister(struct cache_set *c) struct cache_set *bch_cache_set_alloc(struct cache_sb *sb) { int iter_size; - struct cache_set *c = kzalloc(sizeof(struct cache_set), GFP_KERNEL); + const char *err = NULL; - if (!c) - return NULL; + struct cache_set *c = kzalloc(sizeof(struct cache_set), GFP_KERNEL); + if (!c) { + err = "cache_set alloc failed"; + goto err_cache_set_alloc; + } __module_get(THIS_MODULE); closure_init(&c->cl, NULL); @@ -1750,22 +1753,65 @@ struct cache_set *bch_cache_set_alloc(struct cache_sb *sb) iter_size = (sb->bucket_size / sb->block_size + 1) * sizeof(struct btree_iter_set); - if (!(c->devices = kcalloc(c->nr_uuids, sizeof(void *), GFP_KERNEL)) || - mempool_init_slab_pool(&c->search, 32, bch_search_cache) || - mempool_init_kmalloc_pool(&c->bio_meta, 2, - sizeof(struct bbio) + sizeof(struct bio_vec) * - bucket_pages(c)) || - mempool_init_kmalloc_pool(&c->fill_iter, 1, iter_size) || - bioset_init(&c->bio_split, 4, offsetof(struct bbio, bio), - BIOSET_NEED_BVECS|BIOSET_NEED_RESCUER) || - !(c->uuids = alloc_bucket_pages(GFP_KERNEL, c)) || - !(c->moving_gc_wq = alloc_workqueue("bcache_gc", - WQ_MEM_RECLAIM, 0)) || - bch_journal_alloc(c) || - bch_btree_cache_alloc(c) || - bch_open_buckets_alloc(c) || - bch_bset_sort_state_init(&c->sort, ilog2(c->btree_pages))) - goto err; + c->devices = kcalloc(c->nr_uuids, sizeof(void *), GFP_KERNEL); + if (!c->devices) { + err = "c->devices alloc failed"; + goto err_devices_alloc; + } + + if (mempool_init_slab_pool(&c->search, 32, bch_search_cache)) { + err = "c->search alloc failed"; + goto err_search_alloc; + } + + if (mempool_init_kmalloc_pool(&c->bio_meta, 2, sizeof(struct bbio) + + sizeof(struct bio_vec) * bucket_pages(c))) { + err = "c->bio_meta alloc failed"; + goto err_bio_meta_alloc; + } + + if (mempool_init_kmalloc_pool(&c->fill_iter, 1, iter_size)) { + err = "c->fill_iter alloc failed"; + goto err_fill_iter_alloc; + } + + if (bioset_init(&c->bio_split, 4, offsetof(struct bbio, bio), + BIOSET_NEED_BVECS|BIOSET_NEED_RESCUER)) { + err = "c->bio_split init failed"; + goto err_bio_split_init; + } + + c->uuids = alloc_bucket_pages(GFP_KERNEL, c); + if (!c->uuids) { + err = "c->uuids alloc failed"; + goto err_uuids_alloc; + } + + c->moving_gc_wq = alloc_workqueue("bcache_gc", WQ_MEM_RECLAIM, 0); + if (!c->moving_gc_wq) { + err = "c->moving_gc_wq alloc failed"; + goto err_moving_gc_wq_alloc; + } + + if (bch_journal_alloc(c)) { + err = "bch_journal_alloc failed"; + goto err_bch_journal_alloc; + } + + if (bch_btree_cache_alloc(c)) { + err = "bch_btree_cache_alloc failed"; + goto err_bch_btree_cache_alloc; + } + + if (bch_open_buckets_alloc(c)) { + err = "bch_open_buckets_alloc failed"; + goto err_bch_open_buckets_alloc; + } + + if (bch_bset_sort_state_init(&c->sort, ilog2(c->btree_pages))) { + err = "bch_bset_sort_state_init failed"; + goto err_bch_bset_sort_state_init; + } c->congested_read_threshold_us = 2000; c->congested_write_threshold_us = 20000; @@ -1773,8 +1819,34 @@ struct cache_set *bch_cache_set_alloc(struct cache_sb *sb) WARN_ON(test_and_clear_bit(CACHE_SET_IO_DISABLE, &c->flags)); return c; -err: - bch_cache_set_unregister(c); + +err_bch_bset_sort_state_init: + bch_open_buckets_free(c); +err_bch_open_buckets_alloc: + bch_btree_cache_free(c); +err_bch_btree_cache_alloc: + bch_journal_free(c); +err_bch_journal_alloc: + destroy_workqueue(c->moving_gc_wq); +err_moving_gc_wq_alloc: + free_pages((unsigned long) c->uuids, ilog2(bucket_pages(c))); +err_uuids_alloc: + bioset_exit(&c->bio_split); +err_bio_split_init: + mempool_exit(&c->fill_iter); +err_fill_iter_alloc: + mempool_exit(&c->bio_meta); +err_bio_meta_alloc: + mempool_exit(&c->search); +err_search_alloc: + kfree(c->devices); +err_devices_alloc: + bch_cache_accounting_destroy(&c->accounting); + kfree(c); + module_put(THIS_MODULE); +err_cache_set_alloc: + if (err) + pr_notice("error cache set %s: %s", c->sb.set_uuid, err); return NULL; } -- 2.17.1