Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32825ebb authored by Rakesh Pandit's avatar Rakesh Pandit Committed by Jens Axboe
Browse files

lightnvm: pblk: reuse pblk_gc_should_kick 



This is a trivial change which reuses pblk_gc_should_kick instead of
repeating it again in pblk_rl_free_lines_inc.

Signed-off-by: default avatarRakesh Pandit <rakesh@tuxera.com>
Made it apply to the common case.
Reviewed-by: default avatarJavier González <javier@cnexlabs.com>
Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c79819bc

drivers/lightnvm/pblk-core.c

+0 −2
Original line number Diff line number Diff line
@@ -1591,8 +1591,6 @@ void pblk_line_close(struct pblk *pblk, struct pblk_line *line) 


	spin_unlock(&line->lock);

	spin_unlock(&l_mg->gc_lock);



	pblk_gc_should_kick(pblk);

}



void pblk_line_close_meta(struct pblk *pblk, struct pblk_line *line)

drivers/lightnvm/pblk-rl.c

+9 −24
Original line number Diff line number Diff line
@@ -96,9 +96,11 @@ unsigned long pblk_rl_nr_free_blks(struct pblk_rl *rl) 
 *

 * Only the total number of free blocks is used to configure the rate limiter.

 */

static int pblk_rl_update_rates(struct pblk_rl *rl, unsigned long max)

static void pblk_rl_update_rates(struct pblk_rl *rl)

{

	struct pblk *pblk = container_of(rl, struct pblk, rl);

	unsigned long free_blocks = pblk_rl_nr_free_blks(rl);

	int max = rl->rb_budget;



	if (free_blocks >= rl->high) {

		rl->rb_user_max = max;
@@ -124,23 +126,18 @@ static int pblk_rl_update_rates(struct pblk_rl *rl, unsigned long max) 
		rl->rb_state = PBLK_RL_LOW;

	}



	return rl->rb_state;

	if (rl->rb_state == (PBLK_RL_MID | PBLK_RL_LOW))

		pblk_gc_should_start(pblk);

	else

		pblk_gc_should_stop(pblk);

}



void pblk_rl_free_lines_inc(struct pblk_rl *rl, struct pblk_line *line)

{

	struct pblk *pblk = container_of(rl, struct pblk, rl);

	int blk_in_line = atomic_read(&line->blk_in_line);

	int ret;



	atomic_add(blk_in_line, &rl->free_blocks);

	/* Rates will not change that often - no need to lock update */

	ret = pblk_rl_update_rates(rl, rl->rb_budget);



	if (ret == (PBLK_RL_MID | PBLK_RL_LOW))

		pblk_gc_should_start(pblk);

	else

		pblk_gc_should_stop(pblk);

	pblk_rl_update_rates(rl);

}



void pblk_rl_free_lines_dec(struct pblk_rl *rl, struct pblk_line *line)
@@ -148,19 +145,7 @@ void pblk_rl_free_lines_dec(struct pblk_rl *rl, struct pblk_line *line) 
	int blk_in_line = atomic_read(&line->blk_in_line);



	atomic_sub(blk_in_line, &rl->free_blocks);

}



void pblk_gc_should_kick(struct pblk *pblk)

{

	struct pblk_rl *rl = &pblk->rl;

	int ret;



	/* Rates will not change that often - no need to lock update */

	ret = pblk_rl_update_rates(rl, rl->rb_budget);

	if (ret == (PBLK_RL_MID | PBLK_RL_LOW))

		pblk_gc_should_start(pblk);

	else

		pblk_gc_should_stop(pblk);

	pblk_rl_update_rates(rl);

}



int pblk_rl_high_thrs(struct pblk_rl *rl)

drivers/lightnvm/pblk.h

+0 −1
Original line number Diff line number Diff line
@@ -824,7 +824,6 @@ int pblk_gc_init(struct pblk *pblk); 
void pblk_gc_exit(struct pblk *pblk);

void pblk_gc_should_start(struct pblk *pblk);

void pblk_gc_should_stop(struct pblk *pblk);

void pblk_gc_should_kick(struct pblk *pblk);

void pblk_gc_kick(struct pblk *pblk);

void pblk_gc_sysfs_state_show(struct pblk *pblk, int *gc_enabled,

			      int *gc_active);