d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

blobfs: track num outstanding requests per channel

Browse Source 
This will be used in next patch to ensure synchronous
threads wait until any background operations are done
before freeing its request memory, and also to print
errors if internal channels have outstanding
requests when freed.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I24bc8096f84b70270f87b051f9034ed08e639500

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/451780
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Jim Harris 2019-04-23 07:44:14 -07:00
parent ae693db986
commit b282c927ea
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/blobfs/blobfs.c
View File

@ -254,6 +254,7 @@ struct spdk_fs_channel {
struct spdk_io_channel *bs_channel;
fs_send_request_fn send_request;
bool sync;
uint32_t outstanding_reqs;
pthread_spinlock_t lock;
};
@ -282,6 +283,7 @@ alloc_fs_request_with_iov(struct spdk_fs_channel *channel, uint32_t iovcnt)
req = TAILQ_FIRST(&channel->reqs);
if (req) {
channel->outstanding_reqs++;
TAILQ_REMOVE(&channel->reqs, req, link);
}
@ -326,6 +328,7 @@ free_fs_request(struct spdk_fs_request *req)
}
TAILQ_INSERT_HEAD(&req->channel->reqs, req, link);
channel->outstanding_reqs--;
if (channel->sync) {
pthread_spin_unlock(&channel->lock);
@ -343,6 +346,7 @@ _spdk_fs_channel_create(struct spdk_filesystem *fs, struct spdk_fs_channel *chan
return -1;
}
channel->outstanding_reqs = 0;
TAILQ_INIT(&channel->reqs);
sem_init(&channel->sem, 0, 0);
@ -393,6 +397,11 @@ _spdk_fs_channel_destroy(void *io_device, void *ctx_buf)
{
struct spdk_fs_channel *channel = ctx_buf;
if (channel->outstanding_reqs > 0) {
SPDK_ERRLOG("channel freed with %" PRIu32 " outstanding requests!\n",
channel->outstanding_reqs);
}
free(channel->req_mem);
if (channel->bs_channel != NULL) {
spdk_bs_free_io_channel(channel->bs_channel);
@ -1781,6 +1790,18 @@ spdk_fs_alloc_thread_ctx(struct spdk_filesystem *fs)
void
spdk_fs_free_thread_ctx(struct spdk_fs_thread_ctx *ctx)
{
assert(ctx->ch.sync == 1);
while (true) {
pthread_spin_lock(&ctx->ch.lock);
if (ctx->ch.outstanding_reqs == 0) {
pthread_spin_unlock(&ctx->ch.lock);
break;
}
pthread_spin_unlock(&ctx->ch.lock);
usleep(1000);
}
_spdk_fs_channel_destroy(NULL, &ctx->ch);
free(ctx);
}