Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751279AbaLQPsu (ORCPT ); Wed, 17 Dec 2014 10:48:50 -0500 Received: from mail-qg0-f51.google.com ([209.85.192.51]:45990 "EHLO mail-qg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751096AbaLQPss (ORCPT ); Wed, 17 Dec 2014 10:48:48 -0500 Date: Wed, 17 Dec 2014 12:48:37 -0300 From: Guido =?iso-8859-1?Q?Mart=EDnez?= To: Richard Weinberger Cc: dedekind1@gmail.com, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 6/6] UBI: Fastmap: Make ubi_refill_pools() fair Message-ID: <20141217154837.GA2049@fox> References: <1416835236-25185-1-git-send-email-richard@nod.at> <1416835236-25185-7-git-send-email-richard@nod.at> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1416835236-25185-7-git-send-email-richard@nod.at> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Richard, On Mon, Nov 24, 2014 at 02:20:36PM +0100, Richard Weinberger wrote: > Currently ubi_refill_pools() first fills the first and then > the second one. > If only very few free PEBs are available the second pool can get > zero PEBs. > Change ubi_refill_pools() to distribute free PEBs fair between > all pools. > > Signed-off-by: Richard Weinberger Reviewed-by: Guido Mart?nez > --- > drivers/mtd/ubi/wl.c | 77 +++++++++++++++++++++++++++------------------------- > 1 file changed, 40 insertions(+), 37 deletions(-) > > diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c > index f028b68..c2822f7 100644 > --- a/drivers/mtd/ubi/wl.c > +++ b/drivers/mtd/ubi/wl.c > @@ -583,59 +583,62 @@ static void return_unused_pool_pebs(struct ubi_device *ubi, > } > > /** > - * refill_wl_pool - refills all the fastmap pool used by the > - * WL sub-system. > + * ubi_refill_pools - refills all fastmap PEB pools. > * @ubi: UBI device description object > */ > -static void refill_wl_pool(struct ubi_device *ubi) > +void ubi_refill_pools(struct ubi_device *ubi) > { > + struct ubi_fm_pool *wl_pool = &ubi->fm_wl_pool; > + struct ubi_fm_pool *pool = &ubi->fm_pool; > struct ubi_wl_entry *e; > - struct ubi_fm_pool *pool = &ubi->fm_wl_pool; > + int enough; > > + spin_lock(&ubi->wl_lock); > + > + return_unused_pool_pebs(ubi, wl_pool); > return_unused_pool_pebs(ubi, pool); > > - for (pool->size = 0; pool->size < pool->max_size; pool->size++) { > - if (!ubi->free.rb_node || > - (ubi->free_count - ubi->beb_rsvd_pebs < 5)) > - break; > + wl_pool->size = 0; > + pool->size = 0; > > - e = find_wl_entry(ubi, &ubi->free, WL_FREE_MAX_DIFF); > - self_check_in_wl_tree(ubi, e, &ubi->free); > - rb_erase(&e->u.rb, &ubi->free); > - ubi->free_count--; > + for (;;) { > + enough = 0; > + if (pool->size < pool->max_size) { > + if (!ubi->free.rb_node || > + (ubi->free_count - ubi->beb_rsvd_pebs < 5)) > + break; > > - pool->pebs[pool->size] = e->pnum; > - } > - pool->used = 0; > -} > + e = wl_get_wle(ubi); > + if (!e) > + break; > > -/** > - * refill_wl_user_pool - refills all the fastmap pool used by ubi_wl_get_peb. > - * @ubi: UBI device description object > - */ > -static void refill_wl_user_pool(struct ubi_device *ubi) > -{ > - struct ubi_fm_pool *pool = &ubi->fm_pool; > + pool->pebs[pool->size] = e->pnum; > + pool->size++; > + } else > + enough++; > > - return_unused_pool_pebs(ubi, pool); > + if (wl_pool->size < wl_pool->max_size) { > + if (!ubi->free.rb_node || > + (ubi->free_count - ubi->beb_rsvd_pebs < 5)) > + break; > > - for (pool->size = 0; pool->size < pool->max_size; pool->size++) { > - pool->pebs[pool->size] = __wl_get_peb(ubi); > - if (pool->pebs[pool->size] < 0) > + e = find_wl_entry(ubi, &ubi->free, WL_FREE_MAX_DIFF); > + self_check_in_wl_tree(ubi, e, &ubi->free); > + rb_erase(&e->u.rb, &ubi->free); > + ubi->free_count--; > + > + wl_pool->pebs[wl_pool->size] = e->pnum; > + wl_pool->size++; > + } else > + enough++; > + > + if (enough == 2) > break; > } > + > + wl_pool->used = 0; > pool->used = 0; > -} > > -/** > - * ubi_refill_pools - refills all fastmap PEB pools. > - * @ubi: UBI device description object > - */ > -void ubi_refill_pools(struct ubi_device *ubi) > -{ > - spin_lock(&ubi->wl_lock); > - refill_wl_pool(ubi); > - refill_wl_user_pool(ubi); > spin_unlock(&ubi->wl_lock); > } > > -- > 1.8.4.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- Guido Mart?nez, VanguardiaSur www.vanguardiasur.com.ar -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/