2020-09-24 21:54:11 +03:00
|
|
|
#! /usr/bin/env python3
|
|
|
|
"""Generate coroutine wrappers for block subsystem.
|
|
|
|
|
|
|
|
The program parses one or several concatenated c files from stdin,
|
2022-11-28 17:23:33 +03:00
|
|
|
searches for functions with the 'co_wrapper' specifier
|
2020-09-24 21:54:11 +03:00
|
|
|
and generates corresponding wrappers on stdout.
|
|
|
|
|
|
|
|
Usage: block-coroutine-wrapper.py generated-file.c FILE.[ch]...
|
|
|
|
|
|
|
|
Copyright (c) 2020 Virtuozzo International GmbH.
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
"""
|
|
|
|
|
|
|
|
import sys
|
|
|
|
import re
|
|
|
|
from typing import Iterator
|
|
|
|
|
|
|
|
|
|
|
|
def gen_header():
|
|
|
|
copyright = re.sub('^.*Copyright', 'Copyright', __doc__, flags=re.DOTALL)
|
|
|
|
copyright = re.sub('^(?=.)', ' * ', copyright.strip(), flags=re.MULTILINE)
|
|
|
|
copyright = re.sub('^$', ' *', copyright, flags=re.MULTILINE)
|
|
|
|
return f"""\
|
|
|
|
/*
|
|
|
|
* File is generated by scripts/block-coroutine-wrapper.py
|
|
|
|
*
|
|
|
|
{copyright}
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "qemu/osdep.h"
|
|
|
|
#include "block/coroutines.h"
|
|
|
|
#include "block/block-gen.h"
|
2022-12-21 16:35:49 +03:00
|
|
|
#include "block/block_int.h"
|
|
|
|
#include "block/dirty-bitmap.h"
|
2020-09-24 21:54:11 +03:00
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
|
|
class ParamDecl:
|
|
|
|
param_re = re.compile(r'(?P<decl>'
|
|
|
|
r'(?P<type>.*[ *])'
|
|
|
|
r'(?P<name>[a-z][a-z0-9_]*)'
|
|
|
|
r')')
|
|
|
|
|
|
|
|
def __init__(self, param_decl: str) -> None:
|
|
|
|
m = self.param_re.match(param_decl.strip())
|
|
|
|
if m is None:
|
|
|
|
raise ValueError(f'Wrong parameter declaration: "{param_decl}"')
|
|
|
|
self.decl = m.group('decl')
|
|
|
|
self.type = m.group('type')
|
|
|
|
self.name = m.group('name')
|
|
|
|
|
|
|
|
|
|
|
|
class FuncDecl:
|
2023-01-26 20:24:20 +03:00
|
|
|
def __init__(self, wrapper_type: str, return_type: str, name: str,
|
|
|
|
args: str, variant: str) -> None:
|
2020-09-24 21:54:11 +03:00
|
|
|
self.return_type = return_type.strip()
|
|
|
|
self.name = name.strip()
|
2022-11-28 17:23:33 +03:00
|
|
|
self.struct_name = snake_to_camel(self.name)
|
2020-09-24 21:54:11 +03:00
|
|
|
self.args = [ParamDecl(arg.strip()) for arg in args.split(',')]
|
2022-11-28 17:23:33 +03:00
|
|
|
self.create_only_co = 'mixed' not in variant
|
block-coroutine-wrapper.py: introduce annotations that take the graph rdlock
Add co_wrapper_bdrv_rdlock and co_wrapper_mixed_bdrv_rdlock option to
the block-coroutine-wrapper.py script.
This "_bdrv_rdlock" option takes and releases the graph rdlock when a
coroutine function is created.
This means that when used together with "_mixed", the function marked
with co_wrapper_mixed_bdrv_rdlock will support both coroutine and
non-coroutine case, and in the latter case it will create a coroutine
that takes and releases the rdlock. When called from a coroutine, the
caller must already hold the graph lock.
Example:
void co_wrapper_mixed_bdrv_rdlock bdrv_f1();
Becomes
static void bdrv_co_enter_f1()
{
bdrv_graph_co_rdlock();
bdrv_co_function();
bdrv_graph_co_rdunlock();
}
void bdrv_f1()
{
if (qemu_in_coroutine) {
assume_graph_lock();
bdrv_co_function();
} else {
qemu_co_enter(bdrv_co_enter_f1);
...
}
}
When used alone, the function will not work in coroutine context, and
when called in non-coroutine context it will create a new coroutine that
takes care of taking and releasing the rdlock automatically.
Example:
void co_wrapper_bdrv_rdlock bdrv_f1();
Becomes
static void bdrv_co_enter_f1()
{
bdrv_graph_co_rdlock();
bdrv_co_function();
bdrv_graph_co_rdunlock();
}
void bdrv_f1()
{
assert(!qemu_in_coroutine());
qemu_co_enter(bdrv_co_enter_f1);
...
}
About their usage:
- co_wrapper does not take the rdlock, so it can be used also outside
the block layer.
- co_wrapper_mixed will be used by many blk_* functions, since the
coroutine function needs to call blk_wait_while_drained() and
the rdlock *must* be taken afterwards, otherwise it's a deadlock.
In the future this annotation will go away, and blk_* will use
co_wrapper directly.
- co_wrapper_bdrv_rdlock will be used by BlockDriver callbacks, ideally
by all of them in the future.
- co_wrapper_mixed_bdrv_rdlock will be used by the remaining functions
that are still called by coroutine and non-coroutine context. In the
future this annotation will go away, as we will split such mixed
functions.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20221207131838.239125-17-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2022-12-07 16:18:36 +03:00
|
|
|
self.graph_rdlock = 'bdrv_rdlock' in variant
|
2023-09-11 12:46:05 +03:00
|
|
|
self.graph_wrlock = 'bdrv_wrlock' in variant
|
2022-11-28 17:23:33 +03:00
|
|
|
|
2023-01-26 20:24:20 +03:00
|
|
|
self.wrapper_type = wrapper_type
|
|
|
|
|
|
|
|
if wrapper_type == 'co':
|
2023-09-11 12:46:05 +03:00
|
|
|
if self.graph_wrlock:
|
|
|
|
raise ValueError(f"co function can't be wrlock: {self.name}")
|
2023-01-26 20:24:20 +03:00
|
|
|
subsystem, subname = self.name.split('_', 1)
|
|
|
|
self.target_name = f'{subsystem}_co_{subname}'
|
|
|
|
else:
|
|
|
|
assert wrapper_type == 'no_co'
|
|
|
|
subsystem, co_infix, subname = self.name.split('_', 2)
|
|
|
|
if co_infix != 'co':
|
|
|
|
raise ValueError(f"Invalid no_co function name: {self.name}")
|
|
|
|
if not self.create_only_co:
|
|
|
|
raise ValueError(f"no_co function can't be mixed: {self.name}")
|
2023-09-29 17:51:37 +03:00
|
|
|
if self.graph_rdlock and self.graph_wrlock:
|
|
|
|
raise ValueError("function can't be both rdlock and wrlock: "
|
|
|
|
f"{self.name}")
|
2023-01-26 20:24:20 +03:00
|
|
|
self.target_name = f'{subsystem}_{subname}'
|
2022-11-28 17:23:33 +03:00
|
|
|
|
2023-05-25 15:47:02 +03:00
|
|
|
self.ctx = self.gen_ctx()
|
2020-09-24 21:54:11 +03:00
|
|
|
|
2023-01-13 23:41:59 +03:00
|
|
|
self.get_result = 's->ret = '
|
|
|
|
self.ret = 'return s.ret;'
|
|
|
|
self.co_ret = 'return '
|
|
|
|
self.return_field = self.return_type + " ret;"
|
|
|
|
if self.return_type == 'void':
|
|
|
|
self.get_result = ''
|
|
|
|
self.ret = ''
|
|
|
|
self.co_ret = ''
|
|
|
|
self.return_field = ''
|
|
|
|
|
2023-05-25 15:47:02 +03:00
|
|
|
def gen_ctx(self, prefix: str = '') -> str:
|
|
|
|
t = self.args[0].type
|
2023-09-11 12:46:06 +03:00
|
|
|
name = self.args[0].name
|
2023-05-25 15:47:02 +03:00
|
|
|
if t == 'BlockDriverState *':
|
2023-09-11 12:46:06 +03:00
|
|
|
return f'bdrv_get_aio_context({prefix}{name})'
|
2023-05-25 15:47:02 +03:00
|
|
|
elif t == 'BdrvChild *':
|
2023-09-11 12:46:06 +03:00
|
|
|
return f'bdrv_get_aio_context({prefix}{name}->bs)'
|
2023-05-25 15:47:02 +03:00
|
|
|
elif t == 'BlockBackend *':
|
2023-09-11 12:46:06 +03:00
|
|
|
return f'blk_get_aio_context({prefix}{name})'
|
2023-05-25 15:47:02 +03:00
|
|
|
else:
|
|
|
|
return 'qemu_get_aio_context()'
|
|
|
|
|
2020-09-24 21:54:11 +03:00
|
|
|
def gen_list(self, format: str) -> str:
|
|
|
|
return ', '.join(format.format_map(arg.__dict__) for arg in self.args)
|
|
|
|
|
|
|
|
def gen_block(self, format: str) -> str:
|
|
|
|
return '\n'.join(format.format_map(arg.__dict__) for arg in self.args)
|
|
|
|
|
|
|
|
|
2022-11-28 17:23:33 +03:00
|
|
|
# Match wrappers declared with a co_wrapper mark
|
2022-11-28 17:23:35 +03:00
|
|
|
func_decl_re = re.compile(r'^(?P<return_type>[a-zA-Z][a-zA-Z0-9_]* [\*]?)'
|
2023-01-26 20:24:20 +03:00
|
|
|
r'(\s*coroutine_fn)?'
|
|
|
|
r'\s*(?P<wrapper_type>(no_)?co)_wrapper'
|
2022-11-28 17:23:33 +03:00
|
|
|
r'(?P<variant>(_[a-z][a-z0-9_]*)?)\s*'
|
2020-09-24 21:54:11 +03:00
|
|
|
r'(?P<wrapper_name>[a-z][a-z0-9_]*)'
|
|
|
|
r'\((?P<args>[^)]*)\);$', re.MULTILINE)
|
|
|
|
|
|
|
|
|
|
|
|
def func_decl_iter(text: str) -> Iterator:
|
|
|
|
for m in func_decl_re.finditer(text):
|
2023-01-26 20:24:20 +03:00
|
|
|
yield FuncDecl(wrapper_type=m.group('wrapper_type'),
|
|
|
|
return_type=m.group('return_type'),
|
2020-09-24 21:54:11 +03:00
|
|
|
name=m.group('wrapper_name'),
|
2022-11-28 17:23:33 +03:00
|
|
|
args=m.group('args'),
|
|
|
|
variant=m.group('variant'))
|
2020-09-24 21:54:11 +03:00
|
|
|
|
|
|
|
|
|
|
|
def snake_to_camel(func_name: str) -> str:
|
|
|
|
"""
|
|
|
|
Convert underscore names like 'some_function_name' to camel-case like
|
|
|
|
'SomeFunctionName'
|
|
|
|
"""
|
|
|
|
words = func_name.split('_')
|
|
|
|
words = [w[0].upper() + w[1:] for w in words]
|
|
|
|
return ''.join(words)
|
|
|
|
|
|
|
|
|
2022-11-28 17:23:33 +03:00
|
|
|
def create_mixed_wrapper(func: FuncDecl) -> str:
|
|
|
|
"""
|
|
|
|
Checks if we are already in coroutine
|
|
|
|
"""
|
2023-01-26 20:24:20 +03:00
|
|
|
name = func.target_name
|
2022-11-28 17:23:33 +03:00
|
|
|
struct_name = func.struct_name
|
block-coroutine-wrapper.py: introduce annotations that take the graph rdlock
Add co_wrapper_bdrv_rdlock and co_wrapper_mixed_bdrv_rdlock option to
the block-coroutine-wrapper.py script.
This "_bdrv_rdlock" option takes and releases the graph rdlock when a
coroutine function is created.
This means that when used together with "_mixed", the function marked
with co_wrapper_mixed_bdrv_rdlock will support both coroutine and
non-coroutine case, and in the latter case it will create a coroutine
that takes and releases the rdlock. When called from a coroutine, the
caller must already hold the graph lock.
Example:
void co_wrapper_mixed_bdrv_rdlock bdrv_f1();
Becomes
static void bdrv_co_enter_f1()
{
bdrv_graph_co_rdlock();
bdrv_co_function();
bdrv_graph_co_rdunlock();
}
void bdrv_f1()
{
if (qemu_in_coroutine) {
assume_graph_lock();
bdrv_co_function();
} else {
qemu_co_enter(bdrv_co_enter_f1);
...
}
}
When used alone, the function will not work in coroutine context, and
when called in non-coroutine context it will create a new coroutine that
takes care of taking and releasing the rdlock automatically.
Example:
void co_wrapper_bdrv_rdlock bdrv_f1();
Becomes
static void bdrv_co_enter_f1()
{
bdrv_graph_co_rdlock();
bdrv_co_function();
bdrv_graph_co_rdunlock();
}
void bdrv_f1()
{
assert(!qemu_in_coroutine());
qemu_co_enter(bdrv_co_enter_f1);
...
}
About their usage:
- co_wrapper does not take the rdlock, so it can be used also outside
the block layer.
- co_wrapper_mixed will be used by many blk_* functions, since the
coroutine function needs to call blk_wait_while_drained() and
the rdlock *must* be taken afterwards, otherwise it's a deadlock.
In the future this annotation will go away, and blk_* will use
co_wrapper directly.
- co_wrapper_bdrv_rdlock will be used by BlockDriver callbacks, ideally
by all of them in the future.
- co_wrapper_mixed_bdrv_rdlock will be used by the remaining functions
that are still called by coroutine and non-coroutine context. In the
future this annotation will go away, as we will split such mixed
functions.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20221207131838.239125-17-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2022-12-07 16:18:36 +03:00
|
|
|
graph_assume_lock = 'assume_graph_lock();' if func.graph_rdlock else ''
|
|
|
|
|
2022-11-28 17:23:33 +03:00
|
|
|
return f"""\
|
2022-11-28 17:23:35 +03:00
|
|
|
{func.return_type} {func.name}({ func.gen_list('{decl}') })
|
2022-11-28 17:23:33 +03:00
|
|
|
{{
|
|
|
|
if (qemu_in_coroutine()) {{
|
block-coroutine-wrapper.py: introduce annotations that take the graph rdlock
Add co_wrapper_bdrv_rdlock and co_wrapper_mixed_bdrv_rdlock option to
the block-coroutine-wrapper.py script.
This "_bdrv_rdlock" option takes and releases the graph rdlock when a
coroutine function is created.
This means that when used together with "_mixed", the function marked
with co_wrapper_mixed_bdrv_rdlock will support both coroutine and
non-coroutine case, and in the latter case it will create a coroutine
that takes and releases the rdlock. When called from a coroutine, the
caller must already hold the graph lock.
Example:
void co_wrapper_mixed_bdrv_rdlock bdrv_f1();
Becomes
static void bdrv_co_enter_f1()
{
bdrv_graph_co_rdlock();
bdrv_co_function();
bdrv_graph_co_rdunlock();
}
void bdrv_f1()
{
if (qemu_in_coroutine) {
assume_graph_lock();
bdrv_co_function();
} else {
qemu_co_enter(bdrv_co_enter_f1);
...
}
}
When used alone, the function will not work in coroutine context, and
when called in non-coroutine context it will create a new coroutine that
takes care of taking and releasing the rdlock automatically.
Example:
void co_wrapper_bdrv_rdlock bdrv_f1();
Becomes
static void bdrv_co_enter_f1()
{
bdrv_graph_co_rdlock();
bdrv_co_function();
bdrv_graph_co_rdunlock();
}
void bdrv_f1()
{
assert(!qemu_in_coroutine());
qemu_co_enter(bdrv_co_enter_f1);
...
}
About their usage:
- co_wrapper does not take the rdlock, so it can be used also outside
the block layer.
- co_wrapper_mixed will be used by many blk_* functions, since the
coroutine function needs to call blk_wait_while_drained() and
the rdlock *must* be taken afterwards, otherwise it's a deadlock.
In the future this annotation will go away, and blk_* will use
co_wrapper directly.
- co_wrapper_bdrv_rdlock will be used by BlockDriver callbacks, ideally
by all of them in the future.
- co_wrapper_mixed_bdrv_rdlock will be used by the remaining functions
that are still called by coroutine and non-coroutine context. In the
future this annotation will go away, as we will split such mixed
functions.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20221207131838.239125-17-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2022-12-07 16:18:36 +03:00
|
|
|
{graph_assume_lock}
|
2023-01-13 23:41:59 +03:00
|
|
|
{func.co_ret}{name}({ func.gen_list('{name}') });
|
2022-11-28 17:23:33 +03:00
|
|
|
}} else {{
|
|
|
|
{struct_name} s = {{
|
2022-11-28 17:23:34 +03:00
|
|
|
.poll_state.ctx = {func.ctx},
|
2022-11-28 17:23:33 +03:00
|
|
|
.poll_state.in_progress = true,
|
|
|
|
|
|
|
|
{ func.gen_block(' .{name} = {name},') }
|
|
|
|
}};
|
|
|
|
|
|
|
|
s.poll_state.co = qemu_coroutine_create({name}_entry, &s);
|
|
|
|
|
2022-11-28 17:23:35 +03:00
|
|
|
bdrv_poll_co(&s.poll_state);
|
2023-01-13 23:41:59 +03:00
|
|
|
{func.ret}
|
2022-11-28 17:23:33 +03:00
|
|
|
}}
|
|
|
|
}}"""
|
|
|
|
|
|
|
|
|
|
|
|
def create_co_wrapper(func: FuncDecl) -> str:
|
|
|
|
"""
|
|
|
|
Assumes we are not in coroutine, and creates one
|
|
|
|
"""
|
2023-01-26 20:24:20 +03:00
|
|
|
name = func.target_name
|
2022-11-28 17:23:33 +03:00
|
|
|
struct_name = func.struct_name
|
|
|
|
return f"""\
|
2022-11-28 17:23:35 +03:00
|
|
|
{func.return_type} {func.name}({ func.gen_list('{decl}') })
|
2022-11-28 17:23:33 +03:00
|
|
|
{{
|
|
|
|
{struct_name} s = {{
|
2022-11-28 17:23:34 +03:00
|
|
|
.poll_state.ctx = {func.ctx},
|
2022-11-28 17:23:33 +03:00
|
|
|
.poll_state.in_progress = true,
|
|
|
|
|
|
|
|
{ func.gen_block(' .{name} = {name},') }
|
|
|
|
}};
|
|
|
|
assert(!qemu_in_coroutine());
|
|
|
|
|
|
|
|
s.poll_state.co = qemu_coroutine_create({name}_entry, &s);
|
|
|
|
|
2022-11-28 17:23:35 +03:00
|
|
|
bdrv_poll_co(&s.poll_state);
|
2023-01-13 23:41:59 +03:00
|
|
|
{func.ret}
|
2022-11-28 17:23:33 +03:00
|
|
|
}}"""
|
|
|
|
|
|
|
|
|
2023-01-26 20:24:20 +03:00
|
|
|
def gen_co_wrapper(func: FuncDecl) -> str:
|
2021-06-10 13:07:57 +03:00
|
|
|
assert not '_co_' in func.name
|
2023-01-26 20:24:20 +03:00
|
|
|
assert func.wrapper_type == 'co'
|
2020-09-24 21:54:11 +03:00
|
|
|
|
2023-01-26 20:24:20 +03:00
|
|
|
name = func.target_name
|
2022-11-28 17:23:33 +03:00
|
|
|
struct_name = func.struct_name
|
2021-10-06 16:17:12 +03:00
|
|
|
|
block-coroutine-wrapper.py: introduce annotations that take the graph rdlock
Add co_wrapper_bdrv_rdlock and co_wrapper_mixed_bdrv_rdlock option to
the block-coroutine-wrapper.py script.
This "_bdrv_rdlock" option takes and releases the graph rdlock when a
coroutine function is created.
This means that when used together with "_mixed", the function marked
with co_wrapper_mixed_bdrv_rdlock will support both coroutine and
non-coroutine case, and in the latter case it will create a coroutine
that takes and releases the rdlock. When called from a coroutine, the
caller must already hold the graph lock.
Example:
void co_wrapper_mixed_bdrv_rdlock bdrv_f1();
Becomes
static void bdrv_co_enter_f1()
{
bdrv_graph_co_rdlock();
bdrv_co_function();
bdrv_graph_co_rdunlock();
}
void bdrv_f1()
{
if (qemu_in_coroutine) {
assume_graph_lock();
bdrv_co_function();
} else {
qemu_co_enter(bdrv_co_enter_f1);
...
}
}
When used alone, the function will not work in coroutine context, and
when called in non-coroutine context it will create a new coroutine that
takes care of taking and releasing the rdlock automatically.
Example:
void co_wrapper_bdrv_rdlock bdrv_f1();
Becomes
static void bdrv_co_enter_f1()
{
bdrv_graph_co_rdlock();
bdrv_co_function();
bdrv_graph_co_rdunlock();
}
void bdrv_f1()
{
assert(!qemu_in_coroutine());
qemu_co_enter(bdrv_co_enter_f1);
...
}
About their usage:
- co_wrapper does not take the rdlock, so it can be used also outside
the block layer.
- co_wrapper_mixed will be used by many blk_* functions, since the
coroutine function needs to call blk_wait_while_drained() and
the rdlock *must* be taken afterwards, otherwise it's a deadlock.
In the future this annotation will go away, and blk_* will use
co_wrapper directly.
- co_wrapper_bdrv_rdlock will be used by BlockDriver callbacks, ideally
by all of them in the future.
- co_wrapper_mixed_bdrv_rdlock will be used by the remaining functions
that are still called by coroutine and non-coroutine context. In the
future this annotation will go away, as we will split such mixed
functions.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20221207131838.239125-17-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2022-12-07 16:18:36 +03:00
|
|
|
graph_lock=''
|
|
|
|
graph_unlock=''
|
|
|
|
if func.graph_rdlock:
|
|
|
|
graph_lock=' bdrv_graph_co_rdlock();'
|
|
|
|
graph_unlock=' bdrv_graph_co_rdunlock();'
|
|
|
|
|
2022-11-28 17:23:33 +03:00
|
|
|
creation_function = create_mixed_wrapper
|
|
|
|
if func.create_only_co:
|
|
|
|
creation_function = create_co_wrapper
|
2020-09-24 21:54:11 +03:00
|
|
|
|
|
|
|
return f"""\
|
|
|
|
/*
|
|
|
|
* Wrappers for {name}
|
|
|
|
*/
|
|
|
|
|
|
|
|
typedef struct {struct_name} {{
|
|
|
|
BdrvPollCo poll_state;
|
2023-01-13 23:41:59 +03:00
|
|
|
{func.return_field}
|
2020-09-24 21:54:11 +03:00
|
|
|
{ func.gen_block(' {decl};') }
|
|
|
|
}} {struct_name};
|
|
|
|
|
|
|
|
static void coroutine_fn {name}_entry(void *opaque)
|
|
|
|
{{
|
|
|
|
{struct_name} *s = opaque;
|
|
|
|
|
block-coroutine-wrapper.py: introduce annotations that take the graph rdlock
Add co_wrapper_bdrv_rdlock and co_wrapper_mixed_bdrv_rdlock option to
the block-coroutine-wrapper.py script.
This "_bdrv_rdlock" option takes and releases the graph rdlock when a
coroutine function is created.
This means that when used together with "_mixed", the function marked
with co_wrapper_mixed_bdrv_rdlock will support both coroutine and
non-coroutine case, and in the latter case it will create a coroutine
that takes and releases the rdlock. When called from a coroutine, the
caller must already hold the graph lock.
Example:
void co_wrapper_mixed_bdrv_rdlock bdrv_f1();
Becomes
static void bdrv_co_enter_f1()
{
bdrv_graph_co_rdlock();
bdrv_co_function();
bdrv_graph_co_rdunlock();
}
void bdrv_f1()
{
if (qemu_in_coroutine) {
assume_graph_lock();
bdrv_co_function();
} else {
qemu_co_enter(bdrv_co_enter_f1);
...
}
}
When used alone, the function will not work in coroutine context, and
when called in non-coroutine context it will create a new coroutine that
takes care of taking and releasing the rdlock automatically.
Example:
void co_wrapper_bdrv_rdlock bdrv_f1();
Becomes
static void bdrv_co_enter_f1()
{
bdrv_graph_co_rdlock();
bdrv_co_function();
bdrv_graph_co_rdunlock();
}
void bdrv_f1()
{
assert(!qemu_in_coroutine());
qemu_co_enter(bdrv_co_enter_f1);
...
}
About their usage:
- co_wrapper does not take the rdlock, so it can be used also outside
the block layer.
- co_wrapper_mixed will be used by many blk_* functions, since the
coroutine function needs to call blk_wait_while_drained() and
the rdlock *must* be taken afterwards, otherwise it's a deadlock.
In the future this annotation will go away, and blk_* will use
co_wrapper directly.
- co_wrapper_bdrv_rdlock will be used by BlockDriver callbacks, ideally
by all of them in the future.
- co_wrapper_mixed_bdrv_rdlock will be used by the remaining functions
that are still called by coroutine and non-coroutine context. In the
future this annotation will go away, as we will split such mixed
functions.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20221207131838.239125-17-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2022-12-07 16:18:36 +03:00
|
|
|
{graph_lock}
|
2023-01-13 23:41:59 +03:00
|
|
|
{func.get_result}{name}({ func.gen_list('s->{name}') });
|
block-coroutine-wrapper.py: introduce annotations that take the graph rdlock
Add co_wrapper_bdrv_rdlock and co_wrapper_mixed_bdrv_rdlock option to
the block-coroutine-wrapper.py script.
This "_bdrv_rdlock" option takes and releases the graph rdlock when a
coroutine function is created.
This means that when used together with "_mixed", the function marked
with co_wrapper_mixed_bdrv_rdlock will support both coroutine and
non-coroutine case, and in the latter case it will create a coroutine
that takes and releases the rdlock. When called from a coroutine, the
caller must already hold the graph lock.
Example:
void co_wrapper_mixed_bdrv_rdlock bdrv_f1();
Becomes
static void bdrv_co_enter_f1()
{
bdrv_graph_co_rdlock();
bdrv_co_function();
bdrv_graph_co_rdunlock();
}
void bdrv_f1()
{
if (qemu_in_coroutine) {
assume_graph_lock();
bdrv_co_function();
} else {
qemu_co_enter(bdrv_co_enter_f1);
...
}
}
When used alone, the function will not work in coroutine context, and
when called in non-coroutine context it will create a new coroutine that
takes care of taking and releasing the rdlock automatically.
Example:
void co_wrapper_bdrv_rdlock bdrv_f1();
Becomes
static void bdrv_co_enter_f1()
{
bdrv_graph_co_rdlock();
bdrv_co_function();
bdrv_graph_co_rdunlock();
}
void bdrv_f1()
{
assert(!qemu_in_coroutine());
qemu_co_enter(bdrv_co_enter_f1);
...
}
About their usage:
- co_wrapper does not take the rdlock, so it can be used also outside
the block layer.
- co_wrapper_mixed will be used by many blk_* functions, since the
coroutine function needs to call blk_wait_while_drained() and
the rdlock *must* be taken afterwards, otherwise it's a deadlock.
In the future this annotation will go away, and blk_* will use
co_wrapper directly.
- co_wrapper_bdrv_rdlock will be used by BlockDriver callbacks, ideally
by all of them in the future.
- co_wrapper_mixed_bdrv_rdlock will be used by the remaining functions
that are still called by coroutine and non-coroutine context. In the
future this annotation will go away, as we will split such mixed
functions.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20221207131838.239125-17-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2022-12-07 16:18:36 +03:00
|
|
|
{graph_unlock}
|
2020-09-24 21:54:11 +03:00
|
|
|
s->poll_state.in_progress = false;
|
|
|
|
|
|
|
|
aio_wait_kick();
|
|
|
|
}}
|
|
|
|
|
2022-11-28 17:23:33 +03:00
|
|
|
{creation_function(func)}"""
|
2020-09-24 21:54:11 +03:00
|
|
|
|
|
|
|
|
2023-01-26 20:24:20 +03:00
|
|
|
def gen_no_co_wrapper(func: FuncDecl) -> str:
|
|
|
|
assert '_co_' in func.name
|
|
|
|
assert func.wrapper_type == 'no_co'
|
|
|
|
|
|
|
|
name = func.target_name
|
|
|
|
struct_name = func.struct_name
|
|
|
|
|
2023-09-11 12:46:05 +03:00
|
|
|
graph_lock=''
|
|
|
|
graph_unlock=''
|
2023-09-29 17:51:37 +03:00
|
|
|
if func.graph_rdlock:
|
|
|
|
graph_lock=' bdrv_graph_rdlock_main_loop();'
|
|
|
|
graph_unlock=' bdrv_graph_rdunlock_main_loop();'
|
|
|
|
elif func.graph_wrlock:
|
2023-09-11 12:46:05 +03:00
|
|
|
graph_lock=' bdrv_graph_wrlock(NULL);'
|
2023-11-15 20:20:10 +03:00
|
|
|
graph_unlock=' bdrv_graph_wrunlock(NULL);'
|
2023-09-11 12:46:05 +03:00
|
|
|
|
2023-01-26 20:24:20 +03:00
|
|
|
return f"""\
|
|
|
|
/*
|
|
|
|
* Wrappers for {name}
|
|
|
|
*/
|
|
|
|
|
|
|
|
typedef struct {struct_name} {{
|
|
|
|
Coroutine *co;
|
|
|
|
{func.return_field}
|
|
|
|
{ func.gen_block(' {decl};') }
|
|
|
|
}} {struct_name};
|
|
|
|
|
|
|
|
static void {name}_bh(void *opaque)
|
|
|
|
{{
|
|
|
|
{struct_name} *s = opaque;
|
2023-05-25 15:47:02 +03:00
|
|
|
AioContext *ctx = {func.gen_ctx('s->')};
|
2023-01-26 20:24:20 +03:00
|
|
|
|
2023-09-11 12:46:05 +03:00
|
|
|
{graph_lock}
|
2023-05-25 15:47:02 +03:00
|
|
|
aio_context_acquire(ctx);
|
2023-01-26 20:24:20 +03:00
|
|
|
{func.get_result}{name}({ func.gen_list('s->{name}') });
|
2023-05-25 15:47:02 +03:00
|
|
|
aio_context_release(ctx);
|
2023-09-11 12:46:05 +03:00
|
|
|
{graph_unlock}
|
2023-01-26 20:24:20 +03:00
|
|
|
|
|
|
|
aio_co_wake(s->co);
|
|
|
|
}}
|
|
|
|
|
|
|
|
{func.return_type} coroutine_fn {func.name}({ func.gen_list('{decl}') })
|
|
|
|
{{
|
|
|
|
{struct_name} s = {{
|
|
|
|
.co = qemu_coroutine_self(),
|
|
|
|
{ func.gen_block(' .{name} = {name},') }
|
|
|
|
}};
|
|
|
|
assert(qemu_in_coroutine());
|
|
|
|
|
|
|
|
aio_bh_schedule_oneshot(qemu_get_aio_context(), {name}_bh, &s);
|
|
|
|
qemu_coroutine_yield();
|
|
|
|
|
|
|
|
{func.ret}
|
|
|
|
}}"""
|
|
|
|
|
|
|
|
|
2020-09-24 21:54:11 +03:00
|
|
|
def gen_wrappers(input_code: str) -> str:
|
|
|
|
res = ''
|
|
|
|
for func in func_decl_iter(input_code):
|
|
|
|
res += '\n\n\n'
|
2023-01-26 20:24:20 +03:00
|
|
|
if func.wrapper_type == 'co':
|
|
|
|
res += gen_co_wrapper(func)
|
|
|
|
else:
|
|
|
|
res += gen_no_co_wrapper(func)
|
2020-09-24 21:54:11 +03:00
|
|
|
|
|
|
|
return res
|
|
|
|
|
|
|
|
|
|
|
|
if __name__ == '__main__':
|
|
|
|
if len(sys.argv) < 3:
|
|
|
|
exit(f'Usage: {sys.argv[0]} OUT_FILE.c IN_FILE.[ch]...')
|
|
|
|
|
|
|
|
with open(sys.argv[1], 'w', encoding='utf-8') as f_out:
|
|
|
|
f_out.write(gen_header())
|
|
|
|
for fname in sys.argv[2:]:
|
|
|
|
with open(fname, encoding='utf-8') as f_in:
|
|
|
|
f_out.write(gen_wrappers(f_in.read()))
|
|
|
|
f_out.write('\n')
|