Commit 87d5d832 authored by Changpeng Liu's avatar Changpeng Liu Committed by Tomasz Zawadzki
Browse files

blobfs: refactor cache_free_buffers() 



cache_free_buffers() was only used in the file deletion and unload, and
the file is also freed after that, so here we combine the cache free and
file free together and do the cache free in the cache thread.

Change-Id: I57e9a27c9a6467bcf6c85cd277db3b57e06c98e5
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1795


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 76d23f6f

lib/blobfs/blobfs.c

+24 −23
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ struct spdk_fs_cb_args { 
	} op;

};



static void cache_free_buffers(struct spdk_file *file);

static void file_free(struct spdk_file *file);

static void fs_io_device_unregister(struct spdk_filesystem *fs);

static void fs_free_io_channels(struct spdk_filesystem *fs);
@@ -897,10 +897,7 @@ unload_cb(void *ctx, int bserrno) 


	TAILQ_FOREACH_SAFE(file, &fs->files, tailq, tmp) {

		TAILQ_REMOVE(&fs->files, file, tailq);

		cache_free_buffers(file);

		free(file->name);

		free(file->tree);

		free(file);

		file_free(file);

	}



	free_global_cache();
@@ -1525,19 +1522,10 @@ spdk_fs_delete_file_async(struct spdk_filesystem *fs, const char *name, 
		return;

	}



	TAILQ_REMOVE(&fs->files, f, tailq);



	/* It's safe to free cache buffers here while another thread

	 * is trying to free the same file cache buffers, because each

	 * thread will get the g_caches_lock first.

	 */

	cache_free_buffers(f);



	blobid = f->blobid;

	TAILQ_REMOVE(&fs->files, f, tailq);



	free(f->name);

	free(f->tree);

	free(f);

	file_free(f);



	spdk_bs_delete_blob(fs->bs, blobid, blob_delete_cb, req);

}
@@ -2957,22 +2945,35 @@ spdk_file_get_id(struct spdk_file *file, void *id, size_t size) 
}



static void

cache_free_buffers(struct spdk_file *file)

_file_free(void *ctx)

{

	struct spdk_file *file = ctx;



	pthread_spin_lock(&g_caches_lock);

	TAILQ_REMOVE(&g_caches, file, cache_tailq);

	pthread_spin_unlock(&g_caches_lock);



	free(file->name);

	free(file->tree);

	free(file);

}



static void

file_free(struct spdk_file *file)

{

	BLOBFS_TRACE(file, "free=%s\n", file->name);

	pthread_spin_lock(&file->lock);

	pthread_spin_lock(&g_caches_lock);

	if (file->tree->present_mask == 0) {

		pthread_spin_unlock(&g_caches_lock);

		pthread_spin_unlock(&file->lock);

		free(file->name);

		free(file->tree);

		free(file);

		return;

	}

	tree_free_buffers(file->tree);



	TAILQ_REMOVE(&g_caches, file, cache_tailq);

	tree_free_buffers(file->tree);

	assert(file->tree->present_mask == 0);

	file->last = NULL;

	pthread_spin_unlock(&g_caches_lock);

	spdk_thread_send_msg(g_cache_pool_thread, _file_free, file);

	pthread_spin_unlock(&file->lock);

}

test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c

+0 −1
Original line number Diff line number Diff line
@@ -561,7 +561,6 @@ cache_append_no_cache(void) 


	fs_thread_poll();



	cache_free_buffers(g_file);

	spdk_file_write(g_file, channel, buf, 2 * sizeof(buf), sizeof(buf));

	CU_ASSERT(spdk_file_get_length(g_file) == 3 * sizeof(buf));

	spdk_file_write(g_file, channel, buf, 3 * sizeof(buf), sizeof(buf));