2015-10-07 06:52:14 +03: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 20:50:00 +03:00
|
|
|
#include "qemu/osdep.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 11:01:28 +03:00
|
|
|
#include "qapi/error.h"
|
2015-10-07 06:52:14 +03:00
|
|
|
#include "qemu-common.h"
|
|
|
|
#include "qapi/qmp/qerror.h"
|
|
|
|
#include "qemu/error-report.h"
|
|
|
|
|
|
|
|
#include "net/filter.h"
|
|
|
|
#include "net/net.h"
|
|
|
|
#include "net/vhost_net.h"
|
|
|
|
#include "qom/object_interfaces.h"
|
2015-10-07 06:52:18 +03:00
|
|
|
#include "qemu/iov.h"
|
2015-10-07 06:52:14 +03:00
|
|
|
|
2016-03-01 08:37:02 +03:00
|
|
|
static inline bool qemu_can_skip_netfilter(NetFilterState *nf)
|
|
|
|
{
|
|
|
|
return !nf->on;
|
|
|
|
}
|
|
|
|
|
2015-10-07 06:52:15 +03:00
|
|
|
ssize_t qemu_netfilter_receive(NetFilterState *nf,
|
|
|
|
NetFilterDirection direction,
|
|
|
|
NetClientState *sender,
|
|
|
|
unsigned flags,
|
|
|
|
const struct iovec *iov,
|
|
|
|
int iovcnt,
|
|
|
|
NetPacketSent *sent_cb)
|
|
|
|
{
|
2016-03-01 08:37:02 +03:00
|
|
|
if (qemu_can_skip_netfilter(nf)) {
|
|
|
|
return 0;
|
|
|
|
}
|
2015-10-07 06:52:15 +03:00
|
|
|
if (nf->direction == direction ||
|
|
|
|
nf->direction == NET_FILTER_DIRECTION_ALL) {
|
|
|
|
return NETFILTER_GET_CLASS(OBJECT(nf))->receive_iov(
|
|
|
|
nf, sender, flags, iov, iovcnt, sent_cb);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-01-26 08:00:22 +03:00
|
|
|
static NetFilterState *netfilter_next(NetFilterState *nf,
|
|
|
|
NetFilterDirection dir)
|
|
|
|
{
|
|
|
|
NetFilterState *next;
|
|
|
|
|
|
|
|
if (dir == NET_FILTER_DIRECTION_TX) {
|
|
|
|
/* forward walk through filters */
|
|
|
|
next = QTAILQ_NEXT(nf, next);
|
|
|
|
} else {
|
|
|
|
/* reverse order */
|
|
|
|
next = QTAILQ_PREV(nf, NetFilterHead, next);
|
|
|
|
}
|
|
|
|
|
|
|
|
return next;
|
|
|
|
}
|
|
|
|
|
2015-10-07 06:52:18 +03:00
|
|
|
ssize_t qemu_netfilter_pass_to_next(NetClientState *sender,
|
|
|
|
unsigned flags,
|
|
|
|
const struct iovec *iov,
|
|
|
|
int iovcnt,
|
|
|
|
void *opaque)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
int direction;
|
|
|
|
NetFilterState *nf = opaque;
|
2016-01-26 08:00:22 +03:00
|
|
|
NetFilterState *next = NULL;
|
2015-10-07 06:52:18 +03:00
|
|
|
|
|
|
|
if (!sender || !sender->peer) {
|
|
|
|
/* no receiver, or sender been deleted, no need to pass it further */
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nf->direction == NET_FILTER_DIRECTION_ALL) {
|
|
|
|
if (sender == nf->netdev) {
|
|
|
|
/* This packet is sent by netdev itself */
|
|
|
|
direction = NET_FILTER_DIRECTION_TX;
|
|
|
|
} else {
|
|
|
|
direction = NET_FILTER_DIRECTION_RX;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
direction = nf->direction;
|
|
|
|
}
|
|
|
|
|
2016-01-26 08:00:22 +03:00
|
|
|
next = netfilter_next(nf, direction);
|
2015-10-07 06:52:18 +03:00
|
|
|
while (next) {
|
|
|
|
/*
|
|
|
|
* if qemu_netfilter_pass_to_next been called, means that
|
|
|
|
* the packet has been hold by filter and has already retured size
|
|
|
|
* to the sender, so sent_cb shouldn't be called later, just
|
|
|
|
* pass NULL to next.
|
|
|
|
*/
|
|
|
|
ret = qemu_netfilter_receive(next, direction, sender, flags, iov,
|
|
|
|
iovcnt, NULL);
|
|
|
|
if (ret) {
|
|
|
|
return ret;
|
|
|
|
}
|
2016-01-26 08:00:22 +03:00
|
|
|
next = netfilter_next(next, direction);
|
2015-10-07 06:52:18 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We have gone through all filters, pass it to receiver.
|
|
|
|
* Do the valid check again incase sender or receiver been
|
|
|
|
* deleted while we go through filters.
|
|
|
|
*/
|
|
|
|
if (sender && sender->peer) {
|
|
|
|
qemu_net_queue_send_iov(sender->peer->incoming_queue,
|
|
|
|
sender, flags, iov, iovcnt, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
/* no receiver, or sender been deleted */
|
|
|
|
return iov_size(iov, iovcnt);
|
|
|
|
}
|
|
|
|
|
2015-10-07 06:52:14 +03:00
|
|
|
static char *netfilter_get_netdev_id(Object *obj, Error **errp)
|
|
|
|
{
|
|
|
|
NetFilterState *nf = NETFILTER(obj);
|
|
|
|
|
|
|
|
return g_strdup(nf->netdev_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void netfilter_set_netdev_id(Object *obj, const char *str, Error **errp)
|
|
|
|
{
|
|
|
|
NetFilterState *nf = NETFILTER(obj);
|
|
|
|
|
|
|
|
nf->netdev_id = g_strdup(str);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int netfilter_get_direction(Object *obj, Error **errp G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
NetFilterState *nf = NETFILTER(obj);
|
|
|
|
return nf->direction;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void netfilter_set_direction(Object *obj, int direction, Error **errp)
|
|
|
|
{
|
|
|
|
NetFilterState *nf = NETFILTER(obj);
|
|
|
|
nf->direction = direction;
|
|
|
|
}
|
|
|
|
|
2016-03-01 08:37:02 +03:00
|
|
|
static char *netfilter_get_status(Object *obj, Error **errp)
|
|
|
|
{
|
|
|
|
NetFilterState *nf = NETFILTER(obj);
|
|
|
|
|
|
|
|
return nf->on ? g_strdup("on") : g_strdup("off");
|
|
|
|
}
|
|
|
|
|
|
|
|
static void netfilter_set_status(Object *obj, const char *str, Error **errp)
|
|
|
|
{
|
|
|
|
NetFilterState *nf = NETFILTER(obj);
|
|
|
|
NetFilterClass *nfc = NETFILTER_GET_CLASS(obj);
|
|
|
|
|
|
|
|
if (strcmp(str, "on") && strcmp(str, "off")) {
|
|
|
|
error_setg(errp, "Invalid value for netfilter status, "
|
|
|
|
"should be 'on' or 'off'");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (nf->on == !strcmp(str, "on")) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
nf->on = !nf->on;
|
2016-04-05 06:43:55 +03:00
|
|
|
if (nf->netdev && nfc->status_changed) {
|
2016-03-01 08:37:02 +03:00
|
|
|
nfc->status_changed(nf, errp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-10-07 06:52:14 +03:00
|
|
|
static void netfilter_init(Object *obj)
|
|
|
|
{
|
2016-03-01 08:37:02 +03:00
|
|
|
NetFilterState *nf = NETFILTER(obj);
|
|
|
|
|
|
|
|
nf->on = true;
|
|
|
|
|
2015-10-07 06:52:14 +03:00
|
|
|
object_property_add_str(obj, "netdev",
|
|
|
|
netfilter_get_netdev_id, netfilter_set_netdev_id,
|
|
|
|
NULL);
|
|
|
|
object_property_add_enum(obj, "queue", "NetFilterDirection",
|
|
|
|
NetFilterDirection_lookup,
|
|
|
|
netfilter_get_direction, netfilter_set_direction,
|
|
|
|
NULL);
|
2016-03-01 08:37:02 +03:00
|
|
|
object_property_add_str(obj, "status",
|
|
|
|
netfilter_get_status, netfilter_set_status,
|
|
|
|
NULL);
|
2015-10-07 06:52:14 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void netfilter_complete(UserCreatable *uc, Error **errp)
|
|
|
|
{
|
|
|
|
NetFilterState *nf = NETFILTER(uc);
|
|
|
|
NetClientState *ncs[MAX_QUEUE_NUM];
|
|
|
|
NetFilterClass *nfc = NETFILTER_GET_CLASS(uc);
|
|
|
|
int queues;
|
|
|
|
Error *local_err = NULL;
|
|
|
|
|
|
|
|
if (!nf->netdev_id) {
|
|
|
|
error_setg(errp, "Parameter 'netdev' is required");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
queues = qemu_find_net_clients_except(nf->netdev_id, ncs,
|
qapi: Change Netdev into a flat union
This is a mostly-mechanical conversion that creates a new flat
union 'Netdev' QAPI type that covers all the branches of the
former 'NetClientOptions' simple union, where the branches are
now listed in a new 'NetClientDriver' enum rather than generated
from the simple union. The existence of a flat union has no
change to the command line syntax accepted for new code, and
will make it possible for a future patch to switch the QMP
command to parse a boxed union for no change to valid QMP; but
it does have some ripple effect on the C code when dealing with
the new types.
While making the conversion, note that the 'NetLegacy' type
remains unchanged: it applies only to legacy command line options,
and will not be ported to QMP, so it should remain a wrapper
around a simple union; to avoid confusion, the type named
'NetClientOptions' is now gone, and we introduce 'NetLegacyOptions'
in its place. Then, in the C code, we convert from NetLegacy to
Netdev as soon as possible, so that the bulk of the net stack
only has to deal with one QAPI type, not two. Note that since
the old legacy code always rejected 'hubport', we can just omit
that branch from the new 'NetLegacyOptions' simple union.
Based on an idea originally by Zoltán Kővágó <DirtY.iCE.hu@gmail.com>:
Message-Id: <01a527fbf1a5de880091f98cf011616a78adeeee.1441627176.git.DirtY.iCE.hu@gmail.com>
although the sed script in that patch no longer applies due to
other changes in the tree since then, and I also did some manual
cleanups (such as fixing whitespace to keep checkpatch happy).
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1468468228-27827-13-git-send-email-eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Fixup from Eric squashed in]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-07-14 06:50:23 +03:00
|
|
|
NET_CLIENT_DRIVER_NIC,
|
2015-10-07 06:52:14 +03:00
|
|
|
MAX_QUEUE_NUM);
|
|
|
|
if (queues < 1) {
|
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "netdev",
|
|
|
|
"a network backend id");
|
|
|
|
return;
|
|
|
|
} else if (queues > 1) {
|
|
|
|
error_setg(errp, "multiqueue is not supported");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (get_vhost_net(ncs[0])) {
|
|
|
|
error_setg(errp, "Vhost is not supported");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
nf->netdev = ncs[0];
|
|
|
|
|
|
|
|
if (nfc->setup) {
|
|
|
|
nfc->setup(nf, &local_err);
|
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
QTAILQ_INSERT_TAIL(&nf->netdev->filters, nf, next);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void netfilter_finalize(Object *obj)
|
|
|
|
{
|
|
|
|
NetFilterState *nf = NETFILTER(obj);
|
|
|
|
NetFilterClass *nfc = NETFILTER_GET_CLASS(obj);
|
|
|
|
|
|
|
|
if (nfc->cleanup) {
|
|
|
|
nfc->cleanup(nf);
|
|
|
|
}
|
|
|
|
|
2016-02-15 07:52:34 +03:00
|
|
|
if (nf->netdev && !QTAILQ_EMPTY(&nf->netdev->filters) &&
|
|
|
|
nf->next.tqe_prev) {
|
2015-10-07 06:52:14 +03:00
|
|
|
QTAILQ_REMOVE(&nf->netdev->filters, nf, next);
|
|
|
|
}
|
2015-12-23 10:43:18 +03:00
|
|
|
g_free(nf->netdev_id);
|
2015-10-07 06:52:14 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void netfilter_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);
|
|
|
|
|
|
|
|
ucc->complete = netfilter_complete;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const TypeInfo netfilter_info = {
|
|
|
|
.name = TYPE_NETFILTER,
|
|
|
|
.parent = TYPE_OBJECT,
|
|
|
|
.abstract = true,
|
|
|
|
.class_size = sizeof(NetFilterClass),
|
|
|
|
.class_init = netfilter_class_init,
|
|
|
|
.instance_size = sizeof(NetFilterState),
|
|
|
|
.instance_init = netfilter_init,
|
|
|
|
.instance_finalize = netfilter_finalize,
|
|
|
|
.interfaces = (InterfaceInfo[]) {
|
|
|
|
{ TYPE_USER_CREATABLE },
|
|
|
|
{ }
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
static void register_types(void)
|
|
|
|
{
|
|
|
|
type_register_static(&netfilter_info);
|
|
|
|
}
|
|
|
|
|
|
|
|
type_init(register_types);
|