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

Commit 6f26f0ba authored by Kent Overstreet's avatar Kent Overstreet Committed by Greg Kroah-Hartman
Browse files

bcache: Make gc wakeup sane, remove set_task_state() 



commit be628be09563f8f6e81929efbd7cf3f45c344416 upstream.

Signed-off-by: default avatarKent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aee7d041

drivers/md/bcache/bcache.h

+2 −2
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ struct cache { 
	 * until a gc finishes - otherwise we could pointlessly burn a ton of

	 * cpu

	 */

	unsigned		invalidate_needs_gc:1;

	unsigned		invalidate_needs_gc;



	bool			discard; /* Get rid of? */
@@ -593,8 +593,8 @@ struct cache_set { 


	/* Counts how many sectors bio_insert has added to the cache */

	atomic_t		sectors_to_gc;

	wait_queue_head_t	gc_wait;



	wait_queue_head_t	moving_gc_wait;

	struct keybuf		moving_gc_keys;

	/* Number of moving GC bios in flight */

	struct semaphore	moving_in_flight;

drivers/md/bcache/btree.c

+20 −20
Original line number Diff line number Diff line
@@ -1762,33 +1762,34 @@ static void bch_btree_gc(struct cache_set *c) 
	bch_moving_gc(c);

}



static int bch_gc_thread(void *arg)

static bool gc_should_run(struct cache_set *c)

{

	struct cache_set *c = arg;

	struct cache *ca;

	unsigned i;



	while (1) {

again:

		bch_btree_gc(c);



		set_current_state(TASK_INTERRUPTIBLE);

		if (kthread_should_stop())

			break;

	for_each_cache(ca, c, i)

		if (ca->invalidate_needs_gc)

			return true;



		mutex_lock(&c->bucket_lock);

	if (atomic_read(&c->sectors_to_gc) < 0)

		return true;



		for_each_cache(ca, c, i)

			if (ca->invalidate_needs_gc) {

				mutex_unlock(&c->bucket_lock);

				set_current_state(TASK_RUNNING);

				goto again;

	return false;

}



		mutex_unlock(&c->bucket_lock);

static int bch_gc_thread(void *arg)

{

	struct cache_set *c = arg;



	while (1) {

		wait_event_interruptible(c->gc_wait,

			   kthread_should_stop() || gc_should_run(c));



		if (kthread_should_stop())

			break;



		try_to_freeze();

		schedule();

		set_gc_sectors(c);

		bch_btree_gc(c);

	}



	return 0;
@@ -1796,11 +1797,10 @@ again: 


int bch_gc_thread_start(struct cache_set *c)

{

	c->gc_thread = kthread_create(bch_gc_thread, c, "bcache_gc");

	c->gc_thread = kthread_run(bch_gc_thread, c, "bcache_gc");

	if (IS_ERR(c->gc_thread))

		return PTR_ERR(c->gc_thread);



	set_task_state(c->gc_thread, TASK_INTERRUPTIBLE);

	return 0;

}

drivers/md/bcache/btree.h

+1 −2
Original line number Diff line number Diff line
@@ -260,8 +260,7 @@ void bch_initial_mark_key(struct cache_set *, int, struct bkey *); 


static inline void wake_up_gc(struct cache_set *c)

{

	if (c->gc_thread)

		wake_up_process(c->gc_thread);

	wake_up(&c->gc_wait);

}



#define MAP_DONE	0

drivers/md/bcache/request.c

+1 −3
Original line number Diff line number Diff line
@@ -196,10 +196,8 @@ static void bch_data_insert_start(struct closure *cl) 
	struct data_insert_op *op = container_of(cl, struct data_insert_op, cl);

	struct bio *bio = op->bio, *n;



	if (atomic_sub_return(bio_sectors(bio), &op->c->sectors_to_gc) < 0) {

		set_gc_sectors(op->c);

	if (atomic_sub_return(bio_sectors(bio), &op->c->sectors_to_gc) < 0)

		wake_up_gc(op->c);

	}



	if (op->bypass)

		return bch_data_invalidate(cl);

drivers/md/bcache/super.c

+2 −0
Original line number Diff line number Diff line
@@ -1489,6 +1489,7 @@ struct cache_set *bch_cache_set_alloc(struct cache_sb *sb) 
	mutex_init(&c->bucket_lock);

	init_waitqueue_head(&c->btree_cache_wait);

	init_waitqueue_head(&c->bucket_wait);

	init_waitqueue_head(&c->gc_wait);

	sema_init(&c->uuid_write_mutex, 1);



	spin_lock_init(&c->btree_gc_time.lock);
@@ -1547,6 +1548,7 @@ static void run_cache_set(struct cache_set *c) 


	for_each_cache(ca, c, i)

		c->nbuckets += ca->sb.nbuckets;

	set_gc_sectors(c);



	if (CACHE_SYNC(&c->sb)) {

		LIST_HEAD(journal);