2015-10-07 05:52:21 +02:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2015 FUJITSU LIMITED
|
|
|
|
* Author: Yang Hongyang <yanghy@cn.fujitsu.com>
|
|
|
|
*
|
|
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or
|
|
|
|
* later. See the COPYING file in the top-level directory.
|
|
|
|
*/
|
|
|
|
|
2016-01-29 18:50:00 +01:00
|
|
|
#include "qemu/osdep.h"
|
2015-10-07 05:52:21 +02:00
|
|
|
#include "net/filter.h"
|
|
|
|
#include "net/queue.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 09:01:28 +01:00
|
|
|
#include "qapi/error.h"
|
2015-10-07 05:52:21 +02:00
|
|
|
#include "qemu/timer.h"
|
|
|
|
#include "qemu/iov.h"
|
2018-02-11 10:36:05 +01:00
|
|
|
#include "qapi/qapi-builtin-visit.h"
|
2015-10-07 05:52:21 +02:00
|
|
|
#include "qapi/qmp/qerror.h"
|
|
|
|
#include "qom/object.h"
|
|
|
|
|
|
|
|
#define TYPE_FILTER_BUFFER "filter-buffer"
|
|
|
|
|
|
|
|
#define FILTER_BUFFER(obj) \
|
|
|
|
OBJECT_CHECK(FilterBufferState, (obj), TYPE_FILTER_BUFFER)
|
|
|
|
|
|
|
|
typedef struct FilterBufferState {
|
|
|
|
NetFilterState parent_obj;
|
|
|
|
|
|
|
|
NetQueue *incoming_queue;
|
|
|
|
uint32_t interval;
|
|
|
|
QEMUTimer release_timer;
|
|
|
|
} FilterBufferState;
|
|
|
|
|
|
|
|
static void filter_buffer_flush(NetFilterState *nf)
|
|
|
|
{
|
|
|
|
FilterBufferState *s = FILTER_BUFFER(nf);
|
|
|
|
|
|
|
|
if (!qemu_net_queue_flush(s->incoming_queue)) {
|
|
|
|
/* Unable to empty the queue, purge remaining packets */
|
|
|
|
qemu_net_queue_purge(s->incoming_queue, nf->netdev);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void filter_buffer_release_timer(void *opaque)
|
|
|
|
{
|
|
|
|
NetFilterState *nf = opaque;
|
|
|
|
FilterBufferState *s = FILTER_BUFFER(nf);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Note: filter_buffer_flush() drops packets that can't be sent
|
|
|
|
* TODO: We should leave them queued. But currently there's no way
|
|
|
|
* for the next filter or receiver to notify us that it can receive
|
|
|
|
* more packets.
|
|
|
|
*/
|
|
|
|
filter_buffer_flush(nf);
|
|
|
|
/* Timer rearmed to fire again in s->interval microseconds. */
|
|
|
|
timer_mod(&s->release_timer,
|
|
|
|
qemu_clock_get_us(QEMU_CLOCK_VIRTUAL) + s->interval);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* filter APIs */
|
|
|
|
static ssize_t filter_buffer_receive_iov(NetFilterState *nf,
|
|
|
|
NetClientState *sender,
|
|
|
|
unsigned flags,
|
|
|
|
const struct iovec *iov,
|
|
|
|
int iovcnt,
|
|
|
|
NetPacketSent *sent_cb)
|
|
|
|
{
|
|
|
|
FilterBufferState *s = FILTER_BUFFER(nf);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We return size when buffer a packet, the sender will take it as
|
|
|
|
* a already sent packet, so sent_cb should not be called later.
|
|
|
|
*
|
|
|
|
* FIXME: Even if the guest can't receive packets for some reasons,
|
|
|
|
* the filter can still accept packets until its internal queue is full.
|
|
|
|
* For example:
|
|
|
|
* For some reason, receiver could not receive more packets
|
|
|
|
* (.can_receive() returns zero). Without a filter, at most one packet
|
|
|
|
* will be queued in incoming queue and sender's poll will be disabled
|
|
|
|
* unit its sent_cb() was called. With a filter, it will keep receiving
|
|
|
|
* the packets without caring about the receiver. This is suboptimal.
|
|
|
|
* May need more thoughts (e.g keeping sent_cb).
|
|
|
|
*/
|
|
|
|
qemu_net_queue_append_iov(s->incoming_queue, sender, flags,
|
|
|
|
iov, iovcnt, NULL);
|
|
|
|
return iov_size(iov, iovcnt);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void filter_buffer_cleanup(NetFilterState *nf)
|
|
|
|
{
|
|
|
|
FilterBufferState *s = FILTER_BUFFER(nf);
|
|
|
|
|
|
|
|
if (s->interval) {
|
|
|
|
timer_del(&s->release_timer);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* flush packets */
|
|
|
|
if (s->incoming_queue) {
|
|
|
|
filter_buffer_flush(nf);
|
|
|
|
g_free(s->incoming_queue);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-01 06:37:03 +01:00
|
|
|
static void filter_buffer_setup_timer(NetFilterState *nf)
|
|
|
|
{
|
|
|
|
FilterBufferState *s = FILTER_BUFFER(nf);
|
|
|
|
|
|
|
|
if (s->interval) {
|
|
|
|
timer_init_us(&s->release_timer, QEMU_CLOCK_VIRTUAL,
|
|
|
|
filter_buffer_release_timer, nf);
|
|
|
|
/* Timer armed to fire in s->interval microseconds. */
|
|
|
|
timer_mod(&s->release_timer,
|
|
|
|
qemu_clock_get_us(QEMU_CLOCK_VIRTUAL) + s->interval);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-10-07 05:52:21 +02:00
|
|
|
static void filter_buffer_setup(NetFilterState *nf, Error **errp)
|
|
|
|
{
|
|
|
|
FilterBufferState *s = FILTER_BUFFER(nf);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We may want to accept zero interval when VM FT solutions like MC
|
|
|
|
* or COLO use this filter to release packets on demand.
|
|
|
|
*/
|
|
|
|
if (!s->interval) {
|
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "interval",
|
|
|
|
"a non-zero interval");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
s->incoming_queue = qemu_new_net_queue(qemu_netfilter_pass_to_next, nf);
|
2016-03-01 06:37:03 +01:00
|
|
|
filter_buffer_setup_timer(nf);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void filter_buffer_status_changed(NetFilterState *nf, Error **errp)
|
|
|
|
{
|
|
|
|
FilterBufferState *s = FILTER_BUFFER(nf);
|
|
|
|
|
|
|
|
if (!nf->on) {
|
|
|
|
if (s->interval) {
|
|
|
|
timer_del(&s->release_timer);
|
|
|
|
}
|
|
|
|
filter_buffer_flush(nf);
|
|
|
|
} else {
|
|
|
|
filter_buffer_setup_timer(nf);
|
2015-10-07 05:52:21 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void filter_buffer_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
NetFilterClass *nfc = NETFILTER_CLASS(oc);
|
|
|
|
|
|
|
|
nfc->setup = filter_buffer_setup;
|
|
|
|
nfc->cleanup = filter_buffer_cleanup;
|
|
|
|
nfc->receive_iov = filter_buffer_receive_iov;
|
2016-03-01 06:37:03 +01:00
|
|
|
nfc->status_changed = filter_buffer_status_changed;
|
2015-10-07 05:52:21 +02:00
|
|
|
}
|
|
|
|
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-20-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 14:48:55 +01:00
|
|
|
static void filter_buffer_get_interval(Object *obj, Visitor *v,
|
|
|
|
const char *name, void *opaque,
|
|
|
|
Error **errp)
|
2015-10-07 05:52:21 +02:00
|
|
|
{
|
|
|
|
FilterBufferState *s = FILTER_BUFFER(obj);
|
|
|
|
uint32_t value = s->interval;
|
|
|
|
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 14:48:54 +01:00
|
|
|
visit_type_uint32(v, name, &value, errp);
|
2015-10-07 05:52:21 +02:00
|
|
|
}
|
|
|
|
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-20-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 14:48:55 +01:00
|
|
|
static void filter_buffer_set_interval(Object *obj, Visitor *v,
|
|
|
|
const char *name, void *opaque,
|
|
|
|
Error **errp)
|
2015-10-07 05:52:21 +02:00
|
|
|
{
|
|
|
|
FilterBufferState *s = FILTER_BUFFER(obj);
|
|
|
|
Error *local_err = NULL;
|
|
|
|
uint32_t value;
|
|
|
|
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 14:48:54 +01:00
|
|
|
visit_type_uint32(v, name, &value, &local_err);
|
2015-10-07 05:52:21 +02:00
|
|
|
if (local_err) {
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (!value) {
|
|
|
|
error_setg(&local_err, "Property '%s.%s' requires a positive value",
|
|
|
|
object_get_typename(obj), name);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
s->interval = value;
|
|
|
|
|
|
|
|
out:
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void filter_buffer_init(Object *obj)
|
|
|
|
{
|
2017-06-07 18:36:06 +02:00
|
|
|
object_property_add(obj, "interval", "uint32",
|
2015-10-07 05:52:21 +02:00
|
|
|
filter_buffer_get_interval,
|
|
|
|
filter_buffer_set_interval, NULL, NULL, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const TypeInfo filter_buffer_info = {
|
|
|
|
.name = TYPE_FILTER_BUFFER,
|
|
|
|
.parent = TYPE_NETFILTER,
|
|
|
|
.class_init = filter_buffer_class_init,
|
|
|
|
.instance_init = filter_buffer_init,
|
|
|
|
.instance_size = sizeof(FilterBufferState),
|
|
|
|
};
|
|
|
|
|
|
|
|
static void register_types(void)
|
|
|
|
{
|
|
|
|
type_register_static(&filter_buffer_info);
|
|
|
|
}
|
|
|
|
|
|
|
|
type_init(register_types);
|