[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/11] qcow2-threads: add per-thread data
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH 06/11] qcow2-threads: add per-thread data |
Date: |
Fri, 23 Nov 2018 19:55:06 +0300 |
We'll need per-thread data (crypto blocks) for encryption threads.
Prepare threads infrastructure for it.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/qcow2.h | 6 ++++++
block/qcow2-threads.c | 25 ++++++++++++++++++++++---
2 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/block/qcow2.h b/block/qcow2.h
index abe51a385c..7bef0393ce 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -257,9 +257,15 @@ typedef struct Qcow2BitmapHeaderExt {
uint64_t bitmap_directory_offset;
} QEMU_PACKED Qcow2BitmapHeaderExt;
+#define QCOW2_MAX_THREADS 4
+typedef struct Qcow2PerThreadData {
+ bool in_use;
+} Qcow2PerThreadData;
+
typedef struct Qcow2ThreadsState {
CoQueue task_queue;
int count;
+ Qcow2PerThreadData per_thread[QCOW2_MAX_THREADS];
} Qcow2ThreadsState;
typedef struct BDRVQcow2State {
diff --git a/block/qcow2-threads.c b/block/qcow2-threads.c
index a09f07e2f9..3ed990ef2f 100644
--- a/block/qcow2-threads.c
+++ b/block/qcow2-threads.c
@@ -31,24 +31,42 @@
#include "qcow2.h"
#include "block/thread-pool.h"
-#define QCOW2_MAX_THREADS 4
+typedef struct Qcow2ProcessData {
+ Qcow2PerThreadData *self;
+ void *arg;
+} Qcow2ProcessData;
static int coroutine_fn
qcow2_co_process(BlockDriverState *bs, ThreadPoolFunc *func, void *arg)
{
int ret;
+ int ind;
BDRVQcow2State *s = bs->opaque;
Qcow2ThreadsState *thr = &s->threads;
ThreadPool *pool = aio_get_thread_pool(bdrv_get_aio_context(bs));
+ Qcow2ProcessData data = {
+ .arg = arg
+ };
while (thr->count >= QCOW2_MAX_THREADS) {
qemu_co_queue_wait(&thr->task_queue, NULL);
}
+ for (ind = 0; ind < QCOW2_MAX_THREADS; ind++) {
+ if (!thr->per_thread[ind].in_use) {
+ data.self = &thr->per_thread[ind];
+ thr->per_thread[ind].in_use = true;
+ break;
+ }
+ }
+ assert(ind < QCOW2_MAX_THREADS);
+
thr->count++;
- ret = thread_pool_submit_co(pool, func, arg);
+ ret = thread_pool_submit_co(pool, func, &data);
thr->count--;
+ thr->per_thread[ind].in_use = false;
+
qemu_co_queue_next(&thr->task_queue);
return ret;
@@ -158,7 +176,8 @@ static ssize_t qcow2_decompress(void *dest, size_t
dest_size,
static int qcow2_compress_pool_func(void *opaque)
{
- Qcow2CompressData *data = opaque;
+ Qcow2ProcessData *pdata = opaque;
+ Qcow2CompressData *data = pdata->arg;
data->ret = data->func(data->dest, data->dest_size,
data->src, data->src_size);
--
2.18.0
- [Qemu-devel] [PATCH 00/11] qcow2: encryption threads, Vladimir Sementsov-Ogievskiy, 2018/11/23
- [Qemu-devel] [PATCH 06/11] qcow2-threads: add per-thread data,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH 03/11] qcow2-threads: use thread_pool_submit_co, Vladimir Sementsov-Ogievskiy, 2018/11/23
- [Qemu-devel] [PATCH 07/11] qcow2-threads: add encryption, Vladimir Sementsov-Ogievskiy, 2018/11/23
- [Qemu-devel] [PATCH 05/11] qcow2-threads: split out generic path, Vladimir Sementsov-Ogievskiy, 2018/11/23
- [Qemu-devel] [PATCH 01/11] qcow2.h: add missing include, Vladimir Sementsov-Ogievskiy, 2018/11/23
- [Qemu-devel] [PATCH 11/11] qcow2: do encryption in threads, Vladimir Sementsov-Ogievskiy, 2018/11/23
- [Qemu-devel] [PATCH 08/11] qcow2: bdrv_co_preadv: improve locking, Vladimir Sementsov-Ogievskiy, 2018/11/23
- [Qemu-devel] [PATCH 09/11] qcow2: qcow2_co_preadv: skip using hd_qiov when possible, Vladimir Sementsov-Ogievskiy, 2018/11/23
- [Qemu-devel] [PATCH 04/11] qcow2: split out data processing threads state from BDRVQcow2State, Vladimir Sementsov-Ogievskiy, 2018/11/23
- [Qemu-devel] [PATCH 02/11] qcow2: add separate file for threaded data processing functions, Vladimir Sementsov-Ogievskiy, 2018/11/23